From b89462e42bbb9f6456ea03b98a02c19d53105e72 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 16 Jan 2019 18:07:09 -0500
Subject: [PATCH] fixes

---
 src/pregmod/rePregInventor.tw      |  2 +-
 src/uncategorized/remoteSurgery.tw | 40 ++++++++++++++----------------
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/src/pregmod/rePregInventor.tw b/src/pregmod/rePregInventor.tw
index 304608816c7..6cfbffdc101 100644
--- a/src/pregmod/rePregInventor.tw
+++ b/src/pregmod/rePregInventor.tw
@@ -629,7 +629,7 @@
 		You strip and put on one of the swimming outfits that are stored in the baths for your personal use, then slide yourself into the pool, squeezing in between its wall and your hyperswollen broodmother. The gel has a medicinal scent masked by lavender and is the perfect warmth to ease your muscles as you slide into it. Your skin tingles at its touch.
 		<br><br>
 		<<if canTalk($activeSlave)>>
-			"It'<<s>> curative jelly," your slave explains. "I'm <<s>>o big, now, it take<<s>> mo<<s>>t of the day to moi<<s>>turi<<z>>e my poor belly, even with help. With thi<<s>> jelly pool, it only take<<s>> a few minute<<s>>. I'm <<s>>ure thi<<s>> pool can help all <<s>>ort<<s>> of <<s>>lave<<s>> with big a<<ss>>et<<s>> <<s>>o that they can keep them<<s>>elve<<s>> looking pretty for their <<Master>><</if>>."
+			"It'<<s>> curative jelly," your slave explains. "I'm <<s>>o big, now, it take<<s>> mo<<s>>t of the day to moi<<s>>turi<<z>>e my poor belly, even with help. With thi<<s>> jelly pool, it only take<<s>> a few minute<<s>>. I'm <<s>>ure thi<<s>> pool can help all <<s>>ort<<s>> of <<s>>lave<<s>> with big a<<ss>>et<<s>> <<s>>o that they can keep them<<s>>elve<<s>> looking pretty for their <<Master>>."
 		<<else>>
 			<<if $activeSlave.amp == 0>>
 				$He motions to you, explaining in sign that the pool is filled with curative gel. It's designed to help slaves with enormous assets moisturize their oversized bodies without having to spend all day applying it manually.
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index c1c9fac1d81..8fdd5c9c6d0 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -929,31 +929,27 @@ Work on $his sex:
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;
 		<<if $activeSlave.assignment == "work in the dairy" && $dairyPregSetting > 0>>
 			$His womb is already rented out for the production of calves.
-		<<else>>
-			<<if isFertile($activeSlave) && $activeSlave.ovaryAge <= 46>>
-				$He could be made into a broodmother.
-			<<elseif $activeSlave.broodmother > 0>>
-				$He has been made into a <<if $activeSlave.broodmother > 1>>hyper-<</if>>broodmother.
-				<<if $activeSlave.womb.length == 0 >>
-					[[Remove a pregnancy generator|Surgery Degradation][$activeSlave.preg = 0,$activeSlave.pregWeek = -2,$activeSlave.pregSource = 0,$activeSlave.pregWeek = 0,$activeSlave.pregKnown = 0,$activeSlave.pregType = 0,$activeSlave.broodmother = 0,$activeSlave.broodmotherFetuses = 0,$activeSlave.broodmotherOnHold = 0,$cash -= $surgeryCost,$activeSlave.pregControl = "none",$activeSlave.health -= 10,$surgeryType = "pregRemove"]]
-				<<else>>
-					$He is pregnant right now, so $his broodmother implant can't be safely extracted.
-					<<if $activeSlave.broodmother == 1 && $activeSlave.broodmotherFetuses == 1>> /*hack can be applied only one time, for type 1 broodmothers, and only if implant already present*/
-						<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-						[[Hack the pregnancy generator|Surgery Degradation][$cash -= $surgeryCost,$activeSlave.pregControl = "none",$activeSlave.health -= 1,$surgeryType = "preg1hack"]] //This will trick the generator ova release logic, forcing it to release more than one ova each week. This is an untested override and can cause severe health problems.//
-					<<elseif $activeSlave.broodmother == 1 && $activeSlave.broodmotherFetuses > 1>>
-						<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-						The implant firmware has already been adjusted.
-					<</if>>
-				<</if>>
+		<<elseif $activeSlave.broodmother > 0>>
+			$He has been made into a <<if $activeSlave.broodmother > 1>>hyper-<</if>>broodmother.
+			<<if $activeSlave.womb.length == 0 >>
+				[[Remove the pregnancy generator|Surgery Degradation][$activeSlave.preg = 0,$activeSlave.pregWeek = -2,$activeSlave.pregSource = 0,$activeSlave.pregWeek = 0,$activeSlave.pregKnown = 0,$activeSlave.pregType = 0,$activeSlave.broodmother = 0,$activeSlave.broodmotherFetuses = 0,$activeSlave.broodmotherOnHold = 0,$cash -= $surgeryCost,$activeSlave.pregControl = "none",$activeSlave.health -= 10,$surgeryType = "pregRemove"]]
 			<<else>>
-				$His body cannot support being a broodmother.
-			<</if>>
-			<<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
-				<<if isFertile($activeSlave)>>
-					[[Implant a pregnancy generator|Surgery Degradation][$activeSlave.preg = 1,$activeSlave.pregWeek = 1,$activeSlave.pregKnown = 1,$activeSlave.pregType = 1,$activeSlave.broodmother = 1,$activeSlave.broodmotherFetuses = 1,$cash -= $surgeryCost,$activeSlave.pregControl = "none",$activeSlave.health -= 10,$surgeryType = "preg"]] //This will have severe effects on $his health and mind//
+				$He is pregnant right now, so $his broodmother implant can't be safely extracted.
+				<<if $activeSlave.broodmother == 1 && $activeSlave.broodmotherFetuses == 1>> /*hack can be applied only one time, for type 1 broodmothers, and only if implant already present*/
+					<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+					[[Hack the pregnancy generator|Surgery Degradation][$cash -= $surgeryCost,$activeSlave.pregControl = "none",$activeSlave.health -= 1,$surgeryType = "preg1hack"]] //This will trick the generator ova release logic, forcing it to release more than one ova each week. This is an untested override and can cause severe health problems.//
+				<<elseif $activeSlave.broodmother == 1 && $activeSlave.broodmotherFetuses > 1>>
+					<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+					The implant firmware has already been adjusted.
 				<</if>>
 			<</if>>
+		<<elseif $activeSlave.indentureRestrictions > 0 || ($activeSlave.breedingMark == 1 && $propOutcome == 1)>>
+			//$His is protected from extreme surgery//
+		<<elseif isFertile($activeSlave) && $activeSlave.ovaryAge <= 46>>
+			$He could be made into a broodmother.
+			[[Implant a pregnancy generator|Surgery Degradation][$activeSlave.preg = 1,$activeSlave.pregWeek = 1,$activeSlave.pregKnown = 1,$activeSlave.pregType = 1,$activeSlave.broodmother = 1,$activeSlave.broodmotherFetuses = 1,$cash -= $surgeryCost,$activeSlave.pregControl = "none",$activeSlave.health -= 10,$surgeryType = "preg"]] //This will have severe effects on $his health and mind//
+		<<else>>
+			$His body cannot support being a broodmother.
 		<</if>>
 	<</if>>
 <</if>>
-- 
GitLab