Merge branch 'pregmod-master' into 'pregmod-master'

Pregmod v1019-84

See merge request !748

src/pregmod/seFCTVshows.tw

@@ -165,7 +165,7 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
 		<</if>>
 		<<set $activeSlave.pregKnown = 1>>
 		<<set $activeSlave.pregWeek = $activeSlave.preg>>
-		<<SetBellySize>>
+		<<SetBellySize $activeSlave>>
 		<<set $activeSlave.ovaries = 1>>
 		<<set $activeSlave.lips = random(20,50)>>
 		<<set $activeSlave.teeth = "normal">>

src/uncategorized/neighborDescription.tw

@@ -30,7 +30,7 @@
 Its leadership has control of approximately @@.orange;<<print Math.trunc(($arcologies[$i].ownership*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>%@@ of the arcology<<if $arcologies[$i].minority > $arcologies[$i].ownership-10>>, a dangerously narrow margin over competition with a @@.tan;<<print Math.trunc(($arcologies[$i].minority*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>%@@ share<</if>>.
 <</if>>
 <</if>>
-<<if $arcologies[$i].PCminority > 0>>You own @@.lime;$arcologies[$i].PCminority%@@ of this arcology<</if>><<if ($arcologies[$i].government == "your trustees") || ($arcologies[$i].government == "your agent")>><<if $arcologies[$i].minority > $arcologies[$i].PCminority-10>>, a dangerously narrow margin over competition with a @.red;<<print Math.trunc(($arcologies[$i].minority*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>%@@ share<</if>><</if>>.
+<<if $arcologies[$i].PCminority > 0>>You own @@.lime;$arcologies[$i].PCminority%@@ of this arcology<<if ($arcologies[$i].government == "your trustees") || ($arcologies[$i].government == "your agent")>><<if $arcologies[$i].minority > $arcologies[$i].PCminority-10>>, a dangerously narrow margin over competition with a @.red;<<print Math.trunc(($arcologies[$i].minority*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>%@@ share<</if>><</if>>.<</if>>
 <<set $economicUncertainty -= 2*$assistantPower>>
 The arcology has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i].prosperity*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>m,@@
 <<if Math.abs($arcologies[$i].prosperity - $averageProsperity) < 5>>

src/uncategorized/reBoomerang.tw

@@ -247,7 +247,7 @@ brings up the relevant feeds. There's a naked body crumpled pathetically against
 <<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 her to an organ farm. What's unexpected is that she's still alive. They must be removing the less essential parts gradually. "I'm going to die," she <<say>>s hollowly. "Next <<s>>urgery, I won't wake up."
 	<<set $activeSlave.balls = 0, $activeSlave.ovaries = 0, $activeSlave.preg = -2, $activeSlave.pregType = 0, $activeSlave.pregWeek = 0, $activeSlave.pregKnown = 0>>
-	<<SetBellySize>>
+	<<SetBellySize $activeSlave>>
 	<<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." She shifts uncomfortably. "I can barely feel my anu<<s>>."