Vanilla fixes.

src/uncategorized/randomIndividualEvent.tw

@@ -475,7 +475,7 @@
 	<<if ($eventSlave.fetish == "sadist") || ($eventSlave.fetish == "dom") || ($eventSlave.energy > 95)>>
 	  <<if ($REShowerForceSub != 0)>>
 	  <<if ($eventSlave.trust <= 75)>>
-		  <<set $RETSevent.push("RE shower force")>>
+		  <<set $RETSevent.push("shower force")>>
 	  <</if>>
 	  <</if>>
 	  <<if ($eventSlave.anus > 0)>>

src/uncategorized/remoteSurgery.tw

 :: Remote Surgery [nobr]
 
-<<set $nextButton = "Continue">>
-<<set $nextLink = "Slave Interact">>
+<<set $nextButton = "Continue", $nextLink = "Slave Interact">>
 
-<<set $surgeryType = 0>>
-<<set $showEncyclopedia = 1>><<set $encyclopedia = "The Remote Surgery">>
+<<set $surgeryType = 0, $showEncyclopedia = 1, $encyclopedia = "The Remote Surgery">>
 
 $activeSlave.slaveName is lying strapped down on the table in your <<if $surgeryUpgrade == 1>>heavily upgraded and customized remote surgery.<<else>>remote surgery.<</if>> The surgical equipment reads <<if $activeSlave.health < -20>>@@.red;SLAVE UNHEALTHY, SURGERY NOT RECOMMENDED.@@<<elseif $activeSlave.health <= 20>>@@.yellow;SLAVE HEALTHY, SURGERY SAFE.@@<<else>>@@.green;SLAVE HEALTHY, SURGERY ENCOURAGED.@@<</if>><<if $PC.medicine >= 100>> The remote surgery mechanisms that allow a surgeon to be brought in by telepresence are inactive, and the autosurgery is ready for your control inputs. Surgery on your slaves is a challenge and a pleasure you wouldn't dream of sharing.<</if>>
 <br><br>
@@ -663,7 +661,7 @@ $pronounCap has
 	<</if>>
 <</if>>
 
-<<if $organFarmUpgrade >= 1>>
+<<if $organFarmUpgrade >= 1>> /* ORGAN FARM */
 <<if $activeSlave.indentureRestrictions < 2>>
 
 <br><br>
@@ -1666,13 +1664,13 @@ The prosthesis facility has constructed $possessive prosthetic limbs.
 		<<if $activeSlave.origEye != "implant">>
 			<<if ($activeSlave.eyes > -2)>>
 				[[Blind|Surgery Degradation][$activeSlave.eyes = -2,$activeSlave.eyeColor = "dulled " + $activeSlave.origEye,$activeSlave.eyeColor = $activeSlave.origEye,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "blind"]]
-	<</if>>
+			<</if>>
 			/*<<if ($activeSlave.eyes != -3)>>
 				<<if ($activeSlave.eyes >= -2)>> | <</if>>
 				[[Remove eyes|Surgery Degradation][$activeSlave.eyeColor = "empty",$activeSlave.origEye = "none",$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "remove eyes"]]
 				<<if ($activeSlave.eyes != -2)>>//This will greatly restrict $possessive//<</if>>
 			<</if>>*/
-	<</if>>
+		<</if>>
 		<<if $cyberMod == 1 && $stockpile.ocularImplant > 0>>
 			<<if ($activeSlave.eyes != -3)>> | <</if>>
 			[[Give her ocular implants|Surgery Degradation][$activeSlave.origEye = "implant",$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "ocular implant"]]
@@ -1935,13 +1933,13 @@ The prosthesis facility has constructed $possessive prosthetic limbs.
 			[[Remove arms and legs|Surgery Degradation][$activeSlave.amp = 1,$activeSlave.heels = 0,$activeSlave.heightImplant = 0,$activeSlave.legsTat = 0,$activeSlave.armsTat = 0,$cash -= $surgeryCost, $activeSlave.health -= 40,$activeSlave.nails = 0,$surgeryType = "amp1"]] //This will greatly restrict $possessive//
 		<</if>>
 	<<elseif ($activeSlave.amp == 1) && ($activeSlave.PLimb == 0)>>
