diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index 1d6c358681d67d567df33eb3d04d12ab6747c4c5..9af750a76c0a56bb52fd3c311ec05956f926340b 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -241,7 +241,7 @@
<<set $arcologies[0].FSEgyptianRevivalistIncestPolicy = 0>>
<<set $arcologies[0].FSEgyptianRevivalistInterest = 0>>
-<<set $arcologies[0].childhoodFertilityInducedNCSResearch = 0>>
+<<set $arcologies[0].ChildhoodFertilityInducedNCSResearch = 0>>
/*Nationalities Setup*/
diff --git a/src/facilities/nursery/matronSelect.tw b/src/facilities/nursery/matronSelect.tw
index fdfed340d45a5b88f311274be1a8915a1f95de7e..61def000231a323a36fad60d098743e10f7389da 100644
--- a/src/facilities/nursery/matronSelect.tw
+++ b/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.
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index dde5f8948af3d0b737969e187958f2e4fd563c5a..064c607789b6b3aeba3a02ad3b43ca8c8f6b9dc3 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1398,7 +1398,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>>
diff --git a/src/pregmod/theBlackMarket.tw b/src/pregmod/theBlackMarket.tw
index 5e73f351eb0f3f98c480d01581e6d1ab43fe624c..9c37d85fa914f60dbcc5e2164ccae96a18bc79a5 100644
--- a/src/pregmod/theBlackMarket.tw
+++ b/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,10 +135,10 @@ 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">>
+ <<if $thisWeeksIllegalWares[_bim] == "ChildhoodFertilityInducedNCS">>
<br>
<<if $minimumSlaveAge <= 15>>
<dt>@@.cyan;Childhood Fertility Induced NCS (Induced Neotenic Complex Syndrome or Syndrome X modified for fertility).@@</dt>
@@ -149,7 +149,7 @@ Of all the wonders present, the thing that catches your eye the most is a shady
Since the agreed upon minimum age in your Free City is greater than eight, it would draw way too much attention for you to make use of the research recipe for the Childhood Fertility @@.orange;Induced NCS@@ (genetic engineering and hormonal blend).
<br>
He notices your interest and lets you read the information [[Childhood Fertility Induced NCS|Encyclopedia][$encyclopedia = "Childhood Fertility Induced NCS"]].
- <<set _dump = $merchantIllegalWares.delete("childhoodFertilityInducedNCS")>>
+ <<set _dump = $merchantIllegalWares.delete("ChildhoodFertilityInducedNCS")>>
<<else>>
<<if $arcologies[0].FSYouthPreferentialist > 0>>
<<set _match = "Knowing your arcology, I think you could be happy with the results!">>
@@ -164,10 +164,10 @@ Of all the wonders present, the thing that catches your eye the most is a shady
<<if $geneticMappingUpgrade == 0>>
You lack the facilities required for such a treatment to be effective on specific individuals.
<<else>>
- <<if $arcologies[0].childhoodFertilityInducedNCSResearch == 0>>
+ <<if $arcologies[0].ChildhoodFertilityInducedNCSResearch == 0>>
<<if $cash >= 135000>>
"_toydolls _match _norefunds"<br>
- [[Purchase childhood fertility induced NCS|The Black Market][$cash -= 135000, $arcologies[0].childhoodFertilityInducedNCSResearch = 1, _dump = $merchantFSWares.delete("childFertilityInducedSyndromeX")]] //@@.yellowgreen;<<print cashFormat(135000)>>.@@//<br>
+ [[Purchase childhood fertility induced NCS|The Black Market][$cash -= 135000, $arcologies[0].ChildhoodFertilityInducedNCSResearch = 1, _dump = $merchantFSWares.delete("childFertilityInducedSyndromeX")]] //@@.yellowgreen;<<print cashFormat(135000)>>.@@//<br>
<<else>>
"_toydolls _match _norefunds Or, you know, come back with money."<br>
You cannot afford the asking price of @@.red;<<print cashFormat(135000)>>@@ for the Childhood Fertility @@.orange;Induced NCS@@ (genetic engineering and hormonal blend) research recipe.<br>
@@ -175,15 +175,16 @@ Of all the wonders present, the thing that catches your eye the most is a shady
He notices your interest and lets you read the information [[Childhood Fertility Induced NCS|Encyclopedia][$encyclopedia = "Childhood Fertility Induced NCS"]].
<<else>>
You already possess the Childhood Fertility @@.orange;Induced NCS@@ (genetic engineering and hormonal blend) research recipe.<br>
- <<set _dump = $merchantIllegalWares.delete("childhoodFertilityInducedNCS")>>
+ <<set _dump = $merchantIllegalWares.delete("ChildhoodFertilityInducedNCS")>>
<</if>>
<</if>>
<</if>>
<<else>>
You have no interest in such a distasteful research.
- <<set _dump = $merchantIllegalWares.delete("childhoodFertilityInducedNCS")>>
+ <<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.
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 814b1d067ffa57b17d920a7c9b7f347a01a3ba92..36e1ec4c328bf248aaba74152799eb6e2b5512e7 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -1047,15 +1047,15 @@
<<set $merchantFSWares = ["GenderRadicalistResearch", "TransformationFetishistResearch", "AssetExpansionistResearch", "SlimnessEnthusiastResearch", "YouthPreferentialistResearch", "HedonisticDecadenceResearch"]>>
<</if>>
<<if ndef $merchantIllegalWares>>
- <<set $merchantIllegalWares = ["childhoodFertilityInducedNCS", "UterineRestraintMesh", "RapidCellGrowthFormula", "PGHack"]>>
+ <<set $merchantIllegalWares = ["ChildhoodFertilityInducedNCS", "UterineRestraintMesh", "RapidCellGrowthFormula", "PGHack"]>>
<<elseif $merchantIllegalWares.length == 0>>
- <<set $merchantIllegalWares.push("childhoodFertilityInducedNCS")>>
+ <<set $merchantIllegalWares.push("ChildhoodFertilityInducedNCS")>>
<<set $merchantIllegalWares.push("UterineRestraintMesh")>>
<<set $merchantIllegalWares.push("RapidCellGrowthFormula")>>
<<set $merchantIllegalWares.push("PGHack")>>
<</if>>
-<<if ndef $arcologies[0].childhoodFertilityInducedNCSResearch>>
- <<set $arcologies[0].childhoodFertilityInducedNCSResearch = 0>>
+<<if ndef $arcologies[0].ChildhoodFertilityInducedNCSResearch>>
+ <<set $arcologies[0].ChildhoodFertilityInducedNCSResearch = 0>>
<</if>>
<<if $arcologies[0].childFertilityInducedNCSResearch>>
<<unset $arcologies[0].childFertilityInducedNCSResearch>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 4a44b4418fd40e04760ec763266453d0770d615a..3744846f72dfb888aa91303d4b131ee5b74a0979 100644
--- a/src/uncategorized/RESS.tw
+++ b/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
diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw
index 0f9cbde84595e37b529aa312563f0fffe3191a95..26e0757801748366d2804e22e5f5339f4be5f588 100644
--- a/src/uncategorized/dispensary.tw
+++ b/src/uncategorized/dispensary.tw
@@ -621,7 +621,7 @@ Implant Production
<<else>>
The fabricator is capable of mapping a slave's genes, identifying abnormalities and producing treatments to correct them.
<br>
- <<if $arcologies[0].childhoodFertilityInducedNCSResearch == 1>>
+ <<if $arcologies[0].ChildhoodFertilityInducedNCSResearch == 1>>
The fabricator is capable of producing treatments to induce NCS.
<br>
<</if>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 79d470862fd1873bf1a178fbeab3c690a8876ec5..5b8050e3efaa35c95740a51f978feb9ee0baceae 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -1162,7 +1162,7 @@ $He has
//$He's too unhealthy to undergo gene therapy//
<<else>>
Available treatments:
- <<if $arcologies[0].childhoodFertilityInducedNCSResearch == 1>>
+ <<if $arcologies[0].ChildhoodFertilityInducedNCSResearch == 1>>
<br>
<<if $activeSlave.geneMods.NCS == 0>>
[[Induced NCS Treatment|Surgery Degradation][$activeSlave.geneMods.NCS = 1,$cash -= $surgeryCost * 4, $activeSlave.health -= 80, $activeSlave.chem += 40,$surgeryType = "retrograde virus injection NCS"]] //This will induce @@.orange;NCS@@ in $his genetic code//