From 723f0b57d0d17bd57091202d33ed061c39a611bc Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Tue, 21 Aug 2018 13:47:32 -0500
Subject: [PATCH] Voices

---
 slave variables documentation - Pregmod.txt   |   7 +
 .../mod_EditSlaveCheatDatatypeCleanupNew.tw   |  12 +-
 src/cheats/mod_editSlaveCheatNew.tw           |  25 ++-
 src/init/storyInit.tw                         |   2 +
 src/interaction/cyberConfig.tw                |  29 ++-
 src/interaction/researchLab.tw                |  21 ++-
 src/npc/fFeelings.tw                          |   2 +-
 src/pregmod/organFarmOptions.tw               |  38 +++-
 src/uncategorized/BackwardsCompatibility.tw   |  60 ++++---
 .../REresistantmotherdaughter.tw              |   2 +-
 src/uncategorized/clinicReport.tw             |  10 +-
 src/uncategorized/corporateMarket.tw          |   1 -
 src/uncategorized/corporationDevelopments.tw  |   2 +-
 src/uncategorized/generateNewSlave.tw         |  10 +-
 src/uncategorized/labReport.tw                |   4 +
 src/uncategorized/lecoleDesEnculees.tw        |   2 +-
 src/uncategorized/longSlaveDescription.tw     |  10 +-
 src/uncategorized/markets.tw                  |   1 -
 src/uncategorized/pBioreactorPerfected.tw     |   1 -
 src/uncategorized/pPeacekeepersInfluence.tw   | 168 ++++++++++++------
 src/uncategorized/remoteSurgery.tw            |  95 +++++-----
 src/uncategorized/surgeryDegradation.tw       |  53 +++++-
 src/utility/slaveCreationWidgets.tw           |   2 +-
 23 files changed, 369 insertions(+), 188 deletions(-)

diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 4c8330f0195..f86f8ec9dcc 100644
--- a/slave variables documentation - Pregmod.txt	
+++ b/slave variables documentation - Pregmod.txt	
@@ -1295,6 +1295,13 @@ voiceImplant:
 
 has voice implant
 0 - no
+1 - yes, high
+-1 - yes, low
+
+electrolarynx:
+
+has cybernetic voicebox
+0 - no
 1 - yes
 
 accent:
diff --git a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
index 711fd432a3b..1dc643e6624 100644
--- a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
+++ b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
@@ -178,8 +178,16 @@
 	<<print "Lips size too high, reset to 100">><br>
 	<<set $tempSlave.lips = 100>>
 <</if>>
-<<if ($tempSlave.voice == 0) && ($tempSlave.voiceImplant == 1)>>
-	<<print "Slave is mute Voice Surgery reset" >><br>
+<<if ($tempSlave.voice == 0) && ($tempSlave.voiceImplant != 0)>>
+	<<print "Slave is mute, voice surgery reset" >><br>
+	<<set $tempSlave.voiceImplant = 0>>
+<</if>>
+<<if ($tempSlave.voice == 3) && ($tempSlave.voiceImplant < 0)>>
+	<<print "Voice surgery too low, voice surgery reset" >><br>
+	<<set $tempSlave.voiceImplant = 0>>
+<</if>>
+<<if ($tempSlave.voice == 1) && ($tempSlave.voiceImplant > 0)>>
+	<<print "Voice surgery too high, voice surgery reset" >><br>
 	<<set $tempSlave.voiceImplant = 0>>
 <</if>>
 <<if $tempSlave.amp < -5>>
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index 2d9395f4c83..1b54a28b5a4 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -1765,15 +1765,6 @@
 	<<radiobutton "$tempSlave.teeth" removable>> Removable
 
 	<br><br>
-	''Voice OP: ''
-	<<if $tempSlave.voiceImplant == 0>>
-		''@@.yellow;false@@''
-		<<checkbox "$tempSlave.voiceImplant" 0 1>>
-	<<else>>
-		''@@.yellow;true@@''
-		<<checkbox "$tempSlave.voiceImplant" 0 1 checked>>
-	<</if>>
-	<br>
 
 	''Voice : ''
 	<<switch $tempSlave.voice>>
@@ -1799,7 +1790,23 @@
 	<<radiobutton "$tempSlave.accent" 1>> Distinctive
 	<<radiobutton "$tempSlave.accent" 2>> Thick
 	<<radiobutton "$tempSlave.accent" 3>> Barely Understands Language
+
+	<br>
+
+	''Voice OP: ''
+	<<if $tempSlave.voiceImplant == -2>>@@.yellow;Much Lower@@
+	<<elseif $tempSlave.voiceImplant == -1>>@@.yellow;Lower@@
+	<<elseif $tempSlave.voiceImplant == 0>>@@.yellow;None@@
+	<<elseif $tempSlave.voiceImplant == 1>>@@.yellow;Higher@@
+	<<else>>@@.yellow;Much Higher@@<</if>>
+	<br>
+	<<radiobutton "$tempSlave.voiceImplant" -2>> Much Lower
+	<<radiobutton "$tempSlave.voiceImplant" -1>> Lower
+	<<radiobutton "$tempSlave.voiceImplant" 0>> None
+	<<radiobutton "$tempSlave.voiceImplant" 1>> Higher
+	<<radiobutton "$tempSlave.voiceImplant" 2>> Much Higher
 	<br>
+
 <</widget>>
 
 <<widget BodyTab>>
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 7850e884018..7c9d48063ad 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1347,6 +1347,7 @@ advCombatPLimb: 0,
 cyberneticPLimb: 0,
 ocularImplant: 0,
 cochlearImplant: 0,
+electrolarynx: 0,
 erectileImplant: 0
 } >>
 
@@ -1387,6 +1388,7 @@ advCombatPLimb: 0,
 cyberneticPLimb: 0,
 ocularImplant: 0,
 cochlearImplant: 0,
+electrolarynx: 0,
 erectileImplant: 0
 } >>
 
diff --git a/src/interaction/cyberConfig.tw b/src/interaction/cyberConfig.tw
index 3a90777038a..3096a6101d4 100644
--- a/src/interaction/cyberConfig.tw
+++ b/src/interaction/cyberConfig.tw
@@ -10,7 +10,7 @@
 		<<else>>
 			Your slave $activeSlave.slaveName is lying on the table, waiting for your instructions.
 		<</if>>
-	
+
 	<<if $activeSlave.origEye == "implant">><br><br>&nbsp;
 		$He has an ocular implant installed. 
 		<<if $activeSlave.eyes == 1>>
@@ -79,7 +79,7 @@
 		| [[Yellow|cyberConfig][$activeSlave.sclerae = "yellow",$temp = 2,$cash -= $modCost]]
 		| [[Orange|cyberConfig][$activeSlave.sclerae = "orange",$temp = 2,$cash -= $modCost]]
 	<</if>>
-	
+
 	<<if $activeSlave.earImplant == 1>><br><br>&nbsp;
 		$He has a cochlear implant installed. 
 		<<if $activeSlave.hears == 0>>
@@ -94,7 +94,25 @@
 		<<if $activeSlave.hears != -1>>[[Muffle|cyberConfig][$activeSlave.hears = -1,$temp = 5]] | <</if>>
 		<<if $activeSlave.hears != -2>>[[Disable|cyberConfig][$activeSlave.hears = -2,$temp = 5]]<</if>>
 	<</if>>
-	
+
+	<<if $activeSlave.electrolarynx == 1>><br><br>&nbsp;
+		$He has an electrolarynx installed. 
+		<<if $activeSlave.voice == 0>>
+			It is turned off.
+		<<elseif $activeSlave.voice == 1>>
+			It is set to its "deep voice" setting.
+		<<elseif $activeSlave.voice == 2>>
+			It is set to its "normal voice" setting.
+		<<elseif $activeSlave.voice == 3>>
+			It is set to its "high voice" setting.
+		<</if>>
+		<br><br>
+		<<if $activeSlave.voice != 0>>[[Disable|cyberConfig][$activeSlave.voice = 0,$temp = 6]] | <</if>>
+		<<if $activeSlave.voice != 1>>[[Deep voice setting|cyberConfig][$activeSlave.voice = 1,$temp = 6]] | <</if>>
+		<<if $activeSlave.voice != 2>>[[Standard voice setting|cyberConfig][$activeSlave.voice = 2,$temp = 6]]<</if>>
+		<<if $activeSlave.voice != 3>>[[High voice setting|cyberConfig][$activeSlave.voice = 3,$temp = 6]]<</if>>
+	<</if>>
+
 	<<if $activeSlave.PLimb > 0>><br><br>
 		$He has PLimb interface installed. You can assign and adjust $his prosthetics here.
 		<<if $activeSlave.amp <= -1>><br>&nbsp;
@@ -111,7 +129,7 @@
 				 //To equip more advanced prosthetics you will need to upgrade your slaves' PLimb interface.//
 			<</if>>
 		<</if>>
-	
+
 	<<else>>
 		<<if $activeSlave.amp == 0>><br>
 			$He has healthy limbs so there is no need for prosthetics.
@@ -137,7 +155,7 @@
 	<<else>>
 		You order $him to lie down on the table and proceed to remove $his limbs. $He <<if canSee($activeSlave)>>watches<<else>>listens<</if>> with a bitter expression as you work. 
 	<</if>>
-	
+
 <<case 2>>
 	<<set $temp = 0, $nextButton = "Continue", $nextLink = "cyberConfig">>
 	<<if $activeSlave.amp != 1>>You have $him lie down and<<else>>You<</if>> use a speculum to keep $his eyes open while you disengage $his lenses remotely and swap them out with $his new $activeSlave.eyeColor lenses<<if $activeSlave.pupil != "circular" || $activeSlave.sclerae != "white">> with <<if $activeSlave.pupil != "circular" >>$activeSlave.pupil pupils<</if>><<if $activeSlave.pupil != "circular" && $activeSlave.sclerae != "white">> and <</if>><<if $activeSlave.sclerae != "white" >>$activeSlave.sclerae sclerae<</if>><</if>>.
@@ -168,4 +186,5 @@
 	<<else>>
 		$He has a panicked expression when $his hearing is suddenly silenced.
 	<</if>>
+<<case 6>>
 <</switch>>
\ No newline at end of file
diff --git a/src/interaction/researchLab.tw b/src/interaction/researchLab.tw
index 2ec75ce0526..f6f0c5bda31 100644
--- a/src/interaction/researchLab.tw
+++ b/src/interaction/researchLab.tw
@@ -60,8 +60,6 @@
 	<</if>>
 	<br><br>&nbsp;
 
-
-
 	<<if ($researchLab.hired + $researchLab.menials) < $researchLab.maxSpace>>
 		Hire [[x1|Research Lab][$researchLab.hired += 1,$cash -= 5000]]
 		<<if ($researchLab.maxSpace - ($researchLab.hired + $researchLab.menials)) >= 5>>
@@ -149,6 +147,9 @@
 		<<if $researchLab.cochlearImplant == 0 && $stockpile.cochlearImplant > 0>><br>
 			[[Reverse engineer cochlear implants|Research Lab][$stockpile.cochlearImplant -= 1,$researchLab.productionTime = 80,$researchLab.research = "Cochlear implants"]]
 		<</if>>
+		<<if $researchLab.electrolarynx == 0 && $stockpile.electrolarynx > 0>><br>
+			[[Reverse engineer electrolarynx|Research Lab][$stockpile.electrolarynx -= 1,$researchLab.productionTime = 80,$researchLab.research = "Electrolarynx"]]
+		<</if>>
 		<<if $researchLab.erectileImplant == 0 && $stockpile.erectileImplant > 0>><br>
 			[[Reverse engineer erectile implant|Research Lab][$stockpile.erectileImplant -= 1,$researchLab.productionTime = 100,$researchLab.research = "Erectile implant"]]
 		<</if>>