-		<<if ($stockpile.basicPLimbInterface > 0)>> | 
+		<<if ($stockpile.basicPLimbInterface > 0)>> |
 			[[Install basic prosthetic interface|Surgery Degradation][$activeSlave.PLimb = 1,$stockpile.basicPLimbInterface -= 1,$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "PLimb interface1"]]
 		<</if>>
-		<<if $stockpile.advPLimbInterface > 0>> | 
+		<<if $stockpile.advPLimbInterface > 0>> |
 			[[Install advanced prosthetic interface|Surgery Degradation][$activeSlave.PLimb = 2,$stockpile.advPLimbInterface -= 1,$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "PLimb interface2"]]
 		<</if>>
-	<<elseif $activeSlave.amp == 1 && $activeSlave.PLimb == 1 && $stockpile.advPLimbInterface > 0>> | 
+	<<elseif $activeSlave.amp == 1 && $activeSlave.PLimb == 1 && $stockpile.advPLimbInterface > 0>> |
 		[[Upgrade = advanced prosthetic interface|Surgery Degradation][$activeSlave.PLimb = 2,$stockpile.advPLimbInterface -= 1,$cash -= $surgeryCost, $activeSlave.health -= 5,$surgeryType = "PLimb interface3"]]
 	<</if>>
 <</if>>

src/uncategorized/surgeryDegradation.tw

@@ -24,19 +24,8 @@
 	<<set $nextLink = "Main">>
 
 <<else>>
-
-As the remote surgery's long recovery cycle completes,
-<<if $surgeryType == "fuckdoll">>
-	your new Fuckdoll <<if ($activeSlave.amp != 1)>>stumbles<<else>>is carried<</if>> out of the surgery room. The only <<if $activeSlave.vagina > -1>>areas of skin visible are those around its vulva and anus<<else>>area of skin visible is that around its anus<</if>><<if $activeSlave.lips > 95>>, though its lips are also visible as its facepussy makes the standard Fuckdoll mouth insert unnecessary<</if>>. You can see it starting to struggle against the constricting material of the Fuckdoll suit as the sedation wears off. Other than the tiny area of exposed skin and the slight movement, there's no indication that the sex doll in front of you is alive at all.
-<<elseif $surgeryType == "fuckdollExtraction">>
-	$activeSlave.slaveName <<if ($activeSlave.amp != 1)>>walks<<else>>is carried<</if>> out of the surgery room.
-<<else>>
-	$activeSlave.slaveName <<if ($activeSlave.amp != 1)>>walks<<else>>is carried<</if>> out of the surgery room<<if canSee($activeSlave)>> and catches sight of herself in the floor-length mirror outside the door<<else>> and is detailed the modifications done to her body, assuming she hasn't already realized them<</if>>.
-<</if>>
-
-<<switch $surgeryType>>
-
-<<case "fuckdoll">>
+	<<switch $surgeryType>>
+	<<case "fuckdoll" "blind" "remove eyes" "amp" "removeLimbs" "amp1" "PLimb interface1" "PLimb interface2" "PLimb interface3">>
 	<<set _ID = $activeSlave.ID>>
 	<<if _ID == $Lurcher.ID>><<set $Lurcher = 0>><</if>>
 	<<if _ID == $fighterTwo.ID>><<set $fighterTwo = 0>><</if>>
@@ -58,14 +47,22 @@ As the remote surgery's long recovery cycle completes,
 			<<set _dump = $fighterIDs.deleteAt(_y), _y-->>
 		<</if>>
 	<</for>>
