From f0c20ae1e1c4f6de7ce7ea68dbcffffbb5e94ea1 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Thu, 3 Jan 2019 22:32:17 -0600
Subject: [PATCH] MoreWork
---
src/pregmod/theBlackMarket.tw | 2 +-
src/uncategorized/RESS.tw | 2 +-
src/uncategorized/bodyModification.tw | 4 +--
src/uncategorized/masterSuite.tw | 20 +++++++--------
src/uncategorized/newSlaveIntro.tw | 8 +++---
src/uncategorized/pSnatchAndGrabResult.tw | 4 +--
src/uncategorized/reSiblingRevenge.tw | 2 +-
src/uncategorized/resSale.tw | 30 +++++++++++------------
src/utility/descriptionWidgetsTattoos.tw | 8 +++---
9 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/src/pregmod/theBlackMarket.tw b/src/pregmod/theBlackMarket.tw
index 1ed49c1116e..5271a6a654a 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 <<if $PC.title == 1>>Master<<else>>Mistress<</if>>"
<</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/RESS.tw b/src/uncategorized/RESS.tw
index e4c6cba495b..d1694e9d5c0 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -18994,7 +18994,7 @@ You tell her kindly that you understand, and that $he'll be trained to address t
<<if $PC.dick == 1>>cock<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>cunt<</if>>
but you lay a hand on $his forehead and halt $him - $he'll do that last.
<<if $PC.boobs == 1 || $PC.title == 0>>
- Soon enough $he manages to lick all the way up from your feet to your breasts, cleansing your <<if $PC.belly >= 60000>>massively gravid <<elseif $PC.belly >= 5000>>motherly <</if>>body with $his wet tongue all the way. $He hesitates before teasingly laying a single lap on your nipples, so you take $his head and hold it against your breasts to enjoy $his skillful tongue on your nipples.<<if $PC.preg > 22>> $He even gets a special treat to savor, fresh from $his <<= WrittenMaster($activeSlave)>>'s milky breasts. $He makes sure your sore breasts are sufficiently relieved.<</if>>
+ Soon enough $he manages to lick all the way up from your feet to your breasts, cleansing your <<if $PC.belly >= 60000>>massively gravid <<elseif $PC.belly >= 5000>>motherly <</if>>body with $his wet tongue all the way. $He hesitates before teasingly laying a single lap on your nipples, so you take $his head and hold it against your breasts to enjoy $his skillful tongue on your nipples.<<if $PC.lactation > 0>> $He even gets a special treat to savor, fresh from $his <<= WrittenMaster($activeSlave)>>'s milky breasts. $He makes sure your sore breasts are sufficiently relieved.<</if>>
<<else>>
Soon enough $he manages to lick all the way up from your feet to your <<if $PC.belly >= 10000>>taut dome of a stomach<<elseif $PC.belly >= 5000>>pregnancy strained abs<<else>>abs<</if>>, pecs, and collarbone, cleansing your body with $his wet tongue all the way. $He lavishes particular attention on every nook and groove of your chiseled body, clearly eager to please $his muscular <<if $PC.belly >= 5000>>(and very pregnant) <</if>><<= WrittenMaster($activeSlave)>>.
<</if>>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index 1eedd614a7c..fbcb386c1b3 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -220,7 +220,7 @@
<<case "sacrament">>
$He stares, $his mouth working as $he reads the ring of Aramaic around $his hole. Getting it, $he smiles beatifically. "<<Master>>, I alway<<s>> knew butt<<s>>e<<x>> was a <<s>>acrament."
<<case "degradation">>
- $He stares, $his mouth working as $he spells out '<<if $PC.title == 1>>Master<<else>>Mistress<</if>> Made Me An Anal Slut.' $He smiles naughtily. "Oh <<Master>>, you did," $he <<say>>s gratefully. "And I love you for it."
+ $He stares, $his mouth working as $he spells out '<<= WrittenMaster($activeSlave)>> Made Me An Anal Slut.' $He smiles naughtily. "Oh <<Master>>, you did," $he <<say>>s gratefully. "And I love you for it."
<<case "counting">>
$He stares, realizing that the markings denote how many times $he's been sodomized. "<<Master>>, thank you, and, and, I hope I'll have to come back in here a lot," $he <<say>>s. "Um, becau<<s>>e I have to have that updated. Because I'm being fucked in the butt a lot," $he adds, wanting to be completely clear.
<<case "bovine patterns">>
@@ -228,7 +228,7 @@
<<case "possessive">>
$He stares, realizing that the ring of numbers around $his anus give the date $he was enslaved by you. "Be<<s>t place for that date, <<Master>>," $he <<say>>s. "Being a butt <<s>>lut i<<s>> my life now."
<<case "paternalist">>
- $He stares, $his mouth working as $he spells out '<<if $PC.title == 1>>Master<<else>>Mistress<</if>> Helped Me Love Anal.' "Oh <<Master>>, you did," $he coos. "You did! Thank you <<s>>o much for helping me become the anal <<s>>lut I wa<<s>> alway<<s>> meant to be!"
+ $He stares, $his mouth working as $he spells out '<<= WrittenMaster($activeSlave)>> Helped Me Love Anal.' "Oh <<Master>>, you did," $he coos. "You did! Thank you <<s>>o much for helping me become the anal <<s>>lut I wa<<s>> alway<<s>> meant to be!"
<</switch>>
<<elseif $activeSlave.devotion > 50>>
<<switch $activeSlave.anusTat>>
diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw
index 9c48895dd49..f3bc2b7da03 100644
--- a/src/uncategorized/masterSuite.tw
+++ b/src/uncategorized/masterSuite.tw
@@ -109,7 +109,7 @@ $masterSuiteNameCaps is furnished
<<case "Hedonistic">>
comfortably, with lots of lounges for a hefty slaves to relax on. <<if $arcologies[0].FSHedonisticDecadenceResearch == 1>>Platters of food and treats are readily available throughout the room and are<<else>>Slave food is readily available for your harem and platters of food for yourself are<</if>> never out of arm's reach. There's a huge, reinforced, low to the ground bed in the middle of the suite.
<<default>>
- in a refined, yet practical style. It's dominated by a huge bed in which many slaves could serve their <<if $PC.title == 1>>master<<else>>mistress<</if>> and then cuddle afterward.
+ in a refined, yet practical style. It's dominated by a huge bed in which many slaves could serve their <<= properTitle()>> and then cuddle afterward.
<</switch>>
It is full of luxuries of all kinds. The slaves here live free of want or worry, and have everything except their freedom. Their only duties are to please you and look after the suite and one another.
@@ -135,11 +135,11 @@ It is full of luxuries of all kinds. The slaves here live free of want or worry,
$masterSuiteNameCaps is furnished
<<switch $masterSuiteDecoration>>
<<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.
+ as a Roman emperor's apartment. There is a small shrine to the old gods the <<= properTitle()>> favors in a side room, and the flooring is erotic mosaic.
<<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 <<= properTitle()>>'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.
+ after the royal room of an ancient Egyptian palace. There is a small shrine to the old gods the <<= properTitle()>> favors in a side room, and linen hangings decorate the walls and ceiling.
<<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.
<<case "Arabian Revivalist">>
@@ -209,9 +209,9 @@ The true focus of the suite is, however, the fuckpit. This stepped depression in
<<if (_masterSuitePregnantSlaves > 2) && (_masterSuitePregnantSlavesMultiple < 2)>>
Many of the slaves are pregnant, and more than one has her face buried in the cunt directly below a gravid belly while she lovingly massages her own.<br>
<<elseif (_masterSuitePregnantSlaves > 2) && (_masterSuitePregnantSlavesMultiple > 2) && $masterSuiteHyperPregnancy == 1>>
- Many of the slaves are heavily pregnant with multiple children, and more than one has her face buried in the cunt directly below a massively overburdened belly while she lovingly massages her own distended squirming stomach.<br>
+ Many of the slaves are heavily pregnant with multiple children, and more than one has her face buried in the cunt directly below a massively overburdened belly while she lovingly massages her own distended squirming stomach.<br>
<<elseif (_masterSuitePregnantSlaves > 2) && (_masterSuitePregnantSlavesMultiple > 2)>>
- Many of the slaves are pregnant with multiple children, and more than one has her face buried in the cunt directly below a grossly swollen belly while she lovingly massages her own distended stomach.<br>
+ Many of the slaves are pregnant with multiple children, and more than one has her face buried in the cunt directly below a grossly swollen belly while she lovingly massages her own distended stomach.<br>
<</if>>
<<elseif $masterSuiteSlaves > 0>>
has a few lonely-looking fucktoys in it, badly outnumbered by the cushions.
@@ -226,11 +226,11 @@ The true focus of the suite is, however, the fuckpit. This stepped depression in
$masterSuiteNameCaps is furnished
<<switch $masterSuiteDecoration>>
<<case "Roman Revivalist">>
- as a Roman patrician'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.
+ as a Roman patrician's apartment. There is a small shrine to the old gods the <<= properTitle()>> favors in a side room, and the flooring is erotic mosaic.
<<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 <<= properTitle()>>'s room is created to gratify you as a true god of the people.
<<case "Egyptian Revivalist">>
- after the best room of an ancient Egyptian mansion. 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.
+ after the best room of an ancient Egyptian mansion. There is a small shrine to the old gods the <<= properTitle()>> favors in a side room, and linen hangings decorate the walls and ceiling.
<<case "Edo Revivalist">>
in the Spartan style of an Edo period mansion's innermost rooms. Rice paper screens divide it into subsections, each of which contains little more than a low bed.
<<case "Arabian Revivalist">>
@@ -238,7 +238,7 @@ $masterSuiteNameCaps is furnished
<<case "Chinese Revivalist">>
like the mansion of a senior mandarin of ancient China. The walls are gorgeous hand-carved wooden screens, and heavy jade statues of favored gods crouch in the corners.
<<case "Chattel Religionist">>
- as a severe place of cold stone and hard wood. A single shaft of sunlight illuminates the bed where penitents give their bodies to their <<if $PC.title == 1>>master<<else>>mistress<</if>>.
+ as a severe place of cold stone and hard wood. A single shaft of sunlight illuminates the bed where penitents give their bodies to their <<= properTitle()>>.
<<case "Repopulation Focus">>
comfortably, with lots of cushions and seats for a pregnant slaves to lounge on. Various specialized toys, as well as, lotions and creams are readily available.
<<case "Eugenics">>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 359e862a3db..038ea20a837 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -810,7 +810,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<if canDoAnal($activeSlave)>>
<<link "Make sure $he enjoys $his first butt stuff">>
<<replace "#introResult">>
- You make no direct answer to $his nervous question about $his virgin butt, though you do wonder how $he was so selfish as to be a Free Cities party girl without giving up $his asshole nightly. Instead, you ask $him about $himself, ensuring that $he learns the proper way to answer questions from $his <<if $PC.title == 1>>master<<else>>mistress<</if>>. $He answers readily, even when you turn the subject to $his sexual experiences, and $he starts to get visibly aroused. Before long, $he finds $himself sitting on your lap on the couch, making out with you while $he gives you a handjob. $He stiffens a little when you begin to play with $his butthole, but you take your time. Soon $he's taking a finger, and then two, and before long, $he's riding <<if $PC.dick == 1>>your cock<<else>>a strap-on<</if>>. $He doesn't climax to $his @@.lime;first buttsex,@@ but $he is learning to @@.mediumaquamarine;trust@@ that you won't hurt $him.
+ You make no direct answer to $his nervous question about $his virgin butt, though you do wonder how $he was so selfish as to be a Free Cities party girl without giving up $his asshole nightly. Instead, you ask $him about $himself, ensuring that $he learns the proper way to answer questions from $his <<= WrittenMaster($activeSlave)>>. $He answers readily, even when you turn the subject to $his sexual experiences, and $he starts to get visibly aroused. Before long, $he finds $himself sitting on your lap on the couch, making out with you while $he gives you a handjob. $He stiffens a little when you begin to play with $his butthole, but you take your time. Soon $he's taking a finger, and then two, and before long, $he's riding <<if $PC.dick == 1>>your cock<<else>>a strap-on<</if>>. $He doesn't climax to $his @@.lime;first buttsex,@@ but $he is learning to @@.mediumaquamarine;trust@@ that you won't hurt $him.
<</replace>>
<<set $activeSlave.trust += 10>>
<<set $activeSlave.anus = 1>>
@@ -825,7 +825,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<if canDoAnal($activeSlave)>>
<<link "Make sure $he enjoys $his first anal sex">>
<<replace "#introResult">>
- You introduce $him to obedience and proper manners regarding $his <<if $PC.title == 1>>master<<else>>mistress<</if>> before sending $him off for a physical. That night, $he's returned to your room, and finds you doing business on a tablet in bed. $He looks doubtful, but obeys when you direct $him to get into bed<<if $PC.dick == 0>>, even after $he realizes you're wearing a strap-on<</if>>. You turn out the light and spoon $him from behind, kissing $his neck and ears, cupping $his swollen breasts, and running your hands across $his pregnant belly with its taut $activeSlave.skin skin. $He's awkward at first but $his body responds to the tenderness. Before long $he's humping $his pussy back and forth against <<if $PC.dick == 1>>your cock<<else>>the strap-on<</if>>. You tell $him no, not there, and begin to gently work <<if $PC.dick == 1>>your dickhead<<else>>its tip<</if>> up $his tight but relaxed ass. $He's unsure of $himself, but you keep $him nice and relaxed. $He doesn't climax to $his @@.lime;first buttsex,@@ but $he is learning to @@.mediumaquamarine;trust@@ that you won't hurt $him.
+ You introduce $him to obedience and proper manners regarding $his <<= WrittenMaster($activeSlave)>> before sending $him off for a physical. That night, $he's returned to your room, and finds you doing business on a tablet in bed. $He looks doubtful, but obeys when you direct $him to get into bed<<if $PC.dick == 0>>, even after $he realizes you're wearing a strap-on<</if>>. You turn out the light and spoon $him from behind, kissing $his neck and ears, cupping $his swollen breasts, and running your hands across $his pregnant belly with its taut $activeSlave.skin skin. $He's awkward at first but $his body responds to the tenderness. Before long $he's humping $his pussy back and forth against <<if $PC.dick == 1>>your cock<<else>>the strap-on<</if>>. You tell $him no, not there, and begin to gently work <<if $PC.dick == 1>>your dickhead<<else>>its tip<</if>> up $his tight but relaxed ass. $He's unsure of $himself, but you keep $him nice and relaxed. $He doesn't climax to $his @@.lime;first buttsex,@@ but $he is learning to @@.mediumaquamarine;trust@@ that you won't hurt $him.
<</replace>>
<<set $activeSlave.trust += 10>>
<<set $activeSlave.anus = 1>>
@@ -1402,7 +1402,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<br>
<<link "Make sure $he knows pregnant women can still enjoy sex.">>
<<replace "#introResult">>
- You introduce $him to obedience and proper manners regarding $his <<if $PC.title == 1>>master<<else>>mistress<</if>> before sending $him off for a physical. That night, $he's returned to your room, and finds you doing business on a tablet in bed. $He looks doubtful, but obeys when you direct $him to get into bed<<if $PC.dick == 0>>, even after $he realizes you're wearing a strap-on<</if>>. You turn out the light and spoon $him from behind, kissing $his neck and ears, cupping $his swollen breasts, and running your hands across $his pregnant belly with its taut $activeSlave.skin skin. $He's awkward at first but $his body responds to the tenderness. Before long $he's humping $his pussy back and forth against <<if $PC.dick == 1>>your cock<<else>>the strap-on<</if>>. You begin to gently work <<if $PC.dick == 1>>your dickhead<<else>>its tip<</if>> up $his used pussy. $He's unsure of $himself, but you keep $him nice and relaxed. After several minutes of gentle loving, $he's nothing but a satisfied puddle in your arms. $He believes that $he can @@.mediumaquamarine;trust@@ you won't harm $him or $his child.
+ You introduce $him to obedience and proper manners regarding $his <<= WrittenMaster($activeSlave)>> before sending $him off for a physical. That night, $he's returned to your room, and finds you doing business on a tablet in bed. $He looks doubtful, but obeys when you direct $him to get into bed<<if $PC.dick == 0>>, even after $he realizes you're wearing a strap-on<</if>>. You turn out the light and spoon $him from behind, kissing $his neck and ears, cupping $his swollen breasts, and running your hands across $his pregnant belly with its taut $activeSlave.skin skin. $He's awkward at first but $his body responds to the tenderness. Before long $he's humping $his pussy back and forth against <<if $PC.dick == 1>>your cock<<else>>the strap-on<</if>>. You begin to gently work <<if $PC.dick == 1>>your dickhead<<else>>its tip<</if>> up $his used pussy. $He's unsure of $himself, but you keep $him nice and relaxed. After several minutes of gentle loving, $he's nothing but a satisfied puddle in your arms. $He believes that $he can @@.mediumaquamarine;trust@@ you won't harm $him or $his child.
<</replace>>
<<set $activeSlave.trust += 5>>
<<= VaginalVCheck()>>
@@ -1534,7 +1534,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<</if>>
$He tries to squirm away from the moist spot growing under $his cheek, but you reveal your nipple and carefully direct $his mouth over it.
<<if $activeSlave.fetish == "pregnancy">>
- Slowly $he begins to suckle from your swollen breast. You gently brush $his head as you try to hold back your pleasure, a wasted effort as a hand sneaks its way to your <<if $PC.dick == 1>>growing erection and enthusiastically begins pumping away. You clutch your pervy girl closer to you as $he caresses your pregnancy with one hand and gets you off with the other<<else>>wet pussy and enthusiastically begins rubbing your clit. You clutch your pervy girl closer to you as $he caresses your pregnancy with one hand and gets you off with the other<</if>>. Before long you find yourself bucking your hips with lust, a queue for you to release $him from your nipple so $he may slide down your gravid dome of a belly to finish you off. Happy to serve $his pregnant <<if $PC.title == 1>>master<<else>>mistress<</if>>, $he returns to your chest, happy to relieve you of the pressure building in your neglected breast. <<if $activeSlave.fetishKnown == 0>>Judging by that show, @@.green;$he savors getting to be with a pregnant woman.@@<<set $activeSlave.fetishKnown = 1>><<else>>You knew $he had a pregnancy fetish and $his eagerness to serve a pregnant woman proves that.<</if>> A kick from within startles you from your thoughts; as you reach to soothe your child, you find your new slave @@.mediumaquamarine;already doting on it.@@ $He's already starting to @@.hotpink;show understanding of $his place.@@
+ Slowly $he begins to suckle from your swollen breast. You gently brush $his head as you try to hold back your pleasure, a wasted effort as a hand sneaks its way to your <<if $PC.dick == 1>>growing erection and enthusiastically begins pumping away. You clutch your pervy girl closer to you as $he caresses your pregnancy with one hand and gets you off with the other<<else>>wet pussy and enthusiastically begins rubbing your clit. You clutch your pervy girl closer to you as $he caresses your pregnancy with one hand and gets you off with the other<</if>>. Before long you find yourself bucking your hips with lust, a queue for you to release $him from your nipple so $he may slide down your gravid dome of a belly to finish you off. Happy to serve $his pregnant <<= WrittenMaster($activeSlave)>>, $he returns to your chest, happy to relieve you of the pressure building in your neglected breast. <<if $activeSlave.fetishKnown == 0>>Judging by that show, @@.green;$he savors getting to be with a pregnant woman.@@<<set $activeSlave.fetishKnown = 1>><<else>>You knew $he had a pregnancy fetish and $his eagerness to serve a pregnant woman proves that.<</if>> A kick from within startles you from your thoughts; as you reach to soothe your child, you find your new slave @@.mediumaquamarine;already doting on it.@@ $He's already starting to @@.hotpink;show understanding of $his place.@@
<<set $activeSlave.devotion += 15, $activeSlave.trust += 15>>
<<elseif $activeSlave.fetish == "boobs">>
Eagerly $he begins to suckle from your swollen breast. You gently brush $his head as you try to hold back your pleasure, a wasted effort as a hand sneaks its way to your neglected breast. $He massages it, careful not to encourage your lactation too much, as $he greedily sucks you dry. $He wastes no time in swapping to your other nipple, shifting $his ministrations to the one the just left. By the time your reserves are tapped out, both you and $he are quite content. You permit $him to rest against your chest for a little before you send $him on $his way. <<if $activeSlave.fetishKnown == 0>>Judging by $his enthusiasm, @@.green;$he savors getting $his mouth close to a pair of boobs.@@<<set $activeSlave.fetishKnown = 1>><<else>>You knew $he had a breast fetishist and $his eagerness to lighten a lactating woman proves that.<</if>> A kick from within startles you from your thoughts; you pat your gravid middle, reassuring your child that you'll make sure to save some milk for them. $He's already starting to @@.hotpink;show understanding of $his place@@ and even @@.mediumaquamarine;beginning to build trust@@ with you.
diff --git a/src/uncategorized/pSnatchAndGrabResult.tw b/src/uncategorized/pSnatchAndGrabResult.tw
index 6784faa1291..30758e5514d 100644
--- a/src/uncategorized/pSnatchAndGrabResult.tw
+++ b/src/uncategorized/pSnatchAndGrabResult.tw
@@ -131,9 +131,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 <<= properMaster()>>?"
+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 $PC.title != 0>>master<<else>>mistress<</if>>?"
-When you state that, apparently, you are, $he climbs out of the case, prostrates $himself in the hall before you, and says reverentially into the floor, "I love you, <<= properMaster()>>."
+When you state that, apparently, you are, $he climbs out of the case, prostrates $himself in the hall before you, and says reverentially into the floor, "I love you, <<if $PC.title != 0>>Master<<else>>Mistress<</if>>."
<br><br>
<<set $saleDescription = 0, $applyLaw = 0>><<include "Long Slave Description">>
diff --git a/src/uncategorized/reSiblingRevenge.tw b/src/uncategorized/reSiblingRevenge.tw
index 967ef475fdd..92c0f9605d1 100644
--- a/src/uncategorized/reSiblingRevenge.tw
+++ b/src/uncategorized/reSiblingRevenge.tw
@@ -7,7 +7,7 @@
$slaves[$i].slaveName, whose older sister tried to sell her to you, is up for inspection. As usual, you pepper your inspection with questions about her duties, her feelings about her physical condition, and experiences. More information about one's property is never a bad thing. When the inspection reaches $slaves[$i].slaveName's asshole, you ask whether she enjoyed having her older sister sell her butt.
-"No, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>," she says.
+"No, <<= WrittenMaster($slaves[$i])>>," she says.
<br><br>
diff --git a/src/uncategorized/resSale.tw b/src/uncategorized/resSale.tw
index 2dc482ee327..5919612776d 100644
--- a/src/uncategorized/resSale.tw
+++ b/src/uncategorized/resSale.tw
@@ -43,23 +43,23 @@ You receive a personal call from
<<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!"
<br><br>
- 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!"
+ 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!"
<<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, "<<= properTitle()>>, 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, "<<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>, I'm half off!"
<br><br>
-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.
+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.
<<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, <<= properTitle()>>," 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, <<if $PC.title == 1>>sir<<else>>ma'am<</if>>," 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, <<= properTitle()>>," 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, <<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.
<<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, <<= properTitle()>>," 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, <<if $PC.title == 1>>sir<<else>>ma'am<</if>>," 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, <<= properTitle()>>," 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, <<if $PC.title == 1>>sir<<else>>ma'am<</if>>," 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, <<= properTitle()>>," 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, <<if $PC.title == 1>>sir<<else>>ma'am<</if>>," 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>>
@@ -79,7 +79,7 @@ You pause for a moment, and she plunges on: "<<= properTitle()>>, @@.yellow;your
<<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, <<= properMaster()>>," 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
@@ -111,7 +111,7 @@ You pause for a moment, and she plunges on: "<<= properTitle()>>, @@.yellow;your
<<case "incubus">>
brutally stretch both those holes until she is a slave to my dick," the incubus says, stroking her cock to erection.
<<case "succubus">>
- shape her into the perfect girl for <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>," the succubus says, licking her lips with anticipation. "I'll make a real sex demon out of them!"
+ shape her into the perfect girl for <<= properMaster()>>," the succubus says, licking her lips with anticipation. "I'll make a real sex demon out of them!"
<<case "imp">>
tease her until she is begging to have her virginity taken," the imp says, rubbing her hands together with anticipation.
<<case "witch">>
@@ -151,7 +151,7 @@ You pause for a moment, and she plunges on: "<<= properTitle()>>, @@.yellow;your
<<case "incubus">>
wrap them around my shaft and blow a load right into her face," the incubus says, stroking her cock to erection.
<<case "succubus">>
- teach her the perfect way to tease <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>> with those boobs," she says, swelling her own tits and pressing them against the screen.
+ teach her the perfect way to tease <<= properMaster()>> with those boobs," she says, swelling her own tits and pressing them against the screen.
<<case "imp">>
tease her until she cums to the slightest touch of her nipples," the imp says, rubbing her hands together with anticipation.
<<case "witch">>
@@ -191,7 +191,7 @@ You pause for a moment, and she plunges on: "<<= properTitle()>>, @@.yellow;your
<<case "incubus">>
wrap that ass around my shaft and blow a load across her back," the incubus says, stroking her cock to erection.
<<case "succubus">>
- teach her the perfect way to tease <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>> with that ass," she says, swelling her own behind, pressing it against the screen and winking her butthole tantalizingly at you.
+ teach her the perfect way to tease <<= properMaster()>> with that ass," she says, swelling her own behind, pressing it against the screen and winking her butthole tantalizingly at you.
<<case "imp">>
spank that ass till it's big and red then take a nap on it," the imp says, rubbing her hands together with anticipation and yawning.
<<case "witch">>
@@ -231,7 +231,7 @@ You pause for a moment, and she plunges on: "<<= properTitle()>>, @@.yellow;your
<<case "incubus">>
plow her ass and watch her ejaculate against her will," the incubus says, stroking her cock to erection.
<<case "succubus">>
- teach her the perfect way to tease <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>> with that cock," she says, her clit steadily enlarging till it's the size of her leg. She hefts it to her mouth and enthusiastically tongues her urethra.
+ teach her the perfect way to tease <<= properMaster()>> with that cock," she says, her clit steadily enlarging till it's the size of her leg. She hefts it to her mouth and enthusiastically tongues her urethra.
<<case "imp">>
ride that cock until I'm too heavy to fly," the imp says, rubbing her belly and spreading her legs.
<<case "witch">>
@@ -273,7 +273,7 @@ You pause for a moment, and she plunges on: "<<= properTitle()>>, @@.yellow;your
<<case "incubus">>
brutally stretch both those holes until she is a slave to my dick," the incubus says, stroking her cock to erection.
<<case "succubus">>
- shape her into the perfect girl for <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>," the succubus says, licking her lips with anticipation. "I'll make a real sex demon out of them!"
+ shape her into the perfect girl for <<= properMaster()>>," the succubus says, licking her lips with anticipation. "I'll make a real sex demon out of them!"
<<case "imp">>
tease her until she is begging to have her virginity taken," the imp says, rubbing her hands together with anticipation.
<<case "witch">>
@@ -321,5 +321,5 @@ You pause for a moment, and she plunges on: "<<= properTitle()>>, @@.yellow;your
"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, <<= properMaster()>>," 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/utility/descriptionWidgetsTattoos.tw b/src/utility/descriptionWidgetsTattoos.tw
index 87958efc107..41a8635fbab 100644
--- a/src/utility/descriptionWidgetsTattoos.tw
+++ b/src/utility/descriptionWidgetsTattoos.tw
@@ -36,7 +36,7 @@
<<case "sacrament">>
Tattoos depicting saintly nude figures adorn $his shoulders.
<<case "possessive">>
- A rendition of your face inside a heart is tattooed onto $his left shoulder, and the words 'I love my <<if $PC.title == 1>>Master<<else>>Mistress<</if>>' inside an identical heart are tattooed on $his right.
+ A rendition of your face inside a heart is tattooed onto $his left shoulder, and the words 'I love my <<= WrittenMaster($activeSlave)>>' inside an identical heart are tattooed on $his right.
<<case "paternalist">>
'Love Me' is tattooed on $his left shoulder, and 'Teach Me' on $his right.
<<default>>
@@ -108,7 +108,7 @@
<<case "rude words">>
'Fuckslave' is tattooed across $his chest in such large letters that the word is visible a long way off.
<<case "degradation">>
- '<<if $PC.title == 1>>Master<<else>>Mistress<</if>>'s' is tattooed across the top of $his right breast; 'Bitch' is tattooed across the top of $his left.
+ '<<= WrittenMaster($activeSlave)>>'s' is tattooed across the top of $his right breast; 'Bitch' is tattooed across the top of $his left.
<<case "Asian art">>
An octopus is tattooed on $his upper chest; its tentacles reach down to envelop $his breasts, their tips reaching for but not quite reaching each nipple.
<<case "scenes">>
@@ -122,7 +122,7 @@
<<case "possessive">>
Your personal symbol is tattooed above $his left breast, '<<= PlayerName()>>' above $his right, leaving the rest of $his chest and breasts bare.
<<case "paternalist">>
- '<<if $PC.title == 1>>Master<<else>>Mistress<</if>>'s' is tattooed across the top of $his right breast; 'Darling' is tattooed across the top of $his left.
+ '<<= WrittenMaster($activeSlave)>>'s' is tattooed across the top of $his right breast; 'Darling' is tattooed across the top of $his left.
<<default>>
$activeSlave.boobsTat
<</switch>>
@@ -170,7 +170,7 @@
<<elseif ($activeSlave.visualAge < 25)>>
'Teach me how to suck cock' is tattooed on $his left arm, and 'Teach me how to take dick' is tattooed on $his right.
<<else>>
- 'There are many sex slaves like me' is tattooed on $his left arm, and 'But this one is <<if $PC.title == 1>>Master<<else>>Mistress<</if>>'s' is tattooed on $his right.
+ 'There are many sex slaves like me' is tattooed on $his left arm, and 'But this one is <<= WrittenMaster($activeSlave)>>'s' is tattooed on $his right.
<</if>>
<</if>>
<<case "Asian art">>
--
GitLab