diff --git a/.gitignore b/.gitignore
index 1fe0ce12683ec4b06928d5696d6b91969095e53c..bbd8b23dd9c4d37da4d77101b12cc05c61eb747b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -103,4 +103,4 @@ package.json
fc-pregmod
*.outline
*.todo
-TODO.txt
\ No newline at end of file
+TODO.txt
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 3c5e42595e55ba97ae38570882ba3b5f142649e1..f541ee154f1ff4c6a15df8af9eecf96577bc4113 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -33347,7 +33347,7 @@ window.GenerateNewSlave = (function(){
slave.trust = jsRandom(-45,-25);
slave.weight = jsRandom(-100,180);
slave.health = jsRandom(-50,50);
-
+
WombInit(slave);
generateAge();
generateIntelligence();
@@ -33373,7 +33373,7 @@ window.GenerateNewSlave = (function(){
slave.ovaries = 1;
slave.pubertyXY = 0;
slave.energy = jsRandom(1,85);
-
+
generateXXBodyProportions();
generateVagina();
generateXXPreferences();
@@ -33394,7 +33394,7 @@ window.GenerateNewSlave = (function(){
slave.prostate = 1;
slave.pubertyXX = 0;
slave.energy = jsRandom(15,90);
-
+
generateXYBodyProportions();
generateDick();
generateCircumcision();
@@ -33483,7 +33483,7 @@ window.GenerateNewSlave = (function(){
} else {
slave.vagina = jsEither([0, 0, 1, 1, 1]);
}
-
+
if (slave.physicalAge <= 11) {
slave.clit = jsEither([0, 0, 0, 0, 0, 0, 0, 0, 1]);
} else if (slave.physicalAge <= 13) {
@@ -33493,7 +33493,7 @@ window.GenerateNewSlave = (function(){
} else {
slave.clit = jsEither([0, 0, 0, 0, 0, 0, 1, 1, 2]);
}
-
+
if (slave.physicalAge <= 11) {
slave.labia = jsEither([0, 0, 0, 0, 0, 0, 0, 1, 1]);
} else if (slave.physicalAge <= 12) {
@@ -33507,7 +33507,7 @@ window.GenerateNewSlave = (function(){
} else {
slave.labia = jsEither([0, 0, 0, 1, 1, 1, 1, 2, 2, 3]);
}
-
+
if (slave.energy < random(1,80)) {
slave.vaginaLube = 0;
} else if ( slave.physicalAge > random(35,60)) {
@@ -33522,7 +33522,7 @@ window.GenerateNewSlave = (function(){
slave.vagina = -1;
slave.clit = 0;
slave.preg = 0;
-
+
if (slave.physicalAge <= 13) {
slave.dick = jsEither([1, 1, 1, 1, 2, 2, 2, 3]);
if (V.seeExtreme == 1) {
@@ -33945,7 +33945,7 @@ window.GenerateNewSlave = (function(){
slave.fetishStrength = jsRandom(0,90);
slave.fetish = jsEither(["none", "none", "none", "none", "none", "none", "none", "none", "none", "none", "none", "none", "none", "submissive", "submissive", "cumslut", "humiliation", "humiliation", "buttslut", "boobs", "pregnancy", "dom", "sadist", "masochist"]);
slave.behavioralFlaw = jsEither(["none", "none", "none", "arrogant", "bitchy", "odd", "hates men", "hates women", "hates women", "anorexic", "gluttonous", "devout", "liberated"]);
-
+
if (slave.behavioralFlaw == "devout") {
slave.sexualFlaw = jsEither(["none", "repressed", "shamefast", "apathetic", "crude", "judgemental"]);
} else {
@@ -33964,7 +33964,7 @@ window.GenerateNewSlave = (function(){
slave.fetishStrength = jsRandom(0,90);
slave.fetish = jsEither(["none", "none", "none", "none", "none", "none", "none", "none", "none", "none", "none", "none", "none", "submissive", "cumslut", "humiliation", "buttslut", "buttslut", "boobs", "dom", "sadist", "masochist"]);
slave.behavioralFlaw = jsEither(["none", "none", "none", "arrogant", "bitchy", "odd", "hates men", "hates men", "hates men", "hates women", "anorexic", "gluttonous", "devout", "liberated"]);
-
+
if (slave.behavioralFlaw == "devout") {
slave.sexualFlaw = jsEither(["none", "repressed", "shamefast", "apathetic", "crude", "judgemental"]);
} else {
@@ -34225,11 +34225,11 @@ window.GenerateNewSlave = (function(){
} else {
femaleCrookedTeethGen -= 20;
}
-
+
if (jsRandom(0, femaleCrookedTeethGen) <= 15 && slave.physicalAge >= 12) {
slave.teeth = jsEither(["crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "gapped"]);
}
-
+
if (slave.physicalAge < 6) {
slave.teeth = "baby";
} else if (slave.physicalAge < 12) {
@@ -34246,11 +34246,11 @@ window.GenerateNewSlave = (function(){
} else {
maleCrookedTeethGen -= 20;
}
-
+
if (jsRandom(0, maleCrookedTeethGen) <= 15 && slave.physicalAge >= 12) {
slave.teeth = jsEither(["crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "gapped"]);
}
-
+
if (slave.physicalAge < 6) {
slave.teeth = "baby";
} else if (slave.physicalAge < 12) {
@@ -34628,7 +34628,7 @@ window.GenerateNewSlave = (function(){
slave.boobShape = jsEither(BoobShapeGen);
}
}
-
+
if (slave.boobs < 250) {
slave.nipples = jsEither(["cute", "cute", "partially inverted", "puffy", "tiny", "tiny", "tiny", "tiny"]);
} else if (slave.boobs < 500) {
diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw
index 496a76ecfa86de992a454eb511a7d0fa4e375c4c..9042bd94f9d9d8c4581ab3a101a8d365b8024065 100644
--- a/src/SecExp/attackReport.tw
+++ b/src/SecExp/attackReport.tw
@@ -1441,7 +1441,7 @@
<</if>>
<<elseif $chosenTactic == "Choke Points">>
<<if $attackType == "raiders">>
- Raiders lack heavy weaponry or armour, so making use of fortified positions is an excellent way to dissipate the otherwise powerful momentum of their assault.
+ Raiders lack heavy weaponry or armor, so making use of fortified positions is an excellent way to dissipate the otherwise powerful momentum of their assault.
<<elseif $attackType == "free city">>
The high tech equipment free cities can afford to give their guns for hire means there's no defensive position strong enough to stop them, still the relatively low numbers means they will have to take a careful approach, slowing them down.
<<elseif $attackType == "old world">>
diff --git a/src/SecExp/rebellionReport.tw b/src/SecExp/rebellionReport.tw
index bc447191e64c0a5ba01f287e74776ae95507ad4f..bfcc21bb38764d8342d679058847998fc6e5fbcd 100644
--- a/src/SecExp/rebellionReport.tw
+++ b/src/SecExp/rebellionReport.tw
@@ -89,7 +89,7 @@
completely annihilating their troops, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<else>> a casualty.<</if>>
<</if>>
<<if $SFGear>>
- More units were able to survive thanks to wearining $SF.Lower's combat armour suits.
+ More units were able to survive thanks to wearing $SF.Lower's combat armor suits.
<</if>>
<<set $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * $enemyLosses),
$helots -= Math.trunc(($helots / $ASlaves) * $enemyLosses),
@@ -221,7 +221,7 @@
completely annihilating their troops, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<else>> a casualty.<</if>>
<</if>>
<<if $SFGear>>
- More units were able to survive thanks to wearining $SF.Lower's combat armour suits.
+ More units were able to survive thanks to wearing $SF.Lower's combat armor suits.
<</if>>
<<set $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * $enemyLosses),
$helots -= Math.trunc(($helots / $ASlaves) * $enemyLosses),
diff --git a/src/SecExp/riotControlCenter.tw b/src/SecExp/riotControlCenter.tw
index 43d7f51035ffbb39ba25dd828207f24405a9a963..5385f0867edb4c89acca05b09c7bda32eb693ce0 100644
--- a/src/SecExp/riotControlCenter.tw
+++ b/src/SecExp/riotControlCenter.tw
@@ -209,9 +209,9 @@ The riot control center opens its guarded doors to you. The great chamber inside
<<if $SF.Toggle && $SF.Active >= 1>>
<<if $SFSupportLevel >= 4 && !$SFGear && $SFUnit.Armoury >= 8>> <<= Count()>>
- <br><br> <<link "Give the riot unit access to the combat armour suits of $SF.Lower.""riotControlCenter">> <<set $SFGear = 1,$riotUpkeep += 15000,$cash -= Math.ceil(500000*_Env*(1.15+($SFUnit.Armoury/10)))>> <</link>>
+ <br><br> <<link "Give the riot unit access to the combat armor suits of $SF.Lower.""riotControlCenter">> <<set $SFGear = 1,$riotUpkeep += 15000,$cash -= Math.ceil(500000*_Env*(1.15+($SFUnit.Armoury/10)))>> <</link>>
<br>//Costs <<print cashFormat(Math.ceil(500000*_Env*(1.15+($SFUnit.Armoury/10))))>>
<<else>>
- <br><br>//You have given the riot unit access to the combat armour suits of $SF.Lower.//
+ <br><br>//You have given the riot unit access to the combat armor suits of $SF.Lower.//
<</if>>
<</if>>
\ No newline at end of file
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 664a7bb55e73121f6a146bc4159e28c52a58d7ab..8e651a1df82879a79cce1eced245bcae3b2a2953 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -717,7 +717,7 @@ __''Player Character''__
<<set _PCCreationCareer = "a member of the idle wealthy">>
<</switch>>
<br>
- Before you came to the free cities, you were ''_PCCreationCareer'' and it is rumoured that you acquired your arcology through ''$PC.rumor''.
+ Before you came to the free cities, you were ''_PCCreationCareer'' and it is rumored that you acquired your arcology through ''$PC.rumor''.
<br>__Past career:__
<<if $PC.career != "arcology owner">>
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 e0ed2e4e29077ca76f4f99a7707c1f9f2f89ef0e..1a1b63dfe34d471650b6e8f9cfff7497092897c8 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1397,7 +1397,7 @@ erectileImplant: 0
} >>
<<set $merchantFSWares = ["AssetExpansionistResearch", "GenderRadicalistResearch", "HedonisticDecadenceResearch", "SlimnessEnthusiastResearch", "TransformationFetishistResearch", "YouthPreferentialistResearch"]>>
-<<set $merchantIllegalWares = ["childhoodFertilityInducedNCS", "PGHack", "RapidCellGrowthFormula", "UterineRestraintMesh"]>>
+<<set $merchantIllegalWares = ["AnimalOrgans", "childhoodFertilityInducedNCS", "PGHack", "RapidCellGrowthFormula", "UterineRestraintMesh"]>>
<<set $RapidCellGrowthFormula = 0>>
<<set $UterineRestraintMesh = 0>>
<<set $PGHack = 0>>
diff --git a/src/pregmod/theBlackMarket.tw b/src/pregmod/theBlackMarket.tw
index 5e73f351eb0f3f98c480d01581e6d1ab43fe624c..4d047d4fe7521ae9f7047799d467849011a819a0 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,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.
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index fc7ff9dfc6851b59f0297b428be79f55cc358cc6..379a2fdb77d260c2c9e22854b52575a90d67f8e7 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>>
diff --git a/src/uncategorized/siblingsWorkaround.tw b/src/uncategorized/siblingsWorkaround.tw
index 85c84b7b2ca2ad7b67beed97cc9f6a4154e89eff..3c3035f7774b971cc72bfcb0294a4861695a657b 100644
--- a/src/uncategorized/siblingsWorkaround.tw
+++ b/src/uncategorized/siblingsWorkaround.tw
@@ -48,8 +48,8 @@ Your new pair of slaves look frightened and uncertain, but seem encouraged by ea
<</if>>
<<if $familyTesting == 0>>
-<<set _secondSlave.relation = "sister">>
-<<set _secondSlave.relationTarget = _secondSlave.ID - 1000>>
+ <<set _secondSlave.relation = "sister">>
+ <<set _secondSlave.relationTarget = _secondSlave.ID - 1000>>
<</if>>
<<if _secondSlave.actualAge < $minimumSlaveAge>>
diff --git a/src/uncategorized/slaveShelter.tw b/src/uncategorized/slaveShelter.tw
index 1c318980784340b2f9c7a27555e2c65c44ae9870..2e3efb1274535fdf688f7a45266c4cbbe5102fe5 100644
--- a/src/uncategorized/slaveShelter.tw
+++ b/src/uncategorized/slaveShelter.tw
@@ -22,7 +22,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<</if>>
<</if>>
<<if random(1,100) <= $seeDicks>>
- <<set _possibleOrigins.push("geldling", "dickpain")>>
+ <<set _possibleOrigins.push("gelding", "dickpain")>>
<</if>>
<<if random(0,99) >= $seeDicks>>
<<set _possibleOrigins.push("plugs", "used whore", "reaction")>>
@@ -34,7 +34,6 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set _possibleOrigins.push("degraded DoL")>>
<</if>>
-
<<set _origin = _possibleOrigins.random()>>
<<switch _origin>>
@@ -220,7 +219,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<if $shelterSlave.dick > 1>>
<<set $shelterSlave.dickTat = either("degradation", "rude words", 0)>>
<</if>>
-<<case "geldling">>
+<<case "gelding">>
<<set $activeSlaveOneTimeMinAge = 20>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
diff --git a/src/uncategorized/stewardessWorkaround.tw b/src/uncategorized/stewardessWorkaround.tw
index 7efd7ede9c6f08f6007e9e3a663a9deae01a8030..99c517aa1df49bda08582aa8d438d569a6f9c8ed 100644
--- a/src/uncategorized/stewardessWorkaround.tw
+++ b/src/uncategorized/stewardessWorkaround.tw
@@ -10,4 +10,3 @@
<</if>>
<<goto "Servants' Quarters">>
-
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 1439767d93abd3ccd41560ec4d0a8bd657917711..f877dac2419a8f7dbc4801afaa66648827d82314 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -27,7 +27,7 @@
<span id="cost"><<SlaveCostDescription>></span>
<<elseif $ui == "disclaimer">>\
-<span id="nextButton"><strong><<link [[($nextButton)|($nextLink)]]>><</link>></strong></span>
+ <span id="nextButton"><strong><<link [[($nextButton)|($nextLink)]]>><</link>></strong></span>
<<elseif $ui != "start">>\
<<nobr>>