From 6af00b9b50c204f33ea448c91e020752c5f0fdb5 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Wed, 19 Dec 2018 20:56:46 -0600
Subject: [PATCH] Requests
---
devNotes/twine JS.txt | 4 --
slave variables documentation - Pregmod.txt | 1 -
src/js/storyJS.tw | 4 --
src/pregmod/eliteSlave.tw | 6 +-
src/uncategorized/pCollaborationChoice.tw | 4 +-
src/uncategorized/reShelterInspection.tw | 79 ++++++++++-----------
src/uncategorized/spa.tw | 4 +-
7 files changed, 45 insertions(+), 57 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index d688f63d2a6..2f10255dcaf 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -266,10 +266,6 @@ window.canGetPregnant = function(slave) {
window.canBreed = function(slave1, slave2) {
if (!slave1 || !slave2) {
return null;
- } else if (slave1.eggType == "sterile") {
- return false;
- } else if (slave2.ballType == "sterile") {
- return false;
} else if (slave1.eggType == slave2.ballType) {
return true;
} else {
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 491448d581e..ad48108bcd7 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -3178,7 +3178,6 @@ eggType:
What species of ovum she produces.
"human"
-"sterile"
"dog"
"pig"
"horse"
diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw
index 2829314704a..8705bc8e030 100644
--- a/src/js/storyJS.tw
+++ b/src/js/storyJS.tw
@@ -264,10 +264,6 @@ window.canGetPregnant = function(slave) {
window.canBreed = function(slave1, slave2) {
if (!slave1 || !slave2) {
return null;
- } else if (slave1.eggType == "sterile") {
- return false;
- } else if (slave2.ballType == "sterile") {
- return false;
} else if (slave1.eggType == slave2.ballType) {
return true;
} else {
diff --git a/src/pregmod/eliteSlave.tw b/src/pregmod/eliteSlave.tw
index 27a44366d56..b375277f779 100644
--- a/src/pregmod/eliteSlave.tw
+++ b/src/pregmod/eliteSlave.tw
@@ -22,7 +22,7 @@ You check to see if any potential breeding slaves are on auction. <<if $eliteAuc
<<if $arcologies[0].FSSupremacist != "unset">>
<<set $fixedRace = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationist != "unset">>
- <<set _races = ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
+ <<set _races = ["amerindian", "asian", "asian", "asian", "asian", "asian", "asian", "black", "black", "indo-aryan", "indo-aryan", "latina", "latina", "latina", "malay", "malay", "middle eastern", "middle eastern", "mixed race", "pacific islander", "semitic", "semitic", "southern european", "southern european", "white", "white", "white", "white", "white", "white", "white", "white", "white"]>>
<<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
@@ -137,7 +137,7 @@ You check to see if any potential breeding slaves are on auction. <<if $eliteAuc
<<set $activeSlave.nipples = "puffy">>
<</if>>
<<set $activeSlave.face = 100>>
-<<set $activeSlave.faceShape = either("cute", "cute", "sensual", "sensual", "sensual", "normal", "normal", "exotic", "exotic")>>
+<<set $activeSlave.faceShape = either("cute", "cute", "exotic", "exotic", "normal", "normal", "sensual", "sensual", "sensual")>>
<<set $activeSlave.lips = random(45,75)>>
<<if $arcologies[0].FSTransformationFetishist > 20>>
<<set $activeSlave.lips += 25>>
@@ -198,7 +198,7 @@ You check to see if any potential breeding slaves are on auction. <<if $eliteAuc
<<set $activeSlave.attrKnown = 1>>
<<set $activeSlave.fetishKnown = 1>>
<<set $activeSlave.behavioralQuirk = "confident">>
-<<set $activeSlave.sexualQuirk = either("gagfuck queen", "strugglefuck queen", "tease", "romantic", "romantic", "perverted", "caring", "caring", "unflinching")>>
+<<set $activeSlave.sexualQuirk = either("caring", "caring", "gagfuck queen", "perverted", "romantic", "romantic", "strugglefuck queen", "tease", "unflinching")>>
<<set $activeSlave.pubertyXX = 1>>
<<set $activeSlave.breedingMark = 1>>
diff --git a/src/uncategorized/pCollaborationChoice.tw b/src/uncategorized/pCollaborationChoice.tw
index e8fec3030bb..caa28c753a0 100644
--- a/src/uncategorized/pCollaborationChoice.tw
+++ b/src/uncategorized/pCollaborationChoice.tw
@@ -10,14 +10,14 @@ Your next communication from the Daughters of Liberty is a request for a live vi
<br><br>
-"Hello, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>," $he says simply. "It's happening soon. The Daughters a<<s>>ked me to call you to ask you for your help. All they need i<<s the a<<cc>>e<<ss>> code<<s>> to your <<s>>ecurity <<system<<s. They'll let you live, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, they'll even let you take your money. But the arcology and the slaves, those will have to go free." $He hesitates a little. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, I like being free. But I don't want to see you killed. Please, please agree."
+"Hello, <<Master>>," $he says simply. "It's happening soon. The Daughters a<<s>>ked me to call you to ask you for your help. All they need i<<s the a<<cc>>e<<ss>> code<<s>> to your <<s>>ecurity <<system<<s. They'll let you live, <<Master>>, they'll even let you take your money. But the arcology and the slaves, those will have to go free." $He hesitates a little. "<<Master>> I like being free. But I don't want to see you killed. Please, please agree."
<br><br>
<span id="result">
<<link "Transmit the codes">>
<<replace "#result">>
- You transmit the access codes to your security systems. $traitor.slaveName smiles and thanks you. "You made the right decision, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>. I love you."
+ You transmit the access codes to your security systems. $traitor.slaveName smiles and thanks you. "You made the right decision, <<Master>>. I love you."
<<set $collaboration = 1>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw
index f5ddd7a99c5..cfc86f3135f 100644
--- a/src/uncategorized/reShelterInspection.tw
+++ b/src/uncategorized/reShelterInspection.tw
@@ -37,7 +37,7 @@
<<set $activeSlave.hLength = 40>>
<<set $activeSlave.hStyle = "up">>
<<set $activeSlave.energy = random(5,50)>>
-<<set $activeSlave.behavioralQuirk = either("gluttonous", "hates men", "hates women", "liberated")>>
+<<set $activeSlave.behavioralQuirk = either("hates men", "hates women", "gluttonous", "liberated")>>
<<set $activeSlave.sexualQuirk = either("apathetic", "idealistic")>>
<<set _slave = $shelterGirlsIDs.random()>>
@@ -51,9 +51,7 @@
<</if>>
*/
-<<setLocalPronouns $activeSlave>>
<<run Enunciate($subSlave)>>
-<<setLocalPronouns $subSlave 2>>
Your assistant announces a visitor in the entryway of your penthouse, and adds<<if $assistant > 0>> with disapproval<</if>> that it's an inspector from the Slave Shelter.
<<if $assistant > 0>>
@@ -94,15 +92,15 @@ Your assistant announces a visitor in the entryway of your penthouse, and adds<<
Her avatar turns a reproving blue and shrinks a little.
<</switch>>
<</if>>
-Not waiting to be greeted, the inspector looks up at the nearest camera and demands to be let in. $He's an older woman with graying hair up in a bun, holding a tablet against $his chest like a shield. "I'm here to inspect $subSlave.slaveName," $he bellows up at the camera.
+Not waiting to be greeted, the inspector looks up at the nearest camera and demands to be let in. She's an older woman with graying hair up in a bun, holding a tablet against her chest like a shield. "I'm here to inspect $subSlave.slaveName," she bellows up at the camera.
<br><br>
<span id="result">
-<<link "Amusing. Enslave $him">>
+<<link "Amusing. Enslave her">>
<<set $cash -= $contractCost>>
<<replace "#result">>
- <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> ushers $him into your penthouse and keeps $him busy for the few minutes you need to circumvent the Shelter's various legal and contractual defenses to prevent slaveowners from doing exactly what you're doing. Fortunately, you're cleverer and richer than most, and you succeed. You have $him brought into your office, and you are pleased to see $him. $He's not young and $he's not pretty, but $his suit cannot disguise $his big bottom, and $he's using the tablet $he has clasped protectively against $his chest to conceal a huge pair of mature breasts. $He knows exactly what's happened, and fixes you with a gimlet stare. "In a couple of months," $he says with venom, "when you've filled me full of hormones and drugs and training, and I'm begging you to <<if $PC.dick == 1>>stick your tiny little dick up<<else>>fist<</if>> my asshole, remember this. It'll be conditioning and self-preservation and Stockholm Syndrome talking, not me. I think you're a <<if $PC.title == 1>>sad bastard<<else>>vile cunt<</if>>, and I always will."
+ <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> ushers her into your penthouse and keeps her busy for the few minutes you need to circumvent the Shelter's various legal and contractual defenses to prevent slaveowners from doing exactly what you're doing. Fortunately, you're cleverer and richer than most, and you succeed. You have her brought into your office, and you are pleased to see her. She's not young and she's not pretty, but her suit cannot disguise her big bottom, and she's using the tablet she has clasped protectively against her chest to conceal a huge pair of mature breasts. She knows exactly what's happened, and fixes you with a gimlet stare. "In a couple of months," she says with venom, "when you've filled me full of hormones and drugs and training, and I'm begging you to <<if $PC.dick == 1>>stick your tiny little dick up<<else>>fist<</if>> my asshole, remember this. It'll be conditioning and self-preservation and Stockholm Syndrome talking, not me. I think you're a <<if $PC.title == 1>>sad bastard<<else>>vile cunt<</if>>, and I always will."
<<set $shelterAbuse += 10>>
<<include "New Slave Intro">>
<</replace>>
@@ -113,7 +111,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
<<set $activeSlave.clothes = "no clothing">>
<<set $cash -= $contractCost/2>>
<<replace "#result">>
- $subSlave.slaveName is attached to a milking machine, so it would be extremely unwise to let the inspector report on $subSlave.slaveName's industrial fate in all its gorgeous productivity. So, you greet $him politely, and bring $him down to $dairyName to show $him $subSlave.slaveName. The inspector has a single moment to stiffen in shock at the sight before she stiffens involuntarily due to the security drone tazing $him unconscious. It takes a few credits here and there to circumvent the Shelter's various legal and contractual defenses to prevent slaveowners from doing exactly what you're doing, but you finish the day richer by one more big-boobed milk producer. You leave the inspector's drug dosage low to start, so $he can appreciate $his situation for a while. When the inspector awakes, $his visor is set to show an overhead view of $his bay in $dairyName. $He sees $his breasts, already larger than $he remembers, gently swaying with the pumping of the milkers.<<if $dairyFeedersSetting > 1>> $He sees the huge phallus occupying $his mouth, and feels nutrition sliding down $his throat.<</if>><<if $dairyPregSetting > 1>> $He sees $his vagina drooling as it's fucked in preparation for pregnancy.<</if>><<if $dairyPregSetting > 1>> $He sees a massive piston moving slowly back and forth beneath $his buttocks, and understands what the ache of impossible fullness in $his bottom is.<</if>> $His hands ball into fists.
+ $subSlave.slaveName is attached to a milking machine, so it would be extremely unwise to let the inspector report on $subSlave.slaveName's industrial fate in all its gorgeous productivity. So, you greet her politely, and bring her down to $dairyName to show her $subSlave.slaveName. The inspector has a single moment to stiffen in shock at the sight before she stiffens involuntarily due to the security drone tazing her unconscious. It takes a few credits here and there to circumvent the Shelter's various legal and contractual defenses to prevent slaveowners from doing exactly what you're doing, but you finish the day richer by one more big-boobed milk producer. You leave the inspector's drug dosage low to start, so she can appreciate her situation for a while. When the inspector awakes, her visor is set to show an overhead view of her bay in $dairyName. She sees her breasts, already larger than she remembers, gently swaying with the pumping of the milkers.<<if $dairyFeedersSetting > 1>> She sees the huge phallus occupying her mouth, and feels nutrition sliding down her throat.<</if>><<if $dairyPregSetting > 1>> She sees her vagina drooling as it's fucked in preparation for pregnancy.<</if>><<if $dairyPregSetting > 1>> She sees a massive piston moving slowly back and forth beneath her buttocks, and understands what the ache of impossible fullness in her bottom is.<</if>> Her hands ball into fists.
<<set $shelterAbuse += 10>>
<<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</replace>>
@@ -122,72 +120,72 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
<<if ($dairyRestraintsSetting < 2) || ($subSlave.assignment != "work in the dairy")>>
<br><<link "Allow the inspection">>
<<replace "#result">>
- You have $him ushered up to your office, and order $subSlave.slaveName brought in.
+ You have her ushered up to your office, and order $subSlave.slaveName brought in.
<br><br>
<<if $subSlave.origin == "You got her at the Slave Shelter. She has never communicated anything about her background, since she arrived at the shelter with a broken mind.">>
<<if $subSlave.fetish == "mindbroken">>
- Of course, the poor _girl2 is just as mindbroken as ever. The inspector asks some cursory questions and gives up. "Don't worry," $he says. "I know _he2 was like this when you got _him2. Just - just keep trying, would you?" $He leaves, looking bitter.
+ Of course, the poor girl is just as mindbroken as ever. The inspector asks some cursory questions and gives up. "Don't worry," she says. "I know she was like this when you got her. Just - just keep trying, would you?" She leaves, looking bitter.
<<else>>
- The inspector asks some cursory questions and is shocked when _he2 responds. "_He2 came back?" she mutters, "You restored _his2 mind, I can't believe it. This is incredible." $He carries on while writing notes on $his tablet, "You're more than welcome to adopt slaves from our shelter." You swear $he seems in much better spirits as $he leaves your penthouse.
+ The inspector asks some cursory questions and is shocked when she responds. "S-she came back?" she mutters, "You restored her mind, I can't believe it. This is incredible." She carries on while writing notes on her tablet, "You're more than welcome to adopt slaves from our shelter." You swear she seems in much better spirits as she leaves your penthouse.
<<set $shelterAbuse -= 5>>
<</if>>
<<elseif $subSlave.origin == "You got her at the Slave Shelter. She was found unresponsive in the lower arcology with a gaping pussy and deflated belly. It is unclear what happened to her.">>
<<if $subSlave.fetish == "mindbroken">>
- Of course, the poor _girl2 is just as mindbroken as ever. The inspector asks some cursory questions and gives up. "Don't worry," she says. "I know she was like this when you got _him2. Just - just keep trying, would you?"
+ Of course, the poor girl is just as mindbroken as ever. The inspector asks some cursory questions and gives up. "Don't worry," she says. "I know she was like this when you got her. Just - just keep trying, would you?"
<<if $subSlave.pussy > 3 && $subSlave.bellySag > 1>>
- $He gropes the slave's sagging middle before inspecting _his2 ruined pussy. "Still ruined I see."
+ She gropes the slave's sagging middle before inspecting her ruined pussy. "Still ruined I see."
<<elseif $subSlave.pussy <= 3 && $subSlave.bellySag > 1>>
- $He gropes the slave's sagging middle before inspecting _his2 pussy. "Apart from the belly, _his2 pussy has recovered nicely."
+ She gropes the slave's sagging middle before inspecting her pussy. "Apart from the belly, her pussy has recovered nicely."
<<elseif $subSlave.pussy > 3 && $subSlave.bellySag <= 1>>
- $He gropes the slave's middle before inspecting _his2 ruined pussy. "_His2 stomach seems to have recovered, shame you did nothing for _his2 poor vagina."
+ She gropes the slave's middle before inspecting her ruined pussy. "Her stomach seems to have recovered, shame you did nothing for her poor vagina."
<<else>>
- $He runs $his hand across the slave's restored midriff, before inspecting _his2 pussy. "She is looking much better, physically, though. That's worth noting."
+ She runs her hand across the slave's restored midriff, before inspecting her pussy. "She is looking much better, physically, though. That's worth noting."
<<set $shelterAbuse-->>
<</if>>
- $He leaves, looking bitter.
+ She leaves, looking bitter.
<<else>>
- The inspector asks some cursory questions and is shocked when $he responds. "_He2 came back?" $he mutters, "You restored _his2 mind, I can't believe it. This is incredible." $He carries on while writing notes on $his tablet, "You're more than welcome to adopt slaves from our shelter." You swear $he seems in much better spirits as $he leaves your penthouse, even though $he forgot to check _his2 pussy.
+ The inspector asks some cursory questions and is shocked when she responds. "S-she came back?" she mutters, "You restored her mind, I can't believe it. This is incredible." She carries on while writing notes on her tablet, "You're more than welcome to adopt slaves from our shelter." You swear she seems in much better spirits as she leaves your penthouse, even though she forgot to check her pussy.
<<set $shelterAbuse -= 5>>
<</if>>
<<elseif $subSlave.fetish == "mindbroken">>
- Of course, the poor _girl2 is mindbroken now. The inspector is horrified, though $he tries to conceal it. $He makes lengthy notes on $his tablet, and almost runs out of the penthouse.
+ Of course, the poor girl is mindbroken now. The inspector is horrified, though she tries to conceal it. She makes lengthy notes on her tablet, and almost runs out of the penthouse.
<<set $shelterAbuse += 5>>
<<elseif $subSlave.trust < -20>>
- _He2 is sufficiently afraid of you that _he2 tells the inspector whatever _he2 thinks you'd want _him2 to say. The inspector, experienced at this, is not amused. $He offers you a few choice words, makes notes on $his tablet, and storms out.
+ She is sufficiently afraid of you that she tells the inspector whatever she thinks you'd want her to say. The inspector, experienced at this, is not amused. She offers you a few choice words, makes notes on her tablet, and storms out.
<<elseif $subSlave.devotion <= 20>>
- _He2 does not like you and isn't particularly terrified of you, so _he2 is not flattering. _He2's not stupid enough to really criticize you, but _he2 is honest and makes no effort to conceal troubling particulars. The inspector takes copious notes. $He offers you a few choice words, makes notes on $his tablet, and storms out.
+ She does not like you and isn't particularly terrified of you, so she is not flattering. She's not stupid enough to really criticise you, but she is honest and makes no effort to conceal troubling particulars. The inspector takes copious notes. She offers you a few choice words, makes notes on her tablet, and storms out.
<<elseif $subSlave.anus > 2>>
- _He2 cooperates with the inspector, who pulls on a pair of latex gloves and performs a complete examination. When $he pulls the girl's buttocks apart and probes the slave's asshole, $he pulls $his hand away as if scalded. "Oh my God," $he says. "$subSlave.birthName, what happened to your anus?"
+ She cooperates with the inspector, who pulls on a pair of latex gloves and performs a complete examination. When she pulls the girl's buttocks apart and probes the slave's asshole, she pulls her hand away as if scalded. "Oh my God," she says. "$subSlave.birthName, what happened to your anus?"
<br><br>
<<if ($subSlave.devotion < 10)>>
<<if ($subSlave.buttplug == "large plug") || ($subSlave.buttplug == "huge plug") || ($subSlave.buttplug == "long, large plug") || ($subSlave.buttplug == "long, huge plug")>>
- "W-well," _he2 says, "I wear a buttplug." The inspector frowns. "A buttplug shouldn't do that!" The slave looks worried and replies, "It'<<s>> kinda big? And I wear it all the time. B-but I like it! It d-doe<<s>>n't hurt. Well, anymore." The inspector is not amused. $He offers you a few choice words, makes notes on $his tablet, and storms out.
+ "W-well," she says, "I wear a buttplug." The inspector frowns. "A buttplug shouldn't do that!" The slave looks worried and replies, "It'<<s>> kinda big? And I wear it all the time. B-but I like it! It d-doe<<s>>n't hurt. Well, anymore." The inspector is not amused. She offers you a few choice words, makes notes on her tablet, and storms out.
<<elseif ($subSlave.assignment == "whore") || ($subSlave.assignment == "work in the brothel") || ($subSlave.assignment == "serve the public") || ($subSlave.assignment == "serve in the club")>>
- "W-well," _he2 says, "I get fucked there at work." The inspector frowns. "How often!?" The slave looks worried and replies, "L-let me think. Four time<<s>> today? After the third time, it u<<s>>ually <<s>>top<<s>> clo<<s>>ing up again between cock<<s>>." The inspector is not amused. $He offers you a few choice words, makes notes on $his tablet, and storms out.
+ "W-well," she says, "I get fucked there at work." The inspector frowns. "How often!?" The slave looks worried and replies, "L-let me think. Four time<<s>> today? After the third time, it u<<s>>ually <<s>>top<<s>> clo<<s>>ing up again between cock<<s>>." The inspector is not amused. She offers you a few choice words, makes notes on her tablet, and storms out.
<<elseif ($subSlave.fetish == "buttslut") && ($subSlave.fetishKnown == 1)>>
- "Hey," _he2 protests, "that'<<s>> normal." The inspector looks incredulous. "What!?" The slave looks insulted and replies, "I love anal <<s>>e<<x>>! Don't judge me. I want cock up that hole right now, you bitch. I'm going to beg for butt<<s>>e<<x>> the moment you leave." _He2 defiantly sticks _his2 rump out at you. The inspector looks deflated, and reluctantly makes a positive note on $his tablet.
+ "Hey," she protests, "that'<<s>> normal." The inspector looks incredulous. "What!?" The slave looks insulted and replies, "I love anal <<s>>e<<x>>! Don't judge me. I want cock up that hole right now, you bitch. I'm going to beg for butt<<s>>e<<x>> the moment you leave." She defiantly sticks her rump out at you. The inspector looks deflated, and reluctantly makes a positive note on her tablet.
<<set $shelterAbuse -= 1>>
<<elseif ($subSlave.energy > 95) && ($subSlave.fetishKnown == 1)>>
- "Hey," _he2 protests, "that'<<s>> normal." The inspector looks incredulous. "What!?" The slave looks insulted and replies, "I love <<s>>e<<x>>! Don't judge me. I take cock in all my hole<<s>>, and I like it. I'm going to beg for butt<<s>>e<<x>> the moment you leave, you bitch." _He2 defiantly sticks her rump out at you. The inspector looks deflated, and reluctantly makes a positive note on $his tablet.
+ "Hey," she protests, "that'<<s>> normal." The inspector looks incredulous. "What!?" The slave looks insulted and replies, "I love <<s>>e<<x>>! Don't judge me. I take cock in all my hole<<s>>, and I like it. I'm going to beg for butt<<s>>e<<x>> the moment you leave, you bitch." She defiantly sticks her rump out at you. The inspector looks deflated, and reluctantly makes a positive note on her tablet.
<<set $shelterAbuse -= 1>>
<<else>>
- "W-well," _he2 says, "I'm a <<s>>lave." The inspector frowns. "What does that have to do with it?" The slave looks worried and replies, "I-it'<<s>> a hole, right? I get fucked in all my hole<<s>>." The inspector is not amused. $He offers you a few choice words, makes notes on $his tablet, and storms out.
+ "W-well," she says, "I'm a <<s>>lave." The inspector frowns. "What does that have to do with it?" The slave looks worried and replies, "I-it'<<s>> a hole, right? I get fucked in all my hole<<s>>." The inspector is not amused. She offers you a few choice words, makes notes on her tablet, and storms out.
<</if>>
<<else>>
<<if ($subSlave.buttplug == "large plug") || ($subSlave.buttplug == "huge plug") || ($subSlave.buttplug == "long, large plug") || ($subSlave.buttplug == "long, huge plug")>>
- "I wear a buttplug!" _he2 says confidently. The inspector frowns. "A buttplug shouldn't do that!" The slave looks worried and replies, "It'<<s>> really big, and I wear it all the time. I like it! It keep<<s>> my hole ready for anything." The inspector looks deflated, and reluctantly makes a positive note on $his tablet.
+ "I wear a buttplug!" she says confidently. The inspector frowns. "A buttplug shouldn't do that!" The slave looks worried and replies, "It'<<s>> really big, and I wear it all the time. I like it! It keep<<s>> my hole ready for anything." The inspector looks deflated, and reluctantly makes a positive note on her tablet.
<<set $shelterAbuse -= 1>>
<<elseif ($subSlave.assignment == "whore") || ($subSlave.assignment == "work in the brothel") || ($subSlave.assignment == "serve the public") || ($subSlave.assignment == "serve in the club")>>
- "I get fucked there at work!" _he2 says confidently. The inspector frowns. "How often!?" The slave thinks for a moment and replies, "Four time<<s>> today. After the third time, it u<<s>>ually <<s>>top<<s>> clo<<s>>ing up again between cock<<s>>. I'm good at my job!" The inspector looks deflated, and reluctantly makes a positive note on $his tablet.
+ "I get fucked there at work!" she says confidently. The inspector frowns. "How often!?" The slave thinks for a moment and replies, "Four time<<s>> today. After the third time, it u<<s>>ually <<s>>top<<s>> clo<<s>>ing up again between cock<<s>>. I'm good at my job!" The inspector looks deflated, and reluctantly makes a positive note on her tablet.
<<set $shelterAbuse -= 1>>
<<elseif ($subSlave.fetish == "buttslut") && ($subSlave.fetishKnown == 1)>>
- "Hey," _he2 protests, "that'<<s>> normal." The inspector looks incredulous. "What!?" The slave looks insulted and replies, "I love anal <<s>>e<<x>>! Don't judge me. I want cock up that hole right now, you bitch. I'm going to beg for butt<<s>>e<<x>> the moment you leave." _He2 defiantly sticks _his2 rump out at you. The inspector looks deflated, and reluctantly makes a positive note on $his tablet.
+ "Hey," she protests, "that'<<s>> normal." The inspector looks incredulous. "What!?" The slave looks insulted and replies, "I love anal <<s>>e<<x>>! Don't judge me. I want cock up that hole right now, you bitch. I'm going to beg for butt<<s>>e<<x>> the moment you leave." She defiantly sticks her rump out at you. The inspector looks deflated, and reluctantly makes a positive note on her tablet.
<<set $shelterAbuse -= 1>>
<<elseif ($subSlave.energy > 95) && ($subSlave.fetishKnown == 1)>>
- "Hey," _he2 protests, "that'<<s>> normal." The inspector looks incredulous. "What!?" The slave looks insulted and replies, "I love <<s>>e<<x>>! Don't judge me. I take cock in all my hole<<s>>, and I like it. I'm going to beg for butt<<s>>e<<x>> the moment you leave, you bitch." _He2 defiantly sticks _his2 rump out at you. The inspector looks deflated, and reluctantly makes a positive note on $his tablet.
+ "Hey," she protests, "that'<<s>> normal." The inspector looks incredulous. "What!?" The slave looks insulted and replies, "I love <<s>>e<<x>>! Don't judge me. I take cock in all my hole<<s>>, and I like it. I'm going to beg for butt<<s>>e<<x>> the moment you leave, you bitch." She defiantly sticks her rump out at you. The inspector looks deflated, and reluctantly makes a positive note on her tablet.
<<set $shelterAbuse -= 1>>
<<else>>
- "I'm a <<s>>lave," _he2 says confidently. The inspector frowns. "What does that have to do with it?" The slave beams and replies, "It'<<s>> a hole. I'm a good girl, <<s>>o I get fucked in all my hole<<s>>." The inspector looks deflated, and reluctantly makes a positive note on $his tablet.
+ "I'm a <<s>>lave," she says confidently. The inspector frowns. "What does that have to do with it?" The slave beams and replies, "It'<<s>> a hole. I'm a good girl, <<s>>o I get fucked in all my hole<<s>>." The inspector looks deflated, and reluctantly makes a positive note on her tablet.
<<set $shelterAbuse -= 1>>
<</if>>
<</if>>
@@ -197,34 +195,33 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
<<switch $subSlave.assignment>>
<<case "whore" "work in the brothel">>
<<if ($subSlave.fetishStrength > 95) || ($subSlave.energy > 95)>>
- $subSlave.slaveName says happily, "I'm a whore!" The inspector makes a 'go on' gesture, and the slave continues, "It'<<s>> awe<<s>>ome. Nothing but cock, every day." The inspector looks deflated, and reluctantly makes a positive note on $his tablet.
+ $subSlave.slaveName says happily, "I'm a whore!" The inspector makes a go-on gesture, and the slave continues, "It'<<s>> awe<<s>>ome. Nothing but cock, every day." The inspector looks deflated, and reluctantly makes a positive note on her tablet.
<<set $shelterAbuse -= 1>>
<<else>>
- $subSlave.slaveName says confidently, "I'm a whore!" The inspector makes a 'go on' gesture, and the slave continues, "It'<<s>> hard work <<s>>ometime<<s>>, but I'm okay. I'm much happier with my current owner, thank you." The inspector looks pleased, and says $he'll put out a @@.green;good word@@ about you.
+ $subSlave.slaveName says confidently, "I'm a whore!" The inspector makes a go-on gesture, and the slave continues, "It'<<s>> hard work <<s>>ometime<<s>>, but I'm okay. I'm much happier with my current owner, thank you." The inspector looks pleased, and says she'll put out a @@.green;good word@@ about you.
<<set $rep += 100>>
<<set $shelterAbuse -= 1>>
<</if>>
- <<case "serve in the club" "serve the public">>
+ <<case "serve the public" "serve in the club">>
<<if ($subSlave.fetishStrength > 95) || ($subSlave.energy > 95)>>
- $subSlave.slaveName says happily, "I'm a <<s>>lut!" The inspector makes a 'go on' gesture, and the slave continues, "It'<<s>> awe<<s>>ome. Nothing but cute boy<<s>> and girl<<s>>, every day." The inspector looks deflated, and reluctantly makes a positive note on $his tablet.
+ $subSlave.slaveName says happily, "I'm a <<s>>lut!" The inspector makes a go-on gesture, and the slave continues, "It'<<s>> awe<<s>>ome. Nothing but cute boy<<s>> and girl<<s>>, every day." The inspector looks deflated, and reluctantly makes a positive note on her tablet.
<<set $shelterAbuse -= 1>>
<<else>>
- $subSlave.slaveName says confidently, "I'm a <<s>>lut!" The inspector makes a 'go on' gesture, and the slave continues, "It'<<s>> not bad. I'm much happier with my current owner, thank you." The inspector looks pleased, and says $he'll put out a @@.green;good word@@ about you.
+ $subSlave.slaveName says confidently, "I'm a <<s>>lut!" The inspector makes a go-on gesture, and the slave continues, "It'<<s>> not bad. I'm much happier with my current owner, thank you." The inspector looks pleased, and says she'll put out a @@.green;good word@@ about you.
<<set $rep += 100>>
<<set $shelterAbuse -= 1>>
<</if>>
<<case "get milked" "work in the dairy">>
<<if $subSlave.lactation > 0>>
- $subSlave.slaveName says happily, "I'm a milk cow!" The inspector arches an eyebrow skeptically, and the slave continues, "I give milk. <<s>>ee?" _He2 expresses a squirt of milk from one nipple. It'<<s>> a ni<<c>>e life. I'm much happier with my current owner, thank you." The inspector looks pleased, and says $he'll put out a @@.green;good word@@ about you.
+ $subSlave.slaveName says happily, "I'm a milk cow!" The inspector arches an eyebrow skeptically, and the slave continues, "I give milk. <<s>>ee?" She expresses a squirt of milk from one nipple. It'<<s>> a ni<<c>>e life. I'm much happier with my current owner, thank you." The inspector looks pleased, and says she'll put out a @@.green;good word@@ about you.
<<set $rep += 100>>
<<set $shelterAbuse -= 1>>
<<else>>
- $subSlave.slaveName says happily, "I get cockmilked!" The inspector arches an eyebrow skeptically, and the slave continues, "I give cum. It'<<s>> actually lot<<s>> of fun!" _He2 shakes _his2 penis for emphasis. "The machine feel<<s>> <<s>>o good. And when I'm almo<<s>>t empty, I get buttfucked to get the la<<s>>t drop out of me!" _He2 shivers. "It'<<s>> really ni<<c>>e..." The inspector looks deflated, and reluctantly makes a positive note on $his tablet.
+ $subSlave.slaveName says happily, "I get cockmilked!" The inspector arches an eyebrow skeptically, and the slave continues, "I give cum. It'<<s>> actually lot<<s>> of fun!" She shakes her penis for emphasis. "The machine feel<<s>> <<s>>o good. And when I'm almo<<s>>t empty, I get buttfucked to get the la<<s>>t drop out of me!" She shivers. "It'<<s>> really ni<<c>>e..." The inspector looks deflated, and reluctantly makes a positive note on her tablet.
<<set $shelterAbuse -= 1>>
<</if>>
<<default>>
- <<setPlayerPronouns>>
- $subSlave.slaveName <<say>>s flatly, "Whatever my beloved <<Master>> require<<s>>. I have a good life now, and I would appre<<c>>iate it if you would <<s>>upport me by doing everything you can for _himP." Taken aback, the inspector says $he'll put out a @@.green;good word@@ about you.
+ $subSlave.slaveName <<say>>s flatly, "Whatever my beloved <<Master>> require<<s>>. I have a good life now, and I would appre<<c>>iate it if you would <<s>>upport me by doing everything you can for <<if $PC.title == 1>>him<<else>>her<</if>>." Taken aback, the inspector says she'll put out a @@.green;good word@@ about you.
<<set $rep += 100>>
<<set $shelterAbuse -= 1>>
<</switch>>
@@ -232,4 +229,4 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
<</replace>>
<</link>>
<</if>>
-</span>
+</span>
\ No newline at end of file
diff --git a/src/uncategorized/spa.tw b/src/uncategorized/spa.tw
index 0ec95ce6c52..3e309654a8f 100644
--- a/src/uncategorized/spa.tw
+++ b/src/uncategorized/spa.tw
@@ -105,11 +105,11 @@ $spaNameCaps
<<if $spaFix == 2>>
$Attendant.slaveName is focusing only on the health and wellness of the slaves under $his care, obeying your orders to avoid attempting to right mental flaws.
[["Order " + $him + " to only fix mindbroken slaves"|Spa][$spaFix = 1]] |
- [["Let " + $him + " tend as she sees fit"|Spa][$spaFix = 0]]
+ [["Let " + $him + " tend as she " + $he + " fit"|Spa][$spaFix = 0]]
<<elseif $spaFix == 1>>
$Attendant.slaveName is focusing on the health and wellness of the slaves under $his care, as well as trying to bring mindbroken slaves back, while ignoring any mental hang-ups a slave may have.
[["Order " + $him + " to not fix flaws"|Spa][$spaFix = 2]] |
- [["Let " + $him + " tend as she sees fit"|Spa][$spaFix = 0]]
+ [["Let " + $him + " tend as " + $he + " sees fit"|Spa][$spaFix = 0]]
<<else>>
$Attendant.slaveName is not following any special orders and is tending to your slaves as $he sees fit.
[["Order " + $him + " to not fix any flaws"|Spa][$spaFix = 2]] |
--
GitLab