From 79e3863815c0a75e2abf3c0df09ce3294c10420c Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Sun, 16 Dec 2018 00:23:55 -0600
Subject: [PATCH] Etc
---
...ditNeighborArcologyCheatDatatypeCleanup.tw | 8 +++---
.../nursery/longChildDescription.tw | 26 +++++++++----------
src/uncategorized/hgSelect.tw | 2 +-
src/uncategorized/longSlaveDescription.tw | 22 ++++++++--------
src/uncategorized/neighborDescription.tw | 4 +--
src/uncategorized/pRivalInitiation.tw | 4 +--
src/uncategorized/peCombatTraining.tw | 9 ++++---
src/uncategorized/peLonelyBodyguard.tw | 3 ++-
src/uncategorized/reMalefactor.tw | 2 +-
src/uncategorized/reNickname.tw | 2 +-
src/uncategorized/shops.tw | 2 +-
src/utility/descriptionWidgets.tw | 2 +-
src/utility/descriptionWidgetsTattoos.tw | 10 +++----
13 files changed, 49 insertions(+), 47 deletions(-)
diff --git a/src/cheats/mod_EditNeighborArcologyCheatDatatypeCleanup.tw b/src/cheats/mod_EditNeighborArcologyCheatDatatypeCleanup.tw
index 2b15dff2498..f2f7da1aa02 100644
--- a/src/cheats/mod_EditNeighborArcologyCheatDatatypeCleanup.tw
+++ b/src/cheats/mod_EditNeighborArcologyCheatDatatypeCleanup.tw
@@ -13,14 +13,14 @@
<<if $arcologies[_i].FSSupremacist != "unset">>
<<set $arcologies[_i].FSSupremacist = Number($arcologies[_i].FSSupremacist) || "unset">>
<</if>>
- <<if $arcologies[_i].FSSupremacist != "unset" && !["white", "asian", "latina", "middle eastern", "black", "indo-aryan", "pacific islander", "malay", "amerindian", "southern european", "semitic", "mixed race"].includes($arcologies[_i].FSSupremacistRace)>>
- <<set $arcologies[_i].FSSupremacistRace = either("white", "asian", "latina", "middle eastern", "black", "indo-aryan", "pacific islander", "malay", "amerindian", "southern european", "semitic", "mixed race")>>
+ <<if $arcologies[_i].FSSupremacist != "unset" && !["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"].includes($arcologies[_i].FSSupremacistRace)>>
+ <<set $arcologies[_i].FSSupremacistRace = either("amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white")>>
<</if>>
<<if $arcologies[_i].FSSubjugationist != "unset">>
<<set $arcologies[_i].FSSubjugationist = Number($arcologies[_i].FSSubjugationist) || "unset">>
<</if>>
- <<if $arcologies[_i].FSSubjugationist != "unset" && !["white", "asian", "latina", "middle eastern", "black", "indo-aryan", "pacific islander", "malay", "amerindian", "southern european", "semitic", "mixed race"].includes($arcologies[_i].FSSubjugationistRace)>>
- <<set $arcologies[_i].FSSubjugationistRace = either("white", "asian", "latina", "middle eastern", "black", "indo-aryan", "pacific islander", "malay", "amerindian", "southern european", "semitic", "mixed race")>>
+ <<if $arcologies[_i].FSSubjugationist != "unset" && !["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"].includes($arcologies[_i].FSSubjugationistRace)>>
+ <<set $arcologies[_i].FSSubjugationistRace = either("amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white")>>
<</if>>
<<if $arcologies[_i].FSGenderRadicalist != "unset">>
<<set $arcologies[_i].FSGenderRadicalist = Number($arcologies[_i].FSGenderRadicalist) || "unset">>
diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw
index 13b91d704fd..e6f936c9b95 100644
--- a/src/facilities/nursery/longChildDescription.tw
+++ b/src/facilities/nursery/longChildDescription.tw
@@ -627,7 +627,7 @@ $he's
<</if>>
<<case "humiliation">>
<<if ($activeSlave.behavioralFlaw == "bitchy")>>
- $His bitchiness is really just an expression of $his deep need to be @@.lightcoral;humiliated@@ herself.
+ $His bitchiness is really just an expression of $his deep need to be @@.lightcoral;humiliated@@ $himself.
<<elseif ($activeSlave.sexualFlaw == "shamefast")>>
$His shame is genuine, and it is with real self-loathing that $he @@.lightcoral;gets off on humiliation.@@
<<elseif ($activeSlave.fetishStrength > 95)>>
@@ -665,7 +665,7 @@ $he's
<</if>>
<<case "dom">>
<<if ($activeSlave.sexualFlaw == "apathetic")>>
- $He is at war with herself, since $his habitual apathy during sex barely masks a desire to @@.lightcoral;dominate.@@
+ $He is at war with $himself, since $his habitual apathy during sex barely masks a desire to @@.lightcoral;dominate.@@
<<elseif ($activeSlave.fetishStrength > 95)>>
$He is a @@.lightcoral;complete dom;@@ with other slaves this is expressed as a strong preference to top, and with $his betters $he's an almost competitive lover.
<<elseif ($activeSlave.fetishStrength > 60)>>
@@ -677,7 +677,7 @@ $he's
<<if ($activeSlave.fetishStrength > 95)>>
$He is an @@.lightcoral;aggressive sadist@@; $he's constantly plotting to control, abuse, and hurt other slaves.
<<elseif ($activeSlave.fetishStrength > 60)>>
- $He has @@.lightcoral;sadistic tendencies@@; $he enjoys watching other slaves in pain, but truly loves causing pain herself.
+ $He has @@.lightcoral;sadistic tendencies@@; $he enjoys watching other slaves in pain, but truly loves causing pain $himself.
<<else>>
$He gets off on @@.lightcoral;the suffering of others@@; $he enjoys watching other slaves in pain.
<</if>>
@@ -1159,7 +1159,7 @@ $he's
<<elseif $activeSlave.career == "a slave since birth">>
$He's been your slave $his entire life.
<<elseif $activeSlave.career == "a meat toilet" || $activeSlave.career == "a cum dump">>
- $He sees herself as a cum receptacle.
+ $He sees $himself as a cum receptacle.
<<elseif $activeSlave.career == "a dairy cow">>
$He's been broken into the belief that $he is nothing more than a cow to be milked and bred.
<<elseif $activeSlave.career == "a breeding bull">>
@@ -1519,7 +1519,7 @@ $He is
<<elseif $activeSlave.muscles > -96>>
@@.pink;very weak;@@ $he struggles with day-to-day tasks.
<<else>>
- @@.red;frail;@@ $he can barely hold herself up.
+ @@.red;frail;@@ $he can barely hold $himself up.
<</if>>
<<if $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderRadicalistLawBeauty + $arcologies[0].FSSlimnessEnthusiastLaw > 0 && $arcologies[0].FSPhysicalIdealist == "unset" && $arcologies[0].FSHedonisticDecadenceStrongFat == 0>>
@@ -1865,9 +1865,9 @@ $He is
<<if $activeSlave.inflationType == "aphrodisiacs">>
$He's literally full of
<<if ($activeSlave.amp == 1)>>
- aphrodisiacs, but is an amputee, so $he cannot touch herself. $He writhes with extreme sexual frustration, desperately trying to relieve herself, but only managing to stir up the aphrodisiacs contained in $his gut, strengthening their effects even more.
+ aphrodisiacs, but is an amputee, so $he cannot touch $himself. $He writhes with extreme sexual frustration, desperately trying to relieve $himself, but only managing to stir up the aphrodisiacs contained in $his gut, strengthening their effects even more.
<<elseif (($activeSlave.vaginalAccessory == "chastity belt") || ($activeSlave.vaginalAccessory == "combined chastity"))>>
- aphrodisiacs, but is wearing a chastity belt and cannot touch herself. $He writhes with extreme sexual frustration, desperately trying to relieve herself, but only managing to stir up the aphrodisiacs contained in $his gut, strengthening their effects even more.
+ aphrodisiacs, but is wearing a chastity belt and cannot touch $himself. $He writhes with extreme sexual frustration, desperately trying to relieve $himself, but only managing to stir up the aphrodisiacs contained in $his gut, strengthening their effects even more.
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.dick != 0) && ($activeSlave.vagina == -1)>>
aphrodisiacs and is allowed to masturbate, so as $he stands before you $he rubs $his shaft with one hand while $he fingers $his anus with the other.<<if canPenetrate($activeSlave)>> $His cock is painfully erect.<</if>> $His frantic masturbation forces $his distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in $his gut and strengthening their effects even more.
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.dick != 0)>>
@@ -1875,7 +1875,7 @@ $He is
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.vagina == -1)>>
aphrodisiacs, has<<if $seeDicks > 0>> no penis and<</if>> no vagina, and is not allowed to masturbate, so as $he stands before you $he
<<if $activeSlave.anus == 0>>
- plays with a nipple with one hand while furiously rubbing $his virgin anus and the sensitive perineum beneath it with the other, desperately trying to get herself off. $His frantic attempts force $his distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in $his gut and strengthening their effects even more.
+ plays with a nipple with one hand while furiously rubbing $his virgin anus and the sensitive perineum beneath it with the other, desperately trying to get $himself off. $His frantic attempts force $his distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in $his gut and strengthening their effects even more.
<<else>>
<<if $activeSlave.anus > 2>>$his entire hand, formed into a beak shape,<<elseif $activeSlave.anus > 1>>two fingers<<else>>a finger<</if>> to fuck $his own ass. $His frantic attempts force $his distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in $his gut and strengthening their effects even more.
<</if>>
@@ -1891,9 +1891,9 @@ $He is
<<elseif $activeSlave.aphrodisiacs > 1>>
$He's swimming in
<<if ($activeSlave.amp == 1)>>
- aphrodisiacs, but is an amputee, so $he cannot touch herself. $He writhes with extreme sexual frustration, desperately trying to relieve herself.
+ aphrodisiacs, but is an amputee, so $he cannot touch $himself. $He writhes with extreme sexual frustration, desperately trying to relieve $himself.
<<elseif (($activeSlave.vaginalAccessory == "chastity belt") || ($activeSlave.vaginalAccessory == "combined chastity"))>>
- aphrodisiacs, but is wearing a chastity belt and cannot touch herself. $He writhes with extreme sexual frustration, desperately trying to relieve herself.
+ aphrodisiacs, but is wearing a chastity belt and cannot touch $himself. $He writhes with extreme sexual frustration, desperately trying to relieve $himself.
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.dick != 0) && ($activeSlave.vagina == -1)>>
aphrodisiacs and is allowed to masturbate, so as $he stands before you $he rubs $his shaft with one hand while $he fingers $his anus with the other.<<if canPenetrate($activeSlave)>> $His cock is painfully erect.<</if>>
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.dick != 0)>>
@@ -1901,7 +1901,7 @@ $He is
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.vagina == -1)>>
aphrodisiacs, has<<if $seeDicks > 0>> no penis and<</if>> no vagina, and is not allowed to masturbate, so as $he stands before you $he
<<if $activeSlave.anus == 0>>
- plays with a nipple with one hand while furiously rubbing $his virgin anus and the sensitive perineum beneath it with the other, desperately trying to get herself off.
+ plays with a nipple with one hand while furiously rubbing $his virgin anus and the sensitive perineum beneath it with the other, desperately trying to get $himself off.
<<else>>
<<if $activeSlave.anus > 2>>$his entire hand, formed into a beak shape,<<elseif $activeSlave.anus > 1>>two fingers<<else>>a finger<</if>> to fuck $his own ass.
<</if>>
@@ -1916,9 +1916,9 @@ $He is
<</if>>
<<else>>
<<if ($activeSlave.amp == 1)>>
- $He's on aphrodisiacs, but is an amputee, so $he cannot touch herself. $He writhes with sexual frustration.
+ $He's on aphrodisiacs, but is an amputee, so $he cannot touch $himself. $He writhes with sexual frustration.
<<elseif (($activeSlave.vaginalAccessory == "chastity belt") || ($activeSlave.vaginalAccessory == "combined chastity"))>>
- $He's on aphrodisiacs, but is wearing a chastity belt and cannot touch herself. $He writhes with sexual frustration.
+ $He's on aphrodisiacs, but is wearing a chastity belt and cannot touch $himself. $He writhes with sexual frustration.
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.dick != 0) && ($activeSlave.vagina == -1)>>
$He's on aphrodisiacs and is allowed to masturbate, so as $he obeys your commands $he idly rubs $his shaft with one hand while the other pinches a nipple.
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.dick != 0)>>
diff --git a/src/uncategorized/hgSelect.tw b/src/uncategorized/hgSelect.tw
index fdc7ba1c57c..343ad860003 100644
--- a/src/uncategorized/hgSelect.tw
+++ b/src/uncategorized/hgSelect.tw
@@ -70,7 +70,7 @@ _HGName
<<set $HGCum = 2+Math.trunc(($HeadGirl.balls/5)+($HeadGirl.energy/95)+($HeadGirl.health/95)+($HeadGirl.devotion/95)+($reproductionFormula*5))>>
<<if canPenetrate($HeadGirl) && $HeadGirl.pubertyXY == 1>>
To maximize the chances of impregnation, $he will fuck fertile pussies frequently during the week. $HeadGirl.slaveName can service $HGCum slaves this way.
- <<if $HeadGirl.devotion > 95>>$He loves you so much $he'll fuck them until $he's sore.<<else>>If $he were more devoted to you, $he might be able to drive herself to get hard and service one more.<</if>>
+ <<if $HeadGirl.devotion > 95>>$He loves you so much $he'll fuck them until $he's sore.<<else>>If $he were more devoted to you, $he might be able to drive $himself to get hard and service one more.<</if>>
<<if $HeadGirl.balls >= 120>>$His unreal balls produce nearly an endless supply of semen; $his ability to impregnate is almost limitless.<<elseif $HeadGirl.balls >= 80>>$His inhuman balls produce so much semen $he can easily impregnate twenty girls in one sitting.<<elseif $HeadGirl.balls >= 50>>$His giant balls produce so much semen $he can easily impregnate twelve girls in one sitting.<<elseif $HeadGirl.balls >= 25>>$His oversized balls produce so much semen $he can cum repeatedly in a single session.<<elseif $HeadGirl.balls >= 5>>$His big balls produce so much semen $he can cum more before $he's drained.<<else>>Bigger balls would let $him cum more before $he's drained.<</if>>
<<if $HeadGirl.health > 95>>$His wonderful health lets $him get hard and stay hard all the time.<<else>>If $his health were perfect, $he might be able to get hard more often.<</if>>
<<if $HeadGirl.energy > 95>>$His nymphomania drives $him to go above and beyond in this.<<else>>A more powerful sex drive could reduce $his refractory period.<</if>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 2420c570f70..e49cd581481 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -590,7 +590,7 @@ is
<<elseif ($activeSlave.devotion <= 20)>>
$He strongly believes that @@.red;slavery is wrong,@@ and rarely misses a chance to complain about it.
<<else>>
- $He strongly believes that @@.red;slavery is wrong,@@ but has learned to keep it to herself.
+ $He strongly believes that @@.red;slavery is wrong,@@ but has learned to keep it to $himself.
<</if>>
<<elseif ($activeSlave.behavioralFlaw == "devout")>>
$He is @@.red;devoutly religious,@@
@@ -599,7 +599,7 @@ is
<<elseif ($activeSlave.devotion < -20)>>
and uses $his faith as a place of refuge.
<<elseif ($activeSlave.devotion <= 20)>>
- and uses $his faith as a private place within herself.
+ and uses $his faith as a private place within $himself.
<<else>>
but has learned to keep $his faith private.
<</if>>
@@ -633,7 +633,7 @@ is
<<case "confident">>
$He's @@.green;confident,@@ and believes that $he has something of value to offer, even as a slave.
<<case "cutting">>
- $He often has a witty or @@.green;cutting@@ remark ready, but knows when to keep them to herself.
+ $He often has a witty or @@.green;cutting@@ remark ready, but knows when to keep them to $himself.
<<case "funny">>
$He's @@.green;funny,@@ often providing a little comic relief.
<<case "adores women">>
@@ -701,13 +701,13 @@ is
<<case "strugglefuck queen">>
$He's a @@.green;strugglefuck queen:@@ $he can gauge exactly how much resistance $his partners want.
<<case "tease">>
- $He's a @@.green;tease,@@ and often displays a little flash of herself followed by a blush.
+ $He's a @@.green;tease,@@ and often displays a little flash of $himself followed by a blush.
<<case "romantic">>
$He's a @@.green;romantic,@@ and persists in innocent pleasure in the closeness of sex.
<<case "perverted">>
$He's @@.green;perverted,@@ and enjoys breaking sexual boundaries.
<<case "caring">>
- $He's @@.green;caring,@@ and enjoys bringing partners pleasure more than getting off herself.
+ $He's @@.green;caring,@@ and enjoys bringing partners pleasure more than getting off $himself.
<<case "unflinching">>
$He's @@.green;unflinching,@@ willing to do anything, even by the standards of sex slaves.
<<case "size queen">>
@@ -740,7 +740,7 @@ is
<</if>>
<<case "humiliation">>
<<if ($activeSlave.behavioralFlaw == "bitchy")>>
- $His bitchiness is really just an expression of $his deep need to be @@.lightcoral;humiliated@@ herself.
+ $His bitchiness is really just an expression of $his deep need to be @@.lightcoral;humiliated@@ $himself.
<<elseif ($activeSlave.sexualFlaw == "shamefast")>>
$His shame is genuine, and it is with real self-loathing that $he @@.lightcoral;gets off on humiliation.@@
<<elseif ($activeSlave.fetishStrength > 95)>>
@@ -778,7 +778,7 @@ is
<</if>>
<<case "dom">>
<<if ($activeSlave.sexualFlaw == "apathetic")>>
- $He is at war with herself, since $his habitual apathy during sex barely masks a desire to @@.lightcoral;dominate.@@
+ $He is at war with $himself, since $his habitual apathy during sex barely masks a desire to @@.lightcoral;dominate.@@
<<elseif ($activeSlave.fetishStrength > 95)>>
$He is a @@.lightcoral;complete dom;@@ with other slaves this is expressed as a strong preference to top, and with $his betters $he's an almost competitive lover.
<<elseif ($activeSlave.fetishStrength > 60)>>
@@ -790,7 +790,7 @@ is
<<if ($activeSlave.fetishStrength > 95)>>
$He is an @@.lightcoral;aggressive sadist@@; $he's constantly plotting to control, abuse, and hurt other slaves.
<<elseif ($activeSlave.fetishStrength > 60)>>
- $He has @@.lightcoral;sadistic tendencies@@; $he enjoys watching other slaves in pain, but truly loves causing pain herself.
+ $He has @@.lightcoral;sadistic tendencies@@; $he enjoys watching other slaves in pain, but truly loves causing pain $himself.
<<else>>
$He gets off on @@.lightcoral;the suffering of others@@; $he enjoys watching other slaves in pain.
<</if>>
@@ -1270,7 +1270,7 @@ is
<<elseif $activeSlave.career == "a slave since birth">>
$He's been your slave $his entire life.
<<elseif $activeSlave.career == "a meat toilet" || $activeSlave.career == "a cum dump">>
- $He sees herself as a cum receptacle.
+ $He sees $himself as a cum receptacle.
<<elseif $activeSlave.career == "a dairy cow">>
$He's been broken into the belief that $he is nothing more than a cow to be milked and bred.
<<elseif $activeSlave.career == "a breeding bull">>
@@ -2267,7 +2267,7 @@ $He is
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.vagina == -1)>>
aphrodisiacs, has<<if $seeDicks > 0>> no penis and<</if>> no vagina, and is not allowed to masturbate, so as $he stands before you $he
<<if $activeSlave.anus == 0>>
- plays with a nipple with one hand while furiously rubbing $his virgin anus and the sensitive perineum beneath it with the other, desperately trying to get herself off. $His frantic attempts force $his distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in $his gut and strengthening their effects even more.
+ plays with a nipple with one hand while furiously rubbing $his virgin anus and the sensitive perineum beneath it with the other, desperately trying to get $himself off. $His frantic attempts force $his distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in $his gut and strengthening their effects even more.
<<else>>
<<if $activeSlave.anus > 2>>$his entire hand, formed into a beak shape,<<elseif $activeSlave.anus > 1>>two fingers<<else>>a finger<</if>> to fuck $his own ass. $His frantic attempts force $his distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in $his gut and strengthening their effects even more.
<</if>>
@@ -2293,7 +2293,7 @@ $He is
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.vagina == -1)>>
aphrodisiacs, has<<if $seeDicks > 0>> no penis and<</if>> no vagina, and is not allowed to masturbate, so as $he stands before you $he
<<if $activeSlave.anus == 0>>
- plays with a nipple with one hand while furiously rubbing $his virgin anus and the sensitive perineum beneath it with the other, desperately trying to get herself off.
+ plays with a nipple with one hand while furiously rubbing $his virgin anus and the sensitive perineum beneath it with the other, desperately trying to get $himself off.
<<else>>
<<if $activeSlave.anus > 2>>$his entire hand, formed into a beak shape,<<elseif $activeSlave.anus > 1>>two fingers<<else>>a finger<</if>> to fuck $his own ass.
<</if>>
diff --git a/src/uncategorized/neighborDescription.tw b/src/uncategorized/neighborDescription.tw
index 18b9924226b..e1ee625620a 100644
--- a/src/uncategorized/neighborDescription.tw
+++ b/src/uncategorized/neighborDescription.tw
@@ -52,7 +52,7 @@ its neighbors.
<<else>>
<<set $desc = "just establishing ">>
<</if>>
- <<set $desc = $desc + "@@.gold;racial Subjugationism,@@ and is ">>
+ <<set $desc = $desc + "@@.gold;Racial Subjugationism,@@ and is ">>
<<if $arcologies[$i].FSSubjugationist > 95>>
<<set $desc = $desc + "the home of an advanced project to create a subservient race of ">>
<<set $desc = $desc + $arcologies[$i].FSSubjugationistRace>>
@@ -76,7 +76,7 @@ its neighbors.
<<else>>
<<set $desc = "just establishing ">>
<</if>>
- <<set $desc = $desc + "@@.gold;racial Supremacy,@@ and is ">>
+ <<set $desc = $desc + "@@.gold;Racial Supremacism,@@ and is ">>
<<if $arcologies[$i].FSSubjugationist > 95>>
<<set $desc = $desc + "a global magnet for ">>
<<set $desc = $desc + $arcologies[$i].FSSupremacistRace>>
diff --git a/src/uncategorized/pRivalInitiation.tw b/src/uncategorized/pRivalInitiation.tw
index dd743ecd5c7..8986a3c0a9b 100644
--- a/src/uncategorized/pRivalInitiation.tw
+++ b/src/uncategorized/pRivalInitiation.tw
@@ -30,7 +30,7 @@ This is a special week, the week of your victory. <<EventNameLink $activeSlave>>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
<<setLocalPronouns $slaves[1] 2>>
- $slaves[0].slaveName leads $him out into the arcology's largest atrium, forces $him to $his knees, and in full view of the whole arcology, orally rapes someone who was until this week a slaveowner herself. Behind them, $slaves[1].slaveName is standing ready for _his2 turn, and all your other slaves stand behind _him2. Public opinion is divided; the precedent is universally agreed to be bad, but the punishment is generally thought to be terrible and deserved. Your slaves, however, are almost insufferably @@.hotpink;pleased with you@@ for forcing $activeSlave.slaveName, whom they still view as a slaveowner, to pleasure them.
+ $slaves[0].slaveName leads $him out into the arcology's largest atrium, forces $him to $his knees, and in full view of the whole arcology, orally rapes someone who was until this week a slaveowner $himself. Behind them, $slaves[1].slaveName is standing ready for _his2 turn, and all your other slaves stand behind _him2. Public opinion is divided; the precedent is universally agreed to be bad, but the punishment is generally thought to be terrible and deserved. Your slaves, however, are almost insufferably @@.hotpink;pleased with you@@ for forcing $activeSlave.slaveName, whom they still view as a slaveowner, to pleasure them.
<<set $activeSlave.oralCount += $slaves.length*2, $oralTotal += $slaves.length*2>>
<<run $slaves.forEach(function(s) { s.devotion += 10; })>>
<<set $rivalID = 0>>
@@ -51,7 +51,7 @@ This is a special week, the week of your victory. <<EventNameLink $activeSlave>>
<br><<link "Publicly geld $him">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You announce that since $activeSlave.slaveName has spent so much money and effort turning herself into a girl with expensive hormones, you'll take a lower-tech step to bring $him further in that regard. An auto surgery is set up in public and the populace is treated to the edifying spectacle of a very large pair of testicles being efficiently removed by the modern surgical art. Unusually, she was not given general anesthesia, but instead given local painkillers and made to watch on a monitor, to $his @@.gold;rage@@ and @@.mediumorchid;horror.@@ There is @@.green;applause@@ as the cauterizer seals the surgical site where $his massive scrotum used to hang. $His cock looks softer already.
+ You announce that since $activeSlave.slaveName has spent so much money and effort turning $himself into a girl with expensive hormones, you'll take a lower-tech step to bring $him further in that regard. An auto surgery is set up in public and the populace is treated to the edifying spectacle of a very large pair of testicles being efficiently removed by the modern surgical art. Unusually, $he was not given general anesthesia, but instead given local painkillers and made to watch on a monitor, to $his @@.gold;rage@@ and @@.mediumorchid;horror.@@ There is @@.green;applause@@ as the cauterizer seals the surgical site where $his massive scrotum used to hang. $His cock looks softer already.
<<set $rep += 500, $activeSlave.devotion -= 50, $activeSlave.trust -= 50, $activeSlave.health -= 10, $activeSlave.balls = 0>>
<<set $rivalID = 0>>
<</replace>>
diff --git a/src/uncategorized/peCombatTraining.tw b/src/uncategorized/peCombatTraining.tw
index efe7816d5dd..ba53946154a 100644
--- a/src/uncategorized/peCombatTraining.tw
+++ b/src/uncategorized/peCombatTraining.tw
@@ -3,22 +3,23 @@
<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "RIE Eligibility Check">>
<<set $activeSlave = $Bodyguard>>
+<<setLocalPronouns $activeSlave>>
-<<EventNameLink $activeSlave>> has many duties as a bodyguard, and her schedule is carefully built to allow her to complete them. When you're at your desk in your penthouse and there are no guests to intimidate, her services are least needed, so she typically uses these lulls to catch up on sleep or train.
+<<EventNameLink $activeSlave>> has many duties as a bodyguard, and $his schedule is carefully built to allow her to complete them. When you're at your desk in your penthouse and there are no guests to intimidate, her services are least needed, so she typically uses these lulls to catch up on sleep or train.
<br><br>
The feed from the small armory next door shows her doing the latter. She has finished working with a heavy practice sword, and has moved to the tiny, one-shooter range. She seems frustrated, hurrying her shots and missing unnecessarily.
<br><br>
<span id="result">
-<<link "Instruct her">>
+<<link "Instruct $him">>
<<replace "#result">>
- $activeSlave.slaveName starts as you enter the range and don ear protection. She is distracted by your body against hers as you come in close to correct her stance, but she concentrates hard for you. You take whatever time you can spare over the week for serious lessons. She @@.green;is diligent and learns well,@@ and @@.mediumaquamarine;places greater trust@@ in your judgment.
+ $activeSlave.slaveName starts as you enter the range and don ear protection. $He is distracted by your body against $hers as you come in close to correct her stance, but she concentrates hard for you. You take whatever time you can spare over the week for serious lessons. She @@.green;is diligent and learns well,@@ and @@.mediumaquamarine;places greater trust@@ in your judgment.
<<set $activeSlave.trust += 4>>
<<set $activeSlave.combatSkill = 1>>
<</replace>>
<</link>>
-<br><<link "Promise her a sexual reward if she improves">>
+<br><<link "Promise $him a sexual reward if $he improves">>
<<replace "#result">>
Over the feed, you tell $activeSlave.slaveName that she can have her choice of sexual release if she scores well on the next set of targets. She concentrates desperately, trying to ignore her mounting arousal as she imagines enjoying <<if $activeSlave.fetish == "none">>passionate sexual<<elseif $activeSlave.fetish == "boobs">>breast<<else>>$activeSlave.fetish<</if>> play. She barely makes the stated score, and hurries smiling in for her reward. She feels @@.hotpink;closer to you,@@ but is distracted from any real learning and does not become a better fighter.
<<set $activeSlave.devotion += 4>>
diff --git a/src/uncategorized/peLonelyBodyguard.tw b/src/uncategorized/peLonelyBodyguard.tw
index b9f38308685..da31d02d236 100644
--- a/src/uncategorized/peLonelyBodyguard.tw
+++ b/src/uncategorized/peLonelyBodyguard.tw
@@ -10,8 +10,9 @@
<</for>>
<<set $j = _targetSlaveIndex.random()>>
<<run Enunciate($activeSlave)>>
+<<setLocalPronouns $activeSlave>>
-You take an unusually close interest in $activeSlave.slaveName's health and mental well-being, since your health and mental well-being may rely on her combat effectiveness. She performs her duties acceptably, difficult though they are. Hers is a life of long hours and constant vigilance, and she has very little time to herself. The daily wear hasn't really affected her yet, but it may.
+You take an unusually close interest in $activeSlave.slaveName's health and mental well-being, since your health and mental well-being may rely on $his combat effectiveness. $He performs $his duties acceptably, difficult though they are. $Hers is a life of long hours and constant vigilance, and $he has very little time to $himself. The daily wear hasn't really affected $him yet, but it may.
<br><br>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index 469791ddba1..012e5e288de 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -509,7 +509,7 @@ She is easily taken into custody and her contraband confiscated once the jeering
<<case "rapist">>
An example must be made. Rape is rare in your arcology, since citizens are so generously provided with means of sexual outlet. When the price of renting a slave that's impossible to rape is as low as it is, sexual assault of a free woman is doubly unforgivable. The protesting malefactor is stripped and stuffed into your remote surgery on public video feed. She begs and pleads until she sees her doom in the form of the surgical machinery, at which point she switches to fighting vainly to escape. Of course, @@.red;her health is affected@@ and the horrible experience has left her @@.red;acting oddly.@@ Then it's off to the penthouse for basic slave induction. The public @@.green;approves of this harshness,@@ since even if she cheers up and ever manages an erection again, she's not likely to rape anyone without arms or legs.
<<case "mule">>
- An example must be made. With the quantity of drugs consumed in the arcology, quality is everything and attempting to undermine that is unforgivable. The protesting malefactor is stripped and stuffed into your remote surgery on public video feed. She begs and pleads until she sees her doom in the form of the surgical machinery, at which point she switches to fighting vainly to escape. Of course, @@.red;her health is affected@@ and the horrible experience has left her @@.red;acting oddly.@@ Then it's off to the penthouse for basic slave induction. The public @@.green;approves of this harshness,@@ since she can hardly haul contraband into your arcology without the ability to move herself.
+ An example must be made. With the quantity of drugs consumed in the arcology, quality is everything and attempting to undermine that is unforgivable. The protesting malefactor is stripped and stuffed into your remote surgery on public video feed. She begs and pleads until she sees her doom in the form of the surgical machinery, at which point she switches to fighting vainly to escape. Of course, @@.red;her health is affected@@ and the horrible experience has left her @@.red;acting oddly.@@ Then it's off to the penthouse for basic slave induction. The public @@.green;approves of this harshness,@@ since $he can hardly haul contraband into your arcology without the ability to move $himself.
<<case "liberator">>
An example must be made. Slaveownership is the cornerstone of the society you're building in your arcology, and this $woman attempted to undermine it. The protesting malefactor is stripped and stuffed into your remote surgery on public video feed. $He begs and pleads until $he sees $his doom in the form of the surgical machinery, at which point $he switches to fighting vainly to escape. Of course, @@.red;$his health is affected@@ and the horrible experience has left $him @@.red;acting oddly.@@ Then it's off to the penthouse for basic slave induction. The public @@.green;approves of this harshness,@@ since $he will scarcely be able to liberate anyone without arms or legs.
<</switch>>
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index 6ba7b5841f8..7ded12dd414 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -1003,7 +1003,7 @@
<<case "server">>
<<set $nickname = either("'Bedwarmer'", "'Bottom'", "'Girltoy'", "'House Slave'", "'Lovergirl'", "'Please No'", "'Server'", "'Slave Slut'", "'Sub'", "'Submissive'")>>
<<set $situationDesc = "holds a place in the hierarchy of your penthouse that almost demands a nickname. $He is the lowest of the low, below even your other slaves. $He is a pitiable creature, living with a large number of sexually charged people, slave and free, all of whom have the right to demand any sexual service they wish of $him.">>
- <<set $applyDesc = "has become almost proud of $his strange, exhausting situation. Hers is not the struggle of slaves to know their place, for $he knows $hers. It is on the bottom.">>
+ <<set $applyDesc = "has become almost proud of $his strange, exhausting situation. $Hers is not the struggle of slaves to know their place, for $he knows $hers. It is on the bottom.">>
<<set $notApplyDesc = "begins to hope a little that maybe $he can rise beyond $his current station.">>
<<case "nipples">>
diff --git a/src/uncategorized/shops.tw b/src/uncategorized/shops.tw
index 164c7ed81cb..b20670cdbd7 100644
--- a/src/uncategorized/shops.tw
+++ b/src/uncategorized/shops.tw
@@ -60,7 +60,7 @@ This is a section of the promenade
dedicated to Egyptian Revivalism. There are a bewildering multiplicity of shops here; ancient Egypt is wonderfully fertile of linen fashion, fine jewelry, perfumes, incense, and other luxury goods. Beautiful warm-skinned slavegirls of all races have wares in hand to offer citizens who pass by, and they seem well-treated.
<span id="result"><<link "Shop around">><<replace "#result">>You decide to tour the shops; with so much fine merchandise on offer, it's possible that someone's selling something that even you haven't heard of, and it's always good to see and be seen. The slave salesgirls are welcoming, and most are so well-trained that despite knowing who you are, they treat you with the same friendly courtesy that they offer everyone. They all offer you the peculiar straight-down curtsey that allows them to keep their necks straight, since they're all wearing gradually melting perfume cakes atop their hair, making them glisten with beguiling scent.<</replace>><</link>></span>
<<case "Edo Revivalist">>
- dedicated to Edo Revivalism. There are strict restrictions on the establishments' decor here, so //tatami// mats and paper partitions are ubiquitous. There are handsome //sake// shops and tea rooms offering the traditional ceremony, and //kabuki// theaters offering the traditional performance, with modern plots and themes.
+ dedicated to Edo Revivalism. There are strict restrictions on the establishments' décor here, so //tatami// mats and paper partitions are ubiquitous. There are handsome //sake// shops and tea rooms offering the traditional ceremony, and //kabuki// theaters offering the traditional performance, with modern plots and themes.
<span id="result"><<link "See a show">><<replace "#result">>As soon as you enter a theater, the play stops, and refined slave attendants usher you forward to the place of honor. None of the citizens present resent the interruption; having you here is a great addition to the performance. The actors bow deeply to you and resume. The classical dance drama is almost impenetrable to outsiders, and the modernity of the characters and events would not be at all decipherable. Once you catch the thread, though, the richness of the allegory towards Free Cities personages and events is quite enjoyable.<</replace>><</link>></span>
<<case "Arabian Revivalist">>
dedicated to Arabian Revivalism. The thriving mercantilism isn't limited to the slave markets, so many floors below; there are a bewildering variety of shops and stalls here, in no discernible order. Particolored cloth awnings, stacked goods, and bustling menial slaves constantly obscure your view, as pretty slavegirls hawking luxurious goods do their best to catch your eye.
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 9d9551527f4..cf066ff01bd 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -482,7 +482,7 @@
"She offered herself to you for enslavement because she thought she would have prospects of advancement among your slaves."
/*reRecruit
"She offered herself to you as a slave to escape a life of boredom."
- "She offered herself to you as a slave to escape the hard life of a free whore."
+ "She offered herself to you as a slave to escape the hard life of a free whore."
"She was enslaved after she fell into debt to you."
"You turned her into a slave girl after she fell into debt to you."
"She sold herself into slavery out of fear that life on the streets was endangering her pregnancy."
diff --git a/src/utility/descriptionWidgetsTattoos.tw b/src/utility/descriptionWidgetsTattoos.tw
index 00129f4369d..386f0b61394 100644
--- a/src/utility/descriptionWidgetsTattoos.tw
+++ b/src/utility/descriptionWidgetsTattoos.tw
@@ -269,15 +269,15 @@
An Asian dragon is tattooed in a circle across $his back; the dragon has subtle features that, according to traditional meanings, relate it to $his personality.
<<case "scenes">>
<<if $activeSlave.vagina == -1>>
- A line-art rendition of $activeSlave.slaveName herself cumming copiously while riding a dick is tattooed across $his entire back.
+ A line-art rendition of $activeSlave.slaveName $himself cumming copiously while riding a dick is tattooed across $his entire back.
<<elseif $activeSlave.lactation > 0>>
- A line-art rendition of $activeSlave.slaveName herself nursing a pair of $his fellow slaves is tattooed across $his entire back.
+ A line-art rendition of $activeSlave.slaveName $himself nursing a pair of $his fellow slaves is tattooed across $his entire back.
<<elseif $activeSlave.vaginalSkill >= 100>>
- A line-art rendition of $activeSlave.slaveName herself performing reverse cowgirl and spreading $his pussy is tattooed across $his entire back.
+ A line-art rendition of $activeSlave.slaveName $himself performing reverse cowgirl and spreading $his pussy is tattooed across $his entire back.
<<elseif $PC.vagina == 1>>
- A line-art rendition of $activeSlave.slaveName herself eating pussy is tattooed across $his entire back.
+ A line-art rendition of $activeSlave.slaveName $himself eating pussy is tattooed across $his entire back.
<<else>>
- A line-art rendition of $activeSlave.slaveName herself deepthroating a cock is tattooed across $his entire back.
+ A line-art rendition of $activeSlave.slaveName $himself deepthroating a cock is tattooed across $his entire back.
<</if>>
<<case "bovine patterns">>
$His back is tattooed to resemble the dappled flank of a cow.
--
GitLab