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

Pregmod v1021-27

See merge request !819

src/uncategorized/seWedding.tw

@@ -463,7 +463,7 @@
 	<<if $activeSlave.fetish == "mindbroken">>
 		<<set $desc = "a framed shot of you impregnating the blank-faced " + $activeSlave.slaveName + " at your wedding">>
 	<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
-		<<set $desc = "a framed shot of you impregnating the joyous " + $activeSlave.slaveName + " at your wedding.">>
+		<<set $desc = "a framed shot of you impregnating the joyous " + $activeSlave.slaveName + " at your wedding">>
 	<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
 		<<set $desc = "a framed shot of you forcefully impregnating the disinterested " + $activeSlave.slaveName + " at your wedding">>
 	<<elseif $activeSlave.devotion < -20>>

src/uncategorized/storyCaption.tw

@@ -131,6 +131,7 @@
 <br>@@.pink;Total Sex Slaves@@ | _SL
 <br>@@.pink;Penthouse Beds@@ |
 <<if $dormitoryPopulation+$roomsPopulation > ($dormitory+$rooms)>>@@.red;<<print $dormitoryPopulation+$roomsPopulation>>@@<<else>><<print $dormitoryPopulation+$roomsPopulation>><</if>>/<<print ($dormitory+$rooms)>>
+<br>@@.pink;Dormitory Beds@@ | <<if $dormitoryPopulation > $dormitory>>@@.red;<<print $dormitoryPopulation>>@@<<else>><<print $dormitoryPopulation>><</if>>/<<print $dormitory>>
 <br>@@.pink;Luxury Rooms@@ | <<if $roomsPopulation > $rooms>>@@.red;<<print $roomsPopulation>>@@<<else>><<print $roomsPopulation>><</if>>/<<print $rooms>>
 <br>@@.yellowgreen;GSP@@ |
 <<print Math.trunc(0.1*$arcologies[0].prosperity)>>m