@@ -191,12 +192,14 @@
 		<<if $researchLab.cochlearImplant == 1>><br>
 			[[Build cochlear implants|Research Lab][$researchLab.productionTime = 60,$researchLab.manufacture = "Cochlear implants"]] // Currently have: $stockpile.cochlearImplant//
 		<</if>>
+		<<if $researchLab.electrolarynx == 1>><br>
+			[[Build electrolarynx|Research Lab][$researchLab.productionTime = 60,$researchLab.manufacture = "Electrolarynx"]] // Currently have: $stockpile.electrolarynx//
+		<</if>>
 		<<if $researchLab.erectileImplant == 1>><br>
-			[[Build Erectile implant|Research Lab][$researchLab.productionTime = 50,$researchLab.manufacture = "Erectile implant"]] // Costs <<print cashFormat(25000)>>. Currently have: $stockpile.erectileImplant//
+			[[Build erectile implant|Research Lab][$researchLab.productionTime = 50,$researchLab.manufacture = "Erectile implant"]] // Costs <<print cashFormat(25000)>>. Currently have: $stockpile.erectileImplant//
 		<</if>>
 	<</if>>
 
-
 <<case 1>>
 	<<set $temp = 0>>
 	<<set $nextLink = "Research Lab">>
@@ -211,7 +214,8 @@
 	[[Advanced combat limbs|Research Lab][$temp = 1, $cash -= 30000, $stockpile.advCombatPLimb += 1]] //Costs <<print cashFormat(30000)>>. Currently have: $stockpile.advCombatPLimb//<br>
 	[[Ocular implants|Research Lab][$temp = 1, $cash -= 35000, $stockpile.ocularImplant += 1]] //Costs <<print cashFormat(35000)>>. Currently have: $stockpile.ocularImplant//<br>
 	[[Cochlear implants|Research Lab][$temp = 1, $cash -= 15000, $stockpile.cochlearImplant += 1]] //Costs <<print cashFormat(15000)>>. Currently have: $stockpile.cochlearImplant//<br>
-	/*[[Erectile implant|Research Lab][$temp = 1, $cash -= 25000, $stockpile.erectileImplant += 1]] //Costs <<print cashFormat(25000)>>. Currently have: $stockpile.erectileImplant//*/
+	[[Electrolarynx|Research Lab][$temp = 1, $cash -= 50000, $stockpile.electrolarynx += 1]] //Costs <<print cashFormat(50000)>>. Currently have: $stockpile.electrolarynx//<br>
+	[[Erectile implant|Research Lab][$temp = 1, $cash -= 25000, $stockpile.erectileImplant += 1]] //Costs <<print cashFormat(25000)>>. Currently have: $stockpile.erectileImplant//
 
 	<br><br>__Schematics__<br>
 	<<if $researchLab.basicPLimbInterface != 1 && $researchLab.research != "Basic prosthetics interface">>
@@ -238,8 +242,11 @@
 	<<if $researchLab.cochlearImplant != 1 && $researchLab.research != "Cochlear implants">>
 	[[Cochlear implants|Research Lab][$temp = 1, $cash -= 125000, $researchLab.cochlearImplant = 1]] //Costs <<print cashFormat(125000)>>.//<br>
 	<</if>>
-	/*<<if $researchLab.erectileImplant != 1 && $researchLab.research != "Erectile implant">>
+	<<if $researchLab.electrolarynx != 1 && $researchLab.research != "Electrolarynx">>
+	[[Electrolarynx|Research Lab][$temp = 1, $cash -= 125000, $researchLab.electrolarynx = 1]] //Costs <<print cashFormat(200000)>>.//<br>
+	<</if>>
+	<<if $researchLab.erectileImplant != 1 && $researchLab.research != "Erectile implant">>
 	[[Erectile implant|Research Lab][$temp = 1, $cash -= 95000, $researchLab.erectileImplant = 1]] //Costs <<print cashFormat(95000)>>.//
-	<</if>>*/
+	<</if>>
 
 <</switch>>
\ No newline at end of file
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index 076accc7c90..8c731b8993c 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -57,7 +57,7 @@
 	<<if !canTalk($activeSlave)>>
 		$He makes a simple gesture, meaning "I love you." $He continues to sign<<if $activeSlave.accent == 3>>, using gestures to supplant $his poor $language<</if>>:
 	<<else>>
-		"I love you," $he <<say>>s in $his <<if ($activeSlave.voice == 1)>>deep<<elseif ($activeSlave.voice == 2)>>pretty<<else>><<if ($activeSlave.voiceImplant == 1)>>high bimbo<<else>>girly<</if>><</if>> voice.
+		"I love you," $he <<say>>s in $his <<if ($activeSlave.voice == 1)>><<if ($activeSlave.voiceImplant < 0)>>guttural<<else>>deep<</if>><<elseif ($activeSlave.voice == 2)>>pretty<<else>><<if ($activeSlave.voiceImplant > 0)>>high bimbo<<else>>girly<</if>><</if>> voice.
 	<</if>>
 <</if>>
 
diff --git a/src/pregmod/organFarmOptions.tw b/src/pregmod/organFarmOptions.tw
index 4cf7b4bc51a..5afc56c0edf 100644
--- a/src/pregmod/organFarmOptions.tw
+++ b/src/pregmod/organFarmOptions.tw
@@ -1326,10 +1326,9 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
 							@@.red;Organ not found for deletion!@@
 						<</if>>
 					<</link>>
-				<</if>>
-				
+				<</if>>				
 			<<else>>
-				<<if $activeSlave.voice > 0>>
+				<<if $activeSlave.voice > 0 && $activeSlave.electrolarynx != 1>>
 					<br>&nbsp;&nbsp;&nbsp;&nbsp;
 					ERROR: this slave is not mute.
 					<<link "Discard" "Remote Surgery">>
@@ -1340,6 +1339,39 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
 							@@.red;Organ not found for deletion!@@
 						<</if>>
 					<</link>>
+				<<elseif $activeSlave.electrolarynx == 1>>
+					<br>&nbsp;&nbsp;&nbsp;&nbsp;
+					<<link "Remove electrolarynx and implant" "Surgery Degradation">>
+						<<set $cash -= $surgeryCost>>
+						<<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "voicebox"; })>>
+						<<if _ofo != -1>>
+							<<set $completedOrgans.deleteAt(_ofo)>>
+						<<else>>
+							@@.red;Organ not found for deletion!@@
+						<</if>>
+						<<set $stockpile.electrolarynx++>>
+						<<if $activeSlave.ovaries == 1 && $activeSlave.hormoneBalance >= 200>>
+							<<set $activeSlave.voice = 3>>
+						<<elseif ($activeSlave.balls > 0) || ($activeSlave.hormoneBalance < -20)>>
+							<<set $activeSlave.voice = 1>>
+						<<else>>
+							<<set $activeSlave.voice = 2>>
+						<</if>>
+						<<set $activeSlave.health -= 20>>
+						<<if $organFarmUpgrade == 2>>
+							<<set $activeSlave.chem += 20>>
+						<</if>>
+						<<set $surgeryType = "newVoice">>
+					<</link>>
+					|
+					<<link "Discard" "Remote Surgery">>
+						<<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "voicebox"; })>>
+						<<if _ofo != -1>>
+							<<set $completedOrgans.deleteAt(_ofo)>>
+						<<else>>
+							@@.red;Organ not found for deletion!@@
+						<</if>>
+					<</link>>
 				<<else>>
 					<br>&nbsp;&nbsp;&nbsp;&nbsp;
 					<<link "Implant" "Surgery Degradation">>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 61fa469d826..cc0f89c246e 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -783,7 +783,7 @@
 <<if $SFMODToggle == 1 && $securityForceCreate == 1>>
 	/* SF anon additional Special Force Variables [SFVAR] */
 
-	/* Personnel/Gear  */
+	/* Personnel/Gear */
 	<<if ndef $securityForceHeavyBattleTank>>
 		<<set $securityForceHeavyBattleTank = 0>>
 	<</if>>
@@ -924,11 +924,11 @@
 
 <<if ndef $arcologyUpgrade>>
 	<<set $arcologyUpgrade = {drones: 0, hydro: 0, apron: 0, grid: 0, spire: 0}>>
-	<<set $arcologyUpgrade.drones = ($AProsperityCap > 60)  ? 1 : 0>>
-	<<set $arcologyUpgrade.hydro  = ($AProsperityCap > 80)  ? 1 : 0>>
-	<<set $arcologyUpgrade.apron  = ($AProsperityCap > 100) ? 1 : 0>>
-	<<set $arcologyUpgrade.grid   = ($AProsperityCap > 120) ? 1 : 0>>
-	<<set $arcologyUpgrade.spire  = ($AProsperityCap > 240) ? 1 : 0>>
+	<<set $arcologyUpgrade.drones = ($AProsperityCap > 60) ? 1 : 0>>
+	<<set $arcologyUpgrade.hydro = ($AProsperityCap > 80) ? 1 : 0>>
+	<<set $arcologyUpgrade.apron = ($AProsperityCap > 100) ? 1 : 0>>
+	<<set $arcologyUpgrade.grid = ($AProsperityCap > 120) ? 1 : 0>>
+	<<set $arcologyUpgrade.spire = ($AProsperityCap > 240) ? 1 : 0>>
 <</if>>
 
 <<if def $AHelots>>
@@ -2438,6 +2438,10 @@ Setting missing slave variables:
 	<<set _Slave.voiceImplant = 0>>
 <</if>>
 
+<<if ndef _Slave.electrolarynx>>
+	<<set _Slave.electrolarynx = 0>>
+<</if>>
+
 <<if ndef _Slave.backTat>>
 	<<set _Slave.backTat = 0>>
 <</if>>
@@ -2510,23 +2514,23 @@ Setting missing slave variables:
 <</if>>
 
 <<if ndef _Slave.sclerae>>
-  <<set _Slave.sclerae = "white">>
+	<<set _Slave.sclerae = "white">>
 <</if>>
 
 <<if ndef _Slave.eyewear>>
-  <<set _Slave.eyewear = "none">>
+	<<set _Slave.eyewear = "none">>
 <</if>>
 
 <<if ndef _Slave.hears>>
-  <<set _Slave.hears = 0>>
+	<<set _Slave.hears = 0>>
 <</if>>
 
 <<if ndef _Slave.earwear>>
-  <<set _Slave.earwear = "none">>
+	<<set _Slave.earwear = "none">>
 <</if>>
 
 <<if ndef _Slave.earImplant>>
-  <<set _Slave.earImplant = 0>>
+	<<set _Slave.earImplant = 0>>
 <</if>>
 
 <<if ndef _Slave.indenture>>
@@ -2749,7 +2753,7 @@ Setting missing slave variables:
 	<<set _Slave.boobsTat = "scenes">>
 <<case "degrading language">>
 	<<set _Slave.boobsTat = "degradation">>
-<<case  "slutty advertisements">>
+<<case "slutty advertisements">>
 	<<set _Slave.boobsTat = "advertisements">>
 <</switch>>
 
@@ -2762,7 +2766,7 @@ Setting missing slave variables:
 	<<set _Slave.buttTat = "scenes">>
 <<case "degrading language">>
 	<<set _Slave.buttTat = "degradation">>
-<<case  "slutty advertisements">>
+<<case "slutty advertisements">>
 	<<set _Slave.buttTat = "advertisements">>
 <</switch>>
 
