diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 91c5f549b133200ba031c4340b9c1c44d7f20b3c..76265ae3b821a4bff4bb16958b23c46f2a841c1d 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -1820,7 +1820,7 @@ window.setPregType = function(actor) {
ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]); //base chance for twins
}
if(actor.ovaImplant == "fertility") {
- ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
+ ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
fertilityStack++;
}
if(actor.hormones == 2) {
diff --git a/src/cheats/mod_EditChildCheatNew.tw b/src/cheats/mod_EditChildCheatNew.tw
index 039184795eea84af4f063f65a577ca4d0c05fcc7..0cf445c450cbe4848da0258342a75d6d3d5759af 100644
--- a/src/cheats/mod_EditChildCheatNew.tw
+++ b/src/cheats/mod_EditChildCheatNew.tw
@@ -2530,7 +2530,7 @@
''__Lips Tattoo__ (
<<if $tempSlave.lipsTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.lipsTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.lipsTat" 0>>None
<<radiobutton "$tempSlave.lipsTat" "tribal patterns">>Tribal Patterns
@@ -2545,7 +2545,7 @@
''__Shoulders Tattoo__ (
<<if $tempSlave.shouldersTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.shouldersTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.shouldersTat" 0>>None
<<radiobutton "$tempSlave.shouldersTat" "tribal patterns">>Tribal Patterns
@@ -2561,7 +2561,7 @@
''__Back Tattoo__ (
<<if $tempSlave.backTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.backTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.backTat" 0>>None
<<radiobutton "$tempSlave.backTat" "tribal patterns">>Tribal Patterns
@@ -2577,7 +2577,7 @@
''__Belly Tattoo__ (
<<if $tempSlave.bellyTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.bellyTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.bellyTat" 0>>None
<<radiobutton "$tempSlave.bellyTat" "a heart">>Heart
@@ -2588,7 +2588,7 @@
''__Arms Tattoo__ (
<<if $tempSlave.armsTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.armsTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.armsTat" 0>>None
<<radiobutton "$tempSlave.armsTat" "tribal patterns">>Tribal Patterns
@@ -2604,7 +2604,7 @@
''__Legs Tattoo__ (
<<if $tempSlave.legsTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.legsTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.legsTat" 0>>None
<<radiobutton "$tempSlave.legsTat" "tribal patterns">>Tribal Patterns
@@ -2620,7 +2620,7 @@
''__Boobs Tattoo__ (
<<if $tempSlave.boobsTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.boobsTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.boobsTat" 0>>None
<<radiobutton "$tempSlave.boobsTat" "tribal patterns">>Tribal Patterns
@@ -2636,7 +2636,7 @@
''__Butt Tattoo__ (
<<if $tempSlave.buttTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.buttTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.buttTat" 0>>None
<<radiobutton "$tempSlave.buttTat" "tribal patterns">>Tribal Patterns
@@ -2652,7 +2652,7 @@
''__Vagina Tattoo__ (
<<if $tempSlave.vaginaTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.vaginaTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.vaginaTat" 0>>None
<<radiobutton "$tempSlave.vaginaTat" "tribal patterns">>Tribal Patterns
@@ -2668,7 +2668,7 @@
''__Anus Tattoo__ (
<<if $tempSlave.anusTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.anusTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.anusTat" 0>>None
<<radiobutton "$tempSlave.anusTat" "bleached">>Bleached
@@ -2683,7 +2683,7 @@
''__Dick Tattoo__ (
<<if $tempSlave.dickTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.dickTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.dickTat" 0>>None
<<radiobutton "$tempSlave.dickTat" "tribal patterns">>Tribal Patterns
@@ -2697,7 +2697,7 @@
''__Tramp Stamp Tattoo__ (
<<if $tempSlave.stampTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.stampTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.stampTat" 0>>None
<<radiobutton "$tempSlave.stampTat" "tribal patterns">>Tribal Patterns
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index 3fd18ba7a496cfb19318540c7735f8b28d236b74..a4692a3fd827b99e915b717bd56fc282a9cbcfbf 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -3279,7 +3279,7 @@
''__Lips Tattoo__ (
<<if $tempSlave.lipsTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.lipsTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.lipsTat" 0>>None
<<radiobutton "$tempSlave.lipsTat" "tribal patterns">>Tribal Patterns
@@ -3294,7 +3294,7 @@
''__Shoulders Tattoo__ (
<<if $tempSlave.shouldersTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.shouldersTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.shouldersTat" 0>>None
<<radiobutton "$tempSlave.shouldersTat" "tribal patterns">>Tribal Patterns
@@ -3310,7 +3310,7 @@
''__Back Tattoo__ (
<<if $tempSlave.backTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.backTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.backTat" 0>>None
<<radiobutton "$tempSlave.backTat" "tribal patterns">>Tribal Patterns
@@ -3326,7 +3326,7 @@
''__Belly Tattoo__ (
<<if $tempSlave.bellyTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.bellyTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.bellyTat" 0>>None
<<radiobutton "$tempSlave.bellyTat" "a heart">>Heart
@@ -3337,7 +3337,7 @@
''__Arms Tattoo__ (
<<if $tempSlave.armsTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.armsTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.armsTat" 0>>None
<<radiobutton "$tempSlave.armsTat" "tribal patterns">>Tribal Patterns
@@ -3353,7 +3353,7 @@
''__Legs Tattoo__ (
<<if $tempSlave.legsTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.legsTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.legsTat" 0>>None
<<radiobutton "$tempSlave.legsTat" "tribal patterns">>Tribal Patterns
@@ -3369,7 +3369,7 @@
''__Boobs Tattoo__ (
<<if $tempSlave.boobsTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.boobsTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.boobsTat" 0>>None
<<radiobutton "$tempSlave.boobsTat" "tribal patterns">>Tribal Patterns
@@ -3385,7 +3385,7 @@
''__Butt Tattoo__ (
<<if $tempSlave.buttTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.buttTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.buttTat" 0>>None
<<radiobutton "$tempSlave.buttTat" "tribal patterns">>Tribal Patterns
@@ -3401,7 +3401,7 @@
''__Vagina Tattoo__ (
<<if $tempSlave.vaginaTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.vaginaTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.vaginaTat" 0>>None
<<radiobutton "$tempSlave.vaginaTat" "tribal patterns">>Tribal Patterns
@@ -3417,7 +3417,7 @@
''__Anus Tattoo__ (
<<if $tempSlave.anusTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.anusTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.anusTat" 0>>None
<<radiobutton "$tempSlave.anusTat" "bleached">>Bleached
@@ -3432,7 +3432,7 @@
''__Dick Tattoo__ (
<<if $tempSlave.dickTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.dickTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.dickTat" 0>>None
<<radiobutton "$tempSlave.dickTat" "tribal patterns">>Tribal Patterns
@@ -3446,7 +3446,7 @@
''__Tramp Stamp Tattoo__ (
<<if $tempSlave.stampTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.stampTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.stampTat" 0>>None
<<radiobutton "$tempSlave.stampTat" "tribal patterns">>Tribal Patterns
diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw
index 47f74cedf8a90b4c158178dfd9dddf4fca82ddf4..82bd339a4fc1093f081aa8102c1468d40a49adb4 100644
--- a/src/facilities/nursery/childInteract.tw
+++ b/src/facilities/nursery/childInteract.tw
@@ -297,90 +297,90 @@
<br> //Nice://
<<link "Apron">><<set $activeChild.clothes = "an apron",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Ballgown">><<set $activeChild.clothes = "a ball gown",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Bangles">><<set $activeChild.clothes = "slutty jewelry",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Battlearmor">><<set $activeChild.clothes = "battlearmor",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Battledress">><<set $activeChild.clothes = "battledress",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Biyelgee costume">><<set $activeChild.clothes = "a biyelgee costume",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Bodysuit">><<set $activeChild.clothes = "a comfortable bodysuit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Boyshorts">><<set $activeChild.clothes = "boyshorts",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Bra">><<set $activeChild.clothes = "a bra",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Burkini">><<set $activeChild.clothes = "a burkini",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Burqa">><<set $activeChild.clothes = "a burqa",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Button-up shirt and panties">><<set $activeChild.clothes = "a button-up shirt and panties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Button-up shirt">><<set $activeChild.clothes = "a button-up shirt",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Cheerleader">><<set $activeChild.clothes = "a cheerleader outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">><<print $activeChild.clothes>><</replace>><</link>>
-| <<link "Clubslut netting">><<set $activeChild.clothes = "clubslut netting",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Cutoffs and a t-shirt">><<set $activeChild.clothes = "cutoffs and a t-shirt",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Cutoffs">><<set $activeChild.clothes = "cutoffs",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Cybersuit">><<set $activeChild.clothes = "a cybersuit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Dirndl">><<set $activeChild.clothes = "a dirndl",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Fallen nun">><<set $activeChild.clothes = "a fallen nuns habit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Gothic lolita dress">><<set $activeChild.clothes = "a gothic lolita dress",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Haltertop dress">><<set $activeChild.clothes = "a halter top dress",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Hanbok">><<set $activeChild.clothes = "a hanbok",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Hijab and abaya">><<set $activeChild.clothes = "a hijab and abaya",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Hijab and blouse">><<set $activeChild.clothes = "a hijab and blouse",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Jeans">><<set $activeChild.clothes = "jeans",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Kitty lingerie">><<set $activeChild.clothes = "kitty lingerie",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Ku Klux Klan Robe (nice)">><<set $activeChild.clothes = "a klan robe",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Ku Klux Klan Robe (slutty)">><<set $activeChild.clothes = "a slutty klan robe",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Latex catsuit">><<set $activeChild.clothes = "a latex catsuit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Leather pants and a tube top">><<set $activeChild.clothes = "leather pants and a tube top",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Leather pants and pasties">><<set $activeChild.clothes = "leather pants and pasties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Leather pants">><<set $activeChild.clothes = "leather pants",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Lederhosen">><<set $activeChild.clothes = "lederhosen",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Leotard">><<set $activeChild.clothes = "a leotard",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Maid (nice)">><<set $activeChild.clothes = "a nice maid outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Maid (slutty)">><<set $activeChild.clothes = "a slutty maid outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Military uniform">><<set $activeChild.clothes = "a military uniform",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Mini dress">><<set $activeChild.clothes = "a mini dress",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Monokini">><<set $activeChild.clothes = "a monokini",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Mounty outfit">><<set $activeChild.clothes = "a mounty outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Nice lingerie">><<set $activeChild.clothes = "attractive lingerie",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Niqab and abaya">><<set $activeChild.clothes = "a niqab and abaya",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Nurse (nice)">><<set $activeChild.clothes = "a nice nurse outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Nurse (slutty)">><<set $activeChild.clothes = "a slutty nurse outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "One-piece swimsuit">><<set $activeChild.clothes = "a one-piece swimsuit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Oversized t-shirt and boyshorts">><<set $activeChild.clothes = "an oversized t-shirt and boyshorts",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Oversized t-shirt">><<set $activeChild.clothes = "an oversized t-shirt",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Panties and pasties">><<set $activeChild.clothes = "panties and pasties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Panties">><<set $activeChild.clothes = "panties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Police uniform">><<set $activeChild.clothes = "a police uniform",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Pony outfit (nice)">><<set $activeChild.clothes = "a nice pony outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Pony outfit (slutty)">><<set $activeChild.clothes = "a slutty pony outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Red Army uniform">><<set $activeChild.clothes = "a red army uniform",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Scalemail bikini">><<set $activeChild.clothes = "a scalemail bikini",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Schoolgirl">><<set $activeChild.clothes = "a schoolgirl outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Schutzstaffel uniform (nice)">><<set $activeChild.clothes = "a schutzstaffel uniform",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Schutzstaffel uniform (slutty)">><<set $activeChild.clothes = "a slutty schutzstaffel uniform",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Skimpy loincloth">><<set $activeChild.clothes = "a skimpy loincloth",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Slave gown">><<set $activeChild.clothes = "a slave gown",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Slutty outfit">><<set $activeChild.clothes = "a slutty outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Spats and a tank top">><<set $activeChild.clothes = "spats and a tank top",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Sport shorts and a sports bra">><<set $activeChild.clothes = "sport shorts and a sports bra",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Sport shorts and t-shirt">><<set $activeChild.clothes = "sport shorts and a t-shirt",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Sport shorts">><<set $activeChild.clothes = "sport shorts",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Sports bra">><<set $activeChild.clothes = "a sports bra",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "String bikini">><<set $activeChild.clothes = "a string bikini",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Striped bra">><<set $activeChild.clothes = "a striped bra",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Striped panties">><<set $activeChild.clothes = "striped panties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Striped underwear">><<set $activeChild.clothes = "striped underwear",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Succubus costume">><<set $activeChild.clothes = "a succubus outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Suit (nice)">><<set $activeChild.clothes = "nice business attire",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Suit (slutty)">><<set $activeChild.clothes = "slutty business attire",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Sweater and cutoffs">><<set $activeChild.clothes = "a sweater and cutoffs",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Sweater and panties">><<set $activeChild.clothes = "a sweater and panties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Sweater">><<set $activeChild.clothes = "a sweater",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "T-shirt and jeans">><<set $activeChild.clothes = "a t-shirt and jeans",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "T-shirt and panties">><<set $activeChild.clothes = "a t-shirt and panties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "T-shirt and thong">><<set $activeChild.clothes = "a t-shirt and thong",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "T-shirt">><<set $activeChild.clothes = "a t-shirt",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Tank-top and panties">><<set $activeChild.clothes = "a tank-top and panties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Tank-top">><<set $activeChild.clothes = "a tank-top",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Thong">><<set $activeChild.clothes = "a thong",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Tube top and thong">><<set $activeChild.clothes = "a tube top and thong",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Tube top">><<set $activeChild.clothes = "a tube top",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Ballgown">><<set $activeChild.clothes = "a ball gown",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Bangles">><<set $activeChild.clothes = "slutty jewelry",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Battlearmor">><<set $activeChild.clothes = "battlearmor",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Battledress">><<set $activeChild.clothes = "battledress",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Biyelgee costume">><<set $activeChild.clothes = "a biyelgee costume",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Bodysuit">><<set $activeChild.clothes = "a comfortable bodysuit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Boyshorts">><<set $activeChild.clothes = "boyshorts",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Bra">><<set $activeChild.clothes = "a bra",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Burkini">><<set $activeChild.clothes = "a burkini",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Burqa">><<set $activeChild.clothes = "a burqa",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Button-up shirt and panties">><<set $activeChild.clothes = "a button-up shirt and panties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Button-up shirt">><<set $activeChild.clothes = "a button-up shirt",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Cheerleader">><<set $activeChild.clothes = "a cheerleader outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">><<print $activeChild.clothes>><</replace>><</link>>
+| <<link "Clubslut netting">><<set $activeChild.clothes = "clubslut netting",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Cutoffs and a t-shirt">><<set $activeChild.clothes = "cutoffs and a t-shirt",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Cutoffs">><<set $activeChild.clothes = "cutoffs",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Cybersuit">><<set $activeChild.clothes = "a cybersuit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Dirndl">><<set $activeChild.clothes = "a dirndl",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Fallen nun">><<set $activeChild.clothes = "a fallen nuns habit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Gothic lolita dress">><<set $activeChild.clothes = "a gothic lolita dress",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Haltertop dress">><<set $activeChild.clothes = "a halter top dress",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Hanbok">><<set $activeChild.clothes = "a hanbok",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Hijab and abaya">><<set $activeChild.clothes = "a hijab and abaya",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Hijab and blouse">><<set $activeChild.clothes = "a hijab and blouse",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Jeans">><<set $activeChild.clothes = "jeans",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Kitty lingerie">><<set $activeChild.clothes = "kitty lingerie",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Ku Klux Klan Robe (nice)">><<set $activeChild.clothes = "a klan robe",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Ku Klux Klan Robe (slutty)">><<set $activeChild.clothes = "a slutty klan robe",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Latex catsuit">><<set $activeChild.clothes = "a latex catsuit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Leather pants and a tube top">><<set $activeChild.clothes = "leather pants and a tube top",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Leather pants and pasties">><<set $activeChild.clothes = "leather pants and pasties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Leather pants">><<set $activeChild.clothes = "leather pants",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Lederhosen">><<set $activeChild.clothes = "lederhosen",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Leotard">><<set $activeChild.clothes = "a leotard",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Maid (nice)">><<set $activeChild.clothes = "a nice maid outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Maid (slutty)">><<set $activeChild.clothes = "a slutty maid outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Military uniform">><<set $activeChild.clothes = "a military uniform",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Mini dress">><<set $activeChild.clothes = "a mini dress",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Monokini">><<set $activeChild.clothes = "a monokini",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Mounty outfit">><<set $activeChild.clothes = "a mounty outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Nice lingerie">><<set $activeChild.clothes = "attractive lingerie",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Niqab and abaya">><<set $activeChild.clothes = "a niqab and abaya",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Nurse (nice)">><<set $activeChild.clothes = "a nice nurse outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Nurse (slutty)">><<set $activeChild.clothes = "a slutty nurse outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "One-piece swimsuit">><<set $activeChild.clothes = "a one-piece swimsuit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Oversized t-shirt and boyshorts">><<set $activeChild.clothes = "an oversized t-shirt and boyshorts",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Oversized t-shirt">><<set $activeChild.clothes = "an oversized t-shirt",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Panties and pasties">><<set $activeChild.clothes = "panties and pasties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Panties">><<set $activeChild.clothes = "panties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Police uniform">><<set $activeChild.clothes = "a police uniform",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Pony outfit (nice)">><<set $activeChild.clothes = "a nice pony outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Pony outfit (slutty)">><<set $activeChild.clothes = "a slutty pony outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Red Army uniform">><<set $activeChild.clothes = "a red army uniform",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Scalemail bikini">><<set $activeChild.clothes = "a scalemail bikini",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Schoolgirl">><<set $activeChild.clothes = "a schoolgirl outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Schutzstaffel uniform (nice)">><<set $activeChild.clothes = "a schutzstaffel uniform",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Schutzstaffel uniform (slutty)">><<set $activeChild.clothes = "a slutty schutzstaffel uniform",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Skimpy loincloth">><<set $activeChild.clothes = "a skimpy loincloth",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Slave gown">><<set $activeChild.clothes = "a slave gown",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Slutty outfit">><<set $activeChild.clothes = "a slutty outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Spats and a tank top">><<set $activeChild.clothes = "spats and a tank top",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Sport shorts and a sports bra">><<set $activeChild.clothes = "sport shorts and a sports bra",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Sport shorts and t-shirt">><<set $activeChild.clothes = "sport shorts and a t-shirt",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Sport shorts">><<set $activeChild.clothes = "sport shorts",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Sports bra">><<set $activeChild.clothes = "a sports bra",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "String bikini">><<set $activeChild.clothes = "a string bikini",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Striped bra">><<set $activeChild.clothes = "a striped bra",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Striped panties">><<set $activeChild.clothes = "striped panties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Striped underwear">><<set $activeChild.clothes = "striped underwear",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Succubus costume">><<set $activeChild.clothes = "a succubus outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Suit (nice)">><<set $activeChild.clothes = "nice business attire",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Suit (slutty)">><<set $activeChild.clothes = "slutty business attire",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Sweater and cutoffs">><<set $activeChild.clothes = "a sweater and cutoffs",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Sweater and panties">><<set $activeChild.clothes = "a sweater and panties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Sweater">><<set $activeChild.clothes = "a sweater",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "T-shirt and jeans">><<set $activeChild.clothes = "a t-shirt and jeans",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "T-shirt and panties">><<set $activeChild.clothes = "a t-shirt and panties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "T-shirt and thong">><<set $activeChild.clothes = "a t-shirt and thong",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "T-shirt">><<set $activeChild.clothes = "a t-shirt",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Tank-top and panties">><<set $activeChild.clothes = "a tank-top and panties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Tank-top">><<set $activeChild.clothes = "a tank-top",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Thong">><<set $activeChild.clothes = "a thong",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Tube top and thong">><<set $activeChild.clothes = "a tube top and thong",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Tube top">><<set $activeChild.clothes = "a tube top",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
<<if isItemAccessible("attractive lingerie for a pregnant woman")>>
| //FS// <<link "Attractive lingerie for a pregnant woman">><<set $activeChild.clothes = "attractive lingerie for a pregnant woman",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
diff --git a/src/facilities/nursery/childSummary.tw b/src/facilities/nursery/childSummary.tw
index b1e40a02f7e0105a4526dd154cb12bf006f0f819..8879bd285643b9b39f5533ca3954d20ff9c56fa6 100644
--- a/src/facilities/nursery/childSummary.tw
+++ b/src/facilities/nursery/childSummary.tw
@@ -24,24 +24,24 @@
<<if $useSlaveListInPageJSNavigation == 1>>
<<set _Count = _indexSlavesIdxs.length>>
/* Useful for finding weird combinations -- usages of this passage that don't yet generate the quick index.
- * <<print 'pass/count/indexed/flag::[' + _Pass + '/' + _Count + '/' + _indexed + '/' + $Flag + ']'>>
+ * <<print 'pass/count/indexed/flag::[' + _Pass + '/' + _Count + '/' + _indexed + '/' + $Flag + ']'>>
*/
<<if ((_Count > 1) && (_indexed == 0) && (((_Pass == 'Main') && (ndef $Flag) && (($useSlaveSummaryTabs == 0) || ($childAssignmentTab == "all"))) || ($Flag == 1)))>>
<<set _indexed = 1, _counter = 0, _buttons = [], _offset = -50>>
<<if (/Select/i.test(_Pass))>>
- <<set _offset = -25>>
+ <<set _offset = -25>>
<</if>>
<br />
<<set _tableCount = _tableCount || 0>>
<<set _tableCount++>>
/*
- * we want <button data-quick-index="<<= _tableCount>>"> ...
- */
+ * we want <button data-quick-index="<<= _tableCount>>"> ...
+ */
<<set _buttonAttributes = { 'data-quick-index': _tableCount }>>
<<htag _buttonAttributes 'button'>>Quick Index<</htag>>
/*
- * we want <div id="list_index3" class=" hidden">...
- */
+ * we want <div id="list_index3" class=" hidden">...
+ */
<<set _divAttributes = { id: 'list_index' + _tableCount, class: 'hidden'}>>
<<htag _divAttributes>>
<<for !_.isUndefined(_csii = _indexSlavesIdxs.shift())>>
diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index 0b61db9071604182a5403a04b992c3f95ddff0eb..8b2a6f7770e44e6c0ace7c1c0ee0fa9bfa8be7ee 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -376,7 +376,7 @@ Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $
<br><br>
Target age for release: <<textbox "$targetAgeNursery" $targetAgeNursery "Nursery">>
- [[Minimum Legal Age|Nursery][$targetAgeNursery = $minimumSlaveAge]]
+ [[Minimum Legal Age|Nursery][$targetAgeNursery = $minimumSlaveAge]]
| [[Average Age of Fertility|Nursery][$targetAgeNursery = $fertilityAge]]
| [[Average Age of Potency|Nursery][$targetAgeNursery = $potencyAge]]
| [[Legal Adulthood|Nursery][$targetAgeNursery = 18]]
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 716a91e3f3388adb123274e63dbc8d123f7102b4..a3964d87d9b135d53939418afe71fe1e0119b72e 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -800,7 +800,7 @@ Choose a more particular entry below:
<<case "Farmer">>
- <br><br>A ''Farmer'' can be selected once the [[Farmyard|Encyclopedia][$encyclopedia = "Farmyard"]] facility is built. Having applicable [[career experience|Encyclopedia][$encyclopedia = "Career Experience"]] and strong [[muscles|Encyclopedia][$encyclopedia = "Musculature"]] allow a Farmer to maintain the different crops and animals.
+ <br><br>A ''Farmer'' can be selected once the [[Farmyard|Encyclopedia][$encyclopedia = "Farmyard"]] facility is built. Having applicable [[career experience|Encyclopedia][$encyclopedia = "Career Experience"]] and strong [[muscles|Encyclopedia][$encyclopedia = "Musculature"]] allow a Farmer to maintain the different crops and animals.
<br>
//This description needs to be expanded.//
diff --git a/src/js/SetBellySize.tw b/src/js/SetBellySize.tw
index 603d70c5185b74e75297658902eb8b897f460ba1..72689eabb86b1afb684bc9a0fe8bdff0807e2aa8 100644
--- a/src/js/SetBellySize.tw
+++ b/src/js/SetBellySize.tw
@@ -3,7 +3,11 @@
window.SetBellySize = function SetBellySize(slave) {
let _implantSize;
+<<<<<<< HEAD
WombNormalizePreg(slave); /* now with support for legacy code that advances pregnancy by setting .preg++ */
+=======
+ WombNormalizePreg(slave); /*now with support for legacy code that advance pregnancy by setting .preg++ */
+>>>>>>> c51e6f27783bed06aa693679ebdeac47325a88c6
if (slave.bellyImplant > 0)
_implantSize = slave.bellyImplant;
diff --git a/src/js/pregJS.tw b/src/js/pregJS.tw
index 24e623c7bd4b3200e916192c34641d9c3cea7edb..df33cb05f7a269084df82b7e859b96d273ce3162 100644
--- a/src/js/pregJS.tw
+++ b/src/js/pregJS.tw
@@ -254,7 +254,7 @@ window.setPregType = function(actor) {
ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]); //base chance for twins
}
if(actor.ovaImplant == "fertility") {
- ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
+ ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
fertilityStack++;
}
if(actor.hormones == 2) {
diff --git a/src/npc/fKiss.tw b/src/npc/fKiss.tw
index 281f9ce3bd331c8edfabe9adfaf9e40c41c04c17..df4adc6d86e9ac6160a69e95b9c22a65155da842 100644
--- a/src/npc/fKiss.tw
+++ b/src/npc/fKiss.tw
@@ -3,7 +3,7 @@
<<setPlayerPronouns>>
You tell $activeSlave.slaveName to
-<<switch $activeSlave.collar>>
+<<switch $activeSlave.collar>>
<<case "dildo gag">>
<<if ($activeSlave.amp != 1)>>
remove $his dildo gag and approach you.
@@ -41,6 +41,7 @@ You tell $activeSlave.slaveName to
$He hurriedly complies, happy to be near the object of $his longing. Once $he's close, you take a moment to gaze deeply
<<if canSee($activeSlave)>>
<<<<<<< HEAD
+<<<<<<< HEAD
<<<<<<< HEAD
into $his $activeSlave.eyeColor eyes. $He finds the intense look from the _womanP $he loves overwhelming, and $his eyes flick downward after a moment.
<<else>>
@@ -55,6 +56,11 @@ You tell $activeSlave.slaveName to
<<else>>
upon $his face. $He senses the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> $he loves and finds it overwhelming, and after a moment glances away.
>>>>>>> 44d5242562559fcffc0306a9f97ef5737d43d786
+=======
+ into $his $activeSlave.eyeColor eyes. $He finds the intense look from the _womanP $he loves overwhelming, and $his eyes flick downward after a moment.
+ <<else>>
+ upon $his face. $He senses the intense look from the _womanP $he loves and finds it overwhelming, and after a moment glances away.
+>>>>>>> c51e6f27783bed06aa693679ebdeac47325a88c6
<</if>>
$He blushes furiously.
<<elseif ($activeSlave.relationship == -3)>>
@@ -94,7 +100,7 @@ You tell $activeSlave.slaveName to
<<if canSee($activeSlave)>>
into $his $activeSlave.eyeColor eyes. $He finds the intense look from $his beloved <<= WrittenMaster($activeSlave)>> disconcerting, and $his eyes flick downward after a moment.
<<else>>
- upon $his face. $He senses the intense look from $his beloved <<= WrittenMaster()>> and finds it disconcerting, and after a moment glances away.
+ upon $his face. $He senses the intense look from $his beloved <<= WrittenMaster()>> and finds it disconcerting, and after a moment glances away.
<</if>>
$He blushes furiously.
<<elseif ($activeSlave.devotion > 50)>>
diff --git a/src/npc/newSlaveIncestSex.tw b/src/npc/newSlaveIncestSex.tw
index e5ece5b0432aab21b9c115c1dfe630ca198548bf..13f2283c2edb80666c08bcd446a9ac1bbf6ef1ad 100644
--- a/src/npc/newSlaveIncestSex.tw
+++ b/src/npc/newSlaveIncestSex.tw
@@ -130,7 +130,7 @@ You indicate them to present themselves to you. Still shaking from the aftershoc
<</link>>
/*
-<<link "Show them how cruel life in your arcology can be">>
+<<link "Show them how cruel life in your arcology can be">>
TODO: this needs to be written
<<replace "#result">>
<</replace>>
diff --git a/src/pregmod/fSlaveSlaveVag.tw b/src/pregmod/fSlaveSlaveVag.tw
index a2da70af1f7963f607c336fc6d17fccc9091294e..a63fd8290ee936f1b55c440d5785b9973ad22480 100644
--- a/src/pregmod/fSlaveSlaveVag.tw
+++ b/src/pregmod/fSlaveSlaveVag.tw
@@ -1,4 +1,8 @@
:: FSlaveSlaveVag [nobr]
+<<<<<<< HEAD
+=======
+
+>>>>>>> c51e6f27783bed06aa693679ebdeac47325a88c6
<<set $nextButton = "Back", $nextLink = "Slave Interact">>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index 0d8f4819d8bac528bb74464b6f8079c5cf97004c..9cfb9e138cb58a20ba915134cabaf2dd79406043 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -777,8 +777,8 @@ Choose a tattoo style:
<<if $activeSlave.bellyTat == 0>>
<br>
[[Heart|Body Modification][$activeSlave.bellyTat = "a heart",$cash -= $modCost]]
- | [[Star|Body Modification][$activeSlave.bellyTat = "a star",$cash -= $modCost]]
- | [[Butterfly|Body Modification][$activeSlave.bellyTat = "a butterfly",$cash -= $modCost,$degradation += 1]]
+ | [[Star|Body Modification][$activeSlave.bellyTat = "a star",$cash -= $modCost]]
+ | [[Butterfly|Body Modification][$activeSlave.bellyTat = "a butterfly",$cash -= $modCost,$degradation += 1]]
<</if>>
<<if $activeSlave.bellyTat != 0>>
//[[Remove tattoos|Body Modification][$activeSlave.bellyTat = 0,$cash -= $modCost]]//
diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw
index 9d59311731bb31721ab6f9666fac6b60d4c64b50..a40324fd0396d1a004108e7c6bf828417d4b4d55 100644
--- a/src/uncategorized/buildingWidgets.tw
+++ b/src/uncategorized/buildingWidgets.tw
@@ -63,13 +63,13 @@ if(!Macro.has('sectorblock')) {
/* Usage: <<sectorblock sector index "other text (optional)">> */
Macro.add('sectorblock', {
/*
- * Add sector metadata here
- *
- * base: Which passage the sector link goes to if owned. Defaults to the sector type. Unowned go to "Private"
- * name: The sector name. Defaults to the sector type, with spaces inserted in case of WordsLikeThis
- * cls: The CSS id to use for styling if owned; else uses "Private"
- * extra: Some (SugarCube-style) extra text to add after the link
- */
+ * Add sector metadata here
+ *
+ * base: Which passage the sector link goes to if owned. Defaults to the sector type. Unowned go to "Private"
+ * name: The sector name. Defaults to the sector type, with spaces inserted in case of WordsLikeThis
+ * cls: The CSS id to use for styling if owned; else uses "Private"
+ * extra: Some (SugarCube-style) extra text to add after the link
+ */
sectors: {
LuxuryApartments: { base: 'Apartments' },
DenseApartments: { base: 'Apartments' },
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index d1bd65c67cf02e14f6a7b04c9d4cb2c12d28d713..595557f25fb4a74cded4afc0035a66c65eaa26d7 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -565,7 +565,7 @@ $nursery > 0 || $masterSuiteUpgradePregnancy > 0 || $incubator > 0 ||
<br> <i>Specialized dietary adjustments and concentrated, quick to digest food required to support absurd multiples:</i> <<print cashFormat($foodCost*$slaves[$i].pregType*3*_pAccMult)>>
<<set _individualCosts += $foodCost*$slaves[$i].pregType*3*_pAccMult>>
<<elseif $slaves[$i].pregType >= 100>>
- <br> <i>Specialized dietary requirements and feeding methods to support absurd multiples:</i>
+ <br> <i>Specialized dietary requirements and feeding methods to support absurd multiples:</i>
@@.yellowgreen;<<print cashFormat($foodCost*$slaves[$i].pregType*5*_pAccMult)>>@@
<<set _individualCosts += $foodCost*$slaves[$i].pregType*5*_pAccMult>>
<</if>>
diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw
index f3bc2b7da03c2adf949f0e25e1177bd718448c39..814fe559bb4427a97e90742e8bf3af1302dab1b9 100644
--- a/src/uncategorized/masterSuite.tw
+++ b/src/uncategorized/masterSuite.tw
@@ -298,7 +298,7 @@ $masterSuiteNameCaps is furnished
<<set _Tmult0 = Math.trunc($masterSuite*1000*$upgradeMultiplierArcology)>>
[[Expand the Master Suite|Master Suite][$cash -= _Tmult0, $masterSuite += 2, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
<<if $Concubine == 0 && $masterSuiteSlaves == 0>>
- | [[Decommission the Master Suite|Main][$masterSuite = 0, $masterSuiteUpgradeLuxury = 0, $masterSuitePregnancySlaveLuxuries = 0, $masterSuiteDecoration = "standard", $masterSuitePregnancyFertilityDrugs = 0, $masterSuitePregnancyFertilitySupplements = 0, $masterSuiteUpgradePregnancy = 0, $masterSuiteHyperPregnancy = 0]]
+ | [[Decommission the Master Suite|Main][$masterSuite = 0, $masterSuiteUpgradeLuxury = 0, $masterSuitePregnancySlaveLuxuries = 0, $masterSuiteDecoration = "standard", $masterSuitePregnancyFertilityDrugs = 0, $masterSuitePregnancyFertilitySupplements = 0, $masterSuiteUpgradePregnancy = 0, $masterSuiteHyperPregnancy = 0]]
<</if>>
<<if $masterSuiteSlaves > 0>>
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index c0c76fa034beadc34ba7854860d1aa2512148067..85f9fe16dbe855351bd27e1f0f697e741fb68a2d 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -366,7 +366,7 @@
<br> $He <<include "SA please you">>
<br>
<<if $servantMilkers == 1 && $slaves[$i].lactation > 0 && $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken" && $slaves[$i].amp != 1 && $slaves[$i].intelligence+$slaves[$i].intelligenceImplant >= -90>>
- When $his breasts begin to feel full and you aren't around, $he avails $himself to the penthouse milkers and
+ When $his breasts begin to feel full and you aren't around, $he avails $himself to the penthouse milkers and
<<set $servantMilkersMultiplier = 0.25>><<silently>><<include "SA get milked">><</silently>><<set $servantMilkersMultiplier = 1>>
gives $milk liters of milk over the week, which is sold for @@.yellowgreen;<<print cashFormat($milkSale)>>.@@
<</if>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index f10d39c6c6f5f79778aefe3b0babccf52515bbce..78adfcd41a99dd784613bdd998e0aaf87dc787b1 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -644,7 +644,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<= AnalVCheck()>>
<</link>>
- | <<link "Initiate $him with anal pain">>
+ | <<link "Initiate $him with anal pain">>
<<replace "#introResult">>
You haul $him wordlessly into the bathroom. In a few minutes $he finds $himself standing obediently behind you, waiting for your next command with a clean colon and an uncomfortably large buttplug stretching $his virgin ass. Once it's been in long enough to prevent any damage, you push $his fearful form over the desk and pull it free. $He squeals with more embarrassment than pain at the feeling of $his first sodomy, but before long you're pounding $him hard enough that all $he can do is moan and desperately wonder when you'll be done with $his poor little butt. You keep $him around all day; by night, $his asshole is well broken in and @@.mediumorchid;so is $his spirit.@@ $He @@.gold;fears@@ you now, knowing this is only the beginning.
<</replace>>
@@ -670,7 +670,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<set $activeSlave.dick = 0>>
<<set $activeSlave.balls = 0>>
<</link>>
- | <<link "Use $him as $he is">>
+ | <<link "Use $him as $he is">>
<<replace "#introResult">>
You announce that $he'll have to earn $his surgery - if $he ever gets it at all. $He only has time for a moment of shock and betrayal before $he finds $his face jammed into the cushions of your office couch. $He struggles, outraged, but only manages to avoid sodomy for a moment. $His resistance only makes it harder on $himself as you take $his anus without mercy. By the third time you buttfuck $him $he's learned to @@.hotpink;relax and let it happen.@@
<</replace>>
@@ -694,7 +694,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<</link>>
<</if>>
<<if ($activeSlave.indentureRestrictions <= 0) && ($seeExtreme == 1)>>
- | <<link "Cruelly castrate $him">>
+ | <<link "Cruelly castrate $him">>
<<replace "#introResult">>
You rise from your desk and move in close, wordlessly dominating $him without touch, tempting and overawing $him until $he's desperate with desire, $his prick stiff as iron. $He follows you willingly into the autosurgery and even allows you to strap $him in, face down, without comment. $His fuckhole welcomes your <<if $PC.dick == 1>>cock<<else>>strap-on<</if>> and $he gasps with pleasure. $He climaxes with indecent speed, dripping $his cum onto the surgery floor. You keep fucking $him, but lean forward to whisper to $him that that was $his last hardon. $He's completely confused and says nothing, but gradually realizes what the numb feeling around $his ballsack means. $He @@.gold;screams with horror@@ and @@.mediumorchid;sobs disconsolately@@ as the autosurgery disengages from $his clipped genitals and you disengage from $his <<if $PC.dick == 1>>cum-filled<<else>>wilting<</if>> butthole. $He gingerly stumbles back to your office with you and, without even being ordered to, arranges $himself on the couch with $his fuckhole ready. The gelding does affect $his @@.red;health@@ somewhat.
<</replace>>
@@ -730,7 +730,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<</link>>
<</if>>
<<if canDoAnal($activeSlave)>>
- | <<link "Make sure $he knows $he made a mistake">>
+ | <<link "Make sure $he knows $he made a mistake">>
<<replace "#introResult">>
You tell $him that slaves working in your penthouse are all expected to please you, and $he nods eagerly. $He strips, only starting to look doubtful again when you brusquely order $him to hurry up. You order $him to get down on the ground with $his face up, $his shoulders against the floor; $he does, and then you order $him to put $his legs over $his head. $He looks puzzled but does, flipping $himself flexibly up until $he's doing a shoulder stand, bent double with $his crotch over $his face. You stand over $him and shove <<if $PC.dick == 1>>your cock<<else>>a strap-on<</if>> down and into $his asshole. This is an advanced anal position and although $he's clearly no anal virgin it's well beyond $him. $He does $his best but tears begin to streak $his cheeks. After a while you tire of the position and flip $him over onto $his face to assrape $him doggy style. This allows you to whisper into $his ear that $his holes are your property now, to use, to abuse, or to sell. $He @@.mediumorchid;sobs in despair@@ at the latter, knowing $he's @@.gold;thrown $his life away.@@
<</replace>>
@@ -753,8 +753,8 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<set $oralTotal += 1>>
<</link>>
<<if canDoAnal($activeSlave)>>
- | <<link "Put $him in $his place">>
- <<replace "#introResult">>
+ | <<link "Put $him in $his place">>
+ <<replace "#introResult">>
You stand up and tell $him to strip. $He hesitates, staring at you in dawning apprehension, until $he sees that you're stepping into a strap-on. $He unconsciously takes a step backward, but that's as far as $he gets before you cover the ground between you, grab $him by the throat, and push $his back until $he falls onto the couch. You drag the head of the fake phallus down over $his pussylips, and $he shivers, but you keep going, telling $him that you'll only be fucking $him there when $he's good. When $he's bad, you'll assfuck $him. $His eyes fly open and $he tries to struggle, but you give $him a warning slap and then push yourself home. $He starts to cry, more from hopelessness than anal pain, knowing that @@.mediumorchid;you're a slaveowner like any other,@@ more likely to @@.gold;abuse $him@@ than be sympathetic.
<</replace>>
<<set $activeSlave.devotion -= 5>>
@@ -778,7 +778,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<= AnalVCheck()>>
<</link>>
<<if canDoAnal($activeSlave)>>
- | <<link "Let $him know $he'll have to earn $his rewards">>
+ | <<link "Let $him know $he'll have to earn $his rewards">>
<<replace "#introResult">>
You complete the induction and then perform a thorough inspection, noting down each area in which surgery or drugs could improve $his body. $He understands what you're doing and can barely contain $his excitement, but you tell $him that $he'll have to earn such improvements. $His face falls. You reassure $him that it won't take the years $he would have had to work to afford such things $himself, but that $he needs to be a good slave, and soon, for you to spend resources on $him. You let $him start by taking a rough buttfuck, bent over the desk. $His ass is tight and you are not merciful. $He gasps and moans but takes it all the same, @@.mediumaquamarine;trusting@@ that $he'll eventually be rewarded with transformation.
<</replace>>
@@ -1032,23 +1032,23 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<if $activeSlave.dick == 0>>
- | <<link "Give $him a smart clitoral piercing">>
+ | <<link "Give $him a smart clitoral piercing">>
<<set $cash -= $SPcost>>
<<replace "#introResult">>
You take $him to the body modification studio, strap $him down, pierce $his clit, and insert what appears to be a large stainless steel barbell piercing. It actually contains a device that can vibrate to give $him sexual stimulation or create subtle pain to suppress pleasure. It is connected wirelessly to the arcology, which can be given instructions to encourage or discourage sexual pleasure in specific situations. You run a quick test. On the oral setting, as soon as $he kneels in front of your crotch, $he gasps as the stimulation starts. On the anal setting, $he whimpers when you run a finger across $his asshole.
<</replace>>
<<set $activeSlave.clitPiercing = 3>>
<</link>>
- //This option costs <<print cashFormat($SPcost)>>//
+ //This option costs <<print cashFormat($SPcost)>>//
<<else>>
- | <<link "Give $him a smart frenulum piercing">>
+ | <<link "Give $him a smart frenulum piercing">>
<<set $cash -= $SPcost>>
<<replace "#introResult">>
You take $him to the body modification studio, strap $him down, pierce $his frenulum, and insert what appears to be a large stainless steel barbell piercing. It actually contains a device that can vibrate to give $him sexual stimulation or create subtle pain to suppress pleasure. It is connected wirelessly to the arcology, which can be given instructions to encourage or discourage sexual pleasure in specific situations. You run a quick test. On the oral setting, as soon as $he kneels in front of your crotch, $he gasps as the stimulation starts. On the anal setting, $he whimpers and gets rock hard when you run a finger across $his asshole.
<</replace>>
<<set $activeSlave.clitPiercing = 3>>
<</link>>
- //This option costs <<print cashFormat($SPcost)>>//
+ //This option costs <<print cashFormat($SPcost)>>//
<</if>>
@@ -1224,7 +1224,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<if $seePreg != 0>>
<<if isFertile($activeSlave) && $PC.dick == 1 && $activeSlave.ballType == "human">>
- | <<link "Impregnate $him">>
+ | <<link "Impregnate $him">>
<<replace "#introResult">>
You perform a careful medical examination to verify fertility, and then restrain $him in your office with $his ass in the air. Whenever you feel able, you drain your balls into $his <<if $activeSlave.mpreg == 1>>ass<<else>>cunt<</if>>, only releasing $him for other duties when scans verify a fertilized ovum. $He didn't properly understand the scans, so $he just thought it was bound, forced sex; $he won't realize what happened for some weeks at least.
<<if $activeSlave.mpreg == 1>>
@@ -1812,7 +1812,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<</link>>
<<if ($activeSlave.lactation > 0 || (($dairySlimMaintainUpgrade == 0 || $dairySlimMaintain == 0) && ($activeSlave.boobs > 300 || $activeSlave.dick == 0 || $dairyImplantsSetting == 1) && $dairyImplantsSetting != 2)) || ($activeSlave.balls > 0)>>
<<if ($dairyPrepUpgrade == 1) && ($dairy > $dairySlaves+$bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren)>>
- | <<link "Send $him straight to the Industrial Dairy">>
+ | <<link "Send $him straight to the Industrial Dairy">>
<<set $activeSlave.choosesOwnAssignment = 0>>
<<set $activeSlave.anus = Math.clamp($activeSlave.anus, 3, 4)>>
<<if $activeSlave.vagina > -1>><<set $activeSlave.vagina = Math.clamp($activeSlave.vagina, 3, 4)>><</if>>
@@ -1824,7 +1824,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<</link>>
<</if>>
<<if $dairy > $dairySlaves+$bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren>>
- | <<link "Break $him in for the Industrial Dairy">>
+ | <<link "Break $him in for the Industrial Dairy">>
<<set $activeSlave.choosesOwnAssignment = 0>>
<<set $activeSlave.anus = Math.clamp($activeSlave.anus, 3, 4)>>
<<if $activeSlave.vagina > -1>>
diff --git a/src/uncategorized/pRivalryCapture.tw b/src/uncategorized/pRivalryCapture.tw
index 6c124e783045381637032a7dc77bce407539080a..c2441845e91239dc5863c87f973d5d85f0208ae2 100644
--- a/src/uncategorized/pRivalryCapture.tw
+++ b/src/uncategorized/pRivalryCapture.tw
@@ -429,13 +429,13 @@
<<setLocalPronouns $activeSlave>>
-Your
-<<if passage() == "P rivalry actions">>
- target is quickly delivered. Politely dismissing the head of your <<if $mercenariesTitle != "mercenaries">> $mercenariesTitle<<else>> mercenaries<</if>>, you savor
+Your
+<<if passage() == "P rivalry actions">>
+ target is quickly delivered. Politely dismissing the head of your <<if $mercenariesTitle != "mercenaries">> $mercenariesTitle<<else>> mercenaries<</if>>, you savor
<<else>>
- bounty is quickly claimed, and you are treated to
+ bounty is quickly claimed, and you are treated to
<</if>>
-the delicious moment of finding your rival on $his knees in front of you with a black bag over $his head and $his hands cuffed behind $him. $He's one of your slaves now, fundamentally no different than any other. Looking $him over, the causes of $his downfall are
+the delicious moment of finding your rival on $his knees in front of you with a black bag over $his head and $his hands cuffed behind $him. $He's one of your slaves now, fundamentally no different than any other. Looking $him over, the causes of $his downfall are
<<switch _rivalType>>
<<case "expansionist shemale">>
immediately apparent: $he's obviously been indulging in self-transformation to excess.
diff --git a/src/uncategorized/peHeadgirlConcubine.tw b/src/uncategorized/peHeadgirlConcubine.tw
index 521a08b00cafe087623ca8d1020f8c836a7d75ec..cacee3dc82b4ff26aea3166c8e0135785a1c0261 100644
--- a/src/uncategorized/peHeadgirlConcubine.tw
+++ b/src/uncategorized/peHeadgirlConcubine.tw
@@ -157,7 +157,7 @@ and it's also obvious that they've been filling the few minutes they've been wai
<<if canDoAnal($HeadGirl)>>
cocks $his hips, pulls one buttock aside, and winks $his asshole in your direction
<<else>>
- looks you in the eye and gives $his booty a slap
+ looks you in the eye and gives $his booty a slap
<</if>>
<<case "boobs">>
looks you in the eye and gives $his boobs a little bounce
diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw
index e0a31fca098cb0981e4d3eb121b8b360f0aeb201..556db0d737a1cfaa14a1f4d5af83755d87f5e87f 100644
--- a/src/uncategorized/personalAttentionSelect.tw
+++ b/src/uncategorized/personalAttentionSelect.tw
@@ -219,9 +219,9 @@
<br>
<<link "Remove $his behavioral flaw">><<set $personalAttention[_i].trainingRegimen = "fix her behavioral flaw">><<replace `"#training"+_i`>><strong>$personalAttention[_i].trainingRegimen</strong><</replace>><</link>>
<<if ($activeSlave.devotion < -20)>>
- | //$He must be broken before $his flaws can be softened//
+ | //$He must be broken before $his flaws can be softened//
<<else>>
- | <<link "Soften $his behavioral flaw">><<set $personalAttention[_i].trainingRegimen = "soften her behavioral flaw">><<replace `"#training"+_i`>><strong>$personalAttention[_i].trainingRegimen</strong><</replace>><</link>>
+ | <<link "Soften $his behavioral flaw">><<set $personalAttention[_i].trainingRegimen = "soften her behavioral flaw">><<replace `"#training"+_i`>><strong>$personalAttention[_i].trainingRegimen</strong><</replace>><</link>>
<</if>>
<</if>>
@@ -230,12 +230,12 @@
<<link "Remove $his sexual flaw">><<set $personalAttention[_i].trainingRegimen = "fix her sexual flaw">><<replace `"#training"+_i`>><strong>$personalAttention[_i].trainingRegimen</strong><</replace>><</link>>
<<if ($activeSlave.devotion < -20)>>
<<if ($activeSlave.behavioralFlaw == "none")>>
- | //$He must be broken before $his flaws can be softened//
+ | //$He must be broken before $his flaws can be softened//
<</if>>
<<elseif ["abusive", "anal addict", "attention whore", "breast growth", "breeder", "cum addict", "malicious", "neglectful", "self hating"].includes($activeSlave.sexualFlaw)>>
- | //Paraphilias cannot be softened//
+ | //Paraphilias cannot be softened//
<<else>>
- | <<link "Soften $his sexual flaw">><<set $personalAttention[_i].trainingRegimen = "soften her sexual flaw">><<replace `"#training"+_i`>><strong>$personalAttention[_i].trainingRegimen</strong><</replace>><</link>>
+ | <<link "Soften $his sexual flaw">><<set $personalAttention[_i].trainingRegimen = "soften her sexual flaw">><<replace `"#training"+_i`>><strong>$personalAttention[_i].trainingRegimen</strong><</replace>><</link>>
<</if>>
<</if>>
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index 24c189e536d66527ec09e1fad2083425cb7e01dc..2d14afc59e80c654f99de16b93419f2b70503c58 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -4509,7 +4509,7 @@
The spare living conditions and daily tasks @@.hotpink;get $him used@@ to the routine of slavery.
<<set $slaves[$i].devotion += 1>>
<<case "Roman Revivalist">>
- $He is
+ $He is
<<set $slaves[$i].devotion += 2, $slaves[$i].trust += 2>>
<<default>>
The reasonable living conditions allow $him to relax after the days work.
diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw
index 0343685a4a307b5f47d19ab9f6556000d2106d8f..f1acaab3be4fa5ce477b72d2890d3f37d28c6259 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -297,7 +297,7 @@
| [[In a ponytail|Salon][$activeSlave.hStyle = "ponytail",$cash -= $modCost]]
| [[In tails|Salon][$activeSlave.hStyle = "tails",$cash -= $modCost]]
| [[Luxurious|Salon][$activeSlave.hStyle = "luxurious",$cash -= $modCost]]
- | [[Messy|Salon][$activeSlave.hStyle = "messy",$cash -= $modCost]]
+ | [[Messy|Salon][$activeSlave.hStyle = "messy",$cash -= $modCost]]
| [[Neat|Salon][$activeSlave.hStyle = "neat",$cash -= $modCost]]
| [[Permed|Salon][$activeSlave.hStyle = "permed",$cash -= $modCost]]
| [[Shaved sides|Salon][$activeSlave.hStyle = "strip",$cash -= $modCost]]
@@ -455,7 +455,7 @@
| [[In a ponytail|Salon][$activeSlave.hStyle = "ponytail",$cash -= $modCost]]
| [[In tails|Salon][$activeSlave.hStyle = "tails",$cash -= $modCost]]
| [[Luxurious|Salon][$activeSlave.hStyle = "luxurious",$cash -= $modCost]]
- | [[Messy|Salon][$activeSlave.hStyle = "messy",$cash -= $modCost]]
+ | [[Messy|Salon][$activeSlave.hStyle = "messy",$cash -= $modCost]]
| [[Neat|Salon][$activeSlave.hStyle = "neat",$cash -= $modCost]]
| [[Permed|Salon][$activeSlave.hStyle = "permed",$cash -= $modCost]]
| [[Shaved sides|Salon][$activeSlave.hStyle = "strip",$cash -= $modCost]]
diff --git a/src/uncategorized/seRaiding.tw b/src/uncategorized/seRaiding.tw
index 6a2febbb957ab1fc6912aeef9cdcda96ac1b11f5..283ac96b0046b59cd473a7ded492f5b85cbe8509 100644
--- a/src/uncategorized/seRaiding.tw
+++ b/src/uncategorized/seRaiding.tw
@@ -6,7 +6,7 @@ The leader of your $mercenariesTitle has contacted you from the world outside yo
<<if $SF.Toggle && $SF.Active >= 1 && (($SF.Squad.Satellite.lv >= 1 && $SF.Squad.Satellite.InOrbit > 0) || $SF.Squad.SpacePlane >= 1)>>
By having access to the use of $SF.Lower's
<<if $SF.Squad.Satellite.lv >= 1 && $SF.Squad.Satellite.InOrbit > 0>>
- satellite
+ satellite
<</if>>
<<if $SF.Squad.SpacePlane >= 1>>
space plane
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index fac719aa3bf84ecd22114b9c5ffc91935ec05993..18978d926512dcd1222c7f385b94dd74ac7a325f 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -550,18 +550,18 @@
* @author 000-250-006
*
* @param array _facListArr $args
- * Multidimensional temporary array
- * 0: The passage name for the facility's report
- * 1: The facility name capitalized (@see todo)
- * 2: max number of slaves allowed in facility - > 0 implies open
- * 3: number of slaves assigned to facility
- * 4: ID of the slave assigned to run the facility ("Boss")
- * 5: Text title of the Boss
+ * Multidimensional temporary array
+ * 0: The passage name for the facility's report
+ * 1: The facility name capitalized (@see todo)
+ * 2: max number of slaves allowed in facility - > 0 implies open
+ * 3: number of slaves assigned to facility
+ * 4: ID of the slave assigned to run the facility ("Boss")
+ * 5: Text title of the Boss
*
* @todo This is a proof of concept construct, if it works and cuts overhead, intended to create an object
- * for deeper use in multiple locations, including streamlining reports/facilities code to one widget
+ * for deeper use in multiple locations, including streamlining reports/facilities code to one widget
* @todo Figure out if this would be better as an object rather than an array for overhead
- * StoryInit also?
+ * StoryInit also?
* @todo Figure out why we're not using ndef/-1 for a bunch of these story variables. Leaky conditionals
* @todo Figure out why we're using variable space with capitalized facility names when we can parse it from true name
*/
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index 43878c4ff18f6dc4ec25244121e06d39d4c40597..9b5127616ae18988a826fd65753585127e9b5629 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -8,72 +8,72 @@
"Recruiter Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.assignment != "recruit girls" && canWalk(s) && canSee(s) && canTalk(s)),
"HG Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.assignment != "be your Head Girl" && canWalk(s) && canHear(s) && canSee(s) && canTalk(s)),
"Head Girl Suite": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
- ($Flag == 0 && s.assignment != "be your Head Girl" && s.indentureRestrictions <= 0 && (s.breedingMark != 1 || $propOutcome == 0))
+ ($Flag == 0 && s.assignment != "be your Head Girl" && s.indentureRestrictions <= 0 && (s.breedingMark != 1 || $propOutcome == 0))
|| ($Flag != 0 && s.assignment == "live with your Head Girl"))),
"Subordinate Targeting": s => (s.devotion >= -20 && s.fuckdoll == 0 && $activeSlave.ID != s.ID && ($activeSlave.amp != 1 || s.amp != 1)),
"Spa": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
- ($Flag == 0 && s.assignment != "rest in the spa")
+ ($Flag == 0 && s.assignment != "rest in the spa")
|| ($Flag == 1 && s.assignment == "rest in the spa")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Attendant.ID))),
"Attendant Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s) && canHear(s)),
"Nursery": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (s.devotion > 20 || s.trust > 20) && (
- ($Flag == 0 && s.assignment != "work as a nanny")
+ ($Flag == 0 && s.assignment != "work as a nanny")
|| ($Flag == 1 && s.assignment == "work as a nanny")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Matron.ID))),
"Matron Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s) && canHear(s)),
"Brothel": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
- ($Flag == 0 && s.assignment != "work in the brothel")
+ ($Flag == 0 && s.assignment != "work in the brothel")
|| ($Flag == 1 && s.assignment == "work in the brothel")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Madam.ID))),
"Madam Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.intelligence+s.intelligenceImplant >= -50 && canWalk(s) && canSee(s) && canHear(s) && (s.breedingMark != 1 || $propOutcome == 0)),
"Club": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
- ($Flag == 0 && s.assignment != "serve in the club")
+ ($Flag == 0 && s.assignment != "serve in the club")
|| ($Flag == 1 && s.assignment == "serve in the club")
|| ($Flag != 0 && $Flag != 1 && s.ID == $DJ.ID))),
"DJ Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.intelligence+s.intelligenceImplant >= -50 && canTalk(s) && canHear(s) && canWalk(s) && (s.breedingMark != 1 || $propOutcome == 0)),
"Clinic": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
- ($Flag == 0 && s.assignment != "get treatment in the clinic")
+ ($Flag == 0 && s.assignment != "get treatment in the clinic")
|| ($Flag == 1 && s.assignment == "get treatment in the clinic")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Nurse.ID))),
"Nurse Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s) && canSee(s)),
"Schoolroom": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
- ($Flag == 0 && s.fetish != "mindbroken" && s.assignment != "learn in the schoolroom")
+ ($Flag == 0 && s.fetish != "mindbroken" && s.assignment != "learn in the schoolroom")
|| ($Flag == 1 && s.assignment == "learn in the schoolroom")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Schoolteacher.ID))),
"Schoolteacher Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canTalk(s) && canHear(s) && canSee(s)),
"Dairy": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
- ($Flag == 0 && s.assignment != "work in the dairy")
+ ($Flag == 0 && s.assignment != "work in the dairy")
|| ($Flag == 1 && s.assignment == "work in the dairy")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Milkmaid.ID))),
"Milkmaid Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 20 && canWalk(s) && canSee(s) && canHear(s)),
"Farmyard": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && canWalk(s) && (
- ($Flag == 0 && s.assignment != "work as a farmhand")
+ ($Flag == 0 && s.assignment != "work as a farmhand")
|| ($Flag == 1 && s.assignment == "work as a farmhand")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Farmer.ID))),
"Farmer Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s) && canSee(s) && canHear(s)),
"Servants' Quarters": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
- ($Flag == 0 && s.assignment != "work as a servant")
+ ($Flag == 0 && s.assignment != "work as a servant")
|| ($Flag == 1 && s.assignment == "work as a servant")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Stewardess.ID))),
"Stewardess Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.intelligence+s.intelligenceImplant >= -50 && canWalk(s) && canSee(s) && canHear(s)),
"Master Suite": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
- ($Flag == 0 && s.assignment != "serve in the master suite")
+ ($Flag == 0 && s.assignment != "serve in the master suite")
|| ($Flag == 1 && s.assignment == "serve in the master suite")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Concubine.ID))),
"Concubine Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.amp != 1),
"Cellblock": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && s.fetish != "mindbroken" && (
- ($Flag == 0 && s.assignment != "be confined in the cellblock")
+ ($Flag == 0 && s.assignment != "be confined in the cellblock")
|| ($Flag == 1 && s.assignment == "be confined in the cellblock")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Wardeness.ID))),
"Wardeness Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s) && canSee(s) && canHear(s)),
"Arcade": s => (s.assignmentVisible == 1 && ($arcade >= $arcadeSlaves || $arcadeUpgradeFuckdolls == 1) && (
- ($Flag == 0 && s.assignment != "be confined in the arcade")
+ ($Flag == 0 && s.assignment != "be confined in the arcade")
|| ($Flag != 0 && s.assignment == "be confined in the arcade"))),
"Pit": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && (
- ($Flag == 0 && !$fighterIDs.includes(s.ID) && canWalk(s) && (s.assignment != "guard you") && (s.assignment != "work in the dairy" || $dairyRestraintsSetting < 2))
+ ($Flag == 0 && !$fighterIDs.includes(s.ID) && canWalk(s) && (s.assignment != "guard you") && (s.assignment != "work in the dairy" || $dairyRestraintsSetting < 2))
|| ($Flag != 0 && $fighterIDs.includes(s.ID)))),
"Coursing Association": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && (
- ($Flag == 0 && canWalk(s) && $Lurcher.ID != s.ID)
+ ($Flag == 0 && canWalk(s) && $Lurcher.ID != s.ID)
|| ($Flag != 0 && $Lurcher.ID == s.ID))),
"New Game Plus": s => (($Flag == 0 && s.assignment != "be imported") || ($Flag != 0 && s.assignment == "be imported")),
"Rules Slave Select": s => (($Flag == 0 && !ruleSlaveSelected(s, $currentRule)) || ($Flag != 0 && ruleSlaveSelected(s, $currentRule))),
@@ -94,17 +94,18 @@
<<if $useSlaveListInPageJSNavigation == 1>>
<<set _Count = _indexSlavesIdxs.length>>
/* Useful for finding weird combinations -- usages of this passage that don't yet generate the quick index.
- * <<print 'pass/count/indexed/flag::[' + _Pass + '/' + _Count + '/' + _indexed + '/' + $Flag + ']'>>
+ * <<print 'pass/count/indexed/flag::[' + _Pass + '/' + _Count + '/' + _indexed + '/' + $Flag + ']'>>
*/
<<if ((_Count > 1) && (_indexed == 0) && (((_Pass == 'Main') && (ndef $Flag) && (($useSlaveSummaryTabs == 0) || ($slaveAssignmentTab == "all"))) || ($Flag == 1)))>>
<<set _indexed = 1, _counter = 0, _buttons = [], _offset = -50>>
<<if (/Select/i.test(_Pass))>>
- <<set _offset = -25>>
+ <<set _offset = -25>>
<</if>>
<br />
<<set _tableCount = _tableCount || 0>>
<<set _tableCount++>>
/*
+<<<<<<< HEAD
* we want <button data-quick-index="<<= _tableCount>>"> ...
*/
<<set _buttonAttributes = { 'data-quick-index': _tableCount }>>
@@ -112,6 +113,15 @@
/*
* we want <div id="list_index3" class=" hidden">...
*/
+=======
+ * we want <button data-quick-index="<<= _tableCount>>"> ...
+ */
+ <<set _buttonAttributes = { 'data-quick-index': _tableCount }>>
+ <<htag _buttonAttributes 'button'>>Quick Index<</htag>>
+ /*
+ * we want <div id="list_index3" class=" hidden">...
+ */
+>>>>>>> c51e6f27783bed06aa693679ebdeac47325a88c6
<<set _divAttributes = { id: 'list_index' + _tableCount, class: 'hidden'}>>
<<htag _divAttributes>>
<<for !_.isUndefined(_ssii = _indexSlavesIdxs.shift())>>
@@ -765,7 +775,7 @@ will
<<elseif (((_Slave.indentureRestrictions > 0) && ($dairyRestraintsSetting > 1)) || ((_Slave.indentureRestrictions > 1) && ($dairyRestraintsSetting > 0)) || (_Slave.breedingMark == 1 && $propOutcome == 1 && $dairyRestraintsSetting > 0) || (($dairyPregSetting > 0) && ((_Slave.bellyImplant != -1) || (_Slave.broodmother > 0))))>>
Dairy
<<elseif ((_Slave.lactation > 0) || (_Slave.balls > 0)) || (($dairyFeedersUpgrade == 1) && ($dairyFeedersSetting > 0) && ($dairySlimMaintainUpgrade == 0))>>
- [[Dairy|Assign][$assignTo = "Dairy", $i = _ssi]] /* $i = -1 tells Assign to use _Slave as-is */
+ [[Dairy|Assign][$assignTo = "Dairy", $i = _ssi]] /* $i = -1 tells Assign to use _Slave as-is */
<<else>>Dairy<</if>>
<<if _numFacilities-- > 1>>|<</if>>
<</if>>
diff --git a/src/uncategorized/spa.tw b/src/uncategorized/spa.tw
index e8f625e2d8ea27e46f9c3c7db26fd2dbcd32f834..0c8f8c24d7b8a40d6799fe2cd217072579033439 100644
--- a/src/uncategorized/spa.tw
+++ b/src/uncategorized/spa.tw
@@ -140,11 +140,15 @@ $spaNameCaps
<</if>>
<<if $spaSlaves > 0>>
+<<<<<<< HEAD
<<<<<<< HEAD
| <<link "''Prise a slave out of $spaName''">>
=======
| <<link "''Take a slave out of $spaName''">>
>>>>>>> f63aec532d19dd52b97ffc14a555d09e98361ef7
+=======
+ | <<link "''Prise a slave out of $spaName''">>
+>>>>>>> c51e6f27783bed06aa693679ebdeac47325a88c6
<<replace #ComingGoing>>
<<spaAssignmentFilter>>
<<set $Flag = 1>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 11dd3d0419c8886f90e6a0140dacb4dfa3ac900d..3afa05280e2c8e98b7316d1b38dcab460792c93b 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -273,7 +273,7 @@
fertility.
<</if>>
<<elseif $activeSlave.geneticQuirks.fertility == 2>>
- $He is naturally
+ $He is naturally
<<if $activeSlave.ovaries == 1 || $activeSlave.mpreg == 1>>
fertile and prone to having twins.
<<else>>
diff --git a/src/utility/extendedFamilyWidgets.tw b/src/utility/extendedFamilyWidgets.tw
index b01c070653933ec5d96e35bc835f33a45cbfb159..2d6443cec1a5ae05ca86e3c65c35518989a84255 100644
--- a/src/utility/extendedFamilyWidgets.tw
+++ b/src/utility/extendedFamilyWidgets.tw
@@ -704,7 +704,7 @@
<<if $activeSlave.cloneID == -1>>
your clone.
<<else>>
- a clone of $activeSlave.clone.
+ a clone of $activeSlave.clone.
<</if>>
<</if>>
@@ -881,7 +881,7 @@
<<if $activeSlave.cloneID == -1>>
yourself.
<<else>>
- $PC.clone.
+ $PC.clone.
<</if>>
<</if>>
*/