diff --git a/devNotes/Useful JS Function Documentation.txt b/devNotes/Useful JS Function Documentation.txt
index eafa5e09cb42a6b481885d0b473e616fa15279bc..164361af93a49faa1314d714f8cdf68c89ed4872 100644
--- a/devNotes/Useful JS Function Documentation.txt
+++ b/devNotes/Useful JS Function Documentation.txt
@@ -98,7 +98,11 @@ canSee(slave) - Returns if the slave can see.
canHear(slave) - Returns if the slave can hear.
-canWalk(slave) - Returns if the slave can walk.
+canSmell(slave) - Returns if the slave can smell.
+
+canTaste(slave) - Returns if the slave can taste.
+
+canWalk(slave) - Returns if the slave can walk unassisted.
canTalk(slave) - Returns if the slave can talk.
diff --git a/src/SecExp/propagandaHub.tw b/src/SecExp/propagandaHub.tw
index e41b41fabe345596a4ae8443d5cfb36f1bae6444..d54051f59bfaef9b4eaa4c5e5586e61877716abd 100644
--- a/src/SecExp/propagandaHub.tw
+++ b/src/SecExp/propagandaHub.tw
@@ -13,14 +13,18 @@ Propaganda Hub
The propaganda hub is a surprisingly inconspicuous building, dimly lit from the outside. You are well aware however of its role and its importance. You confidently enter its unassuming doorway and calmly review the work being done here.
-<<if $Recruiter != 0>><br><br>
-<<if $RecuriterOffice == 0>>
- <<link "Give ''__@@.pink;<<= SlaveFullName($Recruiter)>>@@__'' an office.""propagandaHub">>
- <<set $RecuriterOffice = 1>> <</link>>
-<<else>>
- <<link "Remove ''__@@.pink;<<= SlaveFullName($Recruiter)>>@@__'' from her office.""propagandaHub">>
- <<set $RecuriterOffice = 0>> <</link>>
-<</if>>
+<<if $Recruiter != 0>>
+ <<setLocalPronouns $Recruiter>>
+ <br><br>
+ <<if $RecuriterOffice == 0>>
+ <<link "Give ''__@@.pink;<<= SlaveFullName($Recruiter)>>@@__'' an office.""propagandaHub">>
+ <<set $RecuriterOffice = 1>>
+ <</link>>
+ <<else>>
+ <<link "Remove ''__@@.pink;<<= SlaveFullName($Recruiter)>>@@__'' from $his office.""propagandaHub">>
+ <<set $RecuriterOffice = 0>>
+ <</link>>
+ <</if>>
<</if>>
/* classic propaganda */
<br><br><<if $propCampaign == 0>>
diff --git a/src/SpecialForce/WeeklyChoices.tw b/src/SpecialForce/WeeklyChoices.tw
index 6456bc9a421ca7d1047b54412a48b8d5d9ab888e..3452dad0f8a196eb5b5fcd72348c465f809733e5 100644
--- a/src/SpecialForce/WeeklyChoices.tw
+++ b/src/SpecialForce/WeeklyChoices.tw
@@ -83,8 +83,8 @@
Your minor skill in warfare convinces the Colonel that <<if $Bodyguard != 0>>in addition to $Bodyguard.slaveName, <</if>>you need two full squads of armed soldiers and an armored car escort for a simple walk around the arcology.
<<else>>
Your complete lack of combat skill convinces the Colonel that <<if $Bodyguard != 0>>in addition to $Bodyguard.slaveName, <</if>>you need two full squads of armed soldiers, an armored car escort, and a sniper overwatch for a simple walk around the arcology.
- <</if>>
-
+ <</if>>
+
<br>As you make your way through the arcology you stop at a
<<if $arcologies[0].FSPaternalist != "unset">>
paternalist shop, <<if $SF.Colonel.Core == "cruel">>earning a sneer from the Colonel.<<else>>helping the Colonel select some luxurious and relaxing slave treatments.<</if>>
diff --git a/src/facilities/nursery/nurseryWorkaround.tw b/src/facilities/nursery/nurseryWorkaround.tw
index fd5e886e88d3fb39c277f6631a5f3a1fdfbc6043..2a06020421d630cb9177aa88d6afdc1c412fb726 100644
--- a/src/facilities/nursery/nurseryWorkaround.tw
+++ b/src/facilities/nursery/nurseryWorkaround.tw
@@ -150,7 +150,7 @@
<</replace>>
<</link>>
<<elseif _tempMom.ID == $HeadGirl.ID>>
- <br><<link "Permit your headgirl to name _his2 daughter">>
+ <br><<link "Permit your Head Girl to name _his2 daughter">>
<<replace "#naming">>
<<ParentNames _tempMom $activeSlave>>
<<set $activeSlave.birthName = $activeSlave.slaveName>>
diff --git a/src/interaction/prostheticConfig.tw b/src/interaction/prostheticConfig.tw
index 3756a951d1a0242ddba28aaae0de07978817de20..354439c24b53a319874e9dd37291e15703cd2af9 100644
--- a/src/interaction/prostheticConfig.tw
+++ b/src/interaction/prostheticConfig.tw
@@ -166,7 +166,7 @@ This room is lined with shelves and cabinets, it could be easily mistaken for a
<</switch>>
installed.//<br>
<<link "Detach <<= $his>> limbs" "Prosthetics Config">>
- <<set $activeSlave.amp = 0, $prostheticsConfig = "removeLimbs">>
+ <<set $activeSlave.amp = 1, $prostheticsConfig = "removeLimbs">>
<</link>>
<br><br>
<</if>>
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index b7f0d4604806cf45ab29a2589628c16f08288d81..60dd55bb852828526948a502c6dc460c09451682 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -123,7 +123,7 @@ window.newSlave = function newSlave(slave) {
if (slave.geneticQuirks.dwarfism === 2 && slave.geneticQuirks.gigantism !== 2 && slave.height > 165) {
slave.geneticQuirks.dwarfism = 1;
}
-
+
if (V.surnamesForbidden === 1) {
slave.slaveSurname = 0;
}
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index 3dd348dcba655cca05aed98a5ddda0755b22d28c..899bbf07bfbd4c01dfe89b6b91b20fac400068cb 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -872,7 +872,7 @@ window.generateGenetics = (function() {
} else if (mother.geneticQuirks.uFace === 2) {
quirks.uFace = 1;
}
-
+
// gigantism
if (father !== 0) {
if (mother.geneticQuirks.gigantism === 2 && father.geneticQuirks.gigantism === 2) {
diff --git a/src/npc/descriptions/fBoobs.tw b/src/npc/descriptions/fBoobs.tw
index 820f0ca632034adedca0e4f6c4ee242eaec2171b..34a3602038f5f56f6176a3e1674611f16bca7b68 100644
--- a/src/npc/descriptions/fBoobs.tw
+++ b/src/npc/descriptions/fBoobs.tw
@@ -199,7 +199,7 @@ tits.
<<= induceLactation($activeSlave)>>
<</if>>
-<<if ($activeSlave.amp !== 1)>>
+<<if ($activeSlave.amp != 1)>>
<<switch $activeSlave.assignment>>
<<case "work in the dairy">>
$He goes off to carefully wash $his <<if $activeSlave.boobs > 1500>>acre of cleavage<<elseif $activeSlave.boobs > 500>>generous cleavage<<else>>chest<</if>> to keep production in $dairyName nice and sanitary.
diff --git a/src/npc/descriptions/fButt.tw b/src/npc/descriptions/fButt.tw
index 16e29748d2235a138e17b91460af9c30177e29eb..ea3792d5f63dfbf4a09a692fbe9644568e0058d0 100644
--- a/src/npc/descriptions/fButt.tw
+++ b/src/npc/descriptions/fButt.tw
@@ -93,7 +93,7 @@ You call $him over so you can
<<elseif ($activeSlave.devotion >= -20)>>
$He is clearly unhappy at the idea of taking a dick up $his butt. $He obeys orders anyway, and lies there wincing and moaning as you<<if ($PC.dick == 0)>> don a strap-on and<</if>> fuck $his ass. @@.lime;$His tight little ass has been broken in,@@ and $he @@.gold;fears further anal pain.@@
<<else>>
- $He is appalled at the idea of taking it up the ass<<if ($PC.dick == 0)>> and cries with fear as you don a strap-on<</if>>. $He does anyway though, sobbing into the cushions<<if $activeSlave.amp !== 1>> while you hold $his arms behind $him<</if>>. You force yourself into $his butthole. $He sobs and cries with disgust while you continue thrusting into $his ass. The painful anal rape @@.mediumorchid;decreases $his devotion to you.@@ @@.lime;$His tight little ass has been broken in,@@ and $he is @@.gold;terrified of further anal pain.@@
+ $He is appalled at the idea of taking it up the ass<<if ($PC.dick == 0)>> and cries with fear as you don a strap-on<</if>>. $He does anyway though, sobbing into the cushions<<if $activeSlave.amp != 1>> while you hold $his arms behind $him<</if>>. You force yourself into $his butthole. $He sobs and cries with disgust while you continue thrusting into $his ass. The painful anal rape @@.mediumorchid;decreases $his devotion to you.@@ @@.lime;$His tight little ass has been broken in,@@ and $he is @@.gold;terrified of further anal pain.@@
<<set $activeSlave.devotion -= 5>>
<</if>>
<<set $activeSlave.anus++>>
diff --git a/src/pregmod/killSlave.tw b/src/pregmod/killSlave.tw
index c0fa9a3683762ea9512e4d6bcf5b2cf164e681af..05cd865d023a80e2750f97e381656cf206a26c3c 100644
--- a/src/pregmod/killSlave.tw
+++ b/src/pregmod/killSlave.tw
@@ -43,7 +43,7 @@
<<else>>
blankly
<</if>>
- and waits for you to continue.
+ and waits for you to continue.
<<else>>
It's hard to tell the expression on the Fuckdoll's face, but your guess is it's
<<if $activeSlave.fetish != "mindbroken">>
@@ -64,7 +64,7 @@
You tell $him that you've gotten tired of having $him around and that you have decided it is time you got rid of $him.
<<if $activeSlave.fuckdoll <= 0>>
- <<if $activeSlave.fetish != "mindbroken">> $His expression changes to one of
+ <<if $activeSlave.fetish != "mindbroken">> $His expression changes to one of
<<if $activeSlave.devotion > 50>>
pure sorrow
<<elseif ($activeSlave.devotion) > 20 && ($activeSlave.devotion <= 50)>>
@@ -108,7 +108,7 @@
<<if $activeSlave.fuckdoll <= 0 && $activeSlave.fetish != "mindbroken">>
- You simply smile at $him and tell $him not to worry
+ You simply smile at $him and tell $him not to worry
<<else>>
You say nothing
<</if>>
@@ -120,7 +120,7 @@
threading on a suppressor.
<</if>>
- $activeSlave.slaveName
+ $activeSlave.slaveName
<<if $activeSlave.fuckdoll <= 0 && $activeSlave.fetish != "mindbroken">>
gives an audible sigh of relief and begins to thank you profusely, though $his thanks are cut short as the sound of
<<else>>
@@ -264,7 +264,7 @@
</span>
<<else>>
<<if $activeSlave.fetish != "mindbroken" || $activeSlave.fuckdoll <= 0>>
- You abruptly cut $his begging short once you
+ You abruptly cut $his begging short once you
<<else>>
You change your mind as you suddenly
<</if>>
diff --git a/src/pregmod/seFCNNstation.tw b/src/pregmod/seFCNNstation.tw
index c4fc495a19de8a2347a4f828bbbe16cad0d442fe..5194e518edab270ef42cad3ddc15e621c5218aaf 100644
--- a/src/pregmod/seFCNNstation.tw
+++ b/src/pregmod/seFCNNstation.tw
@@ -20,7 +20,7 @@ and the price certainly seems outrageous, accepting the offer would likely be a
<<link "Accept">>
<<replace "#result">>
You accept the FCNN president's offer. He looks like he's about to burst into tears after hearing this, especially since you offer no caveats as well, but struggles to maintain a professional composure regardless. Before the week is over, FCNN has established their new headquarters in $arcologies[0].name.
- <<set cashX(forceNeg(100000), "capEx"), $arcologies[0].prosperity += 2, $FCNNstation = 1>>
+ <<set cashX(forceNeg(100000), "capEx"), $arcologies[0].prosperity += 2, $FCNNstation = 1>>
<</replace>>
<</link>>
<br><<link "Decline">>
diff --git a/src/pregmod/widgets/bodySwapReaction.tw b/src/pregmod/widgets/bodySwapReaction.tw
index 3fcd48d56d2b9a88b2b26c0777b1d71c9e84a453..28182fb3612515329d0e8b99d4432ba41d37d151 100644
--- a/src/pregmod/widgets/bodySwapReaction.tw
+++ b/src/pregmod/widgets/bodySwapReaction.tw
@@ -3241,7 +3241,7 @@ Now you only have to wait for $him to wake up.
<<if $args[1].amp == 1>> /*(was already an amputee)*/
but $he realizes that at least nothing about $his limbs, or lack thereof, has changed.
<<else>>
- $His eyes seemed to bulge, $his heart monitor begins to beep faster and more insistently. Eventually, your assistant is forced to inject $him with a sedative. $His eyes flutter closed and the heart monitors beeping slows to a steady pulse. Hopefully $he'll be calmer when $he wakes up again, though the memory of waking without limbs will @@.gold;stick with $him.@@
+ $His eyes seem to bulge, $his heart monitor begins to beep faster and more insistently. Eventually, your assistant is forced to inject $him with a sedative. $His eyes flutter closed and the heart monitors beeping slows to a steady pulse. Hopefully $he'll be calmer when $he wakes up again, though the memory of waking without limbs will @@.gold;stick with $him.@@
<br>
...
<br>
diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw
index 2b15432488912ceab710541552a99bdd302534a9..3b82bce59326b89c5866d4217ffeb1e22acf1742 100644
--- a/src/pregmod/widgets/bodyswapWidgets.tw
+++ b/src/pregmod/widgets/bodyswapWidgets.tw
@@ -158,7 +158,7 @@
<<set $args[0].canRecruit = 0>>
-<<if $args[2] != 1>> /* swpping NOT gene pool records */
+<<if $args[2] != 1>> /* swapping NOT gene pool records */
<<set $args[0].porn = $args[1].porn>>
<<set $args[0].aphrodisiacs = $args[1].aphrodisiacs>>
<<set $args[0].curatives = $args[1].curatives>>
diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw
index af620cc43c4023d98263d00a24035a95eca628a7..cdac14be5d53faf74d051fd29ae5198d5b9390d9 100644
--- a/src/uncategorized/arcadeReport.tw
+++ b/src/uncategorized/arcadeReport.tw
@@ -216,7 +216,7 @@
<<if ($arcadeUpgradeFuckdolls == 2)>>
<<set $activeSlave = 0, _Age = -1, _FD = -1, _MB = -1, _Con = -1>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<if $slaves[$i].sentence == 0>> /* lets not convert slaves we are punishing into Fuckdolls */
+ <<if $slaves[$i].sentence == 0>> /* let's not convert slaves we are punishing into Fuckdolls */
<<set $i = $slaveIndices[$ArcadeiIDs[_dI]]>>
<<if ($slaves[$i].fetish == "mindbroken")>>
<<if ($slaves[$i].fuckdoll == 0)>>
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index 6f372e433b9a4934bb8f18f3d9ce6e27d1a866c2..10be96250b7ce29b91cfc2f074750e12258a7c64 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -158,7 +158,7 @@
$He uses $slaves[$i].slaveName as an example of how even a huge-balled freak like _him2 can be restored to proper femininity.
<<set $madamCashBonus += 0.20>>
<<else>>
- $He tries to hide $slaves[$i].slaveName, "her" body being notorious for defiance of conventional femininity.
+ $He tries to hide $slaves[$i].slaveName, 'her' body being notorious for defiance of conventional femininity.
<</if>>
<<else>>
<<if (($slaves[$i].balls > 5) && ($slaves[$i].dick != 0)) || (($slaves[$i].balls > 4) && ($slaves[$i].dick != 0) && ($slaves[$i].prostate > 1))>>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index fd571cf5566b59b161350306d90afb710bd59576..2fc3c52ec65a81687e1016f150049a9c6f22cd24 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -370,7 +370,7 @@
<<set $slaves[$i].collar = "none", $slaves[$i].choosesOwnClothes = 0, $slaves[$i].clothes = "no clothing", $slaves[$i].vaginalAccessory = "none", $slaves[$i].vaginalAttachment = "none", $slaves[$i].dickAccessory = "none", $slaves[$i].buttplug = "none", $slaves[$i].chastityAnus = 0, $slaves[$i].chastityPenis = 0, $slaves[$i].chastityVagina = 0>>
<</if>>
<<switch $dairyDecoration>>
- <<case "Roman Revivalist" "Aztec Revivalist" "Chinese Revivalist" "Chattel Religionist" "Edo Revivalist" "Arabian Revivalist" "Egyptian Revivalist" "Supremacist" "Subjugationist" "Degradationist">>
+ <<case "Arabian Revivalist" "Aztec Revivalist" "Chattel Religionist" "Chinese Revivalist" "Degradationist" "Edo Revivalist" "Egyptian Revivalist" "Roman Revivalist" "Subjugationist" "Supremacist">>
<<set $slaves[$i].livingRules = "spare">>
<<default>>
<<set $slaves[$i].livingRules = "normal">>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index b6c5d2fcd87618a3d2d921accf668c57a049b096..71c21c3e27d65cc9b51243bca968a44720e8bc42 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -24,7 +24,7 @@
Early one morning, you hear convulsive dry heaving coming from one of the bathrooms. On investigation, it seems that $slaves[_genPlot].slaveName woke up feeling terribly nauseous. $He's in no danger, but you've hardly checked $him over before more slaves stagger in. Every one of your slaves on curatives has been struck by the mysterious malady and has @@.red;sickened.@@
<br><br>
-It doesn't take much investigation before you find other slaveowners reporting the same thing. Elementary detective work fingers a particular drug supplier as the culprit, and before long the unfortunate Pharmaceutical concern is drowning under a rain of harsh public comment and harsher private contract warfare. As the day wears on, the poor slaves feel a bit better, but begin to report discomfort in their breasts. Apparently the problem has to do with contamination of the curative production line with A-HGH production reactants.
+It doesn't take much investigation before you find other slaveowners reporting the same thing. Elementary detective work fingers a particular drug supplier as the culprit, and before long the unfortunate pharmaceutical concern is drowning under a rain of harsh public comment and harsher private contract warfare. As the day wears on, the poor slaves feel a bit better, but begin to report discomfort in their breasts. Apparently the problem has to do with contamination of the curative production line with A-HGH production reactants.
<br><br>
The firm promptly pays @@.yellowgreen;fair compensation@@ for the minor damage to your slaves' health. However, you're left with the matter of the boobs to deal with. Over the week, all your slaves on curatives experience at least a little @@.lime;breast growth,@@ and some gain several cup sizes.<<if $medicalEnema == 1>> Those with bellies full of curative mixture, on the other hand, have not stopped growing yet and won't until they completely absorb their load. They will likely end up @@.lime;sporting enormous tits@@ by the end of this.<</if>>
@@ -44,7 +44,7 @@ The firm promptly pays @@.yellowgreen;fair compensation@@ for the minor damage t
Early one morning, you hear heaving coming from one of the bathrooms. On investigation, it seems that $slaves[_genPlot].slaveName woke up feeling terribly nauseous. $He's in no danger, but you've hardly checked $him over before more slaves stagger in. Every one of your slaves on breast focused A-HGH has been struck by the mysterious malady and has @@.red;sickened.@@
<br><br>
-It doesn't take much investigation before you find other slaveowners reporting the same thing. Elementary detective work fingers a particular drug supplier as the culprit, and before long the unfortunate Pharmaceutical concern is drowning under a rain of harsh public comment and harsher private contract warfare. As the day wears on, the poor slaves feel much better, and appear positively glowing. However, their breasts swell slightly and their bellies bulge, pointing to the issue being the contamination of the A-HGH production line with fertility agents.
+It doesn't take much investigation before you find other slaveowners reporting the same thing. Elementary detective work fingers a particular drug supplier as the culprit, and before long the unfortunate pharmaceutical concern is drowning under a rain of harsh public comment and harsher private contract warfare. As the day wears on, the poor slaves feel much better, and appear positively glowing. However, their breasts swell slightly and their bellies bulge, pointing to the issue being the contamination of the A-HGH production line with fertility agents.
<br><br>
The firm promptly pays @@.yellowgreen; a large compensation@@ for potentially ruining your slaves. However, you're left with the matter of all the growing bellies to deal with. Over the week, all of your slaves on breast injections show signs of @@.yellow;early pregnancy,@@ and hyper pregnancy at that, save those who aren't fertile. They just experienced some hip and ass growth. You have no idea how much fertility agent was in the enhancers but you feel they may become a problem if left alone!
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 9e04cfb6cd3badc42e999ec4ad83577c910e10af..3318fa9ca9fa34a8ab90bb3b0eb0fb20b81696a4 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -179,6 +179,9 @@
<<if $slaves[_i].vagina < 0>>
<<set $slaves[_i].vaginalAccessory = "none", $slaves[_i].chastityVagina = 0, $slaves[_i].vaginaPiercing = 0>>
<</if>>
+ <<if $slaves[_i].clit < 0>>
+ <<set $slaves[_i].clitPiercing = 0, $slaves[_i].clitSetting = "none">>
+ <</if>>
<<if $slaves[_i].dick == 0>>
<<set $slaves[_i].dickAccessory = "none", $slaves[_i].chastityPenis = 0, $slaves[_i].dickTat = 0, $slaves[_i].dickPiercing = 0>>
<</if>>
@@ -186,6 +189,7 @@
<<set $slaves[_i].missingArms = 3, $slaves[_i].missingLegs = 3>>
<</if>>
<<if $slaves[_i].missingArms == 3>>
+ <<set $slaves[_i].armsTat = 0, $slaves[_i].nails = 0>>
<<if (["hands", "left hand", "left lower arm", "left upper arm", "left wrist", "lower arms", "right hand", "right lower arm", "right upper arm", "right wrist", "upper arms", "wrists"].includes($slaves[_i].brandLocation))>>
<<set $slaves[_i].brand = 0>>
<<set $slaves[_i].brandLocation = 0>>
diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw
index c98ffbc6cc9e47ea5eca054c534d5af56239fd6b..983dc2e0274e34d9373aa433f2c1a60cb1d71902 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -4010,7 +4010,7 @@ You remind yourself that success in this conflict will not be defined by the tra
<<include "P rivalry capture">>
<</if>>
<</replace>>
- <</link>> //This option is available due to your @@.springgreen;your hacking mastery,.@@ This will immediately end the conflict with a chance of enslaving your rival//
+ <</link>> //This option is available due to your @@.springgreen;your hacking mastery,@@ and will immediately end the conflict with a chance of enslaving your rival//
<</if>>
<</if>>
</span>
diff --git a/src/uncategorized/pRivalryVictory.tw b/src/uncategorized/pRivalryVictory.tw
index 9bb1ce5487475915a5e28cc417db10277a3ce7b1..78fc92dd07b22637f45a648308641bb89e7b10d6 100644
--- a/src/uncategorized/pRivalryVictory.tw
+++ b/src/uncategorized/pRivalryVictory.tw
@@ -75,7 +75,7 @@ For the first time, you receive a direct call from your rival. You pictured the
<br><<link "Refuse, and place a bounty of <<print cashFormat(50000)>> on your rival's death">>
<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
<<replace "#result">>
- You coldly decline. "That was a mistake," your rival replies, entering a computer command. "All my remaining liquid assets have just been @@.red;expended in an attack on the value of your holdings,@@ and my arcology has been heavily sabotaged. You'll get nothing from me." It's not entirely true, but the damage to your holdings does outweigh your gains by a significant margin. Your rival vanishes back into the old world - but only for a few days.
+ You coldly decline. "That was a mistake," your rival replies, entering a computer command. "All my remaining liquid assets have just been @@.red;expended in an attack on the value of your holdings,@@ and my arcology has been heavily sabotaged. You'll get nothing from me." It's not entirely true, but the damage to your holdings does outweigh your gains by a significant margin. Your rival vanishes back into the old world — but only for a few days.
<br><br>
Your bounty is quickly claimed, and you are treated to the delicious moment of finding your rival's head delivered to your doorstep. It might not have done much good, but damn did it feel good.
<<run cashX(-50000, "war")>>
diff --git a/src/uncategorized/saDevotion.tw b/src/uncategorized/saDevotion.tw
index ac0879165c6f8f30bf4f0dab9068ed324e0757f7..4b56b68633a00db49c817d10ad0647e2cea7b5f1 100644
--- a/src/uncategorized/saDevotion.tw
+++ b/src/uncategorized/saDevotion.tw
@@ -7,6 +7,7 @@
<<else>>
<<if $slaves[$i].fuckdoll == 0>>
+<<setPlayerPronouns>>
<<set $energyPlus = 0>>
<<if $slaves[$i].origin == "You were acquainted with her before you were an arcology owner; your rival tried to use $him to manipulate you, but you rescued her.">>
@@ -54,7 +55,7 @@
<</if>>
<<else>>
<<if $PC.pregMood == 2>>
- $He is @@.gold;horrified@@ of your aggressive sexual advances, forcing $him to @@.hotpink;bend to your will@@ or face punishment at the hands of a hormonal pregnant woman.
+ $He is @@.gold;horrified@@ of your aggressive sexual advances, forcing $him to @@.hotpink;bend to your will@@ or face punishment at the hands of a hormonal pregnant _womanP.
<<set $slaves[$i].devotion += 4>>
<<set $slaves[$i].trust -= 4>>
<<elseif $PC.pregMood == 1>>
diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw
index 218934abc84a0e0f7d8285dfdd43ceb6bc945678..8615f2485e71bae02fae22ec5ef0cded9feca51b 100644
--- a/src/uncategorized/saDrugs.tw
+++ b/src/uncategorized/saDrugs.tw
@@ -13,7 +13,7 @@
<<case "hormone enhancers">>
$His drug regime prepares $his body to accept hormonal effects.
-
+
<<case "priapism agents">>
<<if $slaves[$i].dick == 0>>
Since $he lacks a dick, it is pointless to try and keep it hard. @@.yellow;$His drug regimen has been ended.@@
diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw
index f67f51af0071e322123f6e92a70640a0a5c7787b..64ff05776a9ab0986ad8aa6dff53bae68a421b47 100644
--- a/src/uncategorized/saRelationships.tw
+++ b/src/uncategorized/saRelationships.tw
@@ -1,5 +1,7 @@
:: SA relationships [nobr]
+<<setPlayerPronouns>>
+
<<if $slaves[$i].fuckdoll == 0>>
<<set _SL = $slaves.length, _SlaveI = $slaves[$i], _SlaveJ = null, _drop = 0>>
<<setLocalPronouns _SlaveI>>
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index 7303ae70332f23eda4ed4db00b48e3fff0fb6be6..07cfdb0cbeec5e84277a887c189e6d3bfd029bcf 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -4513,7 +4513,7 @@
The spare living conditions and daily tasks @@.hotpink;get $him used@@ to the routine of slavery.
<<set $slaves[$i].devotion += 1>>
<<case "Roman Revivalist">>
- $He is
+ $He is @@.hotpink;pleased@@ with $his cushy living arrangements, and @@.mediumaquamarine;trusts you more@@ for it.
<<set $slaves[$i].devotion += 2, $slaves[$i].trust += 2>>
<<default>>
The reasonable living conditions allow $him to relax after the days work.
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 46ef284601db7b682d80ea91e35c7b7a4f175662..86ef03541e677ed2b2f4e1d7fe2c104272741e1e 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -711,7 +711,7 @@
<<else>>
<br>//FCE:// [[$encyclopedia|Encyclopedia][$nextButton = "Back", $nextLink = _Pass]]
<</if>>
-
+
<<if ($debugMode == 1)>>
<br><br>Debugging Tools<br>
<<link "Display Variables">><<checkvars>><</link>>
diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index 4b1ca3461e8c41f71bf3a5b2a72b81a211dbbd30..de74c7640df002df5e7e66c044a2fbc8d37018b0 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -25,7 +25,7 @@
<<set _flag = 110, $partner = "relation">>
<<elseif ($activeSlave.relationship > 0) && (random(1,100) > 70)>>
<<set _flag = 120, $partner = "relationship">>
-<<elseif ($activeSlave.rivalry !== 0) && ($activeSlave.amp !== 1) && (random(1,100) > 70)>>
+<<elseif ($activeSlave.rivalry !== 0) && ($activeSlave.amp != 1) && (random(1,100) > 70)>>
<<set _flag = 130, $partner = "rivalry">>
<<else>>
<<set _flag = random(1,100), $partner = "">>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index fe471aaa304fdc2cc2f734687d0c0a79eb7ee339..9139455db90769c8f61e106115c5c9fe2c271a7c 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -19606,7 +19606,7 @@ $His womb contains <<= num(_slaveWD.litters.length)>> separate pregnancies;
$He has an unrecognizable tattoo scrunched around $his navel.
<</if>>
<</if>>
-
+
<<if $activeSlave.birthsTat > 0>>
<<if $activeSlave.birthsTat > 1>>
$He has a series of $activeSlave.birthsTat baby-shaped tattoos adorning $his stomach; one for each successful pregnancy<<if $activeSlave.pregKnown == 1>> and a temporary one for $his current pregnancy<</if>>.
diff --git a/src/utility/descriptionWidgetsPiercings.tw b/src/utility/descriptionWidgetsPiercings.tw
index 477e8d9b59fdac1f5c4ece2ff925eb9f97671459..415a1673df997f2316096c3c1246f0e04c3c0a48 100644
--- a/src/utility/descriptionWidgetsPiercings.tw
+++ b/src/utility/descriptionWidgetsPiercings.tw
@@ -584,7 +584,7 @@ $He has a corset piercing, a ladder of steel rings running up each side of $his
they're laced up with a light golden chain that begins and ends in other parts of $his glinting bonds.
<<default>>
- they're laced up with a ribbon, tightly enough to keep $his aware they're there.
+ they're laced up with a ribbon, tightly enough to keep $him aware they're there.
<</switch>>
<</if>>