From e2ed79c8ec17d90a94101203f154457fa0d0b265 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Wed, 2 Jan 2019 18:31:50 -0600
Subject: [PATCH] TitleWidgeted
---
src/SpecialForce/TrickShotNight.tw | 2 +-
src/gui/Encyclopedia/encyclopedia.tw | 2 +-
src/npc/agent/agentWorkaround.tw | 2 +-
src/npc/descriptions/fBoobs.tw | 2 +-
src/npc/descriptions/fVagina.tw | 2 +-
src/npc/fFeelings.tw | 2 +-
src/player/actions/fCaress.tw | 12 ++++++------
src/player/actions/fEmbrace.tw | 12 ++++++------
src/pregmod/beastFuck.tw | 2 +-
src/pregmod/beastFucked.tw | 2 +-
src/pregmod/fFeet.tw | 2 +-
src/pregmod/theBlackMarket.tw | 2 +-
src/uncategorized/PESS.tw | 2 +-
src/uncategorized/RECI.tw | 6 +++---
src/uncategorized/RESS.tw | 16 +++++++--------
src/uncategorized/RETS.tw | 2 +-
src/uncategorized/REroyalblood.tw | 2 +-
src/uncategorized/assistantEvents.tw | 2 +-
src/uncategorized/bodyModification.tw | 4 ++--
src/uncategorized/masterSuite.tw | 6 +++---
src/uncategorized/pBombing.tw | 2 +-
src/uncategorized/pSnatchAndGrabResult.tw | 4 ++--
src/uncategorized/peLonelyBodyguard.tw | 2 +-
src/uncategorized/ptWorkaround.tw | 2 +-
src/uncategorized/reAWOL.tw | 2 +-
src/uncategorized/reBusyMasterSuite.tw | 2 +-
src/uncategorized/reFSAcquisition.tw | 6 +++---
src/uncategorized/reMilfTourist.tw | 4 ++--
src/uncategorized/reNickname.tw | 2 +-
src/uncategorized/rePokerNight.tw | 2 +-
src/uncategorized/reRecruit.tw | 4 ++--
src/uncategorized/recETS.tw | 2 +-
src/uncategorized/resSale.tw | 24 +++++++++++------------
src/uncategorized/saBeYourHeadGirl.tw | 2 +-
src/uncategorized/saRecruitGirls.tw | 2 +-
src/uncategorized/schoolroom.tw | 2 +-
src/utility/descriptionWidgetsTattoos.tw | 8 ++++----
37 files changed, 78 insertions(+), 78 deletions(-)
diff --git a/src/SpecialForce/TrickShotNight.tw b/src/SpecialForce/TrickShotNight.tw
index 44d6c804aca..bf0e158cb42 100644
--- a/src/SpecialForce/TrickShotNight.tw
+++ b/src/SpecialForce/TrickShotNight.tw
@@ -6,7 +6,7 @@ Despite your direct elevator, interaction with the majority of your security for
<br><br>On a particularly lackadaisical evening, you find yourself alerted to a message alert by $assistantName.
<<if $assistant > 0>>
- "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, a message from $SF.Lower." She pauses before continuing. "It seems they're asking if you'd like to join their trick shot night."
+ "<<= WrittenMaster()>>, a message from $SF.Lower." She pauses before continuing. "It seems they're asking if you'd like to join their trick shot night."
<<else>>
It informs you that $SF.Lower have sent a message asking you to join them at their trick shot night.
<</if>>
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index a1449109818..e928106cf1e 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -1478,7 +1478,7 @@ THE X-SERIES ARCOLOGY
<<case "What the Upgrades Do">>
- //There are a lot of upgrades available for your arcology, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>>. Please relax; some panic upon reviewing the options is normal. This list should familiarize you with your choices.//
+ //There are a lot of upgrades available for your arcology, <<= properTitle()>>. Please relax; some panic upon reviewing the options is normal. This list should familiarize you with your choices.//
<br><br>''Construction''
<br>The first upgrade section on the arcology management menu offers an escalating series of generic upgrades for the arcology. A few of these have minor beneficial side effects, but all share the same main effect: they raise the arcology's maximum prosperity level. You will be informed on the end of week report if your arcology is nearing, at, or over this level. Upgrading early is //not// useless, since prosperity will increase more rapidly if the cap is much higher than the current prosperity level.
diff --git a/src/npc/agent/agentWorkaround.tw b/src/npc/agent/agentWorkaround.tw
index f2796ae4c71..dbbdcdc25a8 100644
--- a/src/npc/agent/agentWorkaround.tw
+++ b/src/npc/agent/agentWorkaround.tw
@@ -32,7 +32,7 @@
<<set $desc = SlaveTitle($slaves[$i])>>
<<setLocalPronouns $slaves[$i]>>
-You order $slaves[$i].slaveName to come into your office for orders. The devoted $desc has no prior warning that this is anything unusual, and from the <<if $slaves[$i].energy > 95>>horny glint<<else>>glow of sexual availability<</if>> in $his $slaves[$i].eyeColor eyes as $he <<if canWalk($slaves[$i])>>enters<<else>>is helped in<</if>>, $he <<if $slaves[$i].energy > 95>>seems to be hoping<<else>>wouldn't mind hearing<</if>> that you've called $him in for a quick fuck. In fact, the matter at hand is about as far as it could possibly be from that, on the spectrum of interactions between <<if $PC.title != 0>>master<<else>>mistress<</if>> and slave.
+You order $slaves[$i].slaveName to come into your office for orders. The devoted $desc has no prior warning that this is anything unusual, and from the <<if $slaves[$i].energy > 95>>horny glint<<else>>glow of sexual availability<</if>> in $his $slaves[$i].eyeColor eyes as $he <<if canWalk($slaves[$i])>>enters<<else>>is helped in<</if>>, $he <<if $slaves[$i].energy > 95>>seems to be hoping<<else>>wouldn't mind hearing<</if>> that you've called $him in for a quick fuck. In fact, the matter at hand is about as far as it could possibly be from that, on the spectrum of interactions between <<= WrittenMaster()>> and slave.
<br><br>You offer $him, without preamble, agency on your behalf in $activeArcology.name. As a $woman of intelligence, $he knows the basics of such an arrangement, but $he's stunned into silence by the offer, so you outline it briefly. Having a slave lead an arcology would be too much, even for the most open minded of Free Cities societies. So, $he would be freed, albeit subject to a set of private, restrictive contracts that would allow you to recall $him if you wish, and require $him to follow your directions, if you give $him any. But other than that, $he would be the effective leader of an entire arcology. It's an unusual arrangement, but one that's becoming more common as multiple arcologies come under united control.
diff --git a/src/npc/descriptions/fBoobs.tw b/src/npc/descriptions/fBoobs.tw
index 3738a706b01..f573d570b52 100644
--- a/src/npc/descriptions/fBoobs.tw
+++ b/src/npc/descriptions/fBoobs.tw
@@ -187,7 +187,7 @@ tits.
<</if>>
<<elseif (random(1,100) > (110-$activeSlave.devotion))>>
<<if ($activeSlave.fetish == "none") && ($activeSlave.behavioralFlaw !== "hates men")>>
- Having attention and love lavished on $his boobs by $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title !== 0>>master<<else>>mistress<</if>> has $him thinking of $his @@.lightcoral;breasts as sexual organs.@@
+ Having attention and love lavished on $his boobs by $his <<= WrittenMaster()>> has $him thinking of $his @@.lightcoral;breasts as sexual organs.@@
<<set $activeSlave.fetish = "boobs", $activeSlave.fetishKnown = 1>>
<</if>>
<</if>>
diff --git a/src/npc/descriptions/fVagina.tw b/src/npc/descriptions/fVagina.tw
index d686455bfda..967283a0ca8 100644
--- a/src/npc/descriptions/fVagina.tw
+++ b/src/npc/descriptions/fVagina.tw
@@ -544,7 +544,7 @@ You call $him over so you can
<<case "be a subordinate slave">>
though it's only a matter of time before another slave decides to play with $his fuckhole.
<<case "be your Head Girl">>
- worried that $his charges got up to trouble while $he enjoyed $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>'s use.
+ worried that $his charges got up to trouble while $he enjoyed $his <<= WrittenMaster()>>'s use.
<<case "guard you">>
so $he can be fresh and ready for more sexual use even as $he guards your person.
<<case "train slaves">>
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index cc0134b082c..389218d1dff 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -46,7 +46,7 @@
<<if ($activeSlave.devotion <= 50)>>
<<if !canTalk($activeSlave)>>
- $He gestures that you're $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>master<<else>>mistress<</if>>, and $he will do $his best to obey you. $He continues to sign<<if $activeSlave.accent == 3 && $activeSlave.voice != 0>>, using gestures to supplant $his poor $language<</if>>:
+ $He gestures that you're $his <<= WrittenMaster()>>, and $he will do $his best to obey you. $He continues to sign<<if $activeSlave.accent == 3 && $activeSlave.voice != 0>>, using gestures to supplant $his poor $language<</if>>:
<<else>>
"You're my <<Master>>, and I'll do my be<<s>>t to obey you," $he says
<</if>>
diff --git a/src/player/actions/fCaress.tw b/src/player/actions/fCaress.tw
index cbf98698ed6..8e496f841f7 100644
--- a/src/player/actions/fCaress.tw
+++ b/src/player/actions/fCaress.tw
@@ -20,12 +20,12 @@ You tell $activeSlave.slaveName to
<</if>>
<<if ($activeSlave.fetish == "mindbroken") && ($activeSlave.relationship != -3)>>
- $He complies mechanically. $He remembers that when <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>>'s commands are not obeyed, there is punishment.
+ $He complies mechanically. $He remembers that when <<= WrittenMaster()>>'s commands are not obeyed, there is punishment.
<<elseif ($activeSlave.relationship == -2)>>
$He eagerly complies, happy to be near the object of $his longing. Once $he's close, you hold $his face in your palms and gaze deeply into $his $activeSlave.eyeColor eyes. $He finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> $he loves overwhelming, and $his eyes flick downward after a moment. $He blushes furiously.
<<elseif ($activeSlave.relationship == -3)>>
<<if $activeSlave.fetish == "mindbroken">>
- $He complies mechanically. $He remembers that when <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>'s commands are not obeyed, there is punishment. Once $he's close, you hold $his face in your palms and look into $his blank $activeSlave.eyeColor eyes. $He doesn't react.
+ $He complies mechanically. $He remembers that when <<= WrittenMaster()>>'s commands are not obeyed, there is punishment. Once $he's close, you hold $his face in your palms and look into $his blank $activeSlave.eyeColor eyes. $He doesn't react.
<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
$He happily complies, eager to be close to the <<if $PC.title == 1>>man<<else>>woman<</if>> who married $him. Once $he's close, you hold $his face in your palms and look into $his $activeSlave.eyeColor eyes. $He finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> $he's married to affirming, and looks down with a smile<<if canSee($activeSlave)>>, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><</if>>.
<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
@@ -36,13 +36,13 @@ You tell $activeSlave.slaveName to
$He complies obediently. Once $he's close, you hold $his face in your palms and look into $his $activeSlave.eyeColor eyes. $He finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> $he's married to reassuring, and looks down with a slight smile<<if $canSee($activeSlave)>>, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><</if>>.
<</if>>
<<elseif ($activeSlave.devotion > 75)>>
- $He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and look into $his $activeSlave.eyeColor eyes. $He finds the intense look from $his beloved <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> disconcerting, and $his eyes flick downward after a moment. $He blushes furiously.
+ $He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and look into $his $activeSlave.eyeColor eyes. $He finds the intense look from $his beloved <<= WrittenMaster()>> disconcerting, and $his eyes flick downward after a moment. $He blushes furiously.
<<elseif ($activeSlave.devotion > 50)>>
- $He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and look into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> disconcerting, and $he looks down after a moment, blushing.
+ $He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and look into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<= WrittenMaster()>> disconcerting, and $he looks down after a moment, blushing.
<<elseif ($activeSlave.devotion > 20)>>
- $He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and look into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> worrying, and $he looks down after a moment, blushing nervously.
+ $He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and look into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, blushing nervously.
<<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust >= -20)>>
- $He visibly considers disobedience, but decides that complying with such an apparently harmless order is safe, for now. Once $he's close, you hold $his face in your palms and look into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> worrying, and $he looks down after a moment, $his lower lip trembling with nervousness.
+ $He visibly considers disobedience, but decides that complying with such an apparently harmless order is safe, for now. Once $he's close, you hold $his face in your palms and look into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, $his lower lip trembling with nervousness.
<<elseif ($activeSlave.trust < -20)>>
The command terrifies $him, but $he's more frightened still of the consequences of disobedience, and $he complies. Once $he's close, you hold $his face in your palms and look into $his $activeSlave.eyeColor eyes. $He looks down fearfully, and begins to shake with terror, tears leaking silently down $his cheeks.
<<else>>
diff --git a/src/player/actions/fEmbrace.tw b/src/player/actions/fEmbrace.tw
index c83c7e3f9c5..d30b9036845 100644
--- a/src/player/actions/fEmbrace.tw
+++ b/src/player/actions/fEmbrace.tw
@@ -8,12 +8,12 @@ You tell $activeSlave.slaveName to
<</if>>
<<if ($activeSlave.fetish == "mindbroken") && ($activeSlave.relationship != -3)>>
- $He complies automatically. $He remembers that when <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>>'s commands are not obeyed, there is punishment.
+ $He complies automatically. $He remembers that when <<= WrittenMaster()>>'s commands are not obeyed, there is punishment.
<<elseif ($activeSlave.relationship == -2)>>
$He excitedly complies, happy to be near the object of $his longing. Once $he's close, you take $his completely relaxed head in your hands and gaze deeply into $his $activeSlave.eyeColor eyes. $He finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> $he loves overwhelming, and $his eyes flick downward after a moment. $He blushes furiously.
<<elseif ($activeSlave.relationship == -3)>>
<<if $activeSlave.fetish == "mindbroken">>
- $He complies mechanically. $He remembers that when <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>'s commands are not obeyed, there is punishment. Once $he's close, you hold $his face in your palms and look into $his blank $activeSlave.eyeColor eyes. $He shows no reaction.
+ $He complies mechanically. $He remembers that when <<= WrittenMaster()>>'s commands are not obeyed, there is punishment. Once $he's close, you hold $his face in your palms and look into $his blank $activeSlave.eyeColor eyes. $He shows no reaction.
<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
$He lovingly complies, hurrying to come close to the <<if $PC.title == 1>>man<<else>>woman<</if>> who married $him. Once $he's close, you take your willing wife's head in your hands and gaze deeply into $his $activeSlave.eyeColor eyes. $He finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> $he's married to affirming, and <<if canSee($activeSlave)>>looks down with a smile, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><<else>>looks down with a smile<</if>>.
<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
@@ -24,13 +24,13 @@ You tell $activeSlave.slaveName to
$He complies obediently. Once $he's close, you take your willing wife's head in your hands and gaze deeply into $his $activeSlave.eyeColor eyes. $He finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> $he's married to reassuring, and looks down with a slight smile<<if $canSee($activeSlave)>>, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><</if>>.
<</if>>
<<elseif ($activeSlave.devotion > 75)>>
- $He elatedly complies, joyful at being near to you. Once $he's close, you take $his completely relaxed head in your hands and gaze deeply into $his $activeSlave.eyeColor eyes. $He finds the intense look from $his beloved <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> disconcerting, and $his eyes flick downward after a moment. $He blushes furiously.
+ $He elatedly complies, joyful at being near to you. Once $he's close, you take $his completely relaxed head in your hands and gaze deeply into $his $activeSlave.eyeColor eyes. $He finds the intense look from $his beloved <<= WrittenMaster()>> disconcerting, and $his eyes flick downward after a moment. $He blushes furiously.
<<elseif ($activeSlave.devotion > 50)>>
- $He dotingly complies, being near you filling $his with delight. Once $he's close, you take $his completely relaxed head in your hands and gaze deeply into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> disconcerting, and $he looks down after a moment, blushing.
+ $He dotingly complies, being near you filling $his with delight. Once $he's close, you take $his completely relaxed head in your hands and gaze deeply into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<= WrittenMaster()>> disconcerting, and $he looks down after a moment, blushing.
<<elseif ($activeSlave.devotion > 20)>>
- $He joyfully complies, happy to be near you. Once $he's close, you you take $his willing head in your hands and gaze deeply into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> worrying, and $he looks down after a moment, blushing nervously.
+ $He joyfully complies, happy to be near you. Once $he's close, you you take $his willing head in your hands and gaze deeply into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, blushing nervously.
<<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust >= -20)>>
- $He visibly considers disobedience, but decides that complying with such an apparently harmless order is safe, for now. Once $he's close, you take $his head in your hands and gaze deeply into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> worrying, and $he looks down after a moment, $his lower lip trembling with nervousness.
+ $He visibly considers disobedience, but decides that complying with such an apparently harmless order is safe, for now. Once $he's close, you take $his head in your hands and gaze deeply into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, $his lower lip trembling with nervousness.
<<elseif ($activeSlave.trust < -20)>>
The command terrifies $him, but $he's more frightened still of the consequences of disobedience, and $he complies. Once $he's close, you take $his trembling head in your hands and gaze deeply into $his $activeSlave.eyeColor eyes for a moment. $He looks down fearfully, and begins to shake with terror, tears streaking down $his cheeks.
<<else>>
diff --git a/src/pregmod/beastFuck.tw b/src/pregmod/beastFuck.tw
index e980ef24d98..acc29050280 100644
--- a/src/pregmod/beastFuck.tw
+++ b/src/pregmod/beastFuck.tw
@@ -361,7 +361,7 @@ before calling in the _animal.species. The _animal.species slowly saunters up to
<<case "be a subordinate slave">>
though it's only a matter of time before another slave decides to play with $his fuckhole.
<<case "be your Head Girl">>
- worried that $his charges got up to trouble while $he enjoyed $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>'s use.
+ worried that $his charges got up to trouble while $he enjoyed $his <<= WrittenMaster()>>'s use.
<<case "guard you">>
so $he can be fresh and ready for more sexual use even as $he guards your person.
<<case "be the Schoolteacher">>
diff --git a/src/pregmod/beastFucked.tw b/src/pregmod/beastFucked.tw
index ef37a4ffd9b..880d0a713e7 100644
--- a/src/pregmod/beastFucked.tw
+++ b/src/pregmod/beastFucked.tw
@@ -470,7 +470,7 @@ before calling in the _animal.species. The _animal.species slowly saunters up to
<<case "be a subordinate slave">>
though it's only a matter of time before another slave decides to play with $his fuckhole.
<<case "be your Head Girl">>
- worried that $his charges got up to trouble while $he enjoyed $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>'s use.
+ worried that $his charges got up to trouble while $he enjoyed $his <<= WrittenMaster()>>'s use.
<<case "guard you">>
so $he can be fresh and ready for more sexual use even as $he guards your person.
<<case "be the Schoolteacher">>
diff --git a/src/pregmod/fFeet.tw b/src/pregmod/fFeet.tw
index c708060c9ba..57858cbbd98 100644
--- a/src/pregmod/fFeet.tw
+++ b/src/pregmod/fFeet.tw
@@ -378,7 +378,7 @@ You call $activeSlave.slaveName to your office, telling $his to use $his feet to
<<elseif $activeSlave.fetish == "sadist" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
$activeSlave.slaveName is a sadist, and $his deft footjob toys with the boundaries of pain and pleasure. $His devoted yet belittling <<if canSee($activeSlave)>>gaze carefully watches your face<<else>>expressions are clear as $he feels<</if>> for every reaction.
<<elseif $activeSlave.fetish == "dom" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
- $activeSlave.slaveName is a dominant and $his skilled feet roughly stroke your erect cock, but $he pauses often to rub $his soles on your <<if $PC.balls >= 2>>massive<<elseif $PC.balls >= 0>>large>><</if>> balls so $he doesn't get too aggressive with $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>.
+ $activeSlave.slaveName is a dominant and $his skilled feet roughly stroke your erect cock, but $he pauses often to rub $his soles on your <<if $PC.balls >= 2>>massive<<elseif $PC.balls >= 0>>large>><</if>> balls so $he doesn't get too aggressive with $his <<= WrittenMaster()>>.
<<elseif $activeSlave.fetish == "pregnancy" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
$activeSlave.slaveName skillfully strokes your cock with $his feet, one of $his hands roaming across $his _belly belly as $he happily services you. $He occasionally pauses to <<if canSee($activeSlave)>>watch <<else>>feel <</if>>your <<if $PC.balls >= 2>>massive<<elseif $PC.balls >= 0>>large>><</if>> balls churn with sperm, clearly lost in a pregnancy fantasy.
<<else>>
diff --git a/src/pregmod/theBlackMarket.tw b/src/pregmod/theBlackMarket.tw
index 5271a6a654a..8cabbe53353 100644
--- a/src/pregmod/theBlackMarket.tw
+++ b/src/pregmod/theBlackMarket.tw
@@ -83,7 +83,7 @@ Of all the wonders present, the thing that catches your eye the most is a shady
<<if $cash >= 50000>>
[[Purchase designs for immense implants|The Black Market][$cash -= 50000, $arcologies[0].FSTransformationFetishistResearch = 1, _dump = $merchantFSWares.delete("TransformationFetishistResearch")]] //@@.yellowgreen;<<print cashFormat(50000)>>.@@//
<<else>>
- You cannot afford the asking price of @@.red;<<print cashFormat(50000)>>@@ for absurdly huge implant designs. "No big fake boobs for you. How sad it must be to be flat and enslaved by such a poor <<if $PC.title == 1>>Master<<else>>Mistress<</if>>"
+ You cannot afford the asking price of @@.red;<<print cashFormat(50000)>>@@ for absurdly huge implant designs. "No big fake boobs for you. How sad it must be to be flat and enslaved by such a poor <<= WrittenMaster()>>"
<</if>>
<<else>>
You lack the facilities needed to produce implants of this caliber, so absurdly huge implant designs are currently unobtainable.
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index 2578f7a6039..139ef176452 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -101,7 +101,7 @@ Your milkmaid <<EventNameLink $activeSlave>> worked hard today. The cows have it
<<case "loving concubine">>
-It's been a long, harassing day as owner of the arcology. You're composing an angry communication to a couple of imbecile tenants who seem to think they're still in their old world shithole of a homeland, insist on acting like it, and are also wealthy enough to make it unwise to simply defenestrate them from the nearest window. Not that you aren't tempted. Suddenly, you feel a moist, <<if ($activeSlave.lips > 70)>>massive<<elseif ($activeSlave.lips > 40)>>pillowlike<<else>>girlish<</if>> pair of lips nibbling their way along your ear, and a <<if ($activeSlave.muscles > 95)>>powerful<<elseif ($activeSlave.muscles > 30)>>strong<<else>>feminine<</if>> hand over your shoulder. Its owner <<if !canTalk($activeSlave)>>passes you a handwritten note: "? ? It can wait, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>> ? ?"<<else>><<say whisper>>s: "It can wait, <<Master>>."<</if>>
+It's been a long, harassing day as owner of the arcology. You're composing an angry communication to a couple of imbecile tenants who seem to think they're still in their old world shithole of a homeland, insist on acting like it, and are also wealthy enough to make it unwise to simply defenestrate them from the nearest window. Not that you aren't tempted. Suddenly, you feel a moist, <<if ($activeSlave.lips > 70)>>massive<<elseif ($activeSlave.lips > 40)>>pillowlike<<else>>girlish<</if>> pair of lips nibbling their way along your ear, and a <<if ($activeSlave.muscles > 95)>>powerful<<elseif ($activeSlave.muscles > 30)>>strong<<else>>feminine<</if>> hand over your shoulder. Its owner <<if !canTalk($activeSlave)>>passes you a handwritten note: "? ? It can wait, <<= WrittenMaster()>> ? ?"<<else>><<say whisper>>s: "It can wait, <<Master>>."<</if>>
You turn to see your concubine <<EventNameLink $activeSlave>>'s <<if ($activeSlave.butt > 5)>>massive, nude ass<<elseif ($activeSlave.butt > 2)>>big naked butt<<else>>nice, nude rear<</if>> vanishing back into your suite.<<if ($activeSlave.boobs > 2000)>> As $he sways away from you, you can clearly see the sides of $his massive tits, sticking out on either side of $his torso.<</if>>
diff --git a/src/uncategorized/RECI.tw b/src/uncategorized/RECI.tw
index 35197ee9cdb..9c12f61aefd 100644
--- a/src/uncategorized/RECI.tw
+++ b/src/uncategorized/RECI.tw
@@ -182,7 +182,7 @@ $He arches $his back and bats $his eyes at you. "A lot."
<</if>>
<</for>>
-<<EventNameLink $activeSlave>> is standing before your desk for an inspection. The $desc is naked, of course, and is devoted enough to find the situation arousing: $he's being inspected by $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>> in the nude, which is sexual enough, and past inspections have often led to a quick fuck. The horny bitch obviously wants it;
+<<EventNameLink $activeSlave>> is standing before your desk for an inspection. The $desc is naked, of course, and is devoted enough to find the situation arousing: $he's being inspected by $his <<= WrittenMaster()>> in the nude, which is sexual enough, and past inspections have often led to a quick fuck. The horny bitch obviously wants it;
<<if ($activeSlave.dick > 0) && ($activeSlave.dickAccessory == "chastity" || $activeSlave.dickAccessory == "combined chastity")>>
$his chastity cage is dribbling precum, and $he's clearly uncomfortable with simultaneous arousal and unwillingness to suffer a hardon inside it.
<<elseif canAchieveErection($activeSlave)>>
@@ -217,7 +217,7 @@ And, <<Master>>." $He arches $his back prettily and then scoots $himself down th
<</if>>
<</for>>
-<<EventNameLink $activeSlave>> is standing before your desk for an inspection. The $desc is naked, of course, and is devoted enough to find the situation arousing: she's being inspected by $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>> in the nude, which is sexual enough, and past inspections have often led to a quick fuck. The horny bitch obviously wants it;
+<<EventNameLink $activeSlave>> is standing before your desk for an inspection. The $desc is naked, of course, and is devoted enough to find the situation arousing: she's being inspected by $his <<= WrittenMaster()>> in the nude, which is sexual enough, and past inspections have often led to a quick fuck. The horny bitch obviously wants it;
<<if ($activeSlave.dick > 0) && ($activeSlave.dickAccessory == "chastity" || $activeSlave.dickAccessory == "combined chastity")>>
$his chastity cage is dribbling precum, and she's clearly uncomfortable with simultaneous arousal and unwillingness to suffer a hardon inside it.
<<elseif canAchieveErection($activeSlave)>>
@@ -493,7 +493,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
<<link "Yes $he can">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- When $he sees you stand up from behind your desk<<if ($PC.dick == 0)>>and pull on a strap-on<</if>>, $he turns fully away from you, cocking $his hips at just the right angle to offer you $his anus, without any preamble or foreplay. But you come up behind her and encircle $his <<if ($activeSlave.belly >= 1500)>><<if $activeSlave.preg > $activeSlave.pregData.normalBirth/8>>pregnant <<else>>rounded <</if>>belly<<elseif ($activeSlave.weight > 10)>>plush belly<<elseif ($activeSlave.muscles > 5)>>toned stomach<<else>>trim waist<</if>> with your capable hands, your lips nibbling along the line of $his <<if ($activeSlave.muscles > 30)>>strong<<elseif ($activeSlave.muscles > 5)>>toned<<else>>soft<</if>> shoulders and neck. $He shudders as the embrace brings your <<if ($PC.dick == 0)>>strap-on<<else>>dick<</if>> <<if ($activeSlave.height >= 185)>>up between $his buttocks, since she's nearly as tall as you<<elseif ($activeSlave.height >= 170)>>pressing into $his asscrack, since she's shorter than you<<else>>nestling down into $his asscrack, since she's so much shorter than you<</if>>. You whisper that a good slave girl doesn't have to touch $himself to come when $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>> fucks $his butt, and ask whether she's a good slave girl. $He shivers and promises that she is, rubbing $his asshole against your <<if ($PC.dick == 0)>>phallus<<else>>cockhead<</if>>. $He gives a feminine sigh as it slides into her, and moves softly within your embrace, doing $his best to pleasure you with $his girly ass. $He was already very close, and your loving touch so aroused her that she gasps and stiffens after only a few thrusts,
+ When $he sees you stand up from behind your desk<<if ($PC.dick == 0)>>and pull on a strap-on<</if>>, $he turns fully away from you, cocking $his hips at just the right angle to offer you $his anus, without any preamble or foreplay. But you come up behind her and encircle $his <<if ($activeSlave.belly >= 1500)>><<if $activeSlave.preg > $activeSlave.pregData.normalBirth/8>>pregnant <<else>>rounded <</if>>belly<<elseif ($activeSlave.weight > 10)>>plush belly<<elseif ($activeSlave.muscles > 5)>>toned stomach<<else>>trim waist<</if>> with your capable hands, your lips nibbling along the line of $his <<if ($activeSlave.muscles > 30)>>strong<<elseif ($activeSlave.muscles > 5)>>toned<<else>>soft<</if>> shoulders and neck. $He shudders as the embrace brings your <<if ($PC.dick == 0)>>strap-on<<else>>dick<</if>> <<if ($activeSlave.height >= 185)>>up between $his buttocks, since she's nearly as tall as you<<elseif ($activeSlave.height >= 170)>>pressing into $his asscrack, since she's shorter than you<<else>>nestling down into $his asscrack, since she's so much shorter than you<</if>>. You whisper that a good slave girl doesn't have to touch $himself to come when $his <<= WrittenMaster()>> fucks $his butt, and ask whether she's a good slave girl. $He shivers and promises that she is, rubbing $his asshole against your <<if ($PC.dick == 0)>>phallus<<else>>cockhead<</if>>. $He gives a feminine sigh as it slides into her, and moves softly within your embrace, doing $his best to pleasure you with $his girly ass. $He was already very close, and your loving touch so aroused her that she gasps and stiffens after only a few thrusts,
<<if ($activeSlave.dick > 0) && ($activeSlave.dickAccessory == "chastity")>>
shuddering
<<elseif ($activeSlave.dick > 0) && canAchieveErection($activeSlave)>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index f89704a4c76..8174f63d209 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -2469,7 +2469,7 @@ You decide to stop by to see $his method at work. By the time you arrive, $he's
<<case "forbidden masturbation">>
<<if $assistant > 0>>
- There is an alert from $assistantName, in her deliciously feminine voice: "$activeSlave.slaveName is masturbating, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>>. Ooh, $he's breaking the rules, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>>!" Her avatar
+ There is an alert from $assistantName, in her deliciously feminine voice: "$activeSlave.slaveName is masturbating, <<= WrittenMaster()>>. Ooh, $he's breaking the rules, <<= WrittenMaster()>>!" Her avatar
<<switch $assistantAppearance>>
<<case "monstergirl">>
strokes its dicks suggestively.
@@ -2507,7 +2507,7 @@ You decide to stop by to see $his method at work. By the time you arrive, $he's
spins accusingly.
<</switch>>
<<else>>
- There is a gentle alert from $assistantName: "$activeSlave.slaveName is masturbating in violation of the rules, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>>."
+ There is a gentle alert from $assistantName: "$activeSlave.slaveName is masturbating in violation of the rules, <<= WrittenMaster()>>."
<</if>>
A video feed appears.
<<if ["chastity belt", "combined chastity"].includes($activeSlave.vaginalAccessory)>>
@@ -3100,7 +3100,7 @@ $He doesn't phrase it quite like that, of course.
One evening, $assistantName breaks in on your
<<if $assistant > 0>>
- work, her $assistantAppearance avatar looking uncharacteristically somber. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>>," she says, "a group of tourists are giving <<EventNameLink $activeSlave>> a bad time." Before you can ask why the security drones haven't addressed the situation, she continues, "They're not abusing $him physically or anything. But, look." She
+ work, her $assistantAppearance avatar looking uncharacteristically somber. "<<= WrittenMaster()>>," she says, "a group of tourists are giving <<EventNameLink $activeSlave>> a bad time." Before you can ask why the security drones haven't addressed the situation, she continues, "They're not abusing $him physically or anything. But, look." She
<<else>>
work, announcing that a group of visitors to the arcology are being verbally abusive to <<EventNameLink $activeSlave>>. Before you can ask why it's bothering you with this, it continues, "An enslavement opportunity may exist," and
<</if>>
@@ -4773,7 +4773,7 @@ brought in to you. This time <<EventNameLink $activeSlave>> has been sent to del
<<if $mutinery != 1>>
<br><<link "Lock $his dick in chastity">>
<<replace "#result2">>
- You simply clamp a chastity cage onto her limp dick; $he'll be taking a little break from fucking girls for the time being. When $he comes to and finds $himself locked in chastity, immediately begins fiddling with it in an attempt to remove it. $He feels this punishment is laughable and only @@.mediumaquamarine;grows more defiant.@@ Word spreads through your chattel that the only downside of trying to rape <<if $PC.customTitle != 0>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> is getting locked in chastity, @@.mediumaquamarine;spreading defiance@@ through your rebellious slaves.
+ You simply clamp a chastity cage onto her limp dick; $he'll be taking a little break from fucking girls for the time being. When $he comes to and finds $himself locked in chastity, immediately begins fiddling with it in an attempt to remove it. $He feels this punishment is laughable and only @@.mediumaquamarine;grows more defiant.@@ Word spreads through your chattel that the only downside of trying to rape <<= WrittenMaster()>> is getting locked in chastity, @@.mediumaquamarine;spreading defiance@@ through your rebellious slaves.
<<set $activeSlave.trust += 10, $activeSlave.dickAccessory = "chastity">>
<<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust += 5; } })>>
<</replace>>
@@ -4873,7 +4873,7 @@ brought in to you. This time <<EventNameLink $activeSlave>> has been sent to del
<<if $mutinery != 1>>
<br><<link "Lock $his dick in chastity">>
<<replace "#result2">>
- You simply clamp a chastity cage onto $his limp dick; $he'll be taking a little break from fucking girls for the time being. When $he comes to and finds $himself locked in chastity, immediately begins fiddling with it in an attempt to remove it. $He feels this punishment is laughable and only @@.mediumaquamarine;grows more defiant.@@ Word spreads through your chattel that the only downside of trying to rape <<if $PC.customTitle != 0>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> is getting locked in chastity, @@.mediumaquamarine;spreading defiance@@ through your rebellious slaves.
+ You simply clamp a chastity cage onto $his limp dick; $he'll be taking a little break from fucking girls for the time being. When $he comes to and finds $himself locked in chastity, immediately begins fiddling with it in an attempt to remove it. $He feels this punishment is laughable and only @@.mediumaquamarine;grows more defiant.@@ Word spreads through your chattel that the only downside of trying to rape <<= WrittenMaster()>> is getting locked in chastity, @@.mediumaquamarine;spreading defiance@@ through your rebellious slaves.
<<set $activeSlave.trust += 10, $activeSlave.dickAccessory = "chastity">>
<<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust += 5; } })>>
<</replace>>
@@ -4968,7 +4968,7 @@ brought in to you. This time <<EventNameLink $activeSlave>> has been sent to del
<<if $mutinery != 1>>
<br><<link "Lock $his dick in chastity">>
<<replace "#result2">>
- You simply clamp a chastity cage onto $his limp dick; $he'll be taking a little break from fucking girls for the time being. When $he comes to and finds $himself locked in chastity, immediately begins fiddling with it in an attempt to remove it. $He feels this punishment is laughable and only @@.mediumaquamarine;grows more defiant.@@ Word spreads through your chattel that the only downside of trying to rape <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> is getting locked in chastity, @@.mediumaquamarine;spreading defiance@@ through your rebellious slaves.
+ You simply clamp a chastity cage onto $his limp dick; $he'll be taking a little break from fucking girls for the time being. When $he comes to and finds $himself locked in chastity, immediately begins fiddling with it in an attempt to remove it. $He feels this punishment is laughable and only @@.mediumaquamarine;grows more defiant.@@ Word spreads through your chattel that the only downside of trying to rape <<= WrittenMaster()>> is getting locked in chastity, @@.mediumaquamarine;spreading defiance@@ through your rebellious slaves.
<<set $activeSlave.trust += 10, $activeSlave.dickAccessory = "chastity">>
<<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust += 5; } })>>
<</replace>>
@@ -5038,7 +5038,7 @@ brought in to you. This time <<EventNameLink $activeSlave>> has been sent to del
<<if $mutinery != 1>>
<br><<link "Lock $his dick in chastity">>
<<replace "#result2">>
- You simply clamp a chastity cage onto $his limp dick; $he'll be taking a little break from fucking girls for the time being. When $he comes to and finds $himself locked in chastity, immediately begins fiddling with it in an attempt to remove it. $He feels this punishment is laughable and only @@.mediumaquamarine;grows more defiant.@@ Word spreads through your chattel that the only downside of trying to rape <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> is getting locked in chastity, @@.mediumaquamarine;spreading defiance@@ through your rebellious slaves.
+ You simply clamp a chastity cage onto $his limp dick; $he'll be taking a little break from fucking girls for the time being. When $he comes to and finds $himself locked in chastity, immediately begins fiddling with it in an attempt to remove it. $He feels this punishment is laughable and only @@.mediumaquamarine;grows more defiant.@@ Word spreads through your chattel that the only downside of trying to rape <<= WrittenMaster()>> is getting locked in chastity, @@.mediumaquamarine;spreading defiance@@ through your rebellious slaves.
<<set $activeSlave.trust += 10, $activeSlave.dickAccessory = "chastity">>
<<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust += 5; } })>>
<</replace>>
@@ -11211,7 +11211,7 @@ You tell her kindly that you understand, and that $he'll be trained to address t
@@.lightcoral;$His enjoyment of pain has increased.@@
<<elseif random(1,100) > 50>>
<<set $activeSlave.fetishStrength = 65, $activeSlave.fetish = "masochist", $activeSlave.fetishKnown = 1>>
- Before $he realizes what's happening, @@.lightcoral;$he's getting aroused at the thought of <<if $PC.title != 0>>her master<<else>>her mistress<</if>> beating her.@@
+ Before $he realizes what's happening, @@.lightcoral;$he's getting aroused at the thought of $his <<= WrittenMaster()>> beating $him.@@
<</if>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index cadb2bc0441..9c3cbef9919 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -1354,7 +1354,7 @@ $he adds impishly. Hearing this, $subSlave.slaveName lets the breast pop free of
<br><<link "What a cute couple">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You tell them they make a cute couple. The slaves start with surprise, since they didn't know you were watching, producing a delightful jiggle of smashed-together boob. "Thank you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>," they chorus correctly, before turning back to look at each other. They take your comment quite seriously, both of them seemingly forgetting that they're in the middle of having sex to consider it. $activeSlave.slaveName speaks first.
+ You tell them they make a cute couple. The slaves start with surprise, since they didn't know you were watching, producing a delightful jiggle of smashed-together boob. "Thank you, <<= WrittenMaster()>>," they chorus correctly, before turning back to look at each other. They take your comment quite seriously, both of them seemingly forgetting that they're in the middle of having sex to consider it. $activeSlave.slaveName speaks first.
"I gue<<ss>> I never really thought about you that way,"
$he says to the huge-boobed <<if $subSlave.physicalAge > 30>>_woman2<<elseif $subSlave.physicalAge > 18>>_girl2<<elseif $subSlave.physicalAge > 12>>teen<<else>>_loli2<</if>> trapped beneath $him.
<br><br>
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index 78de5923e0d..e87346cad09 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -145,7 +145,7 @@
One unfortunate consequence of existing in a global world is that business opportunities continue to crop up unabated by the onset of night in one corner of the world or another, an inconsiderate phenomenon for arcology owners who happen to be asleep when an event of importance takes place outside the walls of their arcology. This particular evening you are awoken by an alert from $assistantName, unusually intense for this late hour.
<<if $assistant > 0>>
- "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, there is a time sensitive enslavement opportunity available if you're interested." She pauses before continuing. "You're going to want to see this one <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>."
+ "<<= WrittenMaster()>>, there is a time sensitive enslavement opportunity available if you're interested." She pauses before continuing. "You're going to want to see this one <<= WrittenMaster()>>."
<<else>>
It informs you that there is a time sensitive enslavement opportunity for you to peruse, and that it has calculated the potential rewards are worthy of your consideration even in the middle of the night.
<</if>>
diff --git a/src/uncategorized/assistantEvents.tw b/src/uncategorized/assistantEvents.tw
index 08b8c40dcbf..fc7ec50fb7d 100644
--- a/src/uncategorized/assistantEvents.tw
+++ b/src/uncategorized/assistantEvents.tw
@@ -1615,7 +1615,7 @@ __Personal Assistant and Market Assistant relationship styles:__
<<case "angel">>
"No." She shakes her head. "I will not." She wraps her arms around the quivering market assistant and hurriedly pulls her off screen.
<<case "cherub">>
- "Kay" She says, lazily reclining, "Do my chores!" The market assistant sighs and states the obvious, "I don't think that's what <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>> meant..."
+ "Kay" She says, lazily reclining, "Do my chores!" The market assistant sighs and states the obvious, "I don't think that's what <<= WrittenMaster()>> meant..."
<<case "incubus">>
You add that she is also a virgin. "Really? I can't wait. Virgins always have so much pent up energy." $assistantName says, licking her lips and stroking her shaft, before turning to the quivering girl. She rushes her, ripping her clothes off and forcing her to the ground. Prodding at her tightly clamped mouth with her massive hard-on, $assistantName shouts "You might as well accept it; it's going into you one way or another. I figured I'd be kind and let you lube me up before I broke your pussy into my new cock sleeve." The market assistant gingerly opens up. In response, $assistantName forces it down her throat. "Never said I'd be gentle!"
<<case "succubus">>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index 78f45680162..c264c2355f3 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -303,7 +303,7 @@
<<case "sacrilege" "sacrament">>
$He stares, $his mouth working as $he reads the ring of Aramaic around $his hole. $He doesn't understand it, but $he's not happy about having stuff permanently inscribed around $his ass.
<<case "degradation">>
- $He stares, $his mouth working as $he spells out '<<if $PC.title == 1>>Master<<else>>Mistress<</if>> Made Me An Anal Slut.' $His face darkens. "No I'm not," $he bursts out. That remains to be seen.
+ $He stares, $his mouth working as $he spells out '<<= WrittenMaster()>> Made Me An Anal Slut.' $His face darkens. "No I'm not," $he bursts out. That remains to be seen.
<<case "counting">>
$He stares, realizing that the markings denote how many times $he's been sodomized. $His face darkens. "I <<s>>ee there'<<s>> room for more," $he bursts out. "Fucking gro<<ss>>."
<<case "bovine patterns">>
@@ -311,7 +311,7 @@
<<case "possessive">>
$He stares, realizing that the ring of numbers around $his anus give the date $he was enslaved by you. $His face darkens. "Wor<<s>>t day of my life," $he bursts out.
<<case "paternalist">>
- $He stares, $his mouth working as $he spells out '<<if $PC.title == 1>>Master<<else>>Mistress<</if>> Helped Me Love Anal.' "I don't," $he bursts out. "It'<<s>> fucking gro<<ss>>."
+ $He stares, $his mouth working as $he spells out '<<= WrittenMaster()>> Helped Me Love Anal.' "I don't," $he bursts out. "It'<<s>> fucking gro<<ss>>."
<</switch>>
<</if>>
<</if>>
diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw
index 34c22029ac5..a65e96ea7c6 100644
--- a/src/uncategorized/masterSuite.tw
+++ b/src/uncategorized/masterSuite.tw
@@ -65,11 +65,11 @@ $masterSuiteNameCaps is furnished
<<case "Roman Revivalist">>
as a Roman emperor's apartment. There is a small shrine to the old gods the <<if $PC.title == 1>>master<<else>>mistress<</if>> favors in a side room, and the flooring is erotic mosaic. Pride of place is given to a set of low couches placed together, capable of accommodating many nude bodies.
<<case "Aztec Revivalist">>
- as an Aztec cultural, spiritual and military leader of the city you're allowed great leniency. The <<if $PC.title == 1>>Master<<else>>Mistress<</if>>'s room is created to gratify you as a true god of the people.
+ as an Aztec cultural, spiritual and military leader of the city you're allowed great leniency. The <<= WrittenMaster()>>'s room is created to gratify you as a true god of the people.
<<case "Egyptian Revivalist">>
- after the royal room of an ancient Egyptian palace. There is a small shrine to the old gods the <<if $PC.title == 1>>master<<else>>mistress<</if>> favors in a side room, and linen hangings decorate the walls and ceiling. An imposing bed of sandalwood occupies the center of the room.
+ after the royal room of an ancient Egyptian palace. There is a small shrine to the old gods the <<= WrittenMaster()>> favors in a side room, and linen hangings decorate the walls and ceiling. An imposing bed of sandalwood occupies the center of the room.
<<case "Edo Revivalist">>
- in the Spartan style of an Edo period castle's innermost rooms. Rice paper screens partition off many small cubicles around its large central space. There, around a low bed, there are many mats for servants to kneel around their <<if $PC.title == 1>>master<<else>>mistress<</if>>.
+ in the Spartan style of an Edo period castle's innermost rooms. Rice paper screens partition off many small cubicles around its large central space. There, around a low bed, there are many mats for servants to kneel around their <<= WrittenMaster()>>.
<<case "Arabian Revivalist">>
as a beguiling haze of Arabian decadence. There is a great gilded bed in the center of the space, piled with silk pillows for naked bodies to recline on. Gauzy curtains flutter in the warm, heady breeze.
<<case "Chinese Revivalist">>
diff --git a/src/uncategorized/pBombing.tw b/src/uncategorized/pBombing.tw
index d89dae96cc9..084830e7f21 100644
--- a/src/uncategorized/pBombing.tw
+++ b/src/uncategorized/pBombing.tw
@@ -79,4 +79,4 @@ The implant is small, and went off too far ahead to do anything more than stun.
<<set $gameover = "bombing">><<goto "Gameover">>
<</if>>
-Hours later, you receive another message from the Daughters of Liberty. This one is even briefer than the first. "Next time, '<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>,'" it reads.
+Hours later, you receive another message from the Daughters of Liberty. This one is even briefer than the first. "Next time, '<<= WrittenMaster()>>,'" it reads.
diff --git a/src/uncategorized/pSnatchAndGrabResult.tw b/src/uncategorized/pSnatchAndGrabResult.tw
index 922509ec8b4..88ea9ebab58 100644
--- a/src/uncategorized/pSnatchAndGrabResult.tw
+++ b/src/uncategorized/pSnatchAndGrabResult.tw
@@ -130,9 +130,9 @@
In the middle of the night, there is a polite knock on your penthouse door. You are alerted by $assistantName, who observes with some irritation that the mercenary who knocked has gone, has left a large case outside the door, and has satisfied the security systems that the case contains nothing hazardous.
-The case prompts you for a handprint code; your hand works just fine. It contains a naked, hairless, perfectly healthy young body in the fetal position. This person awakes as the case opens, looks you confidently in the eye, and says "Are you my <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>?"
+The case prompts you for a handprint code; your hand works just fine. It contains a naked, hairless, perfectly healthy young body in the fetal position. This person awakes as the case opens, looks you confidently in the eye, and says "Are you my <<= WrittenMaster()>>?"
-When you state that, apparently, you are, she climbs out of the case, prostrates herself in the hall before you, and says reverentially into the floor, "I love you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>."
+When you state that, apparently, you are, she climbs out of the case, prostrates herself in the hall before you, and says reverentially into the floor, "I love you, <<= WrittenMaster()>>."
<br><br>
<<set $saleDescription = 0, $applyLaw = 0>><<include "Long Slave Description">>
diff --git a/src/uncategorized/peLonelyBodyguard.tw b/src/uncategorized/peLonelyBodyguard.tw
index da31d02d236..b46654c484e 100644
--- a/src/uncategorized/peLonelyBodyguard.tw
+++ b/src/uncategorized/peLonelyBodyguard.tw
@@ -16,7 +16,7 @@ You take an unusually close interest in $activeSlave.slaveName's health and ment
<br><br>
-On a whim, you ask her whether she feels lonely. Caught off guard, she <<if !canTalk($activeSlave)>>says in hesitant gestures that she's all right, and that her <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>'s companionship is enough for her.<<else>><<say>>s hesitantly "I'm all right, <<Master>>. I love being near you; that'<<s>> enough for me."<</if>> The slight hesitation is explained the next time $slaves[$j].slaveName comes to your office. $activeSlave.slaveName watches everyone who sees you, of course, but you catch her eye running appreciatively up and down $slaves[$j].slaveName's body as she leaves.
+On a whim, you ask her whether she feels lonely. Caught off guard, she <<if !canTalk($activeSlave)>>says in hesitant gestures that she's all right, and that her <<= WrittenMaster()>>'s companionship is enough for her.<<else>><<say>>s hesitantly "I'm all right, <<Master>>. I love being near you; that'<<s>> enough for me."<</if>> The slight hesitation is explained the next time $slaves[$j].slaveName comes to your office. $activeSlave.slaveName watches everyone who sees you, of course, but you catch her eye running appreciatively up and down $slaves[$j].slaveName's body as she leaves.
<br><br>
diff --git a/src/uncategorized/ptWorkaround.tw b/src/uncategorized/ptWorkaround.tw
index 326390d1829..629b3d95e17 100644
--- a/src/uncategorized/ptWorkaround.tw
+++ b/src/uncategorized/ptWorkaround.tw
@@ -512,7 +512,7 @@
$activeSlave.slaveName seems to think she's better than everyone else. Naturally, as her owner you have the means to correct this sad misapprehension. As you train her during the week, you ensure that she submits to anyone and everyone. She is rarely permitted to enjoy sex under your tutelage, but is instead required to use her mouth and hands to get others off. She cleans, washes, and serves.
<<set $activeSlave.oralCount += 10, $oralTotal += 10>>
<<elseif ($activeSlave.behavioralFlaw == "bitchy")>>
- $activeSlave.slaveName always has a cutting remark ready. The more obedient she's feeling, the more she directs them at people other than her <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, but it's still a serious problem. When you train her this week, you keep a sharp ear on her. Whenever she bitches out, you require her to promptly offer the target of her pissiness the use of her mouth. She'll either shut her mouth or have it roughly filled.
+ $activeSlave.slaveName always has a cutting remark ready. The more obedient she's feeling, the more she directs them at people other than her <<= WrittenMaster()>>, but it's still a serious problem. When you train her this week, you keep a sharp ear on her. Whenever she bitches out, you require her to promptly offer the target of her pissiness the use of her mouth. She'll either shut her mouth or have it roughly filled.
<<set $activeSlave.oralCount += 10, $oralTotal += 10>>
<<elseif ($activeSlave.behavioralFlaw == "odd")>>
$activeSlave.slaveName is odd. She behaves strangely, speaking randomly at times and doing things for no apparent reason. In earlier times this might have been considered 'adorable' or 'unique,' but in a slave it's just annoying. You punish her severely whenever she fails to do or say the right thing for the right reasons.
diff --git a/src/uncategorized/reAWOL.tw b/src/uncategorized/reAWOL.tw
index eaf81637dc2..ba3277c9f20 100644
--- a/src/uncategorized/reAWOL.tw
+++ b/src/uncategorized/reAWOL.tw
@@ -47,7 +47,7 @@ Human soldiers are superior to drones in a number of ways - they have the capabi
On this particular evening, you find your work interrupted by an urgent alert from $assistantName.
<<if $assistant > 0>>
- "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, one of the $mercenariesTitle has gone AWOL." She pauses before continuing. "$He's taken a number of weapons with $him."
+ "<<= WrittenMaster()>>, one of the $mercenariesTitle has gone AWOL." She pauses before continuing. "$He's taken a number of weapons with $him."
<<else>>
It informs you that one of the $mercenariesTitle has disappeared, seemingly taking with $him a small stash of weapons.
<</if>>
diff --git a/src/uncategorized/reBusyMasterSuite.tw b/src/uncategorized/reBusyMasterSuite.tw
index 737867a2eb7..23990730ffc 100644
--- a/src/uncategorized/reBusyMasterSuite.tw
+++ b/src/uncategorized/reBusyMasterSuite.tw
@@ -213,7 +213,7 @@ who has paused $his thrusting to issue a peremptory order to the slaves to stay
<<else>>
trim
<</if>>
- ass down near the foot of the bed. You climax, on occasion, but are enjoying yourself so immensely that you let the slaves continue the rotation until you're entirely spent, and they're entirely exhausted. You reach for a tablet to get some work done, in the center of a pile of sweaty, tired girls, all of whom are resting with at least one body part in contact with their @@.hotpink;beloved@@ <<if $PC.title == 1>>master<<else>>mistress<</if>>.
+ ass down near the foot of the bed. You climax, on occasion, but are enjoying yourself so immensely that you let the slaves continue the rotation until you're entirely spent, and they're entirely exhausted. You reach for a tablet to get some work done, in the center of a pile of sweaty, tired girls, all of whom are resting with at least one body part in contact with their @@.hotpink;beloved@@ <<= WrittenMaster()>>.
<<for _reBMS = 0; _reBMS < $slaves.length; _reBMS++>>
<<if $slaves[_reBMS].ID == $Concubine.ID>>
<<set $slaves[_reBMS].trust += 5, $slaves[_reBMS].oralCount++, $oralTotal++, $slaves[_reBMS].penetrativeCount++, $penetrativeTotal++>>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index 1cd533f3d54..01bae264bc4 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -1379,9 +1379,9 @@ The call comes in from an office, and you suppress the urge to check whether $as
<<case "Degradationist Two">>
When $he arrives as part of the anonymous slave transfers that make up a good part of the inter-arcology commerce, $he has clearly had some time to mull over $his situation. As soon as $he sees you, $he glares deep into your eyes and addresses you directly, "Those fuckers threw everything they could at me, you can't break me. No one can."
<<case "Body Purist">>
- When $he arrives, it's obvious that $he isn't particularly happy with the situation, but there is some evident relief to $him. When asked about it, $he says, "I really hate the idea of surgery, especially implant surgery, M-<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>. Just - the idea of having fake shit in here -" $he rubs $his chest a little "- ugh." $He laughs bitterly at $himself, and then rubs $his chest again, looking at you with mixed fear and invitation.
+ When $he arrives, it's obvious that $he isn't particularly happy with the situation, but there is some evident relief to $him. When asked about it, $he says, "I really hate the idea of surgery, especially implant surgery, <<= WrittenMaster()>>. Just - the idea of having fake shit in here -" $he rubs $his chest a little "- ugh." $He laughs bitterly at $himself, and then rubs $his chest again, looking at you with mixed fear and invitation.
<<case "Body Purist Two">>
- When $he arrives, it's obvious that $he's fairly happy. After all, the slave school trained $him for this. When asked about it, $he says, "Some of the girls who graduated before me were given implants, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>. Just - the idea of having fake shit in here -" $he rubs $his chest a little "- ugh. I'm glad you're not into that" $He laughs bitterly at $himself, and then rubs $his chest again, looking at you with mixed fear and invitation.
+ When $he arrives, it's obvious that $he's fairly happy. After all, the slave school trained $him for this. When asked about it, $he says, "Some of the girls who graduated before me were given implants, <<= WrittenMaster()>>. Just - the idea of having fake shit in here -" $he rubs $his chest a little "- ugh. I'm glad you're not into that" $He laughs bitterly at $himself, and then rubs $his chest again, looking at you with mixed fear and invitation.
<<case "Transformation Fetishist">>
$He arrives with various medical devices still attached to $him, wrapped up in supportive hospital clothing. Despite this, it's obvious that you've made a good decision. The new tits that got $him into this situation are so cartoonish that some of the medical tubing has been hastily routed between them. After a few weeks on curatives and a few more in training, $he'll be ready to bounce those fake boobs up and down as $he takes dick.
<<case "Transformation Fetishist Two">>
@@ -1471,7 +1471,7 @@ The call comes in from an office, and you suppress the urge to check whether $as
<<case "Body Purist">>
When $he arrives, it's obvious that $he isn't particularly happy with the situation, but there is some evident relief to $him. It vanishes when a purchaser's agent arrives to take $him away. $He looks at you desperately, begging to know who's purchased $him. You tell $him truthfully that a wealthy citizen one arcology over bought $him as a house slave; you neglect to mention that he likes big tits, and he isn't particular about whether they're natural.
<<case "Body Purist Two">>
- When $he arrives, it's obvious that $he's fairly happy. After all, the slave school trained $him for this. When asked about it, $he says, "Some of the girls who graduated before me were given implants, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>. Just - the idea of having fake shit in here -" $he rubs $his chest a little "- ugh. I'm glad you're not into that" $He laughs bitterly at $himself, and then rubs $his chest again, looking at you with mixed fear and invitation. $His playfulness vanishes when a purchaser's agent arrives to take $him away. $He looks at you desperately, begging to know who's purchased $him. You tell $him truthfully that a wealthy citizen one arcology over bought $him as a house slave; you neglect to mention that he likes big tits, and he isn't particular about whether they're natural.
+ When $he arrives, it's obvious that $he's fairly happy. After all, the slave school trained $him for this. When asked about it, $he says, "Some of the girls who graduated before me were given implants, <<= WrittenMaster()>>. Just - the idea of having fake shit in here -" $he rubs $his chest a little "- ugh. I'm glad you're not into that" $He laughs bitterly at $himself, and then rubs $his chest again, looking at you with mixed fear and invitation. $His playfulness vanishes when a purchaser's agent arrives to take $him away. $He looks at you desperately, begging to know who's purchased $him. You tell $him truthfully that a wealthy citizen one arcology over bought $him as a house slave; you neglect to mention that he likes big tits, and he isn't particular about whether they're natural.
<<case "Transformation Fetishist">>
The only downside to $his condition is that reselling $him is utterly anticlimactic. A purchaser's agent arrives and takes charge of $him, transferring $him to a medical transport bed. He takes $him away, and it's done.
<<case "Transformation Fetishist Two">>
diff --git a/src/uncategorized/reMilfTourist.tw b/src/uncategorized/reMilfTourist.tw
index 6524956b007..194dc3813c4 100644
--- a/src/uncategorized/reMilfTourist.tw
+++ b/src/uncategorized/reMilfTourist.tw
@@ -42,7 +42,7 @@
<<else>>
$assistantAppearance avatar
<</if>>
- appears on your desk in the middle of the day. "Something unusual for you, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>," she says. "_milfSlave.slaveName is out doing public service. A tourist from the old world accosted $him. _milfSlave.slaveName thought _he2 was a rich citizen who wanted to fuck $him, but it turns out _he2 just wanted a tour guide. It was a reasonable mistake; _he2 seems wealthy. _milfSlave.slaveName has been showing _him2 around for the last half hour. Now _he2's asked _milfSlave.slaveName if _he2 can meet you." She displays a video feed showing _milfSlave.slaveName standing with the tourist in question out on the main plaza. _He2's just into middle age, and extremely plush, wearing Capri pants over _his2 motherly hips and a cashmere sweater that understates _his2 generous bust. _He2's blushing as _he2 asks _milfSlave.slaveName a discreet question about public sex in the arcology, brought on by the sight of a couple of citizens spit roasting a slave. Your personal assistant's avatar
+ appears on your desk in the middle of the day. "Something unusual for you, <<= properTitle()>>," she says. "_milfSlave.slaveName is out doing public service. A tourist from the old world accosted $him. _milfSlave.slaveName thought _he2 was a rich citizen who wanted to fuck $him, but it turns out _he2 just wanted a tour guide. It was a reasonable mistake; _he2 seems wealthy. _milfSlave.slaveName has been showing _him2 around for the last half hour. Now _he2's asked _milfSlave.slaveName if _he2 can meet you." She displays a video feed showing _milfSlave.slaveName standing with the tourist in question out on the main plaza. _He2's just into middle age, and extremely plush, wearing Capri pants over _his2 motherly hips and a cashmere sweater that understates _his2 generous bust. _He2's blushing as _he2 asks _milfSlave.slaveName a discreet question about public sex in the arcology, brought on by the sight of a couple of citizens spit roasting a slave. Your personal assistant's avatar
<<switch $assistantAppearance>>
<<case "monstergirl">>
bares her fangs and makes pinching gestures at nipple height.
@@ -78,7 +78,7 @@
reforms into an exaggerated female form before going back to its normal symbol shape.
<</switch>>
<<else>>
- <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> gets your attention the middle of the day. "A minor matter for you, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>," she says. "_milfSlave.slaveName is currently performing public service. A tourist from the old world accosted $him. _milfSlave.slaveName thought _he2 was a rich citizen who wanted to have sex with $him, but it seems _he2 just wanted a tour guide. It was a reasonable mistake; the tourist appears wealthy. _milfSlave.slaveName has been acting as _his2 guide for the last half hour. The tourist has asked _milfSlave.slaveName if _he2 can meet you." She displays a video feed showing _milfSlave.slaveName standing with the tourist in question out on the main plaza. _He2's just into middle age, and extremely plush, wearing Capri pants over _his2 motherly hips and a cashmere sweater that understates _his2 generous bust. _He2's blushing as _he2 asks _milfSlave.slaveName a discreet question about public sex in the arcology, brought on by the sight of a couple of citizens spit roasting a slave.
+ <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> gets your attention the middle of the day. "A minor matter for you, <<= properTitle()>>," she says. "_milfSlave.slaveName is currently performing public service. A tourist from the old world accosted $him. _milfSlave.slaveName thought _he2 was a rich citizen who wanted to have sex with $him, but it seems _he2 just wanted a tour guide. It was a reasonable mistake; the tourist appears wealthy. _milfSlave.slaveName has been acting as _his2 guide for the last half hour. The tourist has asked _milfSlave.slaveName if _he2 can meet you." She displays a video feed showing _milfSlave.slaveName standing with the tourist in question out on the main plaza. _He2's just into middle age, and extremely plush, wearing Capri pants over _his2 motherly hips and a cashmere sweater that understates _his2 generous bust. _He2's blushing as _he2 asks _milfSlave.slaveName a discreet question about public sex in the arcology, brought on by the sight of a couple of citizens spit roasting a slave.
<</if>>
<br><br>
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index 7ded12dd414..d4311a3050b 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -817,7 +817,7 @@
<<case "implants">>
<<set $nickname = either("'Balloons'", "'Blowup Doll'", "'Bolted-On'", "'Enhanced'", "'Fake'", "'Implants'", "'Plastic'", "'Plastique'", "'Silicone'")>>
<<set $situationDesc = "is full of breast implants. They're so large it's quite obvious they're fake, and the implications are clear: $He's a plastic slut, and the other slaves never tire of letting $him know it.">>
- <<set $applyDesc = "accepts the implicit mockery, knowing that $his bimbo-esque body is what appeals to <<if def $PC.customTitle>>$his $PC.customTitle<<elseif $PC.title != 0>>$his master<<else>>$his mistress<</if>>.">>
+ <<set $applyDesc = "accepts the implicit mockery, knowing that $his bimbo-esque body is what appeals to $his <<= WrittenMaster()>>.">>
<<set $notApplyDesc = "is relieved to be protected from the other slaves' mockery over $his implants, though $he's also a little sad $he can't take them as a kind of trademark.">>
<<case "bimbo">>
diff --git a/src/uncategorized/rePokerNight.tw b/src/uncategorized/rePokerNight.tw
index 8c19c6e1d78..64487a91bd3 100644
--- a/src/uncategorized/rePokerNight.tw
+++ b/src/uncategorized/rePokerNight.tw
@@ -8,7 +8,7 @@ Despite their persistent presence in your arcology, interaction with your mercen
On a particularly lackadaisical evening, you find yourself alerted to a message alert by $assistantName.
<<if $assistant > 0>>
- "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, a message from your $mercenariesTitle." She pauses before continuing. "It seems they're asking if you'd like to join their poker night."
+ "<<= WrittenMaster()>>, a message from your $mercenariesTitle." She pauses before continuing. "It seems they're asking if you'd like to join their poker night."
<<else>>
It informs you that the $mercenariesTitle have sent a message asking you to join them at their poker night.
<</if>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 5095db749a9..2a5ab87c238 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -2558,9 +2558,9 @@ He explains that one of his servant <<= $girl>>s was impregnated by his fool of
<<case "rogue cyborg">>
With your order received the target quickly seeks you out. After a huge sum of credits changes hands to render it penthouse safe, the legalities and biometric scanning are complete and you are now the proud owner of a cyberloli.
<<case "female recruit">>
- You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName bounces nervously on $his heels. Finally $he works up $his courage and asks, <<if $HeadGirl.clothes != "no clothing">>"Can I have <<if $HeadGirl.clothes == "choosing her own clothes">>a cute outfit<<else>>$HeadGirl.clothes<</if>> like $HeadGirl.slaveName?"<<else>>"Can I work with $HeadGirl.slaveName?"<</if>> Your sternly tell $him to call you <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, to ask questions only with permission, and to strip. $He looks at $HeadGirl.slaveName, but $HeadGirl.slaveName returns $his look with no compassion at all and tells $him to do what you say. Looking suddenly fearful, $activeSlave.slaveName strips. Once your inspection of $his body reaches $his anus, $he becomes suddenly nervous. "A-am I going to have t-to do butt stuff, <<Master>>?"
+ You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName bounces nervously on $his heels. Finally $he works up $his courage and asks, <<if $HeadGirl.clothes != "no clothing">>"Can I have <<if $HeadGirl.clothes == "choosing her own clothes">>a cute outfit<<else>>$HeadGirl.clothes<</if>> like $HeadGirl.slaveName?"<<else>>"Can I work with $HeadGirl.slaveName?"<</if>> Your sternly tell $him to call you <<= WrittenMaster()>>, to ask questions only with permission, and to strip. $He looks at $HeadGirl.slaveName, but $HeadGirl.slaveName returns $his look with no compassion at all and tells $him to do what you say. Looking suddenly fearful, $activeSlave.slaveName strips. Once your inspection of $his body reaches $his anus, $he becomes suddenly nervous. "A-am I going to have t-to do butt stuff, <<Master>>?"
<<case "male recruit">>
- You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName bounces nervously on $his heels. Finally $he works up $his courage and asks, <<if $HeadGirl.clothes != "no clothing">>"Can I have <<if $HeadGirl.clothes == "choosing her own clothes">>a cute outfit<<else>>$HeadGirl.clothes<</if>> like $HeadGirl.slaveName?"<<else>>"Can I work with $HeadGirl.slaveName?"<</if>> Your sternly tell $him to call you <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, to ask questions only with permission, and to strip. $He looks at $HeadGirl.slaveName, but $HeadGirl.slaveName returns $his look with no compassion at all and tells $him to do what you say. Looking suddenly fearful, $activeSlave.slaveName strips. $His cock is totally flaccid as $he looks at the floor, shivering. Once your inspection of $his body reaches $his anus, $he becomes suddenly nervous. "A-am I going to have t-to do butt stuff, <<Master>>?"
+ You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName bounces nervously on $his heels. Finally $he works up $his courage and asks, <<if $HeadGirl.clothes != "no clothing">>"Can I have <<if $HeadGirl.clothes == "choosing her own clothes">>a cute outfit<<else>>$HeadGirl.clothes<</if>> like $HeadGirl.slaveName?"<<else>>"Can I work with $HeadGirl.slaveName?"<</if>> Your sternly tell $him to call you <<= WrittenMaster()>>, to ask questions only with permission, and to strip. $He looks at $HeadGirl.slaveName, but $HeadGirl.slaveName returns $his look with no compassion at all and tells $him to do what you say. Looking suddenly fearful, $activeSlave.slaveName strips. $His cock is totally flaccid as $he looks at the floor, shivering. Once your inspection of $his body reaches $his anus, $he becomes suddenly nervous. "A-am I going to have t-to do butt stuff, <<Master>>?"
<<case "whore recruit">>
You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName participates matter-of-factly, and there's a certain sense of relief about $him. $His fate is out of $his hands now, and you get the impression $he isn't sorry about that at all.
<<case "desperate birth">>
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index 1d9707c32b9..11c888f1da3 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -1514,7 +1514,7 @@ Your Head Girl comes to see you. She flags a slave posted for sale on your desk.
<br><br>
-"It won't show on the desk yet, but rumor is the little cunt's gotten them both in bad debt, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>. You could grab them both cheap."
+"It won't show on the desk yet, but rumor is the little cunt's gotten them both in bad debt, <<= WrittenMaster()>>. You could grab them both cheap."
<br><br>
diff --git a/src/uncategorized/resSale.tw b/src/uncategorized/resSale.tw
index 436e002489c..f5c5c6c29c0 100644
--- a/src/uncategorized/resSale.tw
+++ b/src/uncategorized/resSale.tw
@@ -41,29 +41,29 @@ You receive a personal call from
the Futanari Sisters, an enigmatic group of transformation enthusiasts that sells beautiful hermaphrodites.
<</if>>
<<if $RESSale == "TCR">>
- It's from a farmhand, not leadership, and they are offering a cow for sale. Before you can hang up on him and reprimand $assistantName for allowing this Free Cities version of telemarketing to get through to you, the man hurriedly says, "<<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>, She's half off!"
+ It's from a farmhand, not leadership, and they are offering a cow for sale. Before you can hang up on him and reprimand $assistantName for allowing this Free Cities version of telemarketing to get through to you, the man hurriedly says, "<<= properTitle()>>, She's half off!"
<br><br>
- You pause for a moment, and he plunges on: "<<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>, @@.yellow;your first cow purchase from us this week is half price.@@ And, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>, this milky beauty is up for grabs. Keep her by your desk for fresh squeezed milk, knock on wood and she'll suck you right off, grab her by the hips and she'll take anything in her rear; she's plenty of fun! Come on down and get yourself a young, affectionate little cowgirl!"
+ You pause for a moment, and he plunges on: "<<= properTitle()>>, @@.yellow;your first cow purchase from us this week is half price.@@ And, <<= properTitle()>>, this milky beauty is up for grabs. Keep her by your desk for fresh squeezed milk, knock on wood and she'll suck you right off, grab her by the hips and she'll take anything in her rear; she's plenty of fun! Come on down and get yourself a young, affectionate little cowgirl!"
<<else>>
-It's from a piece of merchandise, not leadership, and she's offering herself for sale. Before you can hang up on her and reprimand $assistantName for allowing this Free Cities version of telemarketing to get through to you, the slave hurriedly says, "<<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>, I'm half off!"
+It's from a piece of merchandise, not leadership, and she's offering herself for sale. Before you can hang up on her and reprimand $assistantName for allowing this Free Cities version of telemarketing to get through to you, the slave hurriedly says, "<<= properTitle()>>, I'm half off!"
<br><br>
-You pause for a moment, and she plunges on: "<<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>, @@.yellow;your first slave purchase from us this week is half price.@@ And, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>, I'm one of the slaves for sale.
+You pause for a moment, and she plunges on: "<<= properTitle()>>, @@.yellow;your first slave purchase from us this week is half price.@@ And, <<= properTitle()>>, I'm one of the slaves for sale.
<<if $RESSale == "TSS">>
- I've got the very best skills I could learn as a virgin. I'm healthy, obedient, and educated. And I'm fresh, and willing, and really eager." She rips her white schoolgirl blouse open to show off a fresh pair of tits, and shakes them for you. "I would love to be your sex slave, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>," she says, doing her very best to sound appealing, like she's been trained.
+ I've got the very best skills I could learn as a virgin. I'm healthy, obedient, and educated. And I'm fresh, and willing, and really eager." She rips her white schoolgirl blouse open to show off a fresh pair of tits, and shakes them for you. "I would love to be your sex slave, <<= properTitle()>>," she says, doing her very best to sound appealing, like she's been trained.
<<elseif $RESSale == "GRI">>
- I've, uh, been trained to obey." Her eyes flick to one side, like she's reading her cues. "And um I have really big boobs." She's wearing a bathrobe, and she suddenly jerks it open to reveal a bigger pair of breasts than anyone that age could possibly have grown herself. "I would love to be your sex slave, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>," she says, doing her very best to sound appealing. No doubt she'd prefer not to be part of any more testing.
+ I've, uh, been trained to obey." Her eyes flick to one side, like she's reading her cues. "And um I have really big boobs." She's wearing a bathrobe, and she suddenly jerks it open to reveal a bigger pair of breasts than anyone that age could possibly have grown herself. "I would love to be your sex slave, <<= properTitle()>>," she says, doing her very best to sound appealing. No doubt she'd prefer not to be part of any more testing.
<<elseif $RESSale == "SCP">>
- I'm ready to be the perfect bimbo slave, and the young surgeon who did my implants was very skilled." She's wearing a bikini, and she pulls it down to flash you, revealing that her tits resist gravity almost perfectly. They're gorgeous, but quite fake. "I would love to be your sex slave, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>," she says, doing her very best to sound appealing, like she's been trained.
+ I'm ready to be the perfect bimbo slave, and the young surgeon who did my implants was very skilled." She's wearing a bikini, and she pulls it down to flash you, revealing that her tits resist gravity almost perfectly. They're gorgeous, but quite fake. "I would love to be your sex slave, <<= properTitle()>>," she says, doing her very best to sound appealing, like she's been trained.
<<elseif $RESSale == "LDE">>
- I've been trained to need cock up my ass." She's nude, and spins around to point her ass at the camera. She begins to wink her big butthole, her tiny, soft cock dangling limply below it. She cranes her head around to continue. "I can come from nothing but buttsex," she says proudly. "I would love to be your anal slut, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>," she says, sounding very eager to begin.
+ I've been trained to need cock up my ass." She's nude, and spins around to point her ass at the camera. She begins to wink her big butthole, her tiny, soft cock dangling limply below it. She cranes her head around to continue. "I can come from nothing but buttsex," she says proudly. "I would love to be your anal slut, <<= properTitle()>>," she says, sounding very eager to begin.
<<elseif $RESSale == "TGA">>
- My tutelage has been long and hard, and I'm very eager to begin my life as a slave." She's nude, and stands up to reveal her hardon. She spins for the camera, showing herself off. "I can help protect you, too: I'm proficient in unarmed combat, and I have weapons training. I would love to be your bitch, or your bodyguard, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>," she says, doing her very best to sound appealing, like she's been told.
+ My tutelage has been long and hard, and I'm very eager to begin my life as a slave." She's nude, and stands up to reveal her hardon. She spins for the camera, showing herself off. "I can help protect you, too: I'm proficient in unarmed combat, and I have weapons training. I would love to be your bitch, or your bodyguard, <<= properTitle()>>," she says, doing her very best to sound appealing, like she's been told.
<<elseif $RESSale == "HA">>
I am ready to serve you in any way you deem fit and do everything I can to protect your life." She's wearing a delicate maid uniform, beautifully contrasting her powerful physique and towering stature. "The academy has given me the opportunity to learn many valuable skills and I look forward put them at your service."
<<else>>
- The time has come for me to serve my Sisters by leaving my community and becoming a slave. Our sex skills are unparalleled," she says proudly. She's nude, and reclines luxuriantly for the camera, showing her remarkable body off in all its gorgeous strangeness. Her boobs are huge, her dick is hard, her pussy is wet, and her ass is relaxed. "I love to fuck, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>," she says, and you believe her.
+ The time has come for me to serve my Sisters by leaving my community and becoming a slave. Our sex skills are unparalleled," she says proudly. She's nude, and reclines luxuriantly for the camera, showing her remarkable body off in all its gorgeous strangeness. Her boobs are huge, her dick is hard, her pussy is wet, and her ass is relaxed. "I love to fuck, <<= properTitle()>>," she says, and you believe her.
<<if ($PC.dick == 1) && ($PC.vagina == 1)>>
<br><br>
<<if ($PC.boobs == 1)>>
@@ -79,7 +79,7 @@ You pause for a moment, and she plunges on: "<<if $PC.title == 1>>Sir<<else>>Ma'
<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>>'s $assistantAppearance avatar appears on the screen next to the video call.
<<if $assistant == 0>>
- "I have stored the confirmation code, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>," it notes. "If you wish to take advantage of this promotion, use the slave buying menu to navigate to the appropriate school next week. I have appended a note to that school's entry to remind you."
+ "I have stored the confirmation code, <<= properTitle()>>," it notes. "If you wish to take advantage of this promotion, use the slave buying menu to navigate to the appropriate school next week. I have appended a note to that school's entry to remind you."
<<else>>
<<if ($RESSale == "TSS") || ($RESSale == "SCP")>>
"And I would love to
@@ -321,5 +321,5 @@ You pause for a moment, and she plunges on: "<<if $PC.title == 1>>Sir<<else>>Ma'
"And I love to fuck futas!" she exclaims.
<</switch>>
<</if>>
- "Ahem. I have stored the confirmation code, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>," she notes. "If you wish to take advantage of this promotion, use the slave buying menu to navigate to the appropriate school next week. I have appended a note to that school's entry to remind you."
+ "Ahem. I have stored the confirmation code, <<= properTitle()>>," she notes. "If you wish to take advantage of this promotion, use the slave buying menu to navigate to the appropriate school next week. I have appended a note to that school's entry to remind you."
<</if>>
diff --git a/src/uncategorized/saBeYourHeadGirl.tw b/src/uncategorized/saBeYourHeadGirl.tw
index a05a1b77d05..563f84d9c01 100644
--- a/src/uncategorized/saBeYourHeadGirl.tw
+++ b/src/uncategorized/saBeYourHeadGirl.tw
@@ -119,7 +119,7 @@
<<if ($HGFormality == 0)>>
<<if ($slaves[$i].trust > 95)>>
- Every so often, when you're alone, she calls you <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>. She treats your permission to do this as a sacred thing, and @@.hotpink;loves you for it.@@
+ Every so often, when you're alone, she calls you <<= properTitle()>>. She treats your permission to do this as a sacred thing, and @@.hotpink;loves you for it.@@
<<set $slaves[$i].devotion += 1>>
<<else>>
Your permission to be informal in private @@.mediumorchid;confuses her@@ a little, since she isn't perfectly confident enough to be comfortable with the idea.
diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw
index 0589962ccc3..a2b4900da2f 100644
--- a/src/uncategorized/saRecruitGirls.tw
+++ b/src/uncategorized/saRecruitGirls.tw
@@ -1029,7 +1029,7 @@
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
<<if $masterSuiteDecoration == "Arabian Revivalist" && $masterSuiteUpgradeLuxury > 0 && $masterSuiteAverageEnergy > 60>>
<<if $masterSuiteSlaves >= 3>>
- An exposé that "pulls back the curtain" on your elaborate master bedroom goes viral after several harem slaves drag $him into <<if $masterSuiteUpgradeLuxury == 1>>four-way action with their <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>master<<else>>mistress<</if>><<else>>a fuck pit daisy chain<</if>> and another takes over the filming.
+ An exposé that "pulls back the curtain" on your elaborate master bedroom goes viral after several harem slaves drag $him into <<if $masterSuiteUpgradeLuxury == 1>>four-way action with their <<= WrittenMaster()>><<else>>a fuck pit daisy chain<</if>> and another takes over the filming.
<<else>>
$He makes a short video essay about your elaborate master suite, but the empty space unfilled by luscious slave bodies fails to impress.
<</if>>
diff --git a/src/uncategorized/schoolroom.tw b/src/uncategorized/schoolroom.tw
index cca4728b0f1..b2b7c2430be 100644
--- a/src/uncategorized/schoolroom.tw
+++ b/src/uncategorized/schoolroom.tw
@@ -9,7 +9,7 @@
$schoolroomNameCaps is well-equipped, with wallscreens to display lessons. These are currently
<<switch $schoolroomDecoration>>
<<case "Roman Revivalist">>
- showing the story of a famous Roman slave who sacrificed her life for the life of <<if def $PC.customTitle>>her $PC.customTitle<<elseif $PC.title != 0>>her master<<else>>her mistress<</if>>.
+ showing the story of a famous Roman slave who sacrificed her life for the life of her <<= WrittenMaster()>>.
<<case "Aztec Revivalist">>
showing the reenactment of a legendary story of a slave who ascended by offering her blood to the gods, and was granted eternal life.
<<case "Egyptian Revivalist">>
diff --git a/src/utility/descriptionWidgetsTattoos.tw b/src/utility/descriptionWidgetsTattoos.tw
index 386f0b61394..8d8588936de 100644
--- a/src/utility/descriptionWidgetsTattoos.tw
+++ b/src/utility/descriptionWidgetsTattoos.tw
@@ -206,7 +206,7 @@
<<elseif ($activeSlave.visualAge < 25)>>
'Please teach me how to suck cock' is tattooed on $his left arm, and 'Please teach me how to fuck' is tattooed on $his right.
<<else>>
- 'There are many sex slaves like me' is tattooed on $his left arm, and 'But <<if $PC.title == 1>>Master<<else>>Mistress<</if>> loves me' is tattooed on $his right.
+ 'There are many sex slaves like me' is tattooed on $his left arm, and 'But <<= WrittenMaster()>> loves me' is tattooed on $his right.
<</if>>
<</if>>
<<default>>
@@ -464,7 +464,7 @@
<<else>>
'Sex slave
<</if>>
- of <<if $PC.title == 1>>Master<<else>>Mistress<</if>> $PC.name.'
+ of <<= WrittenMaster()>> $PC.name.'
<<case "paternalist">>
$His abdomen is tattooed with a downward-pointing arrow which reads 'Let's come together.'
<<default>>
@@ -550,7 +550,7 @@
$He has a ring of text tattooed around $his anus which reads 'Sissy Slut's Sodomy Slit.'
<</if>>
<<case "degradation">>
- $His anus is bleached. It is tattooed with gothic script in a ring around $his hole, reading '<<if $PC.title == 1>>Master<<else>>Mistress<</if>> Made Me An Anal Slut.'
+ $His anus is bleached. It is tattooed with gothic script in a ring around $his hole, reading '<<= WrittenMaster()>> Made Me An Anal Slut.'
<<case "bovine patterns">>
$His anus is tattooed to mimic the puffy, dark appearance of a cow's.
<<case "sacrilege">>
@@ -560,7 +560,7 @@
<<case "possessive">>
$He has a ring of numbers around $his anus, detailing the date $he was enslaved by you.
<<case "paternalist">>
- $His anus is bleached. It is tattooed with text in a ring around $his hole, reading '<<if $PC.title == 1>>Master<<else>>Mistress<</if>> Helped Me Love Anal.'
+ $His anus is bleached. It is tattooed with text in a ring around $his hole, reading '<<= WrittenMaster()>> Helped Me Love Anal.'
<<default>>
$activeSlave.anusTat
<</switch>>
--
GitLab