@@ -2775,7 +2779,7 @@ Setting missing slave variables:
 	<<set _Slave.vaginaTat = "scenes">>
 <<case "degrading language">>
 	<<set _Slave.vaginaTat = "degradation">>
-<<case  "slutty advertisements">>
+<<case "slutty advertisements">>
 	<<set _Slave.vaginaTat = "advertisements">>
 <</switch>>
 
@@ -2788,7 +2792,7 @@ Setting missing slave variables:
 	<<set _Slave.dickTat = "scenes">>
 <<case "degrading language">>
 	<<set _Slave.dickTat = "degradation">>
-<<case  "slutty advertisements">>
+<<case "slutty advertisements">>
 	<<set _Slave.dickTat = "advertisements">>
 <</switch>>
 
@@ -2801,7 +2805,7 @@ Setting missing slave variables:
 	<<set _Slave.anusTat = "scenes">>
 <<case "degrading language">>
 	<<set _Slave.anusTat = "degradation">>
-<<case  "slutty advertisements">>
+<<case "slutty advertisements">>
 	<<set _Slave.anusTat = "advertisements">>
 <</switch>>
 
@@ -2814,7 +2818,7 @@ Setting missing slave variables:
 	<<set _Slave.backTat = "scenes">>
 <<case "degrading language">>
 	<<set _Slave.backTat = "degradation">>
-<<case  "slutty advertisements">>
+<<case "slutty advertisements">>
 	<<set _Slave.backTat = "advertisements">>
 <</switch>>
 
@@ -2827,7 +2831,7 @@ Setting missing slave variables:
 	<<set _Slave.shouldersTat = "scenes">>
 <<case "degrading language">>
 	<<set _Slave.shouldersTat = "degradation">>
-<<case  "slutty advertisements">>
+<<case "slutty advertisements">>
 	<<set _Slave.shouldersTat = "advertisements">>
 <</switch>>
 
@@ -2840,7 +2844,7 @@ Setting missing slave variables:
 	<<set _Slave.armsTat = "scenes">>
 <<case "degrading language">>
 	<<set _Slave.armsTat = "degradation">>
-<<case  "slutty advertisements">>
+<<case "slutty advertisements">>
 	<<set _Slave.armsTat = "advertisements">>
 <</switch>>
 
@@ -2853,7 +2857,7 @@ Setting missing slave variables:
 	<<set _Slave.legsTat = "scenes">>
 <<case "degrading language">>
 	<<set _Slave.legsTat = "degradation">>
-<<case  "slutty advertisements">>
+<<case "slutty advertisements">>
 	<<set _Slave.legsTat = "advertisements">>
 <</switch>>
 
@@ -2866,7 +2870,7 @@ Setting missing slave variables:
 	<<set _Slave.stampTat = "scenes">>
 <<case "degrading language">>
 	<<set _Slave.stampTat = "degradation">>
-<<case  "slutty advertisements">>
+<<case "slutty advertisements">>
 	<<set _Slave.stampTat = "advertisements">>
 <</switch>>
 
@@ -2879,7 +2883,7 @@ Setting missing slave variables:
 	<<set _Slave.lipsTat = "scenes">>
 <<case "degrading language">>
 	<<set _Slave.lipsTat = "degradation">>
-<<case  "slutty advertisements">>
+<<case "slutty advertisements">>
 	<<set _Slave.lipsTat = "advertisements">>
 <</switch>>
 
@@ -2904,7 +2908,7 @@ Setting missing slave variables:
 <</if>>
 
 <<if ndef _Slave.scrotum>>
-  <<set _Slave.scrotum = _Slave.balls>>
+	<<set _Slave.scrotum = _Slave.balls>>
 <</if>>
 
 <<if ndef _Slave.markings>>
@@ -2923,19 +2927,19 @@ Setting missing slave variables:
 <</if>>
 
 <<if ndef _Slave.bellyAccessory>>
-  <<set _Slave.bellyAccessory = "none">>
+	<<set _Slave.bellyAccessory = "none">>
 <</if>>
 <<if ndef _Slave.legAccessory>>
-  <<set _Slave.legAccessory = "none">>
+	<<set _Slave.legAccessory = "none">>
 <</if>>
 <<if ndef _Slave.headAccessory>>
-  <<set _Slave.headAccessory = "none">>
+	<<set _Slave.headAccessory = "none">>
 <</if>>
 <<if ndef _Slave.rearAccessory>>
-  <<set _Slave.rearAccessory = "none">>
+	<<set _Slave.rearAccessory = "none">>
 <</if>>
 <<if ndef _Slave.backAccessory>>
-  <<set _Slave.backAccessory = "none">>
+	<<set _Slave.backAccessory = "none">>
 <</if>>
 
 <<if (ndef _Slave.currentRules) || (_Slave.currentRules.length < 1)>>
diff --git a/src/uncategorized/REresistantmotherdaughter.tw b/src/uncategorized/REresistantmotherdaughter.tw
index 98c48d21bdd..e316905cdb1 100644
--- a/src/uncategorized/REresistantmotherdaughter.tw
+++ b/src/uncategorized/REresistantmotherdaughter.tw
@@ -15,7 +15,7 @@ $slaves[$i].slaveName and her daughter are both having trouble getting acclimate
 	@@.mediumaquamarine;They have both become more trusting of you.@@
 
 	<<set $slaves[$i].trust += 4, $slaves[$j].trust += 4, $slaves[$i].oralCount += 1, $slaves[$j].oralCount += 1, $oralTotal += 2>>
-	
+
 	<<if canDoAnal($slaves[$j])>>
 		<<set $slaves[$j].analCount += 1>>
 		<<set $analTotal += 1>>
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index b0b8e8e5ffd..0fd1a8f962d 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -21,11 +21,11 @@
 	<<if $slaves[_FLs].trust < 60>>
 		<<set $slaves[_FLs].trust++>>
 	<</if>>
-	
+
 	<<if $slaves[_FLs].livingRules != "luxurious">>
 		<<set $slaves[_FLs].livingRules = "luxurious">>
 	<</if>>
-	
+
 	<<set $slaves[_FLs].devotion += _devBonus>>
 	<<if $slaves[_FLs].fetishStrength <= 95>>
 		<<if $slaves[_FLs].fetish != "dom">>
@@ -86,7 +86,7 @@
 				<<set $Nurse.rivalry++, $slaves[_FLs].rivalry++, $slaves[$i].rivalry++>>
 			<</if>>
 		<<elseif $Nurse.relationshipTarget == $slaves[$i].ID>>
-			She dedicates most of her attention to her <<if $Nurse.relationship == 1>>friend<<elseif $Nurse.relationship == 2>>best friend<<elseif $Nurse.relationship == 3>>friend with benefits<<elseif $Nurse.relationship == 4>>lover<<elseif $Nurse.relationship == 5>>slave wife<</if>>, $slaves[$i].slaveName, making sure she has everything she needs and more.  This lavish attention detracts from her overall effectiveness.
+			She dedicates most of her attention to her <<if $Nurse.relationship == 1>>friend<<elseif $Nurse.relationship == 2>>best friend<<elseif $Nurse.relationship == 3>>friend with benefits<<elseif $Nurse.relationship == 4>>lover<<elseif $Nurse.relationship == 5>>slave wife<</if>>, $slaves[$i].slaveName, making sure she has everything she needs and more. This lavish attention detracts from her overall effectiveness.
 			<<set _idleBonus -= 3, $slaves[$i].devotion++, $slaves[$i].trust++, $slaves[$i].health += 3>>
 		<<elseif $familyTesting == 1 && totalRelatives($slaves[$i]) > 0>>
 			<<if $slaves[$i].mother == $Nurse.ID || $slaves[$i].father == $Nurse.ID>>
@@ -250,7 +250,7 @@
 	<<if $slaves[$i].health < 90>>
 		<<set $slaves[$i].health += 10 + ($curativeUpgrade * 10) + _healthBonus>>
 	<</if>>
-	
+
 	<<switch $clinicDecoration>>
 	<<case "Repopulation Focus" "Eugenics" "Gender Radicalist" "Gender Fundamentalist" "Paternalist" "Maturity Preferentialist" "Youth Preferentialist" "Slimness Enthusiast" "Hedonistic">>
 		<<set $slaves[$i].livingRules = "luxurious">>
@@ -259,7 +259,7 @@
 	<<default>>
 		<<set $slaves[$i].livingRules = "spare">>
 	<</switch>>
-	
+
 	<<if ($Nurse != 0) && ($clinicSpeedGestation == 1) && ($slaves[$i].pregKnown == 1)>>
 		<<set $slaves[$i].pregControl = "speed up">>
 	<</if>>
diff --git a/src/uncategorized/corporateMarket.tw b/src/uncategorized/corporateMarket.tw
index a8d7872f206..57faca6f375 100644
--- a/src/uncategorized/corporateMarket.tw
+++ b/src/uncategorized/corporateMarket.tw
@@ -4,7 +4,6 @@
 
 You're in your corporation's flagship slave market.
 
-
 The corporation pays you only nominal rent for this space, but will offer you a discount on slaves here based on your shares in it. Additionally, having the corporation's premiere products sold here in $arcologies[0].name will associate them with you, allowing your reputation to improve the corporate brand. A pretty
 <<if $surgicalUpgradeGenitalia == "futanari">>futanari<<elseif $captureUpgradeGender == "XY">><<if $surgicalUpgradeGenitalia == "gelded">>clipped<<else>>shemale<</if>><</if>>
 sales<<if $captureUpgradeAge == "old">>woman<<else>>girl<</if>> in a slutty suit greets you properly. She's a corporate slave chosen for loyalty and intelligence, and to physically represent the brand.
diff --git a/src/uncategorized/corporationDevelopments.tw b/src/uncategorized/corporationDevelopments.tw
index 6a3e73e56f4..7ddcdf2a4d2 100644
--- a/src/uncategorized/corporationDevelopments.tw
+++ b/src/uncategorized/corporationDevelopments.tw
@@ -573,7 +573,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
 		<</if>>
 	<</link>>
 <<else>>
-	<span id="generalAssetsDisp">@@.yellowgreen;<<print cashFormat($generalAssetPrice*$generalAssets)>> (<<print commaNum(Math.ceil($generalAssets/500))>>@@ unit<<if Math.ceil($generalAssets/500) != 1>>s<</if>>)</span> in general assets.
+	<span id="generalAssetsDisp">@@.yellowgreen;<<print cashFormat($generalAssetPrice*$generalAssets)>>@@ (<<print commaNum(Math.ceil($generalAssets/500))>> unit<<if Math.ceil($generalAssets/500) != 1>>s<</if>>)</span> in general assets.
 	Prices are
 	<<if $generalAssetPrice > 10>>
 		@@.yellowgreen;<<print cashFormat($generalAssetPrice*500)>>ea@@.
diff --git a/src/uncategorized/generateNewSlave.tw b/src/uncategorized/generateNewSlave.tw
index f94cbfdfe3d..c684720cc9d 100644
--- a/src/uncategorized/generateNewSlave.tw
+++ b/src/uncategorized/generateNewSlave.tw
@@ -4,16 +4,16 @@
 	<<include "Generate XY Slave">>
 <<elseif ($seeDicks > 0)>>
 	<<if ($arcologies[0].FSGenderFundamentalistSMR == 1 || $arcologies[0].FSRepopulationFocusSMR == 1)>>
-	<<set $seed = 90>>
+		<<set $seed = 90>>
 	<<elseif ($arcologies[0].FSGenderRadicalist != "unset")>>
