Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-master

.gitignore

@@ -103,4 +103,4 @@ package.json
 fc-pregmod
 *.outline
 *.todo
-TODO.txt
+TODO.txt
\ No newline at end of file

src/facilities/nursery/matronSelect.tw

@@ -3,7 +3,7 @@
 <<set $nextButton = "Back", $nextLink = "Nursery", $showEncyclopedia = 1, $encyclopedia = "Matron">>
 <<showallAssignmentFilter>>
 <<if ($Matron != 0)>>
-	<<setLocalPronouns $Matron
+	<<setLocalPronouns $Matron>>
 	''__@@.pink;<<= SlaveFullName($Matron)>>@@__'' is serving as your Matron.<br><br>$He will manage the nursery.
 <<else>>
 	You have not selected a Matron.

src/init/storyInit.tw

@@ -1399,7 +1399,7 @@ erectileImplant: 0
 } >>
 
 <<set $merchantFSWares = ["GenderRadicalistResearch", "TransformationFetishistResearch", "AssetExpansionistResearch", "SlimnessEnthusiastResearch", "YouthPreferentialistResearch", "HedonisticDecadenceResearch"]>>
-<<set $merchantIllegalWares = ["childhoodFertilityInducedNCS", "UterineRestraintMesh", "RapidCellGrowthFormula", "PGHack"]>>
+<<set $merchantIllegalWares = ["childhoodFertilityInducedNCS", "UterineRestraintMesh", "RapidCellGrowthFormula", "PGHack", "AnimalOrgans"]>>
 <<set $RapidCellGrowthFormula = 0>>
 <<set $UterineRestraintMesh = 0>>
 <<set $PGHack = 0>>

src/pregmod/theBlackMarket.tw

@@ -98,7 +98,7 @@ Of all the wonders present, the thing that catches your eye the most is a shady
 					<<if $cash >= 75000>>
 						[[Purchase formulas for growth reversing drugs|The Black Market][$cash -= 75000, $arcologies[0].FSSlimnessEnthusiastResearch = 1, _dump = $merchantFSWares.delete("SlimnessEnthusiastResearch")]] //@@.yellowgreen;<<print cashFormat(75000)>>.@@//
 					<<else>>
-						You cannot afford the asking price of @@.red;<<print cashFormat(75000)>>@@ for growth reversing drug formulas. "<<if $PC.boobsBonus > 0>>Guess you'll be keeping those knockers for now, <<if $PC.title == 0>>little miss top heavy<<else>>mr busty<</if>><<else>>Guess you don't mind sore backs. Leads to less sore knees, from what I've heard<</if>>."
+						You cannot afford the asking price of @@.red;<<print cashFormat(75000)>>@@ for growth reversing drug formulas. "<<if $PC.boobsBonus > 0>>Guess you'll be keeping those knockers for now, <<if $PC.title == 0>>Little-Miss-Top-Heavy<<else>>Mr. Busty<</if>><<else>>Guess you don't mind sore backs. Leads to less sore knees, from what I've heard<</if>>."
 					<</if>>
 				<<else>>
 					You already possess formulas for growth reversing drugs.
@@ -110,7 +110,7 @@ Of all the wonders present, the thing that catches your eye the most is a shady
 					<<if $cash >= 45000>>
 						[[Purchase formulas for extremely effective anti-aging beauty creams|The Black Market][$cash -= 45000, $arcologies[0].FSYouthPreferentialistResearch = 1, _dump = $merchantFSWares.delete("YouthPreferentialistResearch")]] //@@.yellowgreen;<<print cashFormat(45000)>>.@@//
 					<<else>>
-						You cannot afford the asking price of @@.red;<<print cashFormat(45000)>>@@ for extremely effective anti-aging beauty creams. "<<if $PC.visualAge > 40>>Those wrinkles don't look that bad on you, so don't worry about not being able to afford this<<else>>Just tell them they look young, and well, don't give them any mirrors. Probably should keep your money troubles from them too<</if>>."
+						You cannot afford the asking price of @@.red;<<print cashFormat(45000)>>@@ for extremely effective anti-aging beauty creams. "<<if $PC.visualAge > 40>>Those wrinkles don't look that bad on you, so don't worry about not being able to afford this<<else>>Just tell them they look young, and, well, don't give them any mirrors. Probably should keep your money troubles from them, too<</if>>."
 					<</if>>
 				<<else>>
 					You already possess formulas for extremely effective anti-aging beauty cream.
