Merge branch 'fixes' into 'pregmod-master'

Redoing fixes

Closes #254

See merge request pregmodfan/fc-pregmod!2527

src/uncategorized/remoteSurgery.tw

@@ -291,7 +291,7 @@ $He has
 	<</if>>
 <</if>>
 <<if ($activeSlave.indentureRestrictions < 1) && ($activeSlave.electrolarynx != 1)>>
-	<<if $activeSlave.voice != 0>>
+	<<if $activeSlave.voice != 0 && ($cyberMod == 0 || $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>>
@@ -304,7 +304,7 @@ $He has
 		<<if $seeExtreme == 1>>
 			| [[Remove vocal cords|Surgery Degradation][$activeSlave.voice = 0, $activeSlave.voiceImplant = 0, $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "mute"]]
 		<</if>>
-	<<elseif ($cyberMod == 1) && ($stockpile.electrolarynx > 0)>>
+	<<elseif $cyberMod == 1 && $activeSlave.electrolarynx == 0 && $stockpile.electrolarynx > 0>>
 		[["Give " + $him + " an electrolarynx"|Surgery Degradation][$activeSlave.electrolarynx = 1, $activeSlave.voice = 2, $stockpile.electrolarynx--, $cash -= $surgeryCost, $activeSlave.health -= 20, $surgeryType = "electrolarynx"]]
 	<</if>>
 <</if>>