-	/% Remove from facility array if assigned, except Arcade, MasterSuite, and Cellblock - also do not move agents or agent companions %/
-	<<switch $activeSlave.assignment>>
-	<<case "be confined in the arcade" "be confined in the cellblock" "serve in the master suite" "be your agent" "live with your agent">>
-		/* no assignment change */
-	<<default>>
-		<<removeJob $activeSlave $activeSlave.assignment>>
+	/% Remove from facility array if assigned. %/
+	<<removeJob $activeSlave $activeSlave.assignment>>
 	<</switch>>
 
+As the remote surgery's long recovery cycle completes,
+<<if $surgeryType == "fuckdoll">>
+	your new Fuckdoll <<if ($activeSlave.amp != 1)>>stumbles<<else>>is carried<</if>> out of the surgery room. The only <<if $activeSlave.vagina > -1>>areas of skin visible are those around its vulva and anus<<else>>area of skin visible is that around its anus<</if>><<if $activeSlave.lips > 95>>, though its lips are also visible as its facepussy makes the standard Fuckdoll mouth insert unnecessary<</if>>. You can see it starting to struggle against the constricting material of the Fuckdoll suit as the sedation wears off. Other than the tiny area of exposed skin and the slight movement, there's no indication that the sex doll in front of you is alive at all.
+<<elseif $surgeryType == "fuckdollExtraction">>
+	$activeSlave.slaveName <<if ($activeSlave.amp != 1)>>walks<<else>>is carried<</if>> out of the surgery room.
+<<else>>
+	$activeSlave.slaveName <<if ($activeSlave.amp != 1)>>walks<<else>>is carried<</if>> out of the surgery room<<if canSee($activeSlave)>> and catches sight of herself in the floor-length mirror outside the door<<else>> and is detailed the modifications done to her body, assuming she hasn't already realized them<</if>>.
+<</if>>
+
+<<switch $surgeryType>>
+<<case "fuckdoll">>
+
 	<<if $familyTesting == 1>>
 		<<for $j = 0; $j < $slaves.length; $j++>>
 			<<if $activeSlave.mother == $slaves[$j].ID>>
@@ -118,9 +115,9 @@ As the remote surgery's long recovery cycle completes,
 		<</if>>
 	<<else>>
 	<<if $activeSlave.relation != 0>>
-		<<for $j to 0; $j < $slaves.length; $j++>>
+		<<for $j = 0; $j < $slaves.length; $j++>>
 			<<if $activeSlave.relationshipTarget != $activeSlave.relationTarget>>
-				<<if $slaves[$j].ID is $activeSlave.relationTarget>>
+				<<if $slaves[$j].ID == $activeSlave.relationTarget>>
 					$slaves[$j].slaveName will be @@.mediumorchid;horrified@@ and @@.gold;afraid@@ when she finds out that her $activeSlave.relation is now a Fuckdoll.
 					<<set $slaves[$j].devotion -= 40>>
 					<<set $slaves[$j].trust -= 40>>
@@ -130,8 +127,8 @@ As the remote surgery's long recovery cycle completes,
 		<</for>>
 	<</if>>
 	<<if $activeSlave.relationship > 0>>
-		<<for $j to 0; $j < $slaves.length; $j++>>
-			<<if $slaves[$j].ID is $activeSlave.relationshipTarget>>
+		<<for $j = 0; $j < $slaves.length; $j++>>
+			<<if $slaves[$j].ID == $activeSlave.relationshipTarget>>
 				$slaves[$j].slaveName will be @@.mediumorchid;horrified@@ and @@.gold;afraid@@ when she finds out that her <<if $activeSlave.relationshipTarget == $activeSlave.relationTarget>>$activeSlave.relation and<</if>> <<if $activeSlave.relationship > 4>>wife<<elseif $activeSlave.relationship > 3>>lover<<elseif $activeSlave.relationship > 2>>intimate friend<<elseif $activeSlave.relationship > 1>>best friend<<else>>friend<</if>> is now a Fuckdoll.
 				<<set $slaves[$j].devotion -= $activeSlave.relationship*10>>
 				<<set $slaves[$j].trust -= $activeSlave.relationship*10>>