@@ -135,7 +135,7 @@ Of all the wonders present, the thing that catches your eye the most is a shady
 	<</if>>
 
 	<br><br>
-	He gestures to a door in the back of the stall. "The good shit's back there<<if $thisWeeksIllegalWares.length > 1>>, here's a list: <<elseif $thisWeeksIllegalWares.length == 1>>, only one this week: <<else>>.<</if>>"
+	He gestures to a door in the back of the stall. "The good shit's back there<<if $thisWeeksIllegalWares.length > 1>>-- here's a list: <<elseif $thisWeeksIllegalWares.length == 1>>-- only one this week: <<else>>.<</if>>"
 	<<if $thisWeeksIllegalWares.length > 0>>
 		<<for _bim = 0; _bim < $thisWeeksIllegalWares.length; _bim++>>
 			<<if $thisWeeksIllegalWares[_bim] == "childhoodFertilityInducedNCS">>
@@ -184,6 +184,7 @@ Of all the wonders present, the thing that catches your eye the most is a shady
 					<<set _dump = $merchantIllegalWares.delete("childhoodFertilityInducedNCS")>>
 				<</if>>
 			<</if>>
+
 			<<if $thisWeeksIllegalWares[_bim] == "UterineRestraintMesh">>
 				<br>
 				<<if $UterineRestraintMesh == 0>>
@@ -258,6 +259,11 @@ Of all the wonders present, the thing that catches your eye the most is a shady
 					<</if>>
 				<</if>>
 			<</if>>
+
+			<<if $thisWeeksIllegalWares[_bim] == "AnimalOrgans">>
+				<br>
+				/*TODO: this entire section */
+			<</if>>
 		<</for>>
 	<<else>>
 		<br>You appear to already possess all the black market schematics he has to offer.

src/uncategorized/RESS.tw

@@ -4286,7 +4286,7 @@ $He cranes $his neck, glancing over $his shoulder to give you a pleading look.
 <<case "devoted fearful slave">>
-You are working late tonight, poring over some particularly troublesome business documents -- though, thankfully, the end appears to be in sight. The sun has all but completely slipped below the horizon, drowning your office in moody twilight. Seeing that you are finally approaching the end of a long day, $assistantName, takes the liberty of having a 
+You are working late tonight, poring over some particularly troublesome business documents -- though, thankfully, the end appears to be in sight. The sun has all but completely slipped below the horizon, drowning your office in moody twilight. Seeing that you are finally approaching the end of a long day, $assistantName takes the liberty of having a 
 <<if $PC.refreshmentType == 0>>
 	$PC.refreshment
 <<elseif $PC.refreshmentType == 1>>
@@ -4302,7 +4302,7 @@ You are working late tonight, poring over some particularly troublesome business
 <<elseif $PC.refreshmentType == 6>>
 	tab of $PC.refreshment
 <</if>>
-brought in to you. This time <<EventNameLink $activeSlave>> has been sent to deliver it. $He loves you, but fears you simultaneously. Such relationships were not uncommon before the advent of modern slavery, but they are especially prevalent in its wake, as fear has proven a highly effective control method for those slave owners with the inclination and relative lack of conscience to utilize it as such. You hurriedly put the finishing touches on your work, eager to be done, and then reach for your $PC.refreshment. $activeSlave.slaveName flinches at your sudden movement, taking a few frightened steps back, nearly dropping the serving tray and leaving you grasping at thin air. It was a simple fear response; $he didn't realize you were ready for your treat and instinctively thought you were reaching out to strike $him. Tears swell up in $his eyes as $he apologizes profusely.
+brought in to you. This time <<EventNameLink $activeSlave>> has been sent to deliver it. $He loves you, but fears you simultaneously. Such relationships were not uncommon before the advent of modern slavery, but they are especially prevalent in its wake, as fear has proven a highly effective control method for those slave owners with the inclination and relative lack of conscience to utilize it as such. You hurriedly put the finishing touches on your work, eager to be done, and reach for your $PC.refreshment. $activeSlave.slaveName flinches at your sudden movement, taking a few frightened steps back, nearly dropping the serving tray and leaving you grasping at thin air. It was a simple fear response; $he didn't realize you were ready for your treat and instinctively thought you were reaching out to strike $him. Tears swell up in $his eyes as $he apologizes profusely.
 <<default>>
 	<br>ERROR: bad RESS event $RESSevent