From afa675079426a5f069935c12733c9d35eefd8612 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Sun, 12 May 2019 22:15:49 -0500
Subject: [PATCH] MiscMRStuff
---
devNotes/Useful JS Function Documentation.txt | 6 +++++-
src/SecExp/propagandaHub.tw | 20 +++++++++++--------
src/SpecialForce/WeeklyChoices.tw | 4 ++--
src/facilities/nursery/nurseryWorkaround.tw | 2 +-
src/interaction/prostheticConfig.tw | 2 +-
src/js/assayJS.js | 2 +-
src/js/generateGenetics.js | 2 +-
src/npc/descriptions/fBoobs.tw | 2 +-
src/npc/descriptions/fButt.tw | 2 +-
src/pregmod/killSlave.tw | 10 +++++-----
src/pregmod/seFCNNstation.tw | 2 +-
src/pregmod/widgets/bodySwapReaction.tw | 2 +-
src/pregmod/widgets/bodyswapWidgets.tw | 2 +-
src/uncategorized/arcadeReport.tw | 2 +-
src/uncategorized/brothelReport.tw | 2 +-
src/uncategorized/dairyReport.tw | 2 +-
src/uncategorized/genericPlotEvents.tw | 4 ++--
src/uncategorized/nextWeek.tw | 4 ++++
src/uncategorized/pRivalryActions.tw | 2 +-
src/uncategorized/pRivalryVictory.tw | 2 +-
src/uncategorized/saDevotion.tw | 3 ++-
src/uncategorized/saDrugs.tw | 2 +-
src/uncategorized/saRelationships.tw | 2 ++
src/uncategorized/saRules.tw | 2 +-
src/uncategorized/storyCaption.tw | 2 +-
src/uncategorized/walkPast.tw | 2 +-
src/utility/descriptionWidgetsFlesh.tw | 2 +-
src/utility/descriptionWidgetsPiercings.tw | 2 +-
28 files changed, 54 insertions(+), 39 deletions(-)
diff --git a/devNotes/Useful JS Function Documentation.txt b/devNotes/Useful JS Function Documentation.txt
index eafa5e09cb4..164361af93a 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 e41b41fabe3..d54051f59bf 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 6456bc9a421..3452dad0f8a 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 fd5e886e88d..2a06020421d 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 3756a951d1a..354439c24b5 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 b7f0d460480..60dd55bb852 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 3dd348dcba6..899bbf07bfb 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 820f0ca6320..34a3602038f 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 16e29748d22..ea3792d5f63 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 c0fa9a36837..05cd865d023 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 c4fc495a19d..5194e518eda 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 3fcd48d56d2..28182fb3612 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 2b154324889..3b82bce5932 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 af620cc43c4..cdac14be5d5 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 6f372e433b9..10be96250b7 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 fd571cf5566..2fc3c52ec65 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 b6c5d2fcd87..71c21c3e27d 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 9e04cfb6cd3..3318fa9ca9f 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 c98ffbc6cc9..983dc2e0274 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 9bb1ce54874..78fc92dd07b 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 ac0879165c6..4b56b68633a 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 218934abc84..8615f2485e7 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 f67f51af007..64ff05776a9 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 7303ae70332..07cfdb0cbee 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 46ef284601d..86ef03541e6 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 4b1ca3461e8..de74c7640df 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 fe471aaa304..9139455db90 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 477e8d9b59f..415a1673df9 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>>
--
GitLab