@@ -187,7 +184,7 @@ As the remote surgery's long recovery cycle completes,
 	<<elseif $activeSlave.fuckdoll > 20>>
 		Though she retains possession of some of her faculties, she's been severely affected by the weeks she's spent as a living sex toy. Any joy or relief at being liberated from the Fuckdoll suit is probably being suppressed by the similarity of the extraction procedure to the routine suit maintenance she received weekly. If she even understands that she's been freed, she's been trained so thoroughly that she will struggle to adapt to life more complex than tonal commands and sexual use.
 	<<else>>
-		Though she hasn't been a Fuckdoll long enough to be permanently damaged, she's so emotionally exhausted by everything she's experienced over the past few weeks that she betrays no relief or joy, or even any fear that she'll be turned into a Fuckdoll again. Her posture bespeaks something like apathy. She should reawake gradually, but for now she's still actively remembering how to live as a human, rather than as a living sex toy.
+		Though she hasn't been a Fuckdoll long enough to be permanently damaged, she's so emotionally exhausted by everything she's experienced over the past few weeks that she betrays no relief or joy, or even any fear that she'll be turned into a Fuckdoll again. Her posture bespeaks something like apathy. She should reawaken gradually, but for now she's still actively remembering how to live as a human, rather than as a living sex toy.
 	<</if>>
 
 <<case "mindbreak">>
@@ -236,7 +233,7 @@ As the remote surgery's long recovery cycle completes,
 		<</if>>
 	<<else>>
 		<<if ($activeSlave.devotion > 50)>>
-			When she realizes why, she seems suprised since she doesn't see the point of such procedure. As she was already blind, her mental state remains unaffected.
+			When she realizes why, she seems surprised since she doesn't see the point of such procedure. As she was already blind, her mental state remains unaffected.
 		<<else>>
 			Her face twists in distaste. Such pointless and invasive procedure drives home just how @@.gold;expendable@@ she is to you.
 			<<set $activeSlave.devotion -= 5>>
@@ -246,7 +243,7 @@ As the remote surgery's long recovery cycle completes,
 
 <<case "ocular implant">>
 	<<if $activeSlave.eyes <= -2>>
-		The implant surgery is @@.red;invasive@@ and she spends some time in the autosurgery recovering. As soon as she is allowed to open her eyes and look around, her gaze flicks from object to object with manic speed as her new eyes deliver nearly overwhelming amount of visual informantion. Seeing the world as it is is a gift that those who do not need it cannot properly understand.
+		The implant surgery is @@.red;invasive@@ and she spends some time in the autosurgery recovering. As soon as she is allowed to open her eyes and look around, her gaze flicks from object to object with manic speed as her new eyes deliver nearly overwhelming amount of visual information. Seeing the world as it is is a gift that those who do not need it cannot properly understand.
 		<<set $activeSlave.devotion += 25>>
 		<<set $activeSlave.trust += 25>>
 		<<if ($activeSlave.devotion > 50)>>
@@ -515,7 +512,9 @@ As the remote surgery's long recovery cycle completes,
 	She notices almost immediately that the soreness that used to tell her she needed to be milked has gone. She bounces her breasts idly; it looks like she doesn't know what to think about having her lactation dry up. As with all surgery @@.red;her health has been slightly affected.@@
 	<<if $activeSlave.assignment == "get milked">>
 		@@.yellow;Her assignment has defaulted to resting.@@
-			<<removeJob $activeSlave $activeSlave.assignment>>
+		<<set $activeSlave.assignment = "rest">>
+		<<set $activeSlave.assignmentVisible = 1>>
+		<<set $activeSlave.choosesOwnAssignment = 0>>
 	<</if>>
 
 <<case "ejaculation">>