-	<<set $seed = 50>>
+		<<set $seed = 50>>
 	<<else>>
-	<<set $seed = 80>>
+		<<set $seed = 80>>
 	<</if>>
 	<<if (random(1,100) > $seed) && (random(0,99) < $seeDicks)>>
-	<<include "Generate XY Slave">>
+		<<include "Generate XY Slave">>
 	<<else>>
-	<<include "Generate XX Slave">>
+		<<include "Generate XX Slave">>
 	<</if>>
 <<else>>
 	<<include "Generate XX Slave">>
diff --git a/src/uncategorized/labReport.tw b/src/uncategorized/labReport.tw
index 23e63a87604..4b0609576c0 100644
--- a/src/uncategorized/labReport.tw
+++ b/src/uncategorized/labReport.tw
@@ -29,6 +29,8 @@
 				<<set $researchLab.ocularImplant = 1>>
 			<<case "Cochlear implants">>
 				<<set $researchLab.cochlearImplant = 1>>
+			<<case "Electrolarynges">>
+				<<set $researchLab.electrolarynx = 1>>
 			<<case "Erectile implant">>
 				<<set $researchLab.erectileImplant = 1>>
 			<</switch>>
@@ -60,6 +62,8 @@
 				<<set $stockpile.ocularImplant += 1, $researchLab.productionTime = 80>>
 			<<case "Cochlear implants">>
 				<<set $stockpile.cochlearImplant += 1, $researchLab.productionTime = 60>>
+			<<case "Electrolarynges">>
+				<<set $stockpile.electrolarynx += 1, $researchLab.productionTime = 100>>
 			<<case "Erectile implant">>
 				<<set $stockpile.erectileImplant += 1, $researchLab.productionTime = 50>>
 			<</switch>>
diff --git a/src/uncategorized/lecoleDesEnculees.tw b/src/uncategorized/lecoleDesEnculees.tw
index 5de48140fe6..21594b9e6f5 100644
--- a/src/uncategorized/lecoleDesEnculees.tw
+++ b/src/uncategorized/lecoleDesEnculees.tw
@@ -7,7 +7,7 @@
 	<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $slaveMarket = "LDE", $returnTo = "Main", $newSlaveIndex = 0>>
 <</if>>
 
-//L'école des Enculées is one of the oldest networks of slave schools, but because its training must be started early, it is only now beginning to produce and show a return on its investors' stakes. It aims to produce graduates more feminine than the average naturally born female, in spite of their having been born male. The school is a global leader in hormonal feminization, which allows it to produce curvier slaves than many schools that focus on natural females. It also retains its graduates for a year after their majority and their enslavement, so as to be able to legally subject them to intensive sexual conditioning that focuses on their prostates as their main remaining locus of arousal. <<if $LDE.schoolUpgrade != 0>><br><br>Since you have endowed <<if $LDE.schoolUpgrade == 1>>the regular application of drugs to induce extreme infatuation in its graduates towards the first dominant person they encounter, any graduate purchased here will now promptly fall in love with you.<<else>>research into narrowly targeted hormonal treatments, its graduates are now available with generous members despite their femininity.<</if>> As a major <<if $PC.title  == 0>>benefactrix<<else>>benefactor<</if>> of the institution, you also receive a discount on them.<</if>>//
+//L'école des Enculées is one of the oldest networks of slave schools, but because its training must be started early, it is only now beginning to produce and show a return on its investors' stakes. It aims to produce graduates more feminine than the average naturally born female, in spite of their having been born male. The school is a global leader in hormonal feminization, which allows it to produce curvier slaves than many schools that focus on natural females. It also retains its graduates for a year after their majority and their enslavement, so as to be able to legally subject them to intensive sexual conditioning that focuses on their prostates as their main remaining locus of arousal. <<if $LDE.schoolUpgrade != 0>><br><br>Since you have endowed <<if $LDE.schoolUpgrade == 1>>the regular application of drugs to induce extreme infatuation in its graduates towards the first dominant person they encounter, any graduate purchased here will now promptly fall in love with you.<<else>>research into narrowly targeted hormonal treatments, its graduates are now available with generous members despite their femininity.<</if>> As a major <<if $PC.title == 0>>benefactrix<<else>>benefactor<</if>> of the institution, you also receive a discount on them.<</if>>//
 
 <br><br>L'école des Enculées offers a fresh graduate for inspection via video call. The interview takes place in the dormitory for the oldest class of girls. Absurdly sexual squeals repeatedly interrupt the call, making it very clear that someone close by the interviewee is experiencing a strong combination of anal pain and anal pleasure.
 
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index a867ce2886d..675bf86d2ef 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -160,15 +160,19 @@ is
 				$He is allowed to ask questions, and when $he speaks, $he does so in a
 			<</if>>
 			<<if $activeSlave.voice == 1>>
-				deep, unfeminine voice.
+				<<if $activeSlave.voiceImplant < 0>>
+					ridiculously deep, gravelly voice.
+				<<else>>
+					deep, unfeminine voice.
+				<</if>>
 			<<elseif $activeSlave.voice == 2>>
-				<<if $activeSlave.voiceImplant == 1>>
+				<<if $activeSlave.voiceImplant != 0>>
 					slightly artificial feminine voice.
 				<<else>>
 					pretty, feminine voice.
 				<</if>>
 			<<elseif $activeSlave.voice == 3>>
-				<<if $activeSlave.voiceImplant == 1>>
+				<<if $activeSlave.voiceImplant > 0>>
 					ridiculously high, bubblegum voice.
 				<<else>>
 					high, girly voice.
diff --git a/src/uncategorized/markets.tw b/src/uncategorized/markets.tw
index 691e36dc0f5..1b6ff9a4f07 100644
--- a/src/uncategorized/markets.tw
+++ b/src/uncategorized/markets.tw
@@ -29,4 +29,3 @@ This is an area of the concourse occupied by large stores and markets, many of w
 	[[Create a flagship slave market for your corporation here|Main][$corpCash -= Math.trunc(10000*$upgradeMultiplierArcology), $corpMarket = 1, $sectors[$AS].type = "CorporateMarket"]]
 	//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>> of the corporation's money//
 <</if>>
