From 56fc890da4451b8c8b92ca7399ac1aacb2e5b2a8 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Sun, 22 Sep 2019 12:39:20 -0500
Subject: [PATCH] TheRest
---
slave variables documentation - Pregmod.txt | 8 ----
src/endWeek/saServeThePublic.js | 2 +-
src/facilities/nursery/customizeChild.tw | 4 +-
src/facilities/nursery/customizeInfant.tw | 2 +-
src/facilities/nursery/nurseryWidgets.js | 5 ---
src/init/dummy.tw | 2 +-
src/uncategorized/RESS.tw | 16 +++----
src/uncategorized/arcade.tw | 4 +-
src/uncategorized/arcmgmt.tw | 2 +-
.../freeRangeDairyAssignmentScene.tw | 2 +-
src/uncategorized/hgApplication.tw | 6 +--
src/uncategorized/newSlaveIntro.tw | 4 +-
src/uncategorized/pHostageAcquisition.tw | 2 +-
src/uncategorized/persBusiness.tw | 4 +-
.../personalAssistantAppearance.tw | 12 ++---
src/uncategorized/ptWorkaround.tw | 2 +-
src/uncategorized/reCitizenHookup.tw | 28 ++++++------
src/uncategorized/reFSNonconformist.tw | 4 +-
src/uncategorized/reShelterInspection.tw | 44 +++++++++----------
src/uncategorized/reShowerPunishment.tw | 2 +-
src/uncategorized/remoteSurgery.tw | 4 +-
src/uncategorized/saLongTermEffects.tw | 4 +-
src/uncategorized/seCustomSlaveDelivery.tw | 2 +-
src/uncategorized/seRaiding.tw | 2 +-
src/uncategorized/slaveStats.tw | 1 -
src/uncategorized/universalRules.tw | 4 +-
26 files changed, 79 insertions(+), 93 deletions(-)
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 5110e3aacc9..310c8f7ccbe 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -3787,14 +3787,6 @@ accepts int
1 - yes, comforting
2 - yes, terrifying
-missingEyes:
-
-are eyes missing?
-0 - none
-1 - yes, left
-2 - yes, right
-3 - yes, both
-
geneMods:
NCS:
diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js
index 065701cbcf0..e3689b524be 100644
--- a/src/endWeek/saServeThePublic.js
+++ b/src/endWeek/saServeThePublic.js
@@ -1226,7 +1226,7 @@ window.saServeThePublic = (function saServeThePublic() {
if (slave.assignment !== "recruit girls") {
if (slave.assignment === "be the DJ") {
repX(Math.trunc((slave.sexAmount * slave.sexQuality) * (1 + (0.003 * slave.skill.entertainment)) * 0.15), "publicServant", slave);
- // DJ donus rep
+ // DJ bonus rep
repX(Math.trunc((slave.sexAmount * slave.sexQuality) * (1 + (0.003 * slave.skill.entertainment)) * 0.15), "publicServantClub", slave);
T.incomeStats.income += Math.trunc((slave.sexAmount * slave.sexQuality) * (1 + (0.003 * slave.skill.entertainment)) * 0.15);
} else if (slave.assignment === "serve in the club") {
diff --git a/src/facilities/nursery/customizeChild.tw b/src/facilities/nursery/customizeChild.tw
index 084fd2eabf4..61aed1f6f64 100644
--- a/src/facilities/nursery/customizeChild.tw
+++ b/src/facilities/nursery/customizeChild.tw
@@ -48,11 +48,11 @@ You may enter custom descriptors for the child's hair color, hair style, tattoos
<<else>>
//You must break $his will further before $he will refer to you by a new title.
<<if SlaveStatsChecker.checkForLisp($activeChild)>>
- <<if (def $activeChild.custom.titleLisp) && $activeChild.custom.titleLisp != "">>
+ <<if (def $activeChild.custom.titleLisp) && ($activeChild.custom.titleLisp != "")>>
For now, $he intends to keep calling you "<<print $activeChild.custom.titleLisp>>".
<</if>>
<<else>>
- <<if (def $activeChild.custom.title) && $activeChild.custom.title != "">>
+ <<if (def $activeChild.custom.title) && ($activeChild.custom.title != "")>>
For now, $he intends to keep calling you "<<print $activeChild.custom.title>>".
<</if>>
<</if>>//
diff --git a/src/facilities/nursery/customizeInfant.tw b/src/facilities/nursery/customizeInfant.tw
index 495b27ece61..eb0c5f6e80b 100644
--- a/src/facilities/nursery/customizeInfant.tw
+++ b/src/facilities/nursery/customizeInfant.tw
@@ -7,7 +7,7 @@
You may enter custom descriptors for your child's hair color, hair style, tattoos, or anything else here. After typing, press enter to commit your change. These custom descriptors will appear in descriptions of your child, but will have no gameplay effect. Changing them is free.
<br><br>
-<<if def $activeChild.custom && $activeChild.custom.title != "">>
+<<if (def $activeChild.custom) && ($activeChild.custom.title != "")>>
You have instructed $him to always refer to you as $activeChild.custom.title, which, should $he lisp, comes out as $activeChild.custom.titleLisp.
<<else>>
You expect $him to refer to you as all the other <<if $nurseryBabies > 1>>children and <</if>>slaves do.
diff --git a/src/facilities/nursery/nurseryWidgets.js b/src/facilities/nursery/nurseryWidgets.js
index a353e62b230..375bf2c8a00 100644
--- a/src/facilities/nursery/nurseryWidgets.js
+++ b/src/facilities/nursery/nurseryWidgets.js
@@ -15721,7 +15721,6 @@ App.Facilities.Nursery.infantToChild = function infantToChild(child) {
child.makeup = 0,
child.markings = "none",
child.minorInjury = 0,
- child.missingEyes = 0,
child.mpreg = 0,
child.muscles = jsRandom(-10, 10),
child.nails = 0,
@@ -18637,10 +18636,6 @@ App.Facilities.Nursery.ChildState = class ChildState {
/** @type {{skin:string, eyeColor:string, hColor:string}} */
this.albinismOverride = null;
/* eslint-enable */
- /** Are eyes missing?
- *
- * 0: none; 1: yes, left; 2: yes, right; 3: yes, both */
- this.missingEyes = 0;
/** Amount of cash paid to acquire the slave
*
* accepts negative numbers, 0, or 1.
diff --git a/src/init/dummy.tw b/src/init/dummy.tw
index 8b3b59f0a30..06c2973349f 100644
--- a/src/init/dummy.tw
+++ b/src/init/dummy.tw
@@ -21,7 +21,7 @@ $ArcologyNamesEugenics, $ArcologyNamesRepopulationist, $ArcologyNamesHedonisticD
$LurcherSpeed
$$i
$activeLurcher
-$activeSlave.bodySwap, $activeSlave.custom.image.format, $activeSlave.custom.hairVector, $activeSlave.shoeColor, $activeSlave.newGamePlus, $activeSlave.nipplesAccessory, $activeSlave.slaveCost, $activeSlave.premature, $activeSlave.missingEyes,
+$activeSlave.bodySwap, $activeSlave.custom.image.format, $activeSlave.custom.hairVector, $activeSlave.shoeColor, $activeSlave.newGamePlus, $activeSlave.nipplesAccessory, $activeSlave.slaveCost, $activeSlave.premature,
$activeSlave.pronoun,
$activeSlave.sexAmount, $activeSlave.sexQuality
$activeSlave.fertKnown
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 733373596ec..7f6df2e250c 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -354,11 +354,11 @@ hips innocently and moves up to $his lower legs. But then, as $he slowly massage
<<else>>
it to become apparent that $his hungry asspussy serves as $his only genitalia.
<</if>>
-With $his back arched and $his thighs together $his <<if $activeSlave.butt > 5>>massive buttocks part a little, showing a hint of<<elseif $activeSlave.butt > 2>>big buttocks part, revealing<<else>>cute buttocks are spread wide apart, displaying<</if>> $his <<if $activeSlave.anus > 2>>lewd anal slit<<elseif $activeSlave.anus == 2>>big butthole<<else>>tight anus<</if>>. <<if canSee($activeSlave)>><<if $activeSlave.belly >= 50000>>$His _belly stomach is far too large to see around, but given $his held pose, $he's waiting to see what you do<<elseif $activeSlave.belly >= 5000>>$He peeks around the edge of $his belly, checking your crotch to see if you are watching<<else>>$He peeks between $his legs again, checking to see if you're watching<</if>><<elseif canHear($activeSlave)>>$His ears perk up, listening to see if you are still there<<else>>$He stays as still as $he can, clearly waiting for you to make a move<</if>>.
+With $his back arched and $his thighs together $his <<if $activeSlave.butt > 5>>massive buttocks part a little, showing a hint of<<elseif $activeSlave.butt > 2>>big buttocks part, revealing<<else>>cute buttocks are spread wide apart, displaying<</if>> $his <<if $activeSlave.anus > 2>>lewd anal slit<<elseif $activeSlave.anus == 2>>big butthole<<else>>tight anus<</if>>. <<if canSee($activeSlave)>><<if $activeSlave.belly >= 50000>>$His _belly stomach is far too large to see around, but given $his held pose, $he's waiting to see what you do<<elseif $activeSlave.belly >= 5000>>$He peeks around the edge of $his belly, checking your crotch to see if you are watching<<else>>$He peeks between $his legs again, checking to see if you're watching<</if>><<elseif canHear($activeSlave)>>$His <<if hasBothEars($activeSlave)>>ears perk<<else>>ear perks<</if>> up, listening to see if you are still there<<else>>$He stays as still as $he can, clearly waiting for you to make a move<</if>>.
<<case "sore shoulders">>
-<<EventNameLink>> comes before you for a routine inspection. The <<if $activeSlave.muscles > 95>>heavily muscled<<elseif $activeSlave.muscles > 30>>ripped<<else>>toned<</if>><<if $activeSlave.preg > $activeSlave.pregData.normalBirth/1.33>> and heavily pregnant<<elseif $activeSlave.preg > $activeSlave.pregData.normalBirth/2>>pregnant<</if>> $desc is looking good, but as $he raises $his arm<<if hasBothArms($activeSlave)>>s<</if>> over $his head to spin $his nude torso under your gaze, $he winces slightly. <<if canSee($activeSlave)>>$His <<= App.Desc.eyeColor($activeSlave)>> eyes flick up to see if you noticed, and $his face falls a little when $he sees that you did. You raise one eyebrow, and the obedient slave explains $himself<<elseif canHear($activeSlave)>>$His ears perk up to hear if you noticed. You clear your throat, startling $him and making $him explain $himself<<else>>$He tries to affect a stoic expression, but when you tentatively touch one of $his shoulders, $he grimaces slightly and quickly opts to explain $himself<</if>>.
+<<EventNameLink>> comes before you for a routine inspection. The <<if $activeSlave.muscles > 95>>heavily muscled<<elseif $activeSlave.muscles > 30>>ripped<<else>>toned<</if>><<if $activeSlave.preg > $activeSlave.pregData.normalBirth/1.33>> and heavily pregnant<<elseif $activeSlave.preg > $activeSlave.pregData.normalBirth/2>>pregnant<</if>> $desc is looking good, but as $he raises $his arm<<if hasBothArms($activeSlave)>>s<</if>> over $his head to spin $his nude torso under your gaze, $he winces slightly. <<if canSee($activeSlave)>>$His <<= App.Desc.eyeColor($activeSlave)>> eyes flick up to see if you noticed, and $his face falls a little when $he sees that you did. You raise one eyebrow, and the obedient slave explains $himself<<elseif canHear($activeSlave)>>$His <<if hasBothEars($activeSlave)>>ears perk<<else>>ear perks<</if>> up to hear if you noticed. You clear your throat, startling $him and making $him explain $himself<<else>>$He tries to affect a stoic expression, but when you tentatively touch one of $his shoulders, $he grimaces slightly and quickly opts to explain $himself<</if>>.
<<if !canTalk($activeSlave)>>
$He uses gestures to beg your pardon, and explains that yesterday was arm day for $him, and $he went out a little hard. $His shoulders are a little sore, but $he gestures that $he's all right.
<<else>>
@@ -9723,7 +9723,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<link "Make an example by forcing $him to take a massive dose">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You take $him by the shoulders, look into $his eyes, and tell $him you'll fix things so $he doesn't mind so much. $He looks hopeful, even when you tell $him to take $his pill. $He does, and you hand $him another. And another. $He's crying with dread by the fourth pill, knowing that this is $his punishment for complaining. $His pupils dilate, $he begins to breathe hard, and $his $activeSlave.skin skin flushes badly. $He tries to beg you to fuck $him but can't seem to find the words. $He begins to masturbate compulsively, so hard that $he collapses to the kitchen floor with $his first spastic orgasm.
+ You take $him by the shoulders<<if hasAnyEyes($activeSlave)>>, look into $his eye<<if hasBothEyes($activeSlave)>>s<</if>>,<</if>> and tell $him you'll fix things so $he doesn't mind so much. $He looks hopeful, even when you tell $him to take $his pill. $He does, and you hand $him another. And another. $He's crying with dread by the fourth pill, knowing that this is $his punishment for complaining. $His pupils dilate, $he begins to breathe hard, and $his $activeSlave.skin skin flushes badly. $He tries to beg you to fuck $him but can't seem to find the words. $He begins to masturbate compulsively, so hard that $he collapses to the kitchen floor with $his first spastic orgasm.
<<if ($activeSlave.chastityPenis == 1)>>
$His cock is painfully compressed by $his chastity cage, but it does nothing to stop $his frantic efforts to come.
<<elseif canAchieveErection($activeSlave)>>
@@ -12326,7 +12326,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<link "Let $him speak briefly if $he's very quiet">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You stand up from your desk and approach $him very closely without touching $him. Looking straight into $his eyes, which are <<if canSee($activeSlave)>>fixed helplessly on you<<else>>gazing in your general direction<</if>>, you tell $him that you'll let $him say whatever it is $he needs to say to you, but only if $he's very quiet. $He <<if canSee($activeSlave)>>looks at you with huge eyes but<</if>> nods vigorously. $He waits until you lean into $him, making $him shiver at your proximity, before putting $his
+ You stand up from your desk and approach $him very closely without touching $him. Looking straight <<if hasAnyEyes($activeSlave)>>into $his eye<<if hasBothEyes($activeSlave)>>s<</if>>, which are <<if canSee($activeSlave)>>fixed helplessly on you<<else>>gazing in your general direction<</if>><<else>>at $him<</if>>, you tell $him that you'll let $him say whatever it is $he needs to say to you, but only if $he's very quiet. $He <<if canSee($activeSlave)>>looks at you with huge eyes but<</if>> nods vigorously. $He waits until you lean into $him, making $him shiver at your proximity, before putting $his
<<if $activeSlave.lips > 70>>
ridiculous
<<elseif $activeSlave.lips > 40>>
@@ -13764,7 +13764,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<link "Let $him get dressed and spend some quality time with $him">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You let $activeSlave.slaveName don a nice dress and take $him out. $He's a little suspicious at first but when you reach the first balcony on your lazy route around the huge building the sun on $his face and the gentle breeze around $his ears convince $him there's no trick. $He watches you shyly as you lead $him around, soaking in the sights and relaxing. Though you still speak as $his <<= WrittenMaster($activeSlave)>>, you chat about goings on around the arcology, and you buy $him a fresh fruit from a vendor. The unexpected show of care and compassion has $him quite agog. By the time you take $him out onto another parklike balcony and fuck $him on a bench,
+ You let $activeSlave.slaveName don a nice dress and take $him out. $He's a little suspicious at first but when you reach the first balcony on your lazy route around the huge building the sun on $his face and the gentle breeze around $his <<if hasAnyEars($activeSlave)>>ear<<if hasBothEars($activeSlave)>>s<</if>><<else>>neck<</if>> convince $him there's no trick. $He watches you shyly as you lead $him around, soaking in the sights and relaxing. Though you still speak as $his <<= WrittenMaster($activeSlave)>>, you chat about goings on around the arcology, and you buy $him a fresh fruit from a vendor. The unexpected show of care and compassion has $him quite agog. By the time you take $him out onto another parklike balcony and fuck $him on a bench,
<<if ($activeSlave.dick > 0) && ($activeSlave.chastityPenis == 1) && ($activeSlave.chastityAnus == 1)>>
$his combined chastity cage and anal chastity belt makes $him move awkwardly.
<<elseif ($activeSlave.dick > 0) && ($activeSlave.chastityPenis == 1)>>
@@ -15555,7 +15555,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<</if>>
sphincter,
<</if>>
- a gasp of air into $his lungs, and a slight shiver. There is a flaw at the corner of $his mouth that might be transitory pleasure, but a look <<if canSee($activeSlave)>>into $his eyes<<else>>at $his face<</if>> confirms that it is not so.
+ a gasp of air into $his lungs, and a slight shiver. There is a flaw at the corner of $his mouth that might be transitory pleasure, but a look <<if canSee($activeSlave)>>into $his eye<<if hasBothEyes($activeSlave)>>s<</if>><<else>>at $his face<</if>> confirms that it is not so.
<</replace>>
<</link>><<if canDoVaginal($activeSlave) && ($activeSlave.vagina == 0)>>//This option will take $his virginity//<<elseif !canDoVaginal($activeSlave) && ($activeSlave.anus == 0)>> //This option will take $his anal virginity//<</if>>
<</if>>
@@ -17445,7 +17445,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<</if>>
<</if>>
<br><br>
- There's a momentary flaw in $his rhythm, a catch in $his breath as $he realizes what you're doing, but $he gets right back into it, displaying $his pleasure with nothing more than a ghost of a smile and a <<if canSee($activeSlave)>>widening of $his eyes as $he looks you up and down<<else>>slight perk of $his ears as $he tracks your motion<</if>>. $He doesn't shove $himself against you; that would be coarse. Instead $he dances alluringly, just out of your grasp. Taking the dominant role, you encircle $him in your arms and draw $him in close, $his heat perceptible against your skin before the very first graze of $his $activeSlave.skin body against yours. $He continues to dance gorgeously as $he helps you out of your clothes.
+ There's a momentary flaw in $his rhythm, a catch in $his breath as $he realizes what you're doing, but $he gets right back into it, displaying $his pleasure with nothing more than a ghost of a smile<<if canSee($activeSlave) || canHear($activeSlave)>> and a <<if canSee($activeSlave)>>widening of $his eye<<if hasBothEyes($activeSlave)>>s<</if>> as $he looks you up and down<<else>>slight perk of $his ear<<if hasBothEars($activeSlave)>>s<</if>> as $he tracks your motion<</if>><</if>>. $He doesn't shove $himself against you; that would be coarse. Instead $he dances alluringly, just out of your grasp. Taking the dominant role, you encircle $him in your arms and draw $him in close, $his heat perceptible against your skin before the very first graze of $his $activeSlave.skin body against yours. $He continues to dance gorgeously as $he helps you out of your clothes.
<br><br>
When you're nude, $he turns $his back to you and starts to grind, letting you feel $his
<<if $activeSlave.weight > 160>>
@@ -20958,7 +20958,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<br><<link "Fuck $him">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You can't help but be aroused by the sight of your swollen, helpless slave, and you take off your pants, revealing your erection. The slave's <<if canSee($activeSlave)>>backward glance falls on your dick<<else>>ears perk up<</if>> and $he
+ You can't help but be aroused by the sight of your swollen, helpless slave, and you take off your pants, revealing your erection. The slave's <<if canSee($activeSlave)>>backward glance falls on your dick<<elseif canHear($activeSlave)>>ear<<if hasBothEars($activeSlave)>>s perk<<else>> perks<</if>> up<<else>>head tilts to face you<</if>> and $he
<<if $activeSlave.devotion > 95>>
licks $his lips,
<<if hasAnyLegs($activeSlave)>>
diff --git a/src/uncategorized/arcade.tw b/src/uncategorized/arcade.tw
index 11316e788c1..2eac468eb68 100644
--- a/src/uncategorized/arcade.tw
+++ b/src/uncategorized/arcade.tw
@@ -60,9 +60,9 @@ $arcadeNameCaps
<<case "Slave Professionalism">>
is constructed so that nothing but the slaves' holes can be seen. No details are given about the slave within, nor are their minds allowed to perceive what is happening around them.
<<case "Petite Admiration">>
- is barely distinguishable from a standard Free Cities sex arcade. The difference is remarkable, though: since it expects clientele of all sizes, the stalls are easily ratcheted to the perfect height.
+ is barely distinguishable from a standard Free Cities sex arcade. The difference is remarkable, though: since it expects clientèle of all sizes, the stalls are easily ratcheted to the perfect height.
<<case "Statuesque Glorification">>
- is constructed so that the slaves' holes are lined up perfectly for the taller clientele. This makes it possible to maintain the appearance of offering nothing but tall slaves while using $arcadeName to get value out of short bitches' holes.
+ is constructed so that the slaves' holes are lined up perfectly for the taller clientèle. This makes it possible to maintain the appearance of offering nothing but tall slaves while using $arcadeName to get value out of short bitches' holes.
<<default>>
is a standard Free Cities sex arcade: a pair of hallways extend away from the entrance, lined with doorless stalls like those in a public restroom. One hallway offers mouths, the other <<if $seeDicks != 100>>vaginas and <</if>>anuses.
<</switch>>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 97f743fb590..7d5299673ee 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -1297,7 +1297,7 @@ You own
<<if $fuckdolls > 0>>
- <<set _AL = $ArcadeiIDs.length>>
+ <<set _AL = $ArcadeiIDs.length>>
<<if ($fuckdolls > $arcade - _AL) && ($arcade > _AL)>>
<<set _fuckdollsArcade = $arcade - _AL>>
<<elseif $fuckdolls < $arcade - _AL>>
diff --git a/src/uncategorized/freeRangeDairyAssignmentScene.tw b/src/uncategorized/freeRangeDairyAssignmentScene.tw
index 95ec91b8e85..d6d6242fed0 100644
--- a/src/uncategorized/freeRangeDairyAssignmentScene.tw
+++ b/src/uncategorized/freeRangeDairyAssignmentScene.tw
@@ -41,7 +41,7 @@ While <<if canWalk($activeSlave) >>walking<<else>>being carried<</if>> to $his d
<<if $slaves[_frdas].assignment == "work in the dairy" && $slaves[_frdas].ID != $activeSlave.ID && $slaves[_frdas].balls >= 10 && $slaves[_frdas].dick > 0>>
<<setLocalPronouns $slaves[_frdas] 2>>
<<set _aroused = true>>
- <br> The hyper-endowed cum-cow $slaves[_frdas].slaveName is the pride of $dairyName. _He2 is limply hanging on _his2 milking chair, panting heavily because of the constant suction on _his2 dick. _He2 is obviously nearing climax. Soon, _his2 eyes bulge and _his2 muscles tense.
+ <br> The hyper-endowed cum-cow $slaves[_frdas].slaveName is the pride of $dairyName. _He2 is limply hanging on _his2 milking chair, panting heavily because of the constant suction on _his2 dick. _He2 is obviously nearing climax. Soon,<<if hasAnyNaturalEyes($slaves[_frdas])>>_his2 <<if hasBothNaturalEyes($slaves[_frdas])>>eyes bulge<<else>>eye bulges<</if>> and<</if>> _his2 muscles tense.
<<if $dairyStimulatorsSetting == 1>>
<<if $slaves[_frdas].prostate != 0>>
_His2 anus clenches around the dildo in _his2 rear. The automatic sodomizer speeds up to give _his2 prostate a helpful pounding.
diff --git a/src/uncategorized/hgApplication.tw b/src/uncategorized/hgApplication.tw
index 30fa07828c1..a8723d1c5de 100644
--- a/src/uncategorized/hgApplication.tw
+++ b/src/uncategorized/hgApplication.tw
@@ -327,7 +327,7 @@ In spare moments $he teaches $activeSlave.slaveName how to prostitute _himself2.
<<if $activeSlave.devotion >= -20 && $activeSlave.genes == "XY" && $activeSlave.attrXY <= 35 && $arcologies[0].FSBodyPurist == "unset" && ($arcologies[0].FSPaternalist == "unset" || ($arcologies[0].FSPaternalist != "unset" && $modScore < 13))>>
<<set _piercingForbidden = 0>>
<<for _i = 0; _i < 1; _i++>>
- <<if $activeSlave.earPiercing == 0>>
+ <<if $activeSlave.earPiercing == 0 && hasAnyEars($activeSlave)>>
<<if $arcologies[0].FSDegradationist != "unset">>
<<set $activeSlave.earPiercing = 2>>
<<else>>
@@ -338,9 +338,9 @@ In spare moments $he teaches $activeSlave.slaveName how to prostitute _himself2.
<<set _piercingForbidden = 1, $activeSlave.earPiercing = 0>>
<<else>>
<<if $arcologies[0].FSDegradationist != "unset">>
- $HeadGirl.slaveName knows that $activeSlave.slaveName needs to adjust to life as a slave _girl2, so $he has the slave's ears pierced. This will be a constant reminder that _he2 is simply a sexual object here.
+ $HeadGirl.slaveName knows that $activeSlave.slaveName needs to adjust to life as a slave _girl2, so $he has the slave's ear<<if hasBothEars($activeSlave)>>s<</if>> pierced. This will be a constant reminder that _he2 is simply a sexual object here.
<<else>>
- $HeadGirl.slaveName knows that $activeSlave.slaveName needs help adjusting to life as a slave _girl2, so $he has the slave's ears pierced. A little feminine touch can make a big difference.
+ $HeadGirl.slaveName knows that $activeSlave.slaveName needs help adjusting to life as a slave _girl2, so $he has the slave's ear<<if hasBothEars($activeSlave)>>s<</if>> pierced. A little feminine touch can make a big difference.
<</if>>
<<run cashX(forceNeg($modCost), "slaveMod", $activeSlave)>>
<<break>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 8206058cbfc..112ad9f88d7 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -921,7 +921,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<if canDoAnal($activeSlave)>>
<<link "Make sure $he enjoys $his first anal sex">>
<<replace "#introResult">>
- You introduce $him to obedience and proper manners regarding $his <<= WrittenMaster($activeSlave)>> before sending $him off for a physical. That night, $he's returned to your room, and finds you doing business on a tablet in bed. $He looks doubtful, but obeys when you direct $him to get into bed<<if $PC.dick == 0>>, even after $he realizes you're wearing a strap-on<</if>>. You turn out the light and spoon $him from behind, kissing $his neck and ears, cupping $his swollen breasts, and running your hands across $his pregnant belly with its taut $activeSlave.skin skin. $He's awkward at first but $his body responds to the tenderness. Before long $he's humping $his pussy back and forth against <<if $PC.dick == 1>>your cock<<else>>the strap-on<</if>>. You tell $him no, not there, and begin to gently work <<if $PC.dick == 1>>your dickhead<<else>>its tip<</if>> up $his tight but relaxed ass. $He's unsure of $himself, but you keep $him nice and relaxed. $He doesn't climax to $his @@.lime;first buttsex,@@ but $he is learning to @@.mediumaquamarine;trust@@ that you won't hurt $him.
+ You introduce $him to obedience and proper manners regarding $his <<= WrittenMaster($activeSlave)>> before sending $him off for a physical. That night, $he's returned to your room, and finds you doing business on a tablet in bed. $He looks doubtful, but obeys when you direct $him to get into bed<<if $PC.dick == 0>>, even after $he realizes you're wearing a strap-on<</if>>. You turn out the light and spoon $him from behind, kissing $his neck<<if hasAnyEars($activeSlave)>> and ear<<if hasBothEars($activeSlave)>>s<</if>><</if>>, cupping $his swollen breasts, and running your hands across $his pregnant belly with its taut $activeSlave.skin skin. $He's awkward at first but $his body responds to the tenderness. Before long $he's humping $his pussy back and forth against <<if $PC.dick == 1>>your cock<<else>>the strap-on<</if>>. You tell $him no, not there, and begin to gently work <<if $PC.dick == 1>>your dickhead<<else>>its tip<</if>> up $his tight but relaxed ass. $He's unsure of $himself, but you keep $him nice and relaxed. $He doesn't climax to $his @@.lime;first buttsex,@@ but $he is learning to @@.mediumaquamarine;trust@@ that you won't hurt $him.
<</replace>>
<<set $activeSlave.trust += 10>>
<<set $activeSlave.anus = 1>>
@@ -1776,7 +1776,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<br>
<<link "Make sure $he knows pregnant women can still enjoy sex.">>
<<replace "#introResult">>
- You introduce $him to obedience and proper manners regarding $his <<= WrittenMaster($activeSlave)>> before sending $him off for a physical. That night, $he's returned to your room, and finds you doing business on a tablet in bed. $He looks doubtful, but obeys when you direct $him to get into bed<<if $PC.dick == 0>>, even after $he realizes you're wearing a strap-on<</if>>. You turn out the light and spoon $him from behind, kissing $his neck and ears, cupping $his swollen breasts, and running your hands across $his pregnant belly with its taut $activeSlave.skin skin. $He's awkward at first but $his body responds to the tenderness. Before long $he's humping $his pussy back and forth against <<if $PC.dick == 1>>your cock<<else>>the strap-on<</if>>. You begin to gently work <<if $PC.dick == 1>>your dickhead<<else>>its tip<</if>> up $his used pussy. $He's unsure of $himself, but you keep $him nice and relaxed. After several minutes of gentle loving, $he's nothing but a satisfied puddle in your arms. $He believes that $he can @@.mediumaquamarine;trust@@ you won't harm $him or $his child.
+ You introduce $him to obedience and proper manners regarding $his <<= WrittenMaster($activeSlave)>> before sending $him off for a physical. That night, $he's returned to your room, and finds you doing business on a tablet in bed. $He looks doubtful, but obeys when you direct $him to get into bed<<if $PC.dick == 0>>, even after $he realizes you're wearing a strap-on<</if>>. You turn out the light and spoon $him from behind, kissing $his neck<<if hasAnyEars($activeSlave)>> and ear<<if hasBothEars($activeSlave)>>s<</if>><</if>>, cupping $his swollen breasts, and running your hands across $his pregnant belly with its taut $activeSlave.skin skin. $He's awkward at first but $his body responds to the tenderness. Before long $he's humping $his pussy back and forth against <<if $PC.dick == 1>>your cock<<else>>the strap-on<</if>>. You begin to gently work <<if $PC.dick == 1>>your dickhead<<else>>its tip<</if>> up $his used pussy. $He's unsure of $himself, but you keep $him nice and relaxed. After several minutes of gentle loving, $he's nothing but a satisfied puddle in your arms. $He believes that $he can @@.mediumaquamarine;trust@@ you won't harm $him or $his child.
<</replace>>
<<set $activeSlave.trust += 5>>
<<= VCheck.Vaginal()>>
diff --git a/src/uncategorized/pHostageAcquisition.tw b/src/uncategorized/pHostageAcquisition.tw
index 822958d1f29..565b647e633 100644
--- a/src/uncategorized/pHostageAcquisition.tw
+++ b/src/uncategorized/pHostageAcquisition.tw
@@ -551,7 +551,7 @@ Your hired mercenaries are en route now with your precious cargo.
<<if $rivalryFS != 0>>
Remaking a fallen empire, madne<<ss>>! You think your<<s>>elf a king —"
<<else>>
- You think you can just take whatever you want from people — Fuck, I don't even know if you even THINK of them as people anymore! How dare you even think I —"
+ You think you can ju<<s>>t take whatever you want from people — Fuck, I don't even know if you even THINK of them a<<s>> people anymore! How dare you even think I —"
<</if>>
The mercenary captain quickly gags $him, "My apologies, I did warn you $he was a handful. Please be careful when you unbind $him, $he may try to do something stupid," he says as he and his group exit your penthouse, leaving you with the enraged $activeSlave.slaveName. $He looks the same as you remember, but $he acts nothing like the $girl you used to know. Odds are high that $he'll cause problems for you in the future.
<</if>>
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index 0d8eef4b79e..a10027870e5 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -263,13 +263,13 @@
Your arcology has strict laws when it comes to who may be stay within its walls and those that don't cut it are often desperate for a loop hole; one you can easily provide. @@.yellowgreen;<<print cashFormat(_income)>>@@ for your pocket and another taxable citizen. Win, win.
<<case "dependency">>
<<set _income += random(5500,15000)>>
- Your arcology has strict laws when it comes to who may be claimed as a dependant and thusly excused from taxation. Of course, there are always those looking to cheat the system for their own benefit and more than willing to slip you a sum of credtis to make it happen. While in the long term it may cost you, but for now you rake in a quick @@.yellowgreen;<<print cashFormat(_income)>>@@ for the forged documents.
+ Your arcology has strict laws when it comes to who may be claimed as a dependent and thusly excused from taxation. Of course, there are always those looking to cheat the system for their own benefit and more than willing to slip you a sum of credits to make it happen. While in the long term it may cost you, but for now you rake in a quick @@.yellowgreen;<<print cashFormat(_income)>>@@ for the forged documents.
<<case "statuesque">>
<<set _income += random(1500,3500)>>
Your arcology likes its slaves tall, but even then there is the occasional outlier. An outlier usually keen on paying a lovely sum to have a tiny embarrassment of a slave slipped discreetly into their possession. All that is seen is a pair of suitcases changing hands and you walk away with @@.yellowgreen;<<print cashFormat(_income)>>.@@
<<case "petite">>
<<set _income += random(1500,3000)>>
- Your arcology prefer a couple with a sizable gap between their heights. When they can't quite achieve that goal, they turn to any means they can. A few descreet surguries and growth inhibitor sales net you @@.yellowgreen;<<print cashFormat(_income)>>@@ this week.
+ Your arcology prefer a couple with a sizable gap between their heights. When they can't quite achieve that goal, they turn to any means they can. A few discreet surgeries and growth inhibitor sales net you @@.yellowgreen;<<print cashFormat(_income)>>@@ this week.
<<case "religion">>
<<set _income += random(2000,3000)>>
The best smugglers know how to use the law to its advantage, and not only are you a really good smuggler, you're also the law itself. You have word spread that some company has done something blasphemous, and have them pray and pay for forgiveness. Panicked at the word of their Prophet, the higher-ups of the company give you @@.yellowgreen;<<print cashFormat(_income)>>@@ for salvation.
diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw
index b9dfaea1d67..96d13695eb8 100644
--- a/src/uncategorized/personalAssistantAppearance.tw
+++ b/src/uncategorized/personalAssistantAppearance.tw
@@ -236,11 +236,11 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
<<case "body purist">>
with a realistic tribes<<= _womanA>>'s garb of woven jewelry and shell beads. _HeA has bigger natural tits than anyone that ripped could possibly maintain.
<<case "intellectual dependency">>
- with much more muscle than brians.
+ with much more muscle than brains.
<<case "slave professionalism">>
with a keen mind to complement _hisA ripped body.
<<case "petite admiration">>
- who, desipte _hisA small stature, can still wrestle _hisA peers into submission.
+ who, despite _hisA small stature, can still wrestle _hisA peers into submission.
<<case "statuesque glorification">>
that few stand a chance of escaping being scooped up and carried off for sex.
<<default>>
@@ -335,7 +335,7 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
<<case "petite admiration">>
wearing a suit tailored to _hisA petite figure.
<<case "statuesque glorification">>
- wearing a suit tailored to _hisA towering figure. Few mrasure up to him.
+ wearing a suit tailored to _hisA towering figure. Few measure up to him.
<<default>>
wearing a nice suit, with chopsticks holding _hisA silver hair back in a bun. _HisA clothes are conservative, but they can't hide _hisA generous curves.
<</switch>>
@@ -517,7 +517,7 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
<<case "intellectual dependency">>
wearing a plaid skirt and a white shirt, though _hisA top is left unbuttoned and _hisA bottom conceals nothing. _HeA usually renders _himselfA flushed and sucking on a lollipop.
<<case "slave professionalism">>
- wearing a long plaid skirt and a clean white shirt; the perfect class rep who takes _hisA duties serisouly.
+ wearing a long plaid skirt and a clean white shirt; the perfect class rep who takes _hisA duties seriously.
<<case "petite admiration">>
wearing a plaid skirt and a white shirt that's a little too big on _himA. _HeA's changed _hisA appearance recently to make _himselfA as short and cute as possible.
<<case "statuesque glorification">>
@@ -622,7 +622,7 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
<<case "petite admiration">>
_HeA stands no chance of moving on _hisA as _hisA mammoth belly has long since lifted _hisA petite body off the ground.
<<case "statuesque glorification">>
- _HeA's increased _hisA height massively, but _hisA mammoth belly has grown proportionatly as well. Occasionally a stream of liquid pours from _hisA crotch along with a rather lanky baby.
+ _HeA's increased _hisA height massively, but _hisA mammoth belly has grown proportionately as well. Occasionally a stream of liquid pours from _hisA crotch along with a rather lanky baby.
<<default>>
_HeA's nude aside from a crown of flowers, _hisA modesty protected only by _hisA massive belly. Occasionally a stream of liquid pours from _hisA crotch along with a healthy baby.
<</switch>>
@@ -1963,7 +1963,7 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
<<case "slave professionalism">>
_HeA is patiently awaiting _hisA <<= properMaster()>> attention and now that _heA has it, curtsies and asks what pleasure you desire.
<<case "petite admiration">>
- _HeA's absentmindedly groping _hisA tits. When _heA notices you eyeing _himA, _heA smiles coyly and lifs _hisA arms, begging to be picked up.
+ _HeA's absentmindedly groping _hisA tits. When _heA notices you eyeing _himA, _heA smiles coyly and lifts _hisA arms, begging to be picked up.
<<case "statuesque glorification">>
_HeA's absentmindedly groping _hisA tits. When _heA notices you eyeing _himA, _heA smiles coyly and runs _hisA hands down the length of _hisA legs while giving you a lovely view of _hisA holes.
<<default>>
diff --git a/src/uncategorized/ptWorkaround.tw b/src/uncategorized/ptWorkaround.tw
index 0b2cce45bd0..ed793b3a837 100644
--- a/src/uncategorized/ptWorkaround.tw
+++ b/src/uncategorized/ptWorkaround.tw
@@ -21,7 +21,7 @@
<<case "build her devotion">>
<<set $activeSlave.devotion += 6>>
<<if ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetish == "submissive")>>
- Since $activeSlave.slaveName is a submissive, you @@.hotpink;build $his devotion to you@@ by indulging $his need to be dominated. Already smiling to $himself, $he changes into bondage gear that blinds $him, forces $his arms behind $his back, forces $him to present $his breasts uncomfortably, and forces a painfully large dildo up $his <<if $activeSlave.vagina > 0>>vagina<<if $activeSlave.anus > 0>> and anus<</if>><<elseif $activeSlave.anus > 0>>anus<</if>>. Thus attired, $he is forced to serve you in whatever petty ways occur to you. $He holds your tablet for you on $his upthrust ass as you work, holds a thin beverage glass for you in $his upturned mouth when you eat, and lies still so you can use $his tits as a pillow whenever you recline. $He loves it.
+ Since $activeSlave.slaveName is a submissive, you @@.hotpink;build $his devotion to you@@ by indulging $his need to be dominated. Already smiling to $himself, $he changes into bondage gear that <<if canSee($activeSlave)>>blinds $him<<else>>covers $his face<</if>><<if hasAnyArms($activeSlave)>>, forces $his arm<<if hasBothArms($activeSlave)>>s<</if>> behind $his back<</if>>, forces $him to present $his breasts uncomfortably, and forces a painfully large dildo up $his <<if $activeSlave.vagina > 0>>vagina<<if $activeSlave.anus > 0>> and anus<</if>><<elseif $activeSlave.anus > 0>>anus<</if>>. Thus attired, $he is forced to serve you in whatever petty ways occur to you. $He holds your tablet for you on $his upthrust ass as you work, holds a thin beverage glass for you in $his upturned mouth when you eat, and lies still so you can use $his tits as a pillow whenever you recline. $He loves it.
<<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetish == "cumslut") && ($PC.dick == 1)>>
Since $activeSlave.slaveName has an unusual taste for oral sex and cum, you @@.hotpink;build $his devotion to you@@ by indulging $him. You allow $him to spend $his free time following you around. $He is permitted to act as your private cum receptacle. If you use another slave, you usually pull out and give $his smiling face a facial. When you come inside another slave instead, $activeSlave.slaveName is allowed to get your cum anyway, regardless of whether that requires the other slave to spit it into $his mouth or $activeSlave.slaveName to suck it out of the other slave's vagina or rectum. Either way, $he rubs $his stomach happily after $he's swallowed it down.
<<set $activeSlave.counter.oral += 20, $oralTotal += 20>>
diff --git a/src/uncategorized/reCitizenHookup.tw b/src/uncategorized/reCitizenHookup.tw
index d01f1dc293c..69869bb9766 100644
--- a/src/uncategorized/reCitizenHookup.tw
+++ b/src/uncategorized/reCitizenHookup.tw
@@ -91,11 +91,11 @@ But tonight, you've put in an appearance. Your citizens are drinking your <<if $
a good-looking young lady
<<case "Repopulationist">>
<<if $arcologies[0].FSRepopulationFocusLaw == 1 && (random(1,10) > 3)>>
- <<set _repopHookupPregnant = 1>>
- a heavily pregnant young lady
+ <<set _repopHookupPregnant = 1>>
+ a heavily pregnant young lady
<<else>>
- <<set _repopHookupPregnant = 0>>
- a pretty, fertile young woman with wide, child-bearing hips
+ <<set _repopHookupPregnant = 0>>
+ a pretty, fertile young woman with wide, child-bearing hips
<</if>>
<<case "Eugenics">>
a stunningly gorgeous woman
@@ -167,11 +167,11 @@ She's yours for the taking, if you want her, and if her praise and proximity wer
lean back just far enough that her full term, triplets rounded middle splits the front of her overly tight dress.
<<else>>
press her hips up against your own, before leaning in and whispering
- <<if $arcologies[0].FSRepopulationFocusLaw == 1>>
- "My womb is ready to do its duty."
- <<else>>
- "I'm ripe for breeding right now."
- <</if>>
+ <<if $arcologies[0].FSRepopulationFocusLaw == 1>>
+ "My womb is ready to do its duty."
+ <<else>>
+ "I'm ripe for breeding right now."
+ <</if>>
<</if>>
<<case "Eugenics">>
give you an excellent view straight down her perfect cleavage, straining against the top of her name-brand dress.
@@ -249,16 +249,16 @@ She's clearly attracted to you; even the most consummate actress would have diff
<<case "Repopulationist">>
<<if _repopHookupPregnant == 1>>
<<if random(1,10) > 7>>
- an experienced body, comfortable with the burdens of pregnancy.
+ an experienced body, comfortable with the burdens of pregnancy.
<<else>>
- an inexperienced body undergoing its very first pregnancy.
+ an inexperienced body undergoing its very first pregnancy.
<</if>>
She's taken good care of herself; not a single stretch mark can be seen across her proportionally giant belly.
<<else>>
- <<if $arcologies[0].FSRepopulationFocusLaw == 1>>
- an experienced body, ready and eager to grow fecund once more.
+ <<if $arcologies[0].FSRepopulationFocusLaw == 1>>
+ an experienced body, ready and eager to grow fecund once more.
<<else>>
- an inexperienced body, but one with potential for becoming quite fecund.
+ an inexperienced body, but one with potential for becoming quite fecund.
<</if>>
<</if>>
<<case "Eugenics">>
diff --git a/src/uncategorized/reFSNonconformist.tw b/src/uncategorized/reFSNonconformist.tw
index 15f53273721..77cfadf425c 100644
--- a/src/uncategorized/reFSNonconformist.tw
+++ b/src/uncategorized/reFSNonconformist.tw
@@ -172,10 +172,10 @@ The nonconformist is far too prominent and prosperous to make this an easy dilem
begins building independent little lives for a few of their best slaves, @@.red;setting back acceptance@@ of degradationism.
<<set $arcologies[0].FSDegradationist -= 10>>
<<elseif $FSNonconformist == "Intellectual Dependency">>
- publishes the exposé, @@.red;setting back acceptance@@ of a totally dependant slave population as citizens scramble to slave-proof their homes.
+ publishes the exposé, @@.red;setting back acceptance@@ of a totally dependent slave population as citizens scramble to slave-proof their homes.
<<set $arcologies[0].FSIntellectualDependency -= 10>>
<<elseif $FSNonconformist == "Slave Professionalism">>
- hosts a public display of just how easy it would be to turn a slave into an effective assassin, striking fear into the citizenry and @@.red;setting back acceptance@@ of slave proffesionalism.
+ hosts a public display of just how easy it would be to turn a slave into an effective assassin, striking fear into the citizenry and @@.red;setting back acceptance@@ of slave professionalism.
<<set $arcologies[0].FSSlaveProfessionalism -= 10>>
<<elseif $FSNonconformist == "Body Purist">>
is soon accompanied around the arcology by a slave with ten-liter breast implants, @@.red;setting back acceptance@@ of body purism.
diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw
index be4b1387fa1..03d848899c5 100644
--- a/src/uncategorized/reShelterInspection.tw
+++ b/src/uncategorized/reShelterInspection.tw
@@ -238,28 +238,28 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
<<set $shelterAbuse -= 3>>
<</if>>
<<case "$His owner purposely deafened $him by piercing $his eardrums with knitting needles.">>
- The inspector gestures for _Inspectee.slaveName to turn away from _him2 and, once $he has done so, asks "Can you hear me, _Inspectee.slaveName?"
- <<if _Inspectee.hears > _originSlave.hears>>
- <<if canTalk(_Inspectee)>>
- <<run Enunciate(_Inspectee)>>
- <<if _Inspectee.hears < 0>>
- $He nods and responds "It'<<s>> <<s>>till hard, but I can."
- <<else>>
- $He nods and responds "Loud and clear."
- <</if>>
- <<else>>
- <<if _Inspectee.hears < 0>>
- $He cocks $his head to listen, and nods slowly.
- <<else>>
- $He nods confidently.
- <</if>>
- <<run Enunciate($activeSlave)>>
- The inspector's expression softens, and _he2 pauses a moment before jotting down more notes on _his2 tablet. "Thank you, _Inspectee.slaveName, that will be all." _He2 turns to you and says "You're more than welcome to adopt <<s>>lave<<s>> from our <<sh>>elter." You swear _he2 seems in much better spirits as _he2 leaves your penthouse.
- <<set _inspectionContinues = 0>>
- <<set $shelterAbuse-->>
- <<else>>
- Unable to hear _him2, $he does not respond. "Pity," the inspector says.
- <</if>>
+ The inspector gestures for _Inspectee.slaveName to turn away from _him2 and, once $he has done so, asks "Can you hear me, _Inspectee.slaveName?"
+ <<if _Inspectee.hears > _originSlave.hears>>
+ <<if canTalk(_Inspectee)>>
+ <<run Enunciate(_Inspectee)>>
+ <<if _Inspectee.hears < 0>>
+ $He nods and responds "It'<<s>> <<s>>till hard, but I can."
+ <<else>>
+ $He nods and responds "Loud and clear."
+ <</if>>
+ <<else>>
+ <<if _Inspectee.hears < 0>>
+ $He cocks $his head to listen, and nods slowly.
+ <<else>>
+ $He nods confidently.
+ <</if>>
+ <<run Enunciate($activeSlave)>>
+ The inspector's expression softens, and _he2 pauses a moment before jotting down more notes on _his2 tablet. "Thank you, _Inspectee.slaveName, that will be all." _He2 turns to you and says "You're more than welcome to adopt <<s>>lave<<s>> from our <<sh>>elter." You swear _he2 seems in much better spirits as _he2 leaves your penthouse.
+ <<set _inspectionContinues = 0>>
+ <<set $shelterAbuse-->>
+ <<else>>
+ Unable to hear _him2, $he does not respond. "Pity," the inspector says.
+ <</if>>
<<case "You got $him at the Slave Shelter. $His owner purposely blinded $him by dumping boiling water into $his eyes.">>
"I wi<<sh>> the <<s>>carring wa<<s>>n't so bad, that way people wouldn't <<s>>tare so much."
<<if _Inspectee.eyes > _originSlave.eyes>>
diff --git a/src/uncategorized/reShowerPunishment.tw b/src/uncategorized/reShowerPunishment.tw
index 09df3a32a01..443f4849087 100644
--- a/src/uncategorized/reShowerPunishment.tw
+++ b/src/uncategorized/reShowerPunishment.tw
@@ -53,7 +53,7 @@ $activeSlave.slaveName is being very thorough. When you first appeared, $he was
<br><br>
When $activeSlave.slaveName is finally done, $HeadGirl.slaveName's
<<if $HGSeverity > 0>>
- hands seize $him by the ears and pull $his head in for a kiss that is dominance distilled into the form of a loving gesture. Then _he2 pokes _his2 bitch in the side, forcing the slave to collapse in just the right way.
+ hands seize $him by the <<if hasBothEars($activeSlave)>>ears<<else>>scruff of the neck<</if>> and pull $his head in for a kiss that is dominance distilled into the form of a loving gesture. Then _he2 pokes _his2 bitch in the side, forcing the slave to collapse in just the right way.
<<elseif $HGSeverity == 0>>
arms encircle $him in an embrace that is simultaneously controlling, comforting, and sexually insistent. The slave does not resist, allowing the Head Girl to run _his2 hands over the warm, wet sex slave.
<<else>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 7cfdff045e7..45194bfa044 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -190,8 +190,8 @@ $He has
<<if $activeSlave.earShape != "normal" && $activeSlave.earShape != "none">>
[[Restore to normal|Surgery Degradation][$activeSlave.earShape = "normal", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "earRestore"]]
<</if>>
- <<if $activeSlave.earShape != "normal" && $activeSlave.earShape != "none" && $seeExtreme == 1 && $activeSlave.indentureRestrictions < 1>> | <</if>>
- <<if $activeSlave.earShape != "none" && $seeExtreme == 1 && $activeSlave.indentureRestrictions < 1>>
+ <<if $activeSlave.earShape != "normal" && hasAnyEars($activeSlave) && $seeExtreme == 1 && $activeSlave.indentureRestrictions < 1>> | <</if>>
+ <<if hasAnyEars($activeSlave) && $seeExtreme == 1 && $activeSlave.indentureRestrictions < 1>>
[[Remove them|Surgery Degradation][surgeryAmp($activeSlave, "left ear"), surgeryAmp($activeSlave, "right ear"), $surgeryType = "earGone", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]
<</if>>
<<if $activeSlave.earShape == "none">>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index c1ebe6cde02..39cda439254 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -5678,7 +5678,7 @@
<<= FutureSocieties.ChangePorn("IntellectualDependency", -1)>>
<</if>>
<<if ($slaves[$i].energy > 95)>>
- Society @@.green;approves@@ of $slaves[$i].slaveName's bottomless lust, showing the public one more way a slave may be reliant on $his ownwer.
+ Society @@.green;approves@@ of $slaves[$i].slaveName's bottomless lust, showing the public one more way a slave may be reliant on $his owner.
<<= FutureSocieties.ChangePorn("IntellectualDependency", 1)>>
<<elseif ($slaves[$i].energy <= 60)>>
Society @@.red;disapproves@@ of $slaves[$i].slaveName's restrained libido; to the public, this gives $him too much freedom to focus on things other than sex.
@@ -5696,7 +5696,7 @@
<<= FutureSocieties.ChangePorn("SlaveProfessionalism", -2)>>
<</if>>
<<if $slaves[$i].accent > 1 && canTalk($slaves[$i]) && ($slaves[$i].speechRules != "restrictive" || ($slaves[$i].speechRules == "restrictive" && $slaves[$i].devotion < 20 && $slaves[$i].trust >= -20))>>
- Society @@.red;dislikes@@ $slaves[$i].slaveName's inability to properly speak $language or hold $his tongue; allowing such a flaw hinders the notion of proffesional slavery.
+ Society @@.red;dislikes@@ $slaves[$i].slaveName's inability to properly speak $language or hold $his tongue; allowing such a flaw hinders the notion of professional slavery.
<<= FutureSocieties.ChangePorn("SlaveProfessionalism", -2)>>
<</if>>
<<if $slaves[$i].skill.entertainment + $slaves[$i].skill.whoring + $slaves[$i].skill.oral + $slaves[$i].skill.anal + $slaves[$i].skill.vaginal >= 400>>
diff --git a/src/uncategorized/seCustomSlaveDelivery.tw b/src/uncategorized/seCustomSlaveDelivery.tw
index 2b6824ba761..7209c2e1aa9 100644
--- a/src/uncategorized/seCustomSlaveDelivery.tw
+++ b/src/uncategorized/seCustomSlaveDelivery.tw
@@ -171,7 +171,7 @@
<<if $customSlave.analVirgin == 0>>
<<set $activeSlave.anus = $customSlave.analVirgin>>
<</if>>
-<<if (def $customSlave.voice) && $customSlave.voice != -1>>
+<<if (def $customSlave.voice) && ($customSlave.voice != -1)>>
<<set $activeSlave.voice = $customSlave.voice>>
<<else>>
<<set $activeSlave.voice = random(0,3)>>
diff --git a/src/uncategorized/seRaiding.tw b/src/uncategorized/seRaiding.tw
index a5729ac0a00..da6fc519c61 100644
--- a/src/uncategorized/seRaiding.tw
+++ b/src/uncategorized/seRaiding.tw
@@ -196,7 +196,7 @@ target
<<set $activeSlave.skill.whoring = 0>>
<<set $activeSlave.skill.combat = 1>>
<<set $activeSlave.intelligence = random(20,60)>>
- <<set activeSlave.intelligenceImplant = 15>>
+ <<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.hStyle = either("short", "very short")>>
<<set $activeSlave.boobs = 150>>
<<set $activeSlave.vagina = -1>>
diff --git a/src/uncategorized/slaveStats.tw b/src/uncategorized/slaveStats.tw
index 86976c47fc5..135d374105f 100644
--- a/src/uncategorized/slaveStats.tw
+++ b/src/uncategorized/slaveStats.tw
@@ -377,7 +377,6 @@ slaveName: $activeSlave.slaveName /* TODO: figure out why this is being inden
<br>override_Pubic_H_Color: $activeSlave.override_Pubic_H_Color
<br>override_Arm_H_Color: $activeSlave.override_Arm_H_Color
<br>override_Brow_H_Color: $activeSlave.override_Brow_H_Color
-<br>missingEyes: $activeSlave.missingEyes
<br>slaveCost: $activeSlave.slaveCost
<br>lifetimeCashExpenses: $activeSlave.lifetimeCashExpenses
<br>lifetimeCashIncome: $activeSlave.lifetimeCashIncome
diff --git a/src/uncategorized/universalRules.tw b/src/uncategorized/universalRules.tw
index d1e4ec74157..002a1f4355d 100644
--- a/src/uncategorized/universalRules.tw
+++ b/src/uncategorized/universalRules.tw
@@ -202,7 +202,7 @@ One 'welcome' for a new slave is to have them branded. Where would you like such
<br> It's possible that ''$brandTarget.primary'' may be missing from a slave. Choose a fallback in case it is not available: Current backup is ''$brandTarget.secondary'':
/* Material copied from bodyModification, but please leave commented out any sections that may not be on ALL slaves. */
- /*<<if $activeSlave.earShape != "none">>[[Ears|Universal Rules][$brandTarget.secondary = "ear"]]<</if>>*/
+ /*<<if hasAnyEars($activeSlave)>>[[Ears|Universal Rules][$brandTarget.secondary = "ear"]]<</if>>*/
| [[Cheeks|Universal Rules][$brandTarget.secondary = "cheek"]]
| [[Shoulders|Universal Rules][$brandTarget.secondary = "shoulder"]]
| [[Breasts|Universal Rules][$brandTarget.secondary = "breast"]]
@@ -377,7 +377,7 @@ One 'welcome' for a new slave is to have them scarred. Where would you like such
<br> It's possible that ''$scarTarget.primary'' may be missing from a slave. Choose a fallback in case it is not available: Current backup is ''$scarTarget.secondary'':
/* Material copied from bodyModification, but please leave commented out any sections that may not be on ALL slaves. */
- /*<<if $activeSlave.earShape != "none">>[[Ears|Universal Rules][$scarTarget.secondary = "ear"]]<</if>>*/
+ /*<<if hasAnyEars($activeSlave)>>[[Ears|Universal Rules][$scarTarget.secondary = "ear"]]<</if>>*/
| [[Cheeks|Universal Rules][$scarTarget.secondary = "cheek"]]
| [[Shoulders|Universal Rules][$scarTarget.secondary = "shoulder"]]
| [[Breasts|Universal Rules][$scarTarget.secondary = "breast"]]
--
GitLab