Merge remote-tracking branch 'origin/pregmod-master' into SF-Tweaking

src/npc/surgery/reproductiveOrgans.js

@@ -165,7 +165,7 @@ App.Medicine.OrganFarm.Ovaries = class extends App.Medicine.OrganFarm.Organ {
 					canImplant: s => (s.vagina >= 0 && s.ovaries <= 0 && s.mpreg === 0 && s.bellyImplant === -1),
 					implantError: s => {
 						if (s.vagina < 0) { return "This slave lacks the vagina necessary to accept ovaries."; }
-						if (s.ovaries >= 0) { return "This slave already has ovaries."; }
+						if (s.ovaries > 0 || s.mpreg > 0) { return "This slave already has ovaries."; }
 						return "This slave's body cavity is filled with another organ.";
 					},
 					implant: s => {

src/uncategorized/reBoomerang.tw

@@ -272,8 +272,16 @@ brings up the relevant feeds. There's a naked body crumpled pathetically against
 	<<set $activeSlave.behavioralFlaw = "odd", $activeSlave.sexualFlaw = "apathetic">>
 <<case "harvester">>
 	"I'm ju<<s>>t kept in a pen unle<<ss>> they're d-doing <<s>>urgery on me." It's not surprising; you did sell $him to an organ farm. What's unexpected is that $he's still alive. They must be removing the less essential parts gradually. "I'm going to die," $he <<say>>s hollowly. "Ne<<x>>t <<s>>urgery, I won't wake up."
-	<<set $activeSlave.balls = 0, $activeSlave.ovaries = 0, $activeSlave.preg = -2, WombFlush($activeSlave)>>
+	<<set $activeSlave.balls = 0, $activeSlave.prostate = 0, $activeSlave.ovaries = 0, $activeSlave.preg = -2, WombFlush($activeSlave)>>
 	<<run SetBellySize($activeSlave)>>
+	<<if $seeExtreme == 1>>
+		<<if $activeSlave.eye.left == 2 && $activeSlave.eye.right == 2 && hasBothNaturalEyes($activeSlave)>>
+			<<run eyeSurgery($activeSlave, "left", "remove")>>
+		<</if>>
+		<<if hasBothNaturalArms($activeSlave)>>
+			<<run removeLimbs($activeSlave, "right arm")>>
+		<</if>>
+	<</if>>
 	<<set $activeSlave.behavioralFlaw = "hates men", $activeSlave.sexualFlaw = "crude">>
 <<case "D butt bury">>
 	"My kind butt loving Ma<<s>>ter had to <<s>>ell me, and the brothel who bought me u<<s>>e<<s>> my behind a<<s>> an adverti<<s>>ement." $He shifts uncomfortably. "I can barely feel my anu<<s>>."