-
diff --git a/src/uncategorized/pBioreactorPerfected.tw b/src/uncategorized/pBioreactorPerfected.tw
index 5f33a2d8020..1134a0b047d 100644
--- a/src/uncategorized/pBioreactorPerfected.tw
+++ b/src/uncategorized/pBioreactorPerfected.tw
@@ -184,4 +184,3 @@ You stop and consider the cow, from her titanic breasts to her <<if ($activeSlav
 </span>
 
 <</if>> /* closes validity check */
-
diff --git a/src/uncategorized/pPeacekeepersInfluence.tw b/src/uncategorized/pPeacekeepersInfluence.tw
index 37e0c993490..a4456a52a9d 100644
--- a/src/uncategorized/pPeacekeepersInfluence.tw
+++ b/src/uncategorized/pPeacekeepersInfluence.tw
@@ -16,20 +16,34 @@ As you review intelligence from the area at your desk,
 <<if $assistant>>
 	$assistantName's avatar pops up.
 	<<switch $assistantAppearance>>
-	<<case "monstergirl">>The little monstergirl toys with her tentacle hair until you give her your attention. When she sees that she has it, she wiggles her hips at you, and gives you a wink.
-	<<case "shemale">>The slutty little shemale pops up, literally, bouncing upward buoyantly in a way that makes her boobs jiggle ridiculously and her cock slap wetly against her stomach.
-	<<case "schoolgirl">>The slutty little schoolgirl pops up, literally, bouncing upward so violently that her skirt flies up and exposes everything. She flips it back down with a giggle.
-	<<case "goddess">>The beautiful, gravid goddess appears with her usual wash of radiant golden light, and gently smoothes one of her long tresses with a soft hand until she has your attention.
-	<<case "businesswoman">>The stacked businesswoman appears hugging a tablet to her generous bosom, squashing her cleavage upward and indicating that she has important information for you.
-	<<case "amazon">>The ferocious little warrior woman stands up straight, cutely muscular and full of self-importance, as though she has something she'd like to share.
-	<<case "fairy">>The little fairy appears on your table, flailing around while her body lights up. She bends over and starts slapping her butt at you and giggling. Her slapping turns into groping, and she gets lost in molesting her own ass. Clearing your throat, she looks upside down between her legs and sees that she finally has your attention.
-	<<case "pregnant fairy">> The little fairy appears on your table, leaning towards you and squishing her breasts together to show off her cleavage. You completely fail to notice her. She tries again, turning around and bending over and shaking her butt while looking back at you. Yet again she fails to draw your attention. Frustrated, she sits on the table, spreading her legs and showing off her pussy. Peeking over her swollen belly, she sees that you're not even looking at her. Her tiny body is just too small to garner your attention. It's not for a few minutes until you notice her sitting up on the desk, looking away with her arms crossed and pouting.
-	<<case "hypergoddess">>The beautiful, massively gravid goddess appears with her usual wash of radiant golden light, and gently calms her squirming occupants until she has your attention.
-	<<case "loli">>The cute little loli pops up, literally, bouncing upward again and again until she is absolutely certain she has your attention.
-	<<case "preggololi">>The slutty little loli appears bent over flashing her pregnant pussy at you. She giggles and straightens up once she is absolutely certain you've given her moist cleft enough attention.
-	<<case "angel">>The beautiful angel appears in her usual wash of radiant white light and gently folds her wings behind her as she patiently awaits your attention.
-	<<case "cherub">>The cute little cherub appears in her usual wash of radiant white light and flutters around until she has your attention.
-	<<case "incubus">>The hung sex demon pops up, bouncing upward buoyantly in a way that makes her erect cock slide along her stomach. Stimulation just enough, she blows a huge load across your desk while moaning lewdly; she knows how to get your attention.
+	<<case "monstergirl">>
+		The little monstergirl toys with her tentacle hair until you give her your attention. When she sees that she has it, she wiggles her hips at you, and gives you a wink.
+	<<case "shemale">>
+		The slutty little shemale pops up, literally, bouncing upward buoyantly in a way that makes her boobs jiggle ridiculously and her cock slap wetly against her stomach.
+	<<case "schoolgirl">>
+		The slutty little schoolgirl pops up, literally, bouncing upward so violently that her skirt flies up and exposes everything. She flips it back down with a giggle.
+	<<case "goddess">>
+		The beautiful, gravid goddess appears with her usual wash of radiant golden light, and gently smoothes one of her long tresses with a soft hand until she has your attention.
+	<<case "businesswoman">>
+		The stacked businesswoman appears hugging a tablet to her generous bosom, squashing her cleavage upward and indicating that she has important information for you.
+	<<case "amazon">>
+		The ferocious little warrior woman stands up straight, cutely muscular and full of self-importance, as though she has something she'd like to share.
+	<<case "fairy">>
+		The little fairy appears on your table, flailing around while her body lights up. She bends over and starts slapping her butt at you and giggling. Her slapping turns into groping, and she gets lost in molesting her own ass. Clearing your throat, she looks upside down between her legs and sees that she finally has your attention.
+	<<case "pregnant fairy">>
+		The little fairy appears on your table, leaning towards you and squishing her breasts together to show off her cleavage. You completely fail to notice her. She tries again, turning around and bending over and shaking her butt while looking back at you. Yet again she fails to draw your attention. Frustrated, she sits on the table, spreading her legs and showing off her pussy. Peeking over her swollen belly, she sees that you're not even looking at her. Her tiny body is just too small to garner your attention. It's not for a few minutes until you notice her sitting up on the desk, looking away with her arms crossed and pouting.
+	<<case "hypergoddess">>
+		The beautiful, massively gravid goddess appears with her usual wash of radiant golden light, and gently calms her squirming occupants until she has your attention.
+	<<case "loli">>
+		The cute little loli pops up, literally, bouncing upward again and again until she is absolutely certain she has your attention.
+	<<case "preggololi">>
+		The slutty little loli appears bent over flashing her pregnant pussy at you. She giggles and straightens up once she is absolutely certain you've given her moist cleft enough attention.
+	<<case "angel">>
+		The beautiful angel appears in her usual wash of radiant white light and gently folds her wings behind her as she patiently awaits your attention.
+	<<case "cherub">>
+		The cute little cherub appears in her usual wash of radiant white light and flutters around until she has your attention.
+	<<case "incubus">>
+		The hung sex demon pops up, bouncing upward buoyantly in a way that makes her erect cock slide along her stomach. Stimulation just enough, she blows a huge load across your desk while moaning lewdly; she knows how to get your attention.
 	<<case "succubus">>
 		The slutty little sex demoness pops up.
 		<<switch $assistantFSAppearance>>
@@ -47,54 +61,96 @@ As you review intelligence from the area at your desk,
 		<<default>>She spasms with a powerful orgasm and moans lewdly and loudly.
 		<</switch>>
 		She knows just how to get your attention.
-	<<case "imp">>The scandalous little imp swoops into view and eagerly stares at you, as if she has some juicy gossip to tell you.
-	<<case "witch">>The cute little witch pops up, before blushing and undressing. An important message for you is scrawled across her skin.
-	<<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>Your shapeshifting assistant pops out of a crack on your desk, her belly swollen with something. She bends over and pushes out information for you, though you're not sure how.
-	<<default>>The round symbol pulses brightly, her way of indicating that she has important information for you.
+	<<case "imp">>
+		The scandalous little imp swoops into view and eagerly stares at you, as if she has some juicy gossip to tell you.
+	<<case "witch">>
+		The cute little witch pops up, before blushing and undressing. An important message for you is scrawled across her skin.
+	<<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
+		Your shapeshifting assistant pops out of a crack on your desk, her belly swollen with something. She bends over and pushes out information for you, though you're not sure how.
+	<<default>>
+		The round symbol pulses brightly, her way of indicating that she has important information for you.
 	<</switch>>
 	"General $peacekeepers.generalName's men and women are using sex slaves," she reports, and brings up a trove of surveillance data to back up her assertion. "It was unofficial at first, 
 	<<switch $assistantAppearance>>
-	<<case "monstergirl">>just people with weapons in their hands doing what people with power over others do," she explains approvingly, showing her fangs.
-	<<case "shemale">>just hot guys sticking their dicks in the local girls," she explains, masturbating openly.
-	<<case "schoolgirl">>just boys blowing off a little steam with the local girls," she explains nastily.
-	<<case "goddess">>just the sort of thing men with arms in their hands have been doing to the locals for thousands of years," she explains.
-	<<case "businesswoman">>normal behavior for soldiers under severe stress in areas with civilians," she explains, sounding vaguely disapproving of something so uncivilized.
-	<<case "amazon">>just warriors letting off steam with the local girls," she explains, making it sound like the most natural thing in the world.
-	<<case "fairy">>just some boys and girls doing those bedroom sports for indoor types" she explains.
-	<<case "pregnant fairy">>just some guys having fun with those bigger girls" she explains, sounding annoyed for some reason.
-	<<case "hypergoddess">>just the boys trying to make sure they have someone to carry on their legacy, I'm sure," she states hopefully.
-	<<case "loli">>just wrestling and dancing," her innocence shining through her explanation.
-	<<case "preggololi">>just the guys enjoying some fresh young girls," she says with a hint of jealousy.
-	<<case "angel">>just the strong taking what they want without consideration," she sighs, sounding disapproving of something so uncivilized. 
-	<<case "cherub">>simply the satisfaction of one's urges," she says with disappointment.
-	<<case "incubus">>just men enjoying new holes," she explains, masturbating openly.
-	<<case "succubus">>just seductresses doing what they do," she explains, masturbating openly.
-	<<case "imp">>just the victors enjoying the spoils," she says, a hint of excitement in her voice.
-	<<case "witch">>just soldiers relaxing after a hard day," she explains.
-	<<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>just the conquerors using what's theirs," she explains, making it sound like the most natural thing in the world.
-	<<default>>just the common behavior of troops under severe stress in areas with civilians," she explains.
+	<<case "monstergirl">>
+		just people with weapons in their hands doing what people with power over others do," she explains approvingly, showing her fangs.
+	<<case "shemale">>
+		just hot guys sticking their dicks in the local girls," she explains, masturbating openly.
+	<<case "schoolgirl">>
+		just boys blowing off a little steam with the local girls," she explains nastily.
+	<<case "goddess">>
+		just the sort of thing men with arms in their hands have been doing to the locals for thousands of years," she explains.
+	<<case "businesswoman">>
+		normal behavior for soldiers under severe stress in areas with civilians," she explains, sounding vaguely disapproving of something so uncivilized.
+	<<case "amazon">>
+		just warriors letting off steam with the local girls," she explains, making it sound like the most natural thing in the world.
+	<<case "fairy">>
+		just some boys and girls doing those bedroom sports for indoor types" she explains.
+	<<case "pregnant fairy">>
+		just some guys having fun with those bigger girls" she explains, sounding annoyed for some reason.
+	<<case "hypergoddess">>
+		just the boys trying to make sure they have someone to carry on their legacy, I'm sure," she states hopefully.
+	<<case "loli">>
+		just wrestling and dancing," her innocence shining through her explanation.
+	<<case "preggololi">>
+		just the guys enjoying some fresh young girls," she says with a hint of jealousy.
+	<<case "angel">>
+		just the strong taking what they want without consideration," she sighs, sounding disapproving of something so uncivilized. 
+	<<case "cherub">>
+		simply the satisfaction of one's urges," she says with disappointment.
+	<<case "incubus">>
+		just men enjoying new holes," she explains, masturbating openly.
+	<<case "succubus">>
+		just seductresses doing what they do," she explains, masturbating openly.
+	<<case "imp">>
+		just the victors enjoying the spoils," she says, a hint of excitement in her voice.
+	<<case "witch">>
+		just soldiers relaxing after a hard day," she explains.
+	<<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
+		just the conquerors using what's theirs," she explains, making it sound like the most natural thing in the world.
+	<<default>>
+		just the common behavior of troops under severe stress in areas with civilians," she explains.
 	<</switch>>
 	"But it's spread, and with their independence, General $peacekeepers.generalName has decided to bring it under control by setting up official slave brothels for his troops. @@.yellow;The officer in charge of staffing these doesn't have enough money to pay Free Cities prices, but I've added him to the standard slave sale interface.@@ Selling sex slaves to him at a price General $peacekeepers.generalName's people can afford would bring them closer to $arcologies[0].name."
 	<<switch $assistantAppearance>>
-	<<case "monstergirl">>She strokes her cocks meaningfully. "Selling them a particularly distinctive, valuable girl might even influence their tastes. Imagine, manipulating an entire army by providing it with skilled whores." She shudders.
-	<<case "shemale">>She strokes her cock meaningfully. "Oh, and they could even develop into a regular market if they're sold distinctive, valuable girls. We should totally get them addicted to anal whores." To make her meaning perfectly clear, she sticks out her butt and winks her lewd little anus.
-	<<case "schoolgirl">>She flashes her breasts, as though to an appreciative crowd. "If we sell them hotties, it'll get them even more used to us," she says naughtily. "Get them used to Free Cities girls sucking their dicks all the time!"
-	<<case "goddess">>She caresses her pregnancy. "If we sell them some of our best slaves, I'm sure their virtues will win General $peacekeepers.generalName's men and women over," she says confidently. "It'd be like sending some of my own out to love each and every one of them."
-	<<case "businesswoman">>She fans herself, flushing at the possibilities. "Just think, they might develop into a regular, profitable market for sex slaves if they're sent top-quality product at first to build up the brand," she says huskily, and then climaxes.
-	<<case "amazon">>She flexes her muscles, crossing her arms under her big breasts and feeling her own biceps thoughtfully. "Selling them good stock would make them like us even more, I bet," she says. "Sharing a good slut around the campfire is a good way to make friends!"
-	<<case "fairy">>She reaches behind herself and starts groping her butt again. "If we sell them some super cuties, they'll really love us!" she giggles as she gives herself a playful slap.
-	<<case "pregnant fairy">>Since she has your attention now, she slowly spreads her legs and flashes her pussy once again. Seeing you watch with interest this time, a small smile creeps up on her face. "If we sell them some of our prettier girls, they'll be sure to warm up to us."
-	<<case "hypergoddess">>She caresses her pregnancy. "If we sell them some of our fertile slaves, I'm sure their burgeoning pregnancies will ease them into relying on us," she says confidently. "Or at least it will result in more slaves later on."
-	<<case "loli">>She claps excitedly. "If we sell them new friends, then they'll hear from them about how great the Free Cities are and want to become our friends too!" She says hopefully, eager to meet all the newcomers to the arcology.
-	<<case "preggololi">>She claps excitedly. "I don't know what they think of lolis, but selling them a few cute little slave girls will surely warm them up to us," she says, patting her belly. "Plus, I'm sure they'll love how tight they are and how much energy they have once you break them in!"
-	<<case "angel">>She wrings a wing nervously. "If we send them nice girls, we'd be doing a disservice to them by sending them away. But if we don't, how can we be certain that the girls they have will be well cared for? We definitely need to teach them our ways." She concludes.
-	<<case "cherub">>She lands and ponders deeply. "We have to show them the right way before they get mislead. Some of our finest girls should help convert them to our ways!"
-	<<case "incubus">>She strokes her cock meaningfully. "Oh, and they could even develop into a regular market if they're sold distinctive, sexy girls. We should totally get them addicted to rape." She makes several thrusting motions.
-	<<case "succubus">>She fingers her pussy meaningfully. "Oh, and they could even develop into a regular market if they're sold distinctive, sexy girls. Plus that means more money for you, and less competition for me." She winks.
-	<<case "imp">>She punches her fist into her palm. "We should sell them sexy, but unbroken, girls. That way they can learn to love breaking slaves into proper sex toys!" She shivers with orgasm at the thought.
-	<<case "witch">>She runs her hat through her hands. "If we sell them skilled girls, they'll grow closer to us. But we have to be careful not to send them klutzes like me; not everyone finds that adorable." She takes the time to mend the rip she accidentally tore in her hat's brim.
-	<<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>She ponders deeply. "We could sell them the most loyal girls we have. They'll naturally lead them back to us. And then they are ours to do as we please," she says smiling deviously.
-	<<default>>Her symbol takes on a rapid succession of pulsating lewd shapes, signifying some of the arcology's better varieties of sex slaves. "If they're sold good product, they may become a reliable market," she asserts.
+	<<case "monstergirl">>
+		She strokes her cocks meaningfully. "Selling them a particularly distinctive, valuable girl might even influence their tastes. Imagine, manipulating an entire army by providing it with skilled whores." She shudders.
+	<<case "shemale">>
+		She strokes her cock meaningfully. "Oh, and they could even develop into a regular market if they're sold distinctive, valuable girls. We should totally get them addicted to anal whores." To make her meaning perfectly clear, she sticks out her butt and winks her lewd little anus.
+	<<case "schoolgirl">>
+		She flashes her breasts, as though to an appreciative crowd. "If we sell them hotties, it'll get them even more used to us," she says naughtily. "Get them used to Free Cities girls sucking their dicks all the time!"
+	<<case "goddess">>
+		She caresses her pregnancy. "If we sell them some of our best slaves, I'm sure their virtues will win General $peacekeepers.generalName's men and women over," she says confidently. "It'd be like sending some of my own out to love each and every one of them."
+	<<case "businesswoman">>
+		She fans herself, flushing at the possibilities. "Just think, they might develop into a regular, profitable market for sex slaves if they're sent top-quality product at first to build up the brand," she says huskily, and then climaxes.
+	<<case "amazon">>
+		She flexes her muscles, crossing her arms under her big breasts and feeling her own biceps thoughtfully. "Selling them good stock would make them like us even more, I bet," she says. "Sharing a good slut around the campfire is a good way to make friends!"
+	<<case "fairy">>
+		She reaches behind herself and starts groping her butt again. "If we sell them some super cuties, they'll really love us!" she giggles as she gives herself a playful slap.
+	<<case "pregnant fairy">>
+		Since she has your attention now, she slowly spreads her legs and flashes her pussy once again. Seeing you watch with interest this time, a small smile creeps up on her face. "If we sell them some of our prettier girls, they'll be sure to warm up to us."
+	<<case "hypergoddess">>
+		She caresses her pregnancy. "If we sell them some of our fertile slaves, I'm sure their burgeoning pregnancies will ease them into relying on us," she says confidently. "Or at least it will result in more slaves later on."
+	<<case "loli">>
+		She claps excitedly. "If we sell them new friends, then they'll hear from them about how great the Free Cities are and want to become our friends too!" She says hopefully, eager to meet all the newcomers to the arcology.
+	<<case "preggololi">>
+		She claps excitedly. "I don't know what they think of lolis, but selling them a few cute little slave girls will surely warm them up to us," she says, patting her belly. "Plus, I'm sure they'll love how tight they are and how much energy they have once you break them in!"
+	<<case "angel">>
+		She wrings a wing nervously. "If we send them nice girls, we'd be doing a disservice to them by sending them away. But if we don't, how can we be certain that the girls they have will be well cared for? We definitely need to teach them our ways." She concludes.
+	<<case "cherub">>
+		She lands and ponders deeply. "We have to show them the right way before they get mislead. Some of our finest girls should help convert them to our ways!"
+	<<case "incubus">>
+		She strokes her cock meaningfully. "Oh, and they could even develop into a regular market if they're sold distinctive, sexy girls. We should totally get them addicted to rape." She makes several thrusting motions.
+	<<case "succubus">>
+		She fingers her pussy meaningfully. "Oh, and they could even develop into a regular market if they're sold distinctive, sexy girls. Plus that means more money for you, and less competition for me." She winks.
+	<<case "imp">>
+		She punches her fist into her palm. "We should sell them sexy, but unbroken, girls. That way they can learn to love breaking slaves into proper sex toys!" She shivers with orgasm at the thought.
+	<<case "witch">>
+		She runs her hat through her hands. "If we sell them skilled girls, they'll grow closer to us. But we have to be careful not to send them klutzes like me; not everyone finds that adorable." She takes the time to mend the rip she accidentally tore in her hat's brim.
+	<<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
+		She ponders deeply. "We could sell them the most loyal girls we have. They'll naturally lead them back to us. And then they are ours to do as we please," she says smiling deviously.
+	<<default>>
+		Her symbol takes on a rapid succession of pulsating lewd shapes, signifying some of the arcology's better varieties of sex slaves. "If they're sold good product, they may become a reliable market," she asserts.
 	<</switch>>
 <<else>>
 	your personal assistant appears to offer a suggestion. "I have collated data on the use of unofficial sex slaves by General $peacekeepers.generalName's forces," it reports. "Despite the high state of readiness of his forces, the use of comfort women seems to have become widespread. Characteristically, the general has responded to this by accepting the new status quo, and is setting up recreation centers to ensure that the practice does not become disruptive. One of his officers has been tasked with obtaining appropriate sex slaves, but does not have sufficient resources to pay Free Cities prices. @@.yellow;The purchasing officer may appear as a slave buyer through the standard slave sale interface.@@ It may be possible to influence them by selling them high-quality slaves."
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 3b458d50bfa..a62504a7c8e 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -181,16 +181,10 @@ $His $activeSlave.faceShape face is
 	<<if $activeSlave.indentureRestrictions < 1>>
 		<<if $activeSlave.earImplant != 1>>
 			<<if ($activeSlave.hears > -2)>>
-				| [[Deafen|Surgery Degradation][$activeSlave.hears = -2,$activeSlave.eyeColor = "dulled " + $activeSlave.origEye,$activeSlave.eyeColor = $activeSlave.origEye,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "deafen"]]
+				| [[Deafen|Surgery Degradation][$activeSlave.hears = -2,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "deafen"]]
 			<</if>>
-			/*<<if ($activeSlave.hears != -3)>>
-				<<if ($activeSlave.hears >= -2)>> | <</if>>
-				| [[Remove eyes|Surgery Degradation][$activeSlave.eyeColor = "empty",$activeSlave.origEye = "none",$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "remove eyes"]]
-				<<if ($activeSlave.hears != -2)>>//This will greatly restrict $him//<</if>>
-			<</if>>*/
 		<</if>>
 		<<if ($cyberMod == 1) && ($stockpile.cochlearImplant > 0) && ($activeSlave.earImplant != 1)>>
-			<<if ($activeSlave.hears != -3)>> <</if>>
 			| [[Give her cochlear implants|Surgery Degradation][$activeSlave.earImplant = 1, $stockpile.cochlearImplant--,$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "cochlear implant"]]
 		<</if>>
 	<</if>>
@@ -279,7 +273,7 @@ $He has
 
 <br>&nbsp;&nbsp;&nbsp;&nbsp;
 <<if $activeSlave.voice == 0>>
-	$He has been made a surgical mute.
+	$He is mute.
 <<elseif $activeSlave.voice == 1>>
 	$He has a deep voice.
 <<elseif $activeSlave.voice == 2>>
@@ -287,20 +281,29 @@ $He has
 <<elseif $activeSlave.voice == 3>>
 	$He has a high, girly voice.
 <</if>>
-<<if $activeSlave.voiceImplant != 0>>
+<<if $activeSlave.voiceImplant >= 1>>
 	$He has had surgery on $his voice box to raise $his voice.
 <</if>>
-<<if ($activeSlave.voice != 0) && ($activeSlave.voiceImplant == 0) && ($activeSlave.voice < 3)>>
-	<<if $activeSlave.indentureRestrictions < 1>>
-	[[Perform surgery to raise voice|Surgery Degradation][$activeSlave.voice += 1, $activeSlave.voiceImplant += 1, $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "voice"]]
-	<</if>>
-<</if>>
-<<if ($activeSlave.voice != 0) && ($activeSlave.voiceImplant == 0) && ($activeSlave.voice < 3) && ($seeExtreme == 1) && ($activeSlave.indentureRestrictions < 1)>>
-	|
+<<if $activeSlave.voiceImplant <= -1>>
+	$He has had surgery on $his voice box to lower $his voice.
 <</if>>
-<<if ($activeSlave.voice != 0) && ($seeExtreme == 1)>>
-	<<if $activeSlave.indentureRestrictions < 1>>
-	[[Remove vocal cords|Surgery Degradation][$activeSlave.voice = 0, $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "mute"]]
+<<if ($activeSlave.indentureRestrictions < 1) && ($activeSlave.electrolarynx == 0)>>
+	<<if $activeSlave.voice < 3>>
+		[[Perform surgery to raise voice|Surgery Degradation][$activeSlave.voice += 1, $activeSlave.voiceImplant += 1, $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "voice"]]
+	<</if>>
+	<<if $activeSlave.voice == 2>>
+		|
+	<</if>>
+	<<if $activeSlave.voice > 1>>
+		[[Perform surgery to lower voice|Surgery Degradation][$activeSlave.voice -= 1, $activeSlave.voiceImplant -= 1, $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "voice2"]]
+	<</if>>
+	<<if $seeExtreme == 1>>
+		<<if $activeSlave.voice != 0>>
+			| [[Remove vocal cords|Surgery Degradation][$activeSlave.voice = 0, $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "mute"]]
+		<</if>>
+		<<if ($cyberMod == 1) && ($stockpile.electrolarynx > 0)>>
+			| [[Give her an electrolarynx|Surgery Degradation][$activeSlave.electrolarynx = 1, $stockpile.electrolarynx--,$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "electrolarynx"]]
+		<</if>>
 	<</if>>
 <</if>>
 
@@ -482,27 +485,18 @@ Work on her chest:
 
 <br>&nbsp;&nbsp;&nbsp;&nbsp;
 <<if $activeSlave.areolae == 0>>
-	$His areolae are fairly normal.
+	$His areolae are small<<if $activeSlave.areolaeShape != "circle">>and have been surgically altered to be $activeSlave.areolaeShape-shaped<<else>>and fairly normal<</if>>.
 <<elseif $activeSlave.areolae == 1>>
-	$His areolae are large but still fairly normal.
-<<elseif ($activeSlave.areolae > 1) && ($activeSlave.areolae < 4)>>
-	<<if $activeSlave.indentureRestrictions < 2>>
-	$He has big areolae that could be reshaped into a pattern. Graft skin to make $his areolae:
-		[[Heart-shaped|Surgery Degradation][$activeSlave.areolaeShape = "heart",$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "areolae"]]
-		 | [[Star-shaped|Surgery Degradation][$activeSlave.areolaeShape = "star",$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "areolae"]] |
-	<</if>>
-<<elseif $activeSlave.areolaeShape == "heart">>
-	$His huge areolae have been surgically altered to be heart-shaped.
-<<elseif $activeSlave.areolaeShape == "star">>
-	$His huge areolae have been surgically altered to be star-shaped.
-<</if>>
-<<if $activeSlave.areolae > 1>>
-	<<if $activeSlave.indentureRestrictions < 2>>
-		[[Reduce areolae|Surgery Degradation][$activeSlave.areolae = 1,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "areolae"]]
+	$His areolae are large<<if $activeSlave.areolaeShape != "circle">> and have been surgically altered to be $activeSlave.areolaeShape-shaped<<else>> but still fairly normal<</if>>.
+<<elseif $activeSlave.areolae > 1>>
+	$He has <<if $activeSlave.areolae == 2>>huge<<elseif $activeSlave.areolae == 3>>massive<</if>> areolae<<if $activeSlave.areolaeShape != "circle">>, which have been surgically altered to be $activeSlave.areolaeShape-shaped<</if>>.
+	<<if ($activeSlave.indentureRestrictions < 2) && ($activeSlave.areolaeShape == "circle")>>
+	They are big enough that they could be reshaped into a pattern. Graft skin to make $his areolae:
+		[[Heart-shaped|Surgery Degradation][$activeSlave.areolaeShape = "heart",$activeSlave.areolae -= 1,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "areolae"]]
+		| [[Star-shaped|Surgery Degradation][$activeSlave.areolaeShape = "star",$activeSlave.areolae -= 1,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "areolae"]] |
 	<</if>>
-<<elseif $activeSlave.areolae > 0>>
 	<<if $activeSlave.indentureRestrictions < 2>>
-		[[Reduce areolae|Surgery Degradation][$activeSlave.areolae = 0,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "areolae"]]
+		[[Reduce areolae|Surgery Degradation][$activeSlave.areolae -= 1,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "areolae"]]
 	<</if>>
 <</if>>
 
@@ -1095,23 +1089,24 @@ Deal with her hair:
 
 <br><br>
 
-Alter her Race:
+Alter her race:
 <br>&nbsp;&nbsp;&nbsp;&nbsp;
 <<set $toSearch = $activeSlave.race>>
 <<if $toSearch.indexOf("surgically") == -1>>
 	<<if $activeSlave.indentureRestrictions < 1>>
-	$He is $activeSlave.race. Surgically alter $him to look more:
-	[[White|Surgery Degradation][$activeSlave.race = "surgically altered to look white",$activeSlave.skin = either("pale", "light", "fair"),$activeSlave.eyeColor = either("blue", "brown", "green"),$activeSlave.hColor = either("black", "blonde", "red", "brown"),$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
-	[[Latina|Surgery Degradation][$activeSlave.race = "surgically altered to look latina",$activeSlave.skin = either("light olive", "brown", "dark brown", "tanned", "dark olive"),$activeSlave.hColor = either("black", "black", "brown", "brown"),$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
-	[[Black|Surgery Degradation][$activeSlave.race = "surgically altered to look black",$activeSlave.skin = either("black", "brown", "dark brown"),$activeSlave.hColor = either("black", "black", "black", "brown"),$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
-	[[Asian|Surgery Degradation][$activeSlave.race = "surgically altered to look asian",$activeSlave.skin = either("light olive", "dark olive", "light"),$activeSlave.hColor = either("black"),$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
-	[[Middle Eastern|Surgery Degradation][$activeSlave.race = "surgically altered to look middle eastern",$activeSlave.skin = either("tanned", "dark olive", "light olive"),$activeSlave.hColor = "black",$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
-	[[Indo-aryan|Surgery Degradation][$activeSlave.race = "surgically altered to look indo-aryan",$activeSlave.skin = either("dark", "light"),$activeSlave.hColor = "black",$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]]
-	[[Pacific Islander|Surgery Degradation][$activeSlave.race = "surgically altered to look pacific islander",$activeSlave.skin = either("dark", "dark olive", "brown"),$activeSlave.hColor = either("black"),$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
-	[[Malay|Surgery Degradation][$activeSlave.race = "surgically altered to look malay",$activeSlave.skin = either("dark", "light"),$activeSlave.hColor = "black",$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
-	[[Amerindian|Surgery Degradation][$activeSlave.race = "surgically altered to look amerindian",$activeSlave.skin = either("dark", "brown", "light"),$activeSlave.hColor = "black",$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
-	[[Southern European|Surgery Degradation][$activeSlave.race = "surgically altered to look southern european",$activeSlave.skin = either("fair", "light olive", "tanned", "pale"),$activeSlave.hColor = "black",$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
-	[[Semitic|Surgery Degradation][$activeSlave.race = "surgically altered to look semitic",$activeSlave.skin = either("light", "light olive" "tanned", "dark olive"),$activeSlave.hColor = "black", "brown",$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]]
+		$He is $activeSlave.race. Surgically alter $him to look more:
+		[[White|Surgery Degradation][$activeSlave.race = "surgically altered to look white",$activeSlave.skin = either("pale", "light", "fair"),$activeSlave.eyeColor = either("blue", "brown", "green"),$activeSlave.hColor = either("black", "blonde", "red", "brown"),$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
+		[[Latina|Surgery Degradation][$activeSlave.race = "surgically altered to look latina",$activeSlave.skin = either("light olive", "brown", "dark brown", "tanned", "dark olive"),$activeSlave.hColor = either("black", "black", "brown", "brown"),$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
+		[[Black|Surgery Degradation][$activeSlave.race = "surgically altered to look black",$activeSlave.skin = either("black", "dark brown", "brown"),$activeSlave.hColor = either("black", "black", "black", "brown"),$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
+		[[Asian|Surgery Degradation][$activeSlave.race = "surgically altered to look asian",$activeSlave.skin = either("light olive", "dark olive", "light"),$activeSlave.hColor = either("black"),$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
+		[[Middle Eastern|Surgery Degradation][$activeSlave.race = "surgically altered to look middle eastern",$activeSlave.skin = either("fair", "light olive", "tanned", "light"),$activeSlave.hColor = either("black"),$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
+		[[Indo-Aryan|Surgery Degradation][$activeSlave.race = "surgically altered to look indo-aryan",$activeSlave.skin = either("dark", "light"),$activeSlave.hColor = either("black"),$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
+		[[Pacific Islander|Surgery Degradation][$activeSlave.race = "surgically altered to look pacific islander",$activeSlave.skin = either("dark", "light"),$activeSlave.hColor = either("black"),$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
+		[[Malay|Surgery Degradation][$activeSlave.race = "surgically altered to look malay",$activeSlave.skin = either("dark", "light"),$activeSlave.hColor = either("black"),$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
+		[[Amerindian|Surgery Degradation][$activeSlave.race = "surgically altered to look amerindian",$activeSlave.skin = either("dark", "light"),$activeSlave.hColor = either("black"),$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
+		[[Southern European|Surgery Degradation][$activeSlave.race = "surgically altered to look southern european",$activeSlave.skin = either("fair", "light olive", "tanned", "light"),$activeSlave.hColor = either("black"),$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
+		[[Semitic|Surgery Degradation][$activeSlave.race = "surgically altered to look semitic",$activeSlave.skin = either("fair", "light olive", "tanned", "light"),$activeSlave.hColor = either("black"),$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]] |
+		[[Mixed Race|Surgery Degradation][$activeSlave.race = "surgically altered to look mixed race",$activeSlave.skin = either("pale", "dark", "light"),$activeSlave.hColor = either("black", "black", "black", "black", "brown", "brown", "blonde", "red"),$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "race"]]
 	<<else>>
 		//$His indenture forbids elective surgery//
 	<</if>>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index 616b898594c..11393d2d5bf 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -29,6 +29,7 @@
 	$activeSlave.slaveName @@.red;has died from complications of surgery.@@
 	<<if $surgeryType == "ocular implant">>At least the ocular implants are still good.<<set $stockpile.ocularImplant++>><</if>>
 	<<if $surgeryType == "cochlear implant">>At least the cochlear implants are still good.<<set $stockpile.cochlearImplant++>><</if>>
+	<<if $surgeryType == "electrolarynx">>At least the electrolarynx is still good.<<set $stockpile.electrolarynx++>><</if>>
 	<<include "Remove activeSlave">>
 	<<set $nextLink = "Main">>
 <<elseif $surgeryType == "breastShapePreservation" && (($activeSlave.health-($activeSlave.boobs/1000)) < random(-100,-80))>>
@@ -258,7 +259,7 @@ As the remote surgery's long recovery cycle completes,
 	<</if>>
 
 <<case "mindbreak">>
-	$His gaze is placid and empty. <<if canSee($activeSlave)>>$He looks at<<else>>You cough causing $him to turn to face<</if>> you, and there is nothing there: no recognition, no fear, no love. Nothing. @@.red;$He will forget this in a few hours. $He will forget everything in a few hours.@@
+	$His gaze is placid and empty. <<if canSee($activeSlave)>>$He looks at<<elseif canHear($activeSlave>>You cough, causing $him to turn to face<<else>>$He does not respond to your touch, so you turn $his head to face<</if>> you, and there is nothing there: no recognition, no fear, no love. Nothing. @@.red;$He will forget this in a few hours. $He will forget everything in a few hours.@@
 	<<set $activeSlave.sexualFlaw = "none">>
 	<<set $activeSlave.behavioralFlaw = "none">>
 
@@ -327,7 +328,7 @@ As the remote surgery's long recovery cycle completes,
 	<<else>>
 		The implant surgery is @@.red;invasive@@ and $he spends some time in the autosurgery recovering. When $he is allowed to open $his eyes the amount of visual information makes $him reel.
 		<<if ($activeSlave.devotion > 50)>>
-			$He is @@.hotpink;grateful,@@ for $his improved vision, and knowing how much you invested in $him makes $him @@.mediumaquamarine;trust you more@@ as well.
+			$He is @@.hotpink;grateful@@ for $his improved vision, and knowing how much you invested in $him makes $him @@.mediumaquamarine;trust you more@@ as well.
 			<<set $activeSlave.devotion += 10; $activeSlave.trust += 10>>
 		<<elseif ($activeSlave.devotion > 20)>>
 			$He has mixed feelings about $his new eyes, but $he's @@.mediumaquamarine;aware@@ how valuable such implants are, and $he already @@.hotpink;accepted@@ that you have complete control over $his body.
@@ -1403,13 +1404,39 @@ As the remote surgery's long recovery cycle completes,
 		<<set $activeSlave.devotion -= 50>>
 	<</if>>
 
+<<case "electrolarynx">>
+	<<if $activeSlave.eyes <= -2>>
+		<<if ($activeSlave.devotion > 50)>>
+			The autosurgery instructed $him in no uncertain terms not to speak during recovery, so $he knows that $his voice has been restored. When you come in to check on her late in the process, though, $he does $his best to communicate adoration with $his <<if canSee($activeSlave)>>eyes<<else>>face<</if>> alone. Finally, the accelerated healing process reaches the time when $he's to test $his new vocal organs. $He <<if canSee($activeSlave)>>looks at<<else>>turns to<</if>> you shyly, and <<if $activeSlave.amp != 1>>meekly beckons to you from where $he's still<<else>>meekly mouths a request that you come over to where $he's<</if>> restrained by the autosurgery. When you're near, $he clears her sore throat gingerly and then whispers, "@@.hotpink;I love you,@@ <<Master>>" @@.mediumaquamarine;$He is far more trusting of your plans for $him in the future.@@
+			<<set $activeSlave.trust += 5>>
+			<<set $activeSlave.devotion += 5>>
+		<<elseif ($activeSlave.devotion >= -20)>>
+			The autosurgery instructed her in no uncertain terms not to speak during recovery, so $he knows that her voice has been restored. When you come in to check on her late in the process, though, $he does her best to communicate gratitude with her <<if canSee($activeSlave)>>eyes<<else>>face<</if>> alone. Finally, the accelerated healing process reaches the time when $he's to test her new vocal organs. $He <<if canSee($activeSlave)>>looks at<<else>>turns to<</if>> you shyly, and hesitantly <<if $activeSlave.amp != 1>>beckons to you from where $he's still<<else>>mouths a request that you come over to where $he's<</if>> restrained by the autosurgery. When you're near, $he clears $his sore throat gingerly and then whispers, "Thank you, <<Master>>." @@.hotpink;$He has a much higher regard for you@@ due to this display of care for $him.
+			<<set $activeSlave.devotion += 10>>
+		<<else>>
+			The autosurgery instructed $him in no uncertain terms not to speak during recovery, so $he knows that her voice has been restored. When you come in to check on her late in the process, though, $he <<if canSee($activeSlave)>>stares at<<else>>faces<</if>> you for a long moment before turning away from you, towards the wall, and beginning to cry quietly. It seems $he's surprised that you would do this for $him, and does not understand how to deal with the situation. In any case, @@.hotpink;$he hates you far less@@ than $he once did.
+		<<set $activeSlave.devotion += 10>>
+		<</if>>
+	<<else>>
+		<<if ($activeSlave.devotion > 50)>>
+			Before surgery, $he was warned repeatedly not to try talking for a while, and $he obeys. When $he finally does, her voice is raspy and weak, but it gains strength gradually. While $he first believes nothing has changed, <<if canHear($activeSlave)>>$he soon notices a slight synthetic tone to $his voice and realizes $he has been given a mechanical larynx<<else>>the autosurgery informs $him in no uncertain terms that $he has implanted with a mechanical larynx<</if>>. $He is @@.hotpink;appreciative@@ of $his new implant, and knowing how much you invested in $him makes $him @@.mediumaquamarine;trust you more@@ as well.
+			<<set $activeSlave.devotion += 10; $activeSlave.trust += 10>>
+		<<elseif ($activeSlave.devotion > 20)>>
+			Before surgery, $he was warned repeatedly not to try talking for a while, and $he obeys. When $he finally does, her voice is raspy and weak, but it gains strength gradually. While $he first believes nothing has changed, <<if canHear($activeSlave)>>$he soon notices a slight synthetic tone to $his voice and realizes $he has been given a mechanical larynx<<else>>the autosurgery informs $him in no uncertain terms that $he has implanted with a mechanical larynx<</if>>. $He has mixed feelings about this development, but $he's @@.mediumaquamarine;aware@@ how valuable such implants are, and $he already @@.hotpink;accepted@@ that you have complete control over $his body.
+			<<set $activeSlave.devotion += 5; $activeSlave.trust += 10>>
+		<<else>>
+			Before surgery, $he was warned repeatedly not to try talking for a while, and $he obeys. When $he finally does, her voice is raspy and weak, but it gains strength gradually. While $he first believes nothing has changed, <<if canHear($activeSlave)>>$he soon notices a slight synthetic tone to $his voice and realizes $he has been given a mechanical larynx<<else>>the autosurgery informs $him in no uncertain terms that $he has implanted with a mechanical larynx<</if>>. $He is @@.gold;disturbed@@ that you replaced $his larynx with an artificial one and afraid of increased control over $him that such device grants.
+			<<set $activeSlave.devotion -= 5>>
+		<</if>>
+	<</if>>
+
 <<case "restoreVoice">>
 	<<if ($activeSlave.devotion > 50)>>
-		The autosurgery instructed her in no uncertain terms not to speak during recovery, so $he knows that $his voice has been restored. When you come in to check on her late in the process, though, $he does $his best to communicate adoration with $his <<if canSee($activeSlave)>>eyes<<else>>face<</if>> alone. Finally, the accelerated healing process reaches the time when $he's to test $his new vocal organs. $He <<if canSee($activeSlave)>>looks at<<else>>turns to<</if>> you shyly, and <<if $activeSlave.amp != 1>>meekly beckons to you from where $he's still<<else>>meekly mouths a request that you come over to where $he's<</if>> restrained by the autosurgery. When you're near, $he clears her sore throat gingerly and then whispers, "@@.hotpink;I love you,@@ <<Master>>" @@.mediumaquamarine;$He is far more trusting of your plans for $him in the future.@@ As with all surgery @@.red;$his health has been slightly affected.@@
+		The autosurgery instructed $him in no uncertain terms not to speak during recovery, so $he knows that $his voice has been restored. When you come in to check on $him late in the process, though, $he does $his best to communicate adoration with $his <<if canSee($activeSlave)>>eyes<<else>>face<</if>> alone. Finally, the accelerated healing process reaches the time when $he's to test $his new vocal organs. $He <<if canSee($activeSlave)>>looks at<<else>>turns to<</if>> you shyly, and <<if $activeSlave.amp != 1>>meekly beckons to you from where $he's still<<else>>meekly mouths a request that you come over to where $he's<</if>> restrained by the autosurgery. When you're near, $he clears her sore throat gingerly and then whispers, "@@.hotpink;I love you,@@ <<Master>>" @@.mediumaquamarine;$He is far more trusting of your plans for $him in the future.@@ As with all surgery @@.red;$his health has been slightly affected.@@
 		<<set $activeSlave.trust += 5>>
 		<<set $activeSlave.devotion += 5>>
 	<<elseif ($activeSlave.devotion >= -20)>>
-		The autosurgery instructed her in no uncertain terms not to speak during recovery, so $he knows that her voice has been restored. When you come in to check on her late in the process, though, $he does her best to communicate gratitude with her <<if canSee($activeSlave)>>eyes<<else>>face<</if>> alone. Finally, the accelerated healing process reaches the time when $he's to test her new vocal organs. $He <<if canSee($activeSlave)>>looks at<<else>>turns to<</if>> you shyly, and hesitantly <<if $activeSlave.amp != 1>>beckons to you from where $he's still<<else>>mouths a request that you come over to where $he's<</if>> restrained by the autosurgery. When you're near, $he clears her sore throat gingerly and then whispers, "Thank you, <<Master>>." @@.hotpink;$He has a much higher regard for you@@ due to this display of care for $him. As with all surgery @@.red;$his health has been slightly affected.@@
+		The autosurgery instructed her in no uncertain terms not to speak during recovery, so $he knows that her voice has been restored. When you come in to check on $him late in the process, though, $he does her best to communicate gratitude with her <<if canSee($activeSlave)>>eyes<<else>>face<</if>> alone. Finally, the accelerated healing process reaches the time when $he's to test her new vocal organs. $He <<if canSee($activeSlave)>>looks at<<else>>turns to<</if>> you shyly, and hesitantly <<if $activeSlave.amp != 1>>beckons to you from where $he's still<<else>>mouths a request that you come over to where $he's<</if>> restrained by the autosurgery. When you're near, $he clears her sore throat gingerly and then whispers, "Thank you, <<Master>>." @@.hotpink;$He has a much higher regard for you@@ due to this display of care for $him. As with all surgery @@.red;$his health has been slightly affected.@@
 		<<set $activeSlave.devotion += 10>>
 	<<else>>
 		The autosurgery instructed her in no uncertain terms not to speak during recovery, so $he knows that her voice has been restored. When you come in to check on her late in the process, though, $he <<if canSee($activeSlave)>>stares at<<else>>faces<</if>> you for a long moment before turning away from you, towards the wall, and beginning to cry quietly. It seems $he's surprised that you would do this for $him, and does not understand how to deal with the situation. In any case, @@.hotpink;$he hates you far less@@ than $he once did. As with all surgery @@.red;$his health has been slightly affected.@@
@@ -1418,12 +1445,24 @@ As the remote surgery's long recovery cycle completes,
 
 <<case "voice">>
 	<<if ($activeSlave.devotion > 50)>>
-		Before surgery, $he was warned repeatedly not to try talking for a while, and $he obeys. When $he finally does, her voice is raspy and weak, but it gains strength gradually. It comes out far higher and more girly than it was before, and $he laughs at $himself as $he gets used to it. @@.hotpink;$He has become more submissive,@@ since this helps $him to think of $himself as a bimbo slut. As with all surgery @@.red;$his health has been slightly affected.@@
+		Before surgery, $he was warned repeatedly not to try talking for a while, and $he obeys. When $he finally does, her voice is raspy and weak, but it gains strength gradually. It comes out <<if $activeSlave.voice == 3>>far <</if>>higher and more girly than it was before, and $he laughs at $himself as $he gets used to it. @@.hotpink;$He has become more submissive,@@ since this helps $him to think of $himself as a <<if $activeSlave.voice == 3>>bimbo slut<<elseif $activeSlave.voice == 2>>real woman<</if>>. As with all surgery @@.red;$his health has been slightly affected.@@
+		<<set $activeSlave.devotion += 4>>
+	<<elseif ($activeSlave.devotion > 20)>>
+		Before surgery, $he was warned repeatedly not to try talking for a while, and $he obeys. When $he finally does, her voice is raspy and weak, but it gains strength gradually. It comes out <<if $activeSlave.voice == 3>>far <</if>> higher and more girly than it was before, and $he laughs grimly at $himself as $he gets used to it. $He carries on regardless, accepting it as one more thing to learn to accept. As with all surgery @@.red;$his health has been slightly affected.@@
+	<<else>>
+		Before surgery, $he was warned repeatedly not to try talking for a while, and $he obeys. When $he finally does, her voice is raspy and weak, but it gains strength gradually. It comes out <<if $activeSlave.voice == 3>>far <</if>> higher and more girly than it was before. For now, @@.mediumorchid;$he feels this <<if $activeSlave.voice == 3>>bimbo<<elseif $activeSlave.voice == 2>>feminine<</if>> voice is not $hers, a cruel mockery.@@ As with all surgery @@.red;$his health has been slightly affected.@@ $He is now @@.gold;terribly afraid@@ of your total power over $his body.
+		<<set $activeSlave.trust -= 10>>
+		<<set $activeSlave.devotion -= 5>>
+	<</if>>
+
+<<case "voice2">>
+	<<if ($activeSlave.devotion > 50)>>
+		Before surgery, $he was warned repeatedly not to try talking for a while, and $he obeys. When $he finally does, $his voice is raspy and weak, but it gains strength gradually. It comes out <<if $activeSlave.voice == 1>>far <</if>> lower and more manly than it was before, and $he laughs at $himself as $he gets used to it. @@.hotpink;$He has become more dominant,@@ since this allows $him to think of $himself as <<if $activeSlave.voice == 1>>an action movie hero<<elseif $activeSlave.voice == 2>>a mature career woman<</if>>. As with all surgery @@.red;$his health has been slightly affected.@@
 		<<set $activeSlave.devotion += 4>>
 	<<elseif ($activeSlave.devotion > 20)>>
-		Before surgery, $he was warned repeatedly not to try talking for a while, and $he obeys. When $he finally does, her voice is raspy and weak, but it gains strength gradually. It comes out far higher and more girly than it was before, and $he laughs grimly at $himself as $he gets used to it. $He carries on regardless, accepting it as one more thing to learn to accept. As with all surgery @@.red;$his health has been slightly affected.@@
+		Before surgery, $he was warned repeatedly not to try talking for a while, and $he obeys. When $he finally does, $his voice is raspy and weak, but it gains strength gradually. It comes out <<if $activeSlave.voice == 1>>far <</if>> lower and more manly than it was before, and $he laughs grimly at $himself as $he gets used to it. $He carries on regardless, accepting it as one more thing to learn to accept. As with all surgery @@.red;$his health has been slightly affected.@@
 	<<else>>
-		Before surgery, $he was warned repeatedly not to try talking for a while, and $he obeys. When $he finally does, her voice is raspy and weak, but it gains strength gradually. It comes out far higher and more girly than it was before. For now, @@.mediumorchid;$he feels this bimbo voice is not hers, a cruel mockery.@@ As with all surgery @@.red;$his health has been slightly affected.@@ $He is now @@.gold;terribly afraid@@ of your total power over $his body.
+		Before surgery, $he was warned repeatedly not to try talking for a while, and $he obeys. When $he finally does, $his voice is raspy and weak, but it gains strength gradually. It comes out <<if $activeSlave.voice == 1>>far <</if>> lower and more manly than it was before. For now, @@.mediumorchid;$he feels this <<if $activeSlave.voice == 1>>gravelly<<elseif $activeSlave.voice == 2>>subdued<</if>> voice is not $hers, a cruel mockery.@@ As with all surgery @@.red;$his health has been slightly affected.@@ $He is now @@.gold;terribly afraid@@ of your total power over $his body.
 		<<set $activeSlave.trust -= 10>>
 		<<set $activeSlave.devotion -= 5>>
 	<</if>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index d68c9df8184..cd3a89daeeb 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -1919,7 +1919,7 @@
 	<<if ($captureUpgradeRace == "unselected") || ($captureUpgradeRace == "none")>>
 		There is no racial element to trainee selection.
 	<<else>>
-		The corporation prefers to train <<print $captureUpgradeRace>>s.
+		The corporation prefers to train <<print $captureUpgradeRace>> slaves.
 	<</if>>
 	<<if $generalUpgradeBreaking == "brutality">>
 		The corporation applies brutal slave breaking techniques, with new captures assigned rape quotas.
-- 
GitLab