@@ -796,7 +795,7 @@ Even though creating an artificial scar is a trivial process, @@.red;her health
 	<<if $activeSlave.vagina == -1>>
 		Of course, she already realized while exiting that something very dear to her has been taken away.
 		<<if ($activeSlave.devotion > 50) && ($activeSlave.sexualFlaw == "self hating")>>
-			Strong emotions play out on her face as she experiences a watershed in her life of sexual slavery, perhaps the most radical one she'll ever experience. She loves you with all her being, and truly hates herself. She finds herself in an emotional place where she's willing to accept having had you cut her dick off. She knows she's a worthless piece of trash, and realizes that if you feel like trimming useless bits off her, that's your perogative. In moments, she's confirmed in @@.hotpink;total, final, fanatical submission to your will.@@ It's almost frightening.
+			Strong emotions play out on her face as she experiences a watershed in her life of sexual slavery, perhaps the most radical one she'll ever experience. She loves you with all her being, and truly hates herself. She finds herself in an emotional place where she's willing to accept having had you cut her dick off. She knows she's a worthless piece of trash, and realizes that if you feel like trimming useless bits off her, that's your prerogative. In moments, she's confirmed in @@.hotpink;total, final, fanatical submission to your will.@@ It's almost frightening.
 			<<set $activeSlave.devotion += 50>>
 		<<elseif ($activeSlave.devotion > 20) && ($activeSlave.fetishknown == 1) && ($activeSlave.fetishStrength > 95) && ($activeSlave.fetish == "buttslut")>>
 			She's such a complete buttslut, though, that she finds she doesn't really care. She never really paid much attention to her own dick; for her, sex is about the phalli that get rammed up her ass. And you didn't take that from her. If anything, she's @@.aquamarine;reassured@@ by the implicit promise that she'll never be anything but a butthole slut, and of course is forced even further into @@.hotpink;submission to your will.@@
@@ -1067,17 +1066,16 @@ Even though creating an artificial scar is a trivial process, @@.red;her health
 	<</if>>
 
 <<case "amp1">>
-	<<set $nextLink to "Surgery Degradation", $surgeryType to "amp">>
+	<<set $nextLink = "Surgery Degradation", $surgeryType = "amp">>
 	Since you invested in cybernetic technology you can install PLimb interface into her body during the operation.<br>
 	Procedure will put additional strain on her health but less so than if you were to perform the procedures separately.<br>
 	<<if $stockpile.basicPLimbInterface > 0>>
-		[[Install basic interface|Surgery Degradation][$activeSlave.PLimb to 1, $activeSlave.health -= 10, $stockpile.basicPLimbInterface -= 1, $surgeryType = "amp2", $nextLink = "Remote Surgery"]]
+		[[Install basic interface|Surgery Degradation][$activeSlave.PLimb = 1, $activeSlave.health -= 10, $stockpile.basicPLimbInterface -= 1, $surgeryType = "amp2", $nextLink = "Remote Surgery"]]
 	<br><</if>>
 	<<if $stockpile.advPLimbInterface > 0>>
-		[[Install advanced interface|Surgery Degradation][$activeSlave.PLimb to 2, $activeSlave.health -= 10, $stockpile.advPLimbInterface -= 1, $surgeryType = "amp2", $nextLink = "Remote Surgery"]]
+		[[Install advanced interface|Surgery Degradation][$activeSlave.PLimb = 2, $activeSlave.health -= 10, $stockpile.advPLimbInterface -= 1, $surgeryType = "amp2", $nextLink = "Remote Surgery"]]
 	<</if>>
 
-
 <<case "amp2">>
 	<<if ($activeSlave.devotion > 50)>>
 		Of course, she could not walk out of the surgery; you carried her. She knows what a slave's life is, but she did not really expect that it would ever come to this for her. Anesthesia has yet to completely wear off so it takes her a while to notice ports in her stumps. When she does, she visibly relaxes, realizing she may yet walk again. She squares her shoulders and visibly resolves to carry on being a good slave as best she can. Since the surgery was invasive, @@.red;her health has been greatly affected.@@