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

fixes

See merge request pregmodfan/fc-pregmod!2826

src/pregmod/theBlackMarket.tw

@@ -187,7 +187,7 @@ Of all the wonders present, the thing that catches your eye the most is a shady
 						<<if $ImplantProductionUpgrade == 1>>
 							<<if $surgeryUpgrade == 1>>
 								<<if $cash >= 20000>>
-									[[Purchase blueprints for a supportive uterine mesh|The Black Market][$cash -= 20000, $UterineRestraintMesh = 1, _dump = $merchantFSWares.delete("UterineRestraintMesh")]] //@@.yellowgreen;<<print cashFormat(20000)>>.@@//
+									[[Purchase blueprints for a supportive uterine mesh|The Black Market][$cash -= 20000, $UterineRestraintMesh = 1, _dump = $merchantIllegalWares.delete("UterineRestraintMesh")]] //@@.yellowgreen;<<print cashFormat(20000)>>.@@//
 								<<else>>
 									You cannot afford the asking price of @@.red;<<print cashFormat(20000)>>@@ for a supportive uterine mesh.
 								<</if>>
@@ -204,21 +204,21 @@ Of all the wonders present, the thing that catches your eye the most is a shady
 					<</if>>
 				<<else>>
 					You already possess blueprints for a supportive uterine mesh.
-					<<set _dump = $merchantFSWares.delete("UterineRestraintMesh")>>
+					<<set _dump = $merchantIllegalWares.delete("UterineRestraintMesh")>>
 				<</if>>
 			<</if>>
 			<<if $thisWeeksIllegalWares[_bim] == "RapidCellGrowthFormula">>
 				<br>
 				<<if $RapidCellGrowthFormula == 0>>
 					<<if $cash >= 70000>>
-						[[Purchase formulas for elasticity increasing injections|The Black Market][$cash -= 70000, $RapidCellGrowthFormula = 1, _dump = $merchantFSWares.delete("RapidCellGrowthFormula")]] //@@.yellowgreen;<<print cashFormat(70000)>>.@@//
+						[[Purchase formulas for elasticity increasing injections|The Black Market][$cash -= 70000, $RapidCellGrowthFormula = 1, _dump = $merchantIllegalWares.delete("RapidCellGrowthFormula")]] //@@.yellowgreen;<<print cashFormat(70000)>>.@@//
 					<<else>>
 						You cannot afford the asking price of @@.red;<<print cashFormat(70000)>>@@ for elasticity increasing injections.
 					<</if>>
 					"These injections will loosen up any skin, muscle, organ or whatever living flesh you inject them in to. I'm not entirely sure how they work, something about increased cell growth or something. Probably not the safest thing to use, what with it pretty much being cancer in a vial. From what I've gathered, they were originally being developed to use with fillable breast implants. Some rich investor got his rocks off from BE and decided to make his dream a reality. Worked great too, save for the fact that the breasts didn't shrink down when the implant was emptied. Yep, she was left with a big ol' pair of floppy tits after being stretched so much. My take is, if you want to get big, fast, this is the drug for you, but only if you don't care about ever going back."
 				<<else>>
 					You already possess formulas for elasticity increasing injections.
-					<<set _dump = $merchantFSWares.delete("RapidCellGrowthFormula")>>
+					<<set _dump = $merchantIllegalWares.delete("RapidCellGrowthFormula")>>
 				<</if>>
 			<</if>>
 		<</for>>

src/uncategorized/nextWeek.tw

@@ -300,7 +300,7 @@
 <<if $boomerangWeeks>><<set $boomerangWeeks++>><<else>><<set $boomerangSlave = 0>><</if>>
 
 <<set $thisWeeksFSWares = $merchantFSWares.randomMany(2)>>
-<<set $thisWeeksIllegalFSWares = $merchantIllegalWares.randomMany(1)>>
+<<set $thisWeeksIllegalWares = $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>>