From 21e6109c867e57b14600e207ef34039db4eab8c8 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Fri, 3 May 2019 20:16:00 -0500
Subject: [PATCH] NeedToMakeBC
---
.../legacy files/pronoun fix functions.txt | 45 ++++++++++++++++++
.../nursery/longChildDescription.tw | 6 ++-
src/pregmod/pRaped.tw | 2 +-
src/uncategorized/BackwardsCompatibility.tw | 8 ++--
src/uncategorized/RESS.tw | 2 +-
src/uncategorized/jeSlaveDispute.tw | 14 +++---
src/uncategorized/longSlaveDescription.tw | 6 ++-
src/uncategorized/pCoupAttempt.tw | 6 +--
src/uncategorized/reMalefactor.tw | 22 ++++-----
src/uncategorized/recETS.tw | 44 +++++++++---------
src/uncategorized/seRetirement.tw | 2 +-
src/utility/descriptionWidgetsTattoos.tw | 46 -------------------
12 files changed, 103 insertions(+), 100 deletions(-)
diff --git a/devNotes/legacy files/pronoun fix functions.txt b/devNotes/legacy files/pronoun fix functions.txt
index 8a790297fd8..94725f62931 100644
--- a/devNotes/legacy files/pronoun fix functions.txt
+++ b/devNotes/legacy files/pronoun fix functions.txt
@@ -339,4 +339,49 @@ window.originPronounReplace = function(slave) {
<<default>>
<<print $args[0].origin>>
<</switch>>
+<</widget>>
+
+<<widget "customTatDescription">>
+ <<switch $args[0].custom.tattoo>>
+ <<case "She has a famous corporate logo tattooed on the nape of her neck.">>
+ <<print "$He has a famous corporate logo tattooed on the nape of $his neck.">>
+ <<case "She has a small tattoo of a private military company's coat of arms on the nape of her neck.">>
+ <<print "$He has a small tattoo of a private military company's coat of arms on the nape of $his neck.">>
+ <<case "She has your tiny slaving emblem tattooed behind her left ear.">>
+ <<print "$He has your tiny slaving emblem tattooed behind $his left ear.">>
+ <<case "She has the geometric symbol of your old arcology engineering firm laser tattooed into the nape of her neck.">>
+ <<print "$He has the geometric symbol of your old arcology engineering firm laser tattooed into the nape of $his neck.">>
+ <<case "She has your custom emblem tattooed on her left breast.">>
+ <<print "$He has your custom emblem tattooed on $his left breast.">>
+ <<case "She has the number of times her father came in you while you were pregnant with her tattooed down her back.">>
+ <<print "$He has the number of times $his father came in you while you were pregnant with $him tattooed down $his back.">>
+ <<case "She has your name angrily tattooed on her right shoulder.">>
+ <<print "$He has your name angrily tattooed on $his right shoulder.">>
+ <<case "She has your custom emblem tattooed on her left breast. She got the tattoo after starring in a porno with you.">>
+ <<print "$He has your custom emblem tattooed on $his left breast. $He got the tattoo after starring in a porno with you.">>
+ <<case "She has your former gang's sign tattooed on her neck.">>
+ <<print "$He has your former gang's sign tattooed on $his neck.">>
+ <<case "She has your master's brand on her left breast.">>
+ <<print "$He has your master's brand on $his left breast.">>
+ <<case "She has your personal symbol tattooed on the back of her neck: it's invisible to the naked eye, but shows up starkly on medical imaging.">>
+ <<print "$He has your personal symbol tattooed on the back of $his neck: it's invisible to the naked eye, but shows up starkly on medical imaging.">>
+ <<case "She has your signature, surrounded by hearts, tattooed on the back of her neck.">>
+ <<print "$He has your signature, surrounded by hearts, tattooed on the back of $his neck.">>
+ <<case "She has your signature, surrounded by hearts, tattooed on the back of her neck. She got the tattoo when she was still free.">>
+ <<print "$He has your signature, surrounded by hearts, tattooed on the back of $his neck. $He got the tattoo when $he was still free.">>
+ <<case "She has a small tattoo of a losing hand of cards on the nape of her neck.">>
+ <<print "$He has a small tattoo of a losing hand of cards on the nape of $his neck.">>
+ <<case "She has a small tattoo of a poor hand of cards on the nape of her neck.">>
+ <<print "$He has a small tattoo of a poor hand of cards on the nape of $his neck.">>
+ <<case "She has a small tattoo of a winning hand of cards on the nape of her neck.">>
+ <<print "$He has a small tattoo of a winning hand of cards on the nape of $his neck.">>
+ <<case "She has your former digital calling card tattooed on her neck.">>
+ <<print "$He has your former digital calling card tattooed on $his neck.">>
+ <<case "She has the silhouette of an arcology tattooed on the nape of her neck.">>
+ <<print "$He has the silhouette of an arcology tattooed on the nape of $his neck.">>
+ <<case "She has a barcode tattooed on her neck.">>
+ <<print "$He has a barcode tattooed on $his neck.">>
+ <<default>>
+ <<print $args[0].custom.tattoo>>
+ <</switch>>
<</widget>>
\ No newline at end of file
diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw
index 46b07d4b00f..8fded54285f 100644
--- a/src/facilities/nursery/longChildDescription.tw
+++ b/src/facilities/nursery/longChildDescription.tw
@@ -773,7 +773,7 @@ is
<<if $saleDescription == 0>>
<<if $activeChild.origin != 0>>
- <<= originPronounReplace($activeChild)>>
+ <<= $activeChild.origin>>
<</if>>
<</if>>
@@ -1268,7 +1268,9 @@ $He is
<<earPiercingDescription>>
<<nosePiercingDescription>>
<<eyebrowPiercingDescription>>
- <<customTatDescription $activeChild>>
+ <<if ($activeSlave.custom.tattoo != "") && (def $activeSlave.custom.tattoo)>>
+ <<print $activeSlave.custom.tattoo>>
+ <</if>>
<</if>>
<</if>>
diff --git a/src/pregmod/pRaped.tw b/src/pregmod/pRaped.tw
index 92d96f2ebaf..a81cbb0547b 100644
--- a/src/pregmod/pRaped.tw
+++ b/src/pregmod/pRaped.tw
@@ -11,7 +11,7 @@
<<set $fixedRace = _races.random()>>
<</if>>
<<set $activeSlave = GenerateNewSlave("XY")>>
-<<set $activeSlave.origin = "You sentenced her to enslavement for the attempted rape of a free woman.">>
+<<set $activeSlave.origin = "You sentenced $him to enslavement for the attempted rape of a free woman.">>
<<set $activeSlave.devotion = -100>>
<<set $activeSlave.trust = -100>>
<<set $activeSlave.health = random(-50,-20)>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index aaa287a3ef5..81b3f835544 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -2699,9 +2699,9 @@ Setting missing slave variables:
<<PMODinit _Slave>>
-<<if _Slave.origin == "Shortly after birth, she was sealed in an aging tank until she was of age. She knows only of the terror that awaits her should she not obey her master.">>
+<<if _Slave.origin == "Shortly after birth, $he was sealed in an aging tank until $he was of age. $He knows only of the terror that awaits $him should $he not obey $his master.">>
<<set _Slave.tankBaby = 2>>
-<<elseif _Slave.origin == "Shortly after birth, she was sealed in an aging tank until she was of age. She knows nothing of the world outside of what the tank imprinted her with.">>
+<<elseif _Slave.origin == "Shortly after birth, $he was sealed in an aging tank until $he was of age. $He knows nothing of the world outside of what the tank imprinted $him with.">>
<<set _Slave.tankBaby = 1>>
<<elseif ndef _Slave.tankBaby>>
<<set _Slave.tankBaby = 0>>
@@ -3685,7 +3685,7 @@ Done!
<<set $JobIDArray = resetJobIDArray()>>
-/* unifify cybermod & vanilla */
+/* unify cybermod & vanilla */
/* limbs */
<<if def $limbs>>
<<set $adjustProsthetics = []>>
@@ -3858,7 +3858,7 @@ Done!
<<if def $cyberMod>>
<<unset $cyberMod>>
<</if>>
-/* unifify cybermod & vanilla finished*/
+/* unify cybermod & vanilla finished*/
/* reset NaNArray after BC is run */
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index a6b84c458a2..09b0f898eb3 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -76,7 +76,7 @@
<</if>>
<<set $fixedNationality = "American">>
<<set _meanGirl = GenerateNewSlave("XX")>>
- <<set _meanGirl.origin = "You enslaved her for abusing " + $eventSlave.slaveName + " while " + $he + " was serving the public.">>
+ <<set _meanGirl.origin = "You enslaved $him for abusing " + $eventSlave.slaveName + " while " + $eventSlave.pronoun + " was serving the public.">>
<<set _meanGirl.career = "a student">>
<<set _meanGirl.markings = "none", _meanGirl.weight = -20>>
<<set _meanGirl.devotion = random(-80,-60)>>
diff --git a/src/uncategorized/jeSlaveDispute.tw b/src/uncategorized/jeSlaveDispute.tw
index 181a1778758..a29f51750a2 100644
--- a/src/uncategorized/jeSlaveDispute.tw
+++ b/src/uncategorized/jeSlaveDispute.tw
@@ -10,7 +10,7 @@
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
- <<set $activeSlave.origin = "She sold $himself into slavery to buy medical care for her daughter.">>
+ <<set $activeSlave.origin = "$He sold $himself into slavery to buy medical care for $his daughter.">>
<<set $activeSlave.devotion = random(25,30)>>
<<set $activeSlave.trust = $activeSlave.devotion-20>>
<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
@@ -28,7 +28,7 @@
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
- <<set $activeSlave.origin = "She was raised to be a mother.">>
+ <<set $activeSlave.origin = "$He was raised to be a mother.">>
<<set $activeSlave.career = "a breeder">>
<<set $activeSlave.devotion = random(10,25)>>
<<set $activeSlave.trust = $activeSlave.devotion>>
@@ -52,7 +52,7 @@
<<set $contractCost = 10000>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XY")>>
- <<set $activeSlave.origin = "You bought out a deal involving her training to be an expert gelded sex slave.">>
+ <<set $activeSlave.origin = "You bought out a deal involving $him training to be an expert gelded sex slave.">>
<<set $activeSlave.devotion = random(30,40)>>
<<set $activeSlave.trust = $activeSlave.devotion>>
<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
@@ -89,7 +89,7 @@
<<set $activeSlaveOneTimeMaxAge = 18>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave()>>
- <<set $activeSlave.origin = "She was raised to be a slave, since she was mistakenly thought to be from good slave stock.">>
+ <<set $activeSlave.origin = "$He was raised to be a slave, since $he was mistakenly thought to be from good slave stock.">>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.devotion = random(10,15)>>
<<set $activeSlave.trust = $activeSlave.devotion>>
@@ -143,7 +143,7 @@
<<set $activeSlaveOneTimeMaxAge = 22>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave()>>
- <<set $activeSlave.origin = "You bought out a deal for her sale after the seller took her virginity and the buyer no longer wanted her.">>
+ <<set $activeSlave.origin = "You bought out a deal for $his sale after the seller took $his virginity and the buyer no longer wanted $him.">>
<<if ndef $activeSlave.counter.publicUse>><<set $activeSlave.counter.publicUse = 10>><<else>><<set $activeSlave.counter.publicUse += 10>><</if>>
<<set $activeSlave.devotion = random(25,30)>>
<<set $activeSlave.trust = $activeSlave.devotion-20>>
@@ -374,7 +374,7 @@
<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
<<set $activeSlave.indenture = random(52,78)>>
<<set $activeSlave.indentureRestrictions = 2>>
- <<set $activeSlave.origin = "You took over her indenture after she launched a legal complaint against an abusive master.">>
+ <<set $activeSlave.origin = "You took over $his indenture after $he launched a legal complaint against an abusive master.">>
<<run cashX(forceNeg($contractCost), "slaveTransfer")>>
<<replace "#result">>
You offer to simply buy out the indenture contract, thereby acquiring $him, to which both parties readily agree. This decision is viewed as @@.green;incredibly generous@@ by both your arcology's romantically-minded and financially-inclined citizens. For their part, your new servant is hopeful that you will be more considerate of $his health, while the former holder is just happy to have $him off his hands.
@@ -385,7 +385,7 @@
<</replace>>
<</link>> //This will cost <<print cashFormat($contractCost)>> and give you the servant as such//
<br><<link "Buy out the contract and enslave $him">>
- <<set $activeSlave.origin = "She was enslaved after you manipulated her deal for indentured servitude.">>
+ <<set $activeSlave.origin = "$He was enslaved after you manipulated $his deal for indentured servitude.">>
<<set $activeSlave.devotion = random(-10,-15)>>
<<set $activeSlave.trust = $activeSlave.devotion+4>>
<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index aa4383667d0..63d9dbf3dc9 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -1277,7 +1277,7 @@ is
<<if $saleDescription == 0>>
<<if $activeSlave.origin != 0>>
- <<= originPronounReplace($activeSlave)>>
+ <<= $activeSlave.origin>>
<</if>>
<</if>>
@@ -2132,7 +2132,9 @@ $He is
<<earPiercingDescription>>
<<nosePiercingDescription>>
<<eyebrowPiercingDescription>>
- <<customTatDescription $activeSlave>>
+ <<if ($activeSlave.custom.tattoo != "") && (def $activeSlave.custom.tattoo)>>
+ <<print $activeSlave.custom.tattoo>>
+ <</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/pCoupAttempt.tw b/src/uncategorized/pCoupAttempt.tw
index 1aeb1efb08f..a2d7c4799ad 100644
--- a/src/uncategorized/pCoupAttempt.tw
+++ b/src/uncategorized/pCoupAttempt.tw
@@ -84,7 +84,7 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<<set $activeSlave.muscles = random(0,80)>>
<<set $activeSlave.waist = random(-20,20)>>
<</if>>
- <<set $activeSlave.origin = "She is an enslaved Daughter of Liberty.">>
+ <<set $activeSlave.origin = "$He is an enslaved Daughter of Liberty.">>
<<set _newSlaves.push($activeSlave)>>
<</for>>
<<set $desc = "a damaged plate carrier bearing Daughters of Liberty insignia">>
@@ -109,7 +109,7 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<<set $activeSlaveOneTimeMaxAge = 32>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XY")>>
- <<set $activeSlave.origin = "She is an enslaved Daughter of Liberty.">>
+ <<set $activeSlave.origin = "$He is an enslaved Daughter of Liberty.">>
<<set $activeSlave.weight = random(-20,30)>>
<<set $activeSlave.muscles = random(20,80)>>
<<set $activeSlave.waist = random(10,80)>>
@@ -127,7 +127,7 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<<set $activeSlaveOneTimeMaxAge = 32>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
- <<set $activeSlave.origin = "She is an enslaved Daughter of Liberty.">>
+ <<set $activeSlave.origin = "$He is an enslaved Daughter of Liberty.">>
<<set $activeSlave.weight = random(-50,30)>>
<<set $activeSlave.muscles = random(0,80)>>
<<set $activeSlave.waist = random(-20,20)>>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index 95e804e539f..d1c895fe414 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -7,7 +7,7 @@
<<case "addict">>
<<set $activeSlave = GenerateNewSlave()>>
-<<set $activeSlave.origin = "You sentenced her to enslavement as a punishment for attempted burglary.">>
+<<set $activeSlave.origin = "You sentenced $him to enslavement as a punishment for attempted burglary.">>
<<set $activeSlave.career = "a criminal">>
<<set $activeSlave.devotion = random(-75,-60)>>
<<set $activeSlave.trust = random(-15,0)>>
@@ -37,7 +37,7 @@
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave()>>
-<<set $activeSlave.origin = "You sentenced her to enslavement as a punishment for suspected escapism.">>
+<<set $activeSlave.origin = "You sentenced $him to enslavement as a punishment for suspected escapism.">>
<<set $activeSlave.devotion = random(-75,-60)>>
<<set $activeSlave.trust = random(-15,0)>>
<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
@@ -69,7 +69,7 @@
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
-<<set $activeSlave.origin = "You sentenced her to enslavement as a punishment for smuggling slaves within her body.">>
+<<set $activeSlave.origin = "You sentenced $him to enslavement as a punishment for smuggling slaves within $his body.">>
<<set $activeSlave.career = setup.uneducatedCareers.random()>>
<<set $activeSlave.devotion = random(-75,-50)>>
<<set $activeSlave.trust = random(-75,-60)>>
@@ -100,7 +100,7 @@
<<set $activeSlaveOneTimeMaxAge = 12>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave()>>
-<<set $activeSlave.origin = "You sentenced her to enslavement as a punishment for suspected escapism.">>
+<<set $activeSlave.origin = "You sentenced $him to enslavement as a punishment for suspected escapism.">>
<<set $activeSlave.career = "an orphan">>
<<set $activeSlave.devotion = random(-15,0)>>
<<set $activeSlave.trust = random(-75,-60)>>
@@ -140,7 +140,7 @@
<<set $fixedRace = _races.random()>>
<</if>>
<<set $activeSlave = GenerateNewSlave("XX")>>
-<<set $activeSlave.origin = "You sentenced her to enslavement as a punishment for fraud and theft.">>
+<<set $activeSlave.origin = "You sentenced $him to enslavement as a punishment for fraud and theft.">>
<<set $activeSlave.career = "a criminal businesswoman">>
<<set $activeSlave.devotion = random(-75,-60)>>
<<set $activeSlave.trust = random(-15,0)>>
@@ -169,7 +169,7 @@
<<set $fixedRace = _races.random()>>
<</if>>
<<set $activeSlave = GenerateNewSlave()>>
-<<set $activeSlave.origin = "You sentenced her to enslavement as a punishment for theft and battery.">>
+<<set $activeSlave.origin = "You sentenced $him to enslavement as a punishment for theft and battery.">>
<<set $activeSlave.career = "a prostitute">>
<<set $activeSlave.devotion = random(-75,-60)>>
<<set $activeSlave.trust = random(-15,0)>>
@@ -199,7 +199,7 @@
<<set $activeSlave.clitPiercing = 1>>
<<set $activeSlave.sexualFlaw = "hates penetration">>
<<set $activeSlave.hStyle = "strip">>
-<<set $activeSlave.custom.tattoo = "$He has a tear tattooed under each eye.">>
+<<set $activeSlave.custom.tattoo = "$He has a teardrop tattooed under each eye.">>
<<case "rapist">>
@@ -212,7 +212,7 @@
<<set $fixedRace = _races.random()>>
<</if>>
<<set $activeSlave = GenerateNewSlave("XY")>>
-<<set $activeSlave.origin = "You sentenced her to enslavement as a punishment for rape of a free woman.">>
+<<set $activeSlave.origin = "You sentenced $him to enslavement as a punishment for the rape of a free woman.">>
<<set $activeSlave.devotion = random(-75,-60)>>
<<set $activeSlave.trust = random(-15,0)>>
<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
@@ -239,7 +239,7 @@
<<set $fixedRace = _races.random()>>
<</if>>
<<set $activeSlave = GenerateNewSlave("XX")>>
-<<set $activeSlave.origin = "You sentenced her to enslavement for smuggling drugs into the arcology.">>
+<<set $activeSlave.origin = "You sentenced $him to enslavement for smuggling drugs into the arcology.">>
<<set $activeSlave.career = "a drug mule">>
<<set $activeSlave.devotion = random(-50,-20)>>
<<set $activeSlave.trust = random(-100,-75)>>
@@ -267,7 +267,7 @@
<<set $activeSlaveOneTimeMaxAge = 43>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
-<<set $activeSlave.origin = "You sentenced her to enslavement as a punishment for attempted theft of a slave.">>
+<<set $activeSlave.origin = "You sentenced $him to enslavement as a punishment for attempted theft of a slave.">>
<<set $activeSlave.career = "an antislavery activist">>
<<set $activeSlave.devotion = random(-75,-60)>>
<<set $activeSlave.trust = random(-15,0)>>
@@ -298,7 +298,7 @@
<</if>>
<<set $fixedRace = _realRace>>
<<set $activeSlave = GenerateNewSlave()>>
-<<set $activeSlave.origin = "You sentenced her to enslavement as a punishment for defying local racial segregation laws.">>
+<<set $activeSlave.origin = "You sentenced $him to enslavement as a punishment for defying local racial segregation laws.">>
<<set $activeSlave.career = setup.educatedCareers.random()>>
<<set $activeSlave.devotion = random(-75,-50)>>
<<set $activeSlave.trust = random(-75,-50)>>
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index 741cdf98bf6..dbd528a0125 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -72,7 +72,7 @@
<<set $fixedRace = _races.random()>>
<</if>>
<<set $activeSlave = GenerateNewSlave("XX")>>
-<<set $activeSlave.origin = "$He was enslaved after you called in her business debts.">>
+<<set $activeSlave.origin = "$He was enslaved after you called in $his business debts.">>
<<set $activeSlave.career = "a business owner">>
<<set $activeSlave.devotion = random(-15,15)>>
<<set $activeSlave.trust = random(-15,15)>>
@@ -106,10 +106,10 @@
<<set $contractCost = 10000>>
<<set $activeSlaveOneTimeMinAge = Math.max($fertilityAge+20, $potencyAge+20, $minimumSlaveAge+20)>>
<<set $activeSlaveOneTimeMaxAge = 40>>
-<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to have a son who can knock her up. %/
+<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to have a son who can knock $him up. %/
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
-<<set $activeSlave.origin = "$He offered to become your slave to protect her incestuous relationship.">>
+<<set $activeSlave.origin = "$He offered to become your slave to protect $his incestuous relationship.">>
<<set $activeSlave.career = "a housewife">>
<<set $activeSlave.devotion = random(-15,15)>>
<<set $activeSlave.trust = random(-15,15)>>
@@ -154,7 +154,7 @@
<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to have a daughter to knock up. %/
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XY")>>
-<<set $activeSlave.origin = "$He offered to become your slave to protect her incestuous relationship.">>
+<<set $activeSlave.origin = "$He offered to become your slave to protect $his incestuous relationship.">>
<<set $activeSlave.devotion = random(-15,15)>>
<<set $activeSlave.trust = random(-15,15)>>
<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
@@ -183,7 +183,7 @@
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
-<<set $activeSlave.origin = "$He offered to become your slave to protect her incestuous relationship.">>
+<<set $activeSlave.origin = "$He offered to become your slave to protect $his incestuous relationship.">>
<<set $activeSlave.career = "a dropout">>
<<set $activeSlave.devotion = random(-15,15)>>
<<set $activeSlave.trust = random(-15,15)>>
@@ -227,7 +227,7 @@
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
-<<set $activeSlave.origin = "$He offered to become your slave to protect her incestuous relationship.">>
+<<set $activeSlave.origin = "$He offered to become your slave to protect $his incestuous relationship.">>
<<set $activeSlave.career = "a dropout">>
<<set $activeSlave.devotion = random(-15,15)>>
<<set $activeSlave.trust = random(-15,15)>>
@@ -261,7 +261,7 @@
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XY")>>
-<<set $activeSlave.origin = "$He offered to become your slave to protect her incestuous relationship.">>
+<<set $activeSlave.origin = "$He offered to become your slave to protect $his incestuous relationship.">>
<<set $activeSlave.career = "a dropout">>
<<set $activeSlave.devotion = random(-15,15)>>
<<set $activeSlave.trust = random(-15,15)>>
@@ -295,7 +295,7 @@
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
-<<set $activeSlave.origin = "$He offered to become your slave to protect her incestuous relationship.">>
+<<set $activeSlave.origin = "$He offered to become your slave to protect $his incestuous relationship.">>
<<set $activeSlave.devotion = random(-15,15)>>
<<set $activeSlave.trust = random(-15,15)>>
<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
@@ -327,7 +327,7 @@
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XY")>>
-<<set $activeSlave.origin = "$He offered to become your slave to protect her incestuous relationship.">>
+<<set $activeSlave.origin = "$He offered to become your slave to protect $his incestuous relationship.">>
<<set $activeSlave.devotion = random(-15,15)>>
<<set $activeSlave.trust = random(-15,15)>>
<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
@@ -359,7 +359,7 @@
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.vagina = 1>>
-<<set $activeSlave.origin = "$He offered to become your slave to protect her incestuous relationship.">>
+<<set $activeSlave.origin = "$He offered to become your slave to protect $his incestuous relationship.">>
<<set $activeSlave.devotion = random(-15,15)>>
<<set $activeSlave.trust = random(-15,15)>>
<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
@@ -391,7 +391,7 @@
<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to have a daughter. %/
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
-<<set $activeSlave.origin = "$He offered to become your slave to protect her incestuous relationship.">>
+<<set $activeSlave.origin = "$He offered to become your slave to protect $his incestuous relationship.">>
<<set $activeSlave.career = "a housewife">>
<<set $activeSlave.devotion = random(-15,15)>>
<<set $activeSlave.trust = random(-15,15)>>
@@ -429,7 +429,7 @@
<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to have a son. %/
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XY")>>
-<<set $activeSlave.origin = "$He offered to become your slave to protect her incestuous relationship.">>
+<<set $activeSlave.origin = "$He offered to become your slave to protect $his incestuous relationship.">>
<<set $activeSlave.devotion = random(-15,15)>>
<<set $activeSlave.trust = random(-15,15)>>
<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
@@ -463,7 +463,7 @@
<<set $fixedRace = _races.random()>>
<</if>>
<<set $activeSlave = GenerateNewSlave("XY")>>
-<<set $activeSlave.origin = "$He was sold into slavery by her older sister.">>
+<<set $activeSlave.origin = "$He was sold into slavery by $his older sister.">>
<<set $activeSlave.career = "a prostitute">>
<<set $activeSlave.devotion = random(-15,15)>>
<<set $activeSlave.trust = random(-15,15)>>
@@ -511,7 +511,7 @@
<<set $activeSlaveOneTimeMaxAge = 21>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
-<<set $activeSlave.origin = "$He was brought up in a radical slave school to match her twin.">>
+<<set $activeSlave.origin = "$He was brought up in a radical slave school to match $his twin.">>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.devotion = random(25,45)>>
<<set $activeSlave.trust = random(-15,15)>>
@@ -563,7 +563,7 @@
<<set $activeSlaveOneTimeMaxAge = 21>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
-<<set $activeSlave.origin = "$He was brought up in a radical slave school to match her twin.">>
+<<set $activeSlave.origin = "$He was brought up in a radical slave school to match $his twin.">>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.devotion = random(25,45)>>
<<set $activeSlave.trust = random(-15,15)>>
@@ -618,7 +618,7 @@
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
-<<set $activeSlave.origin = "$He was brought up in a radical slave school to match her twin.">>
+<<set $activeSlave.origin = "$He was brought up in a radical slave school to match $his twin.">>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.devotion = random(25,45)>>
<<set $activeSlave.trust = random(-15,15)>>
@@ -688,7 +688,7 @@
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
-<<set $activeSlave.origin = "$He begged to be enslaved in a desperate attempt to provide for her many children.">>
+<<set $activeSlave.origin = "$He begged to be enslaved in a desperate attempt to provide for $his many children.">>
<<set $activeSlave.career = "homeless">>
<<set $activeSlave.health = random(-45,-30)>>
<<set $activeSlave.devotion = random(35,45)>>
@@ -744,7 +744,7 @@
<<case "addict mother daughter">>
-<<set $activeSlave.origin = "You tricked her mother into selling her into slavery to clear addiction debts.">>
+<<set $activeSlave.origin = "You tricked $his mother into selling $him into slavery to clear addiction debts.">>
<<set $activeSlave.slaveName = $activeSlave.birthName>>
<<set $activeSlave.ID = $activeSlave.ID + 1000>>
<<set $activeSlave.devotion += 10>>
@@ -776,7 +776,7 @@
<<case "posh mother daughter">>
-<<set $activeSlave.origin = "You acquired her along with her mother when the family business failed.">>
+<<set $activeSlave.origin = "You acquired $him along with $his mother when the family business failed.">>
<<set $activeSlave.slaveName = $activeSlave.birthName>>
<<set $activeSlave.ID = $activeSlave.ID + 1000>>
<<set $activeSlave.devotion -= 25>>
@@ -1162,7 +1162,7 @@
<<case "mismatched pair">>
-<<set $activeSlave.origin = "You acquired her along with her sissy sister due to her inexperience as a madam.">>
+<<set $activeSlave.origin = "You acquired $him along with $his sissy sister due to $his inexperience as a madam.">>
<<set $activeSlave.career = "a pimp">>
<<set $activeSlave.slaveName = $activeSlave.birthName>>
<<set $activeSlave.ID = $activeSlave.ID + 1000>>
@@ -1249,7 +1249,7 @@
<<case "desperate broodmother">>
<<if random(1,100) < $seeDicks>> /*boy*/
- <<set $activeSlave.origin = "$His mother offered her to you as an incentive to take them in.">>
+ <<set $activeSlave.origin = "$His mother offered $him to you as an incentive to take them in.">>
<<set $activeSlave.slaveName = $activeSlave.birthName>>
<<set $activeSlave.ID = $activeSlave.ID + 1000>>
<<set $activeSlave.health = random(10,20)>>
@@ -1315,7 +1315,7 @@
<<set $activeSlave.teeth = "mixed">>
<</if>>
<<else>> /*girl*/
- <<set $activeSlave.origin = "$His mother offered her to you as an incentive to take them in.">>
+ <<set $activeSlave.origin = "$His mother offered $him to you as an incentive to take them in.">>
<<set $activeSlave.slaveName = $activeSlave.birthName>>
<<set $activeSlave.ID = $activeSlave.ID + 1000>>
<<set $activeSlave.health = random(10,20)>>
diff --git a/src/uncategorized/seRetirement.tw b/src/uncategorized/seRetirement.tw
index 64a38f05d82..1876bff8651 100644
--- a/src/uncategorized/seRetirement.tw
+++ b/src/uncategorized/seRetirement.tw
@@ -104,7 +104,7 @@ $He's certainly going to have some adjustments to make.
<<elseif ($toSearchAlt.indexOf("is world famous for") != -1)>>
<br><br>
<<set _pornFame = $activeSlave.pornPrestigeDesc>>
- <<set _pornFame = _pornFame.replace("She is world famous for her career in slave pornography. Millions are intimately familiar with", "enjoy")>>
+ <<set _pornFame = _pornFame.replace("$He is world famous for her career in slave pornography. Millions are intimately familiar with", "enjoy")>>
<<set _pornFame = _pornFame.replace(".", ",")>>
In addition to $his annuity, you've laid the groundwork for $him to become wealthy by the way you publicized pornography of $him. Many thousands of people across the world are willing to pay to _pornFame and they enjoy it in part because $he doesn't mind it, either. $He's in a position to make great money for doing on camera what $he would probably do anyway.
<<elseif ($activeSlave.intelligence+$activeSlave.intelligenceImplant >= -50) && ($activeSlave.muscles > 5) && ($activeSlave.skill.combat >= 1) && ($activeSlave.amp != 1) && ($activeSlave.face > 10)>>
diff --git a/src/utility/descriptionWidgetsTattoos.tw b/src/utility/descriptionWidgetsTattoos.tw
index 6301deafe0f..2c1da9bfbba 100644
--- a/src/utility/descriptionWidgetsTattoos.tw
+++ b/src/utility/descriptionWidgetsTattoos.tw
@@ -605,49 +605,3 @@
<</switch>>
<</if>>
<</widget>>
-
-
-<<widget "customTatDescription">>
- <<switch $args[0].custom.tattoo>>
- <<case "She has a famous corporate logo tattooed on the nape of her neck.">>
- <<print "$He has a famous corporate logo tattooed on the nape of $his neck.">>
- <<case "She has a small tattoo of a private military company's coat of arms on the nape of her neck.">>
- <<print "$He has a small tattoo of a private military company's coat of arms on the nape of $his neck.">>
- <<case "She has your tiny slaving emblem tattooed behind her left ear.">>
- <<print "$He has your tiny slaving emblem tattooed behind $his left ear.">>
- <<case "She has the geometric symbol of your old arcology engineering firm laser tattooed into the nape of her neck.">>
- <<print "$He has the geometric symbol of your old arcology engineering firm laser tattooed into the nape of $his neck.">>
- <<case "She has your custom emblem tattooed on her left breast.">>
- <<print "$He has your custom emblem tattooed on $his left breast.">>
- <<case "She has the number of times her father came in you while you were pregnant with her tattooed down her back.">>
- <<print "$He has the number of times $his father came in you while you were pregnant with $him tattooed down $his back.">>
- <<case "She has your name angrily tattooed on her right shoulder.">>
- <<print "$He has your name angrily tattooed on $his right shoulder.">>
- <<case "She has your custom emblem tattooed on her left breast. She got the tattoo after starring in a porno with you.">>
- <<print "$He has your custom emblem tattooed on $his left breast. $He got the tattoo after starring in a porno with you.">>
- <<case "She has your former gang's sign tattooed on her neck.">>
- <<print "$He has your former gang's sign tattooed on $his neck.">>
- <<case "She has your master's brand on her left breast.">>
- <<print "$He has your master's brand on $his left breast.">>
- <<case "She has your personal symbol tattooed on the back of her neck: it's invisible to the naked eye, but shows up starkly on medical imaging.">>
- <<print "$He has your personal symbol tattooed on the back of $his neck: it's invisible to the naked eye, but shows up starkly on medical imaging.">>
- <<case "She has your signature, surrounded by hearts, tattooed on the back of her neck.">>
- <<print "$He has your signature, surrounded by hearts, tattooed on the back of $his neck.">>
- <<case "She has your signature, surrounded by hearts, tattooed on the back of her neck. She got the tattoo when she was still free.">>
- <<print "$He has your signature, surrounded by hearts, tattooed on the back of $his neck. $He got the tattoo when $he was still free.">>
- <<case "She has a small tattoo of a losing hand of cards on the nape of her neck.">>
- <<print "$He has a small tattoo of a losing hand of cards on the nape of $his neck.">>
- <<case "She has a small tattoo of a poor hand of cards on the nape of her neck.">>
- <<print "$He has a small tattoo of a poor hand of cards on the nape of $his neck.">>
- <<case "She has a small tattoo of a winning hand of cards on the nape of her neck.">>
- <<print "$He has a small tattoo of a winning hand of cards on the nape of $his neck.">>
- <<case "She has your former digital calling card tattooed on her neck.">>
- <<print "$He has your former digital calling card tattooed on $his neck.">>
- <<case "She has the silhouette of an arcology tattooed on the nape of her neck.">>
- <<print "$He has the silhouette of an arcology tattooed on the nape of $his neck.">>
- <<case "She has a barcode tattooed on her neck.">>
- <<print "$He has a barcode tattooed on $his neck.">>
- <<default>>
- <<print $args[0].custom.tattoo>>
- <</switch>>
-<</widget>>
--
GitLab