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

Pregmod v1031-26

See merge request !2817

devNotes/VersionChangeLog-Premod+LoliMod.txt

@@ -4,6 +4,9 @@
 
 10/20/2018
 
+	26
+	-fixes
+
 	25
 	-implemented the uterine restraint mesh from the black market
 	-fixes and tweaks

src/uncategorized/dispensary.tw

@@ -523,6 +523,27 @@ Implant Production
 		<br>
 	<</if>>
 
+	<<if $UterineRestraintMesh == 1>>
+		The fabricator is capable of producing supportive mesh uterine implants.
+		<br>
+	<</if>>
+	
+<</if>>
+
+<<if $arcologies[0].childhoodFertilityInducedNCSResearch == 1 || $RapidCellGrowthFormula == 1>>
+	<br>
+	Gene Mods
+	<hr>
+	
+	<<if $arcologies[0].childhoodFertilityInducedNCSResearch == 1>>
+		The fabricator is capable of producing treatments to induce NCS.
+		<br>
+	<</if>>
+	<<if $RapidCellGrowthFormula == 1>>
+		The fabricator is capable of producing treatments to accelerate cellular reproduction.
+		<br>
+	<</if>>
+	
 <</if>>
 
 <br>

src/uncategorized/nextWeek.tw

@@ -300,6 +300,7 @@
 <<if $boomerangWeeks>><<set $boomerangWeeks++>><<else>><<set $boomerangSlave = 0>><</if>>
 
 <<set $thisWeeksFSWares = $merchantFSWares.randomMany(2)>>
+<<set $thisWeeksIllegalFSWares = $merchantIllegalWares.randomMany(1)>>
 <<set $prisonCircuitIndex++>><<if $prisonCircuitIndex >= $prisonCircuit.length>><<set $prisonCircuitIndex = 0>><</if>>
 
 <<set $coursed = 0, $eventDescription = 0, $pitFought = 0, $preOwnedViewed = 0, $prestigeAuctioned = 0, $eliteAuctioned = 0, $repGain = 0, $shelterSlave = 0, $shelterSlaveBought = 0, $slaveMarketLimit = 10 + ($rep / 1000), $slavesSeen = 0, $slavesSacrificedThisWeek = 0, $subSlaves = 0>>