From e24a6984c5f57c8a1db5be786d80fd15cebc8ba6 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Thu, 7 Feb 2019 20:09:56 -0600
Subject: [PATCH] FeedbackNeeded
---
src/SpecialForce/Firebase.tw | 4 +-
src/SpecialForce/NamingColonel.tw | 2 +-
src/SpecialForce/Upgrades.tw | 2 +-
src/facilities/nursery/childInteract.tw | 112 ++++++++++++------------
src/uncategorized/RESS.tw | 2 +-
src/uncategorized/slaveInteract.tw | 4 +-
src/uncategorized/wardrobeUse.tw | 31 ++++++-
7 files changed, 91 insertions(+), 66 deletions(-)
diff --git a/src/SpecialForce/Firebase.tw b/src/SpecialForce/Firebase.tw
index de2b09e8e0f..21e2badae27 100644
--- a/src/SpecialForce/Firebase.tw
+++ b/src/SpecialForce/Firebase.tw
@@ -44,7 +44,7 @@
<br>While at the recent merc meetup, The Colonel made @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Income))>>@@ selling generic schematics to her friends, <<print commaNum($SF.MercCon.Menials)>> menial slaves were won in a poker game, and <<print commaNum($SF.MercCon.TotalMercs)>> mercenaries were persuaded to join $SF.Lower.
<br>Total earnings thus far: @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Revenue))>>@@ in income, <<print commaNum($SF.MercCon.TotalMenials)>> menial slaves and <<print commaNum($SF.MercCon.Mercs)>> mercenaries joined across $SF.MercCon.History meetups.
<</if>>
-
+
<<if $SF.UC.Lock < 1>>
<br><<switch $SF.UC.Assign>>
<<case 0>>
@@ -69,6 +69,6 @@
<<if $SF.Squad.Firebase > 5 && $secExp > 0 && $SFSupportLevel >= 4 && $maxUnits === 16 && $readiness <= 10>>
<br><br>[[Provide the security force with their own section.|Firebase][$maxUnits += 4,$readiness = 10,cashX(forceNeg(Math.ceil((750000*(1.15+($SF.Size/1000))*(1.15+($SF.Squad.Firebase/10)))*_Env)), "capEx")]]
@@.yellowgreen;<<print cashFormat(Math.ceil((750000*(1.15+($SF.Size/1000))*(1.15+($SF.Squad.Firebase/10)))*_Env))>>@@
- <</if>>
+ <</if>>
<br>[[Tour the firebase|Firebase][$Tour = 1]]
<<else>> <<= FlavourText()>> <br>[[Return to Operations|Firebase][$Tour=0]] <</if>>
\ No newline at end of file
diff --git a/src/SpecialForce/NamingColonel.tw b/src/SpecialForce/NamingColonel.tw
index 33867ce92e9..599a1e00b6f 100644
--- a/src/SpecialForce/NamingColonel.tw
+++ b/src/SpecialForce/NamingColonel.tw
@@ -125,5 +125,5 @@
Either way, I'll keep my hands off those mercs you've already installed. I figure that you've reasons for having two different death squads under contract.
<</if>>
<br><br>Oh, one last thing. I know you've got some kind of grand social experiment going on up there like all the other arco owners, and that's your own deal, but I'd appreciate it if you could keep that stuff out of the new barracks. I'll have a hard time approaching potential recruits and telling them they should come live in a Roman apartment, an Egyptian temple, a goddamn Japanese teahouse, or some of the other crazy shit I've seen in the past. They're hard, nasty people, and trust me, I can tell you from experience that changing that is just not going to happen. Like I said, though, I can hold them back a bit if you like.
- <br><br>Talk to you later, boss.//
+ <br><br>Talk to you later, boss.//
<</if>>
\ No newline at end of file
diff --git a/src/SpecialForce/Upgrades.tw b/src/SpecialForce/Upgrades.tw
index d2d1a3b94e1..62b74c8b545 100644
--- a/src/SpecialForce/Upgrades.tw
+++ b/src/SpecialForce/Upgrades.tw
@@ -159,7 +159,7 @@
//Costs @@.yellowgreen;<<print cashFormat(_cSub)>>@@ //<span style="float:right;"> <<print progress($SF.Squad.Sub)>> </span>
<<elseif $SF.Squad.Sub == _SubU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.Sub)>> </span>
<<else>>//The Submarine has been fully upgraded.//<span style="float:right;"> <<print progress($SF.Squad.Sub)>> </span><</if>></div>
-
+
<div style="margin-left:2em"><<if $SF.Squad.HAT < _HATU>>
<<set _cHAT = SFUpgradeCost(665000,$SF.Squad.HAT)>>
<<if $cash >= _cHAT>>
diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw
index 4a084b86752..7da46bfed79 100644
--- a/src/facilities/nursery/childInteract.tw
+++ b/src/facilities/nursery/childInteract.tw
@@ -39,7 +39,7 @@
<<if canDoVaginal($activeChild)>>
<<link "Fuck $him">><<replace "#miniscene">><<set $childSex = 1>><<include "FVagina">><br><</replace>><</link>>
<<if canDoAnal($activeChild)>>
- | <<link "Use $his holes">><<replace "#miniscene">><<set $childSex = 1>><<include "FButt">><br> <</replace>><</link>>
+ | <<link "Use $his holes">><<replace "#miniscene">><<set $childSex = 1>><<include "FButt">><br> <</replace>><</link>>
<</if>>
<<else>>
//Remove $his chastity belt if you wish to fuck $him//
@@ -48,9 +48,9 @@
</span>
<span id="analsexoption">
<<if canDoAnal($activeChild)>>
- | <<link "Fuck $his ass">><<replace "#miniscene">><<set $childSex = 1>><<include "FAnus">><br> <</replace>><</link>>
+ | <<link "Fuck $his ass">><<replace "#miniscene">><<set $childSex = 1>><<include "FAnus">><br> <</replace>><</link>>
<<else>>
- | //Remove $his chastity belt if you wish to fuck $his ass//
+ | //Remove $his chastity belt if you wish to fuck $his ass//
<</if>>
</span>
| <<link "Use $his mouth">><<replace "#miniscene">><<set $childSex = 1>><<include "FLips">><br> <</replace>><</link>>
@@ -70,14 +70,14 @@
<</if>>
<span id="analgropeoption">
<<if canDoAnal($activeChild)>>
- | <<link "Grope $his butt">><<replace "#miniscene">><<set $childSex = 1>><<include "FondleButt">><br> <</replace>><</link>>
+ | <<link "Grope $his butt">><<replace "#miniscene">><<set $childSex = 1>><<include "FondleButt">><br> <</replace>><</link>>
<</if>>
</span>
<span id="gropeoption">
<<if ($activeChild.vagina > -1)>>
<<if canDoVaginal($activeChild)>>
- | <<link "Grope $his pussy">><<replace "#miniscene">><<set $childSex = 1>><<include "FondleVagina">><br> <</replace>><</link>>
- | <<link "Eat $him out">><<replace "#miniscene">><<set $childSex = 1>><<include "FLickPussy">><br> <</replace>><</link>>
+ | <<link "Grope $his pussy">><<replace "#miniscene">><<set $childSex = 1>><<include "FondleVagina">><br> <</replace>><</link>>
+ | <<link "Eat $him out">><<replace "#miniscene">><<set $childSex = 1>><<include "FLickPussy">><br> <</replace>><</link>>
<</if>>
<</if>>
</span>
@@ -462,12 +462,12 @@
<</if>>
| <<link "Uncomfortable leather">><<set $activeChild.collar = "uncomfortable leather">><<replace "#collar">>$activeChild.collar<</replace>><</link>>
<<if $activeChild.preg > -1 && $seePreg != 0>>
-| <<link "Pregnancy biometrics">><<set $activeChild.collar = "preg biometrics">><<replace "#collar">>$activeChild.collar<</replace>><</link>>
+ | <<link "Pregnancy biometrics">><<set $activeChild.collar = "preg biometrics">><<replace "#collar">>$activeChild.collar<</replace>><</link>>
<</if>>
| <<link "Shock punishment">><<set $activeChild.collar = "shock punishment">><<replace "#collar">>$activeChild.collar<</replace>><</link>>
| <<link "Dildo gag">><<set $activeChild.collar = "dildo gag">><<replace "#collar">>$activeChild.collar<</replace>><</link>>
<<if isItemAccessible("massive dildo gag") && $activeChild.oralSkill > 50>>
-| <<link "Massive dildo gag">><<set $activeChild.collar = "massive dildo gag">><<replace "#collar">>$activeChild.collar<</replace>><</link>>
+ | <<link "Massive dildo gag">><<set $activeChild.collar = "massive dildo gag">><<replace "#collar">>$activeChild.collar<</replace>><</link>>
<</if>>
| <<link "Ball gag">><<set $activeChild.collar = "ball gag">><<replace "#collar">>$activeChild.collar<</replace>><</link>>
| <<link "Bit gag">><<set $activeChild.collar = "bit gag">><<replace "#collar">>$activeChild.collar<</replace>><</link>>
@@ -475,57 +475,57 @@
| <<link "Porcelain mask">><<set $activeChild.collar = "porcelain mask">><<replace "#collar">>$activeChild.collar<</replace>><</link>>
<<if $activeChild.amp != 1>>
-<br>Shoes: ''<span id="shoes">$activeChild.shoes</span>.''
-<<link "Go barefoot">><<set $activeChild.shoes = "none">><<replace "#shoes">>$activeChild.shoes<</replace>><</link>>
-| <<link "Flats">><<set $activeChild.shoes = "flats">><<replace "#shoes">>$activeChild.shoes<</replace>><</link>>
-| <<link "Heels">><<set $activeChild.shoes = "heels">><<replace "#shoes">>$activeChild.shoes<</replace>><</link>>
-| <<link "Pumps">><<set $activeChild.shoes = "pumps">><<replace "#shoes">>$activeChild.shoes<</replace>><</link>>
-| <<link "Thigh boots">><<set $activeChild.shoes = "boots">><<replace "#shoes">>$activeChild.shoes<</replace>><</link>>
-| <<link "Painfully extreme heels">><<set $activeChild.shoes = "extreme heels">><<replace "#shoes">>$activeChild.shoes<</replace>><</link>>
+ <br>Shoes: ''<span id="shoes">$activeChild.shoes</span>.''
+ <<link "Go barefoot">><<set $activeChild.shoes = "none">><<replace "#shoes">>$activeChild.shoes<</replace>><</link>>
+ | <<link "Flats">><<set $activeChild.shoes = "flats">><<replace "#shoes">>$activeChild.shoes<</replace>><</link>>
+ | <<link "Heels">><<set $activeChild.shoes = "heels">><<replace "#shoes">>$activeChild.shoes<</replace>><</link>>
+ | <<link "Pumps">><<set $activeChild.shoes = "pumps">><<replace "#shoes">>$activeChild.shoes<</replace>><</link>>
+ | <<link "Thigh boots">><<set $activeChild.shoes = "boots">><<replace "#shoes">>$activeChild.shoes<</replace>><</link>>
+ | <<link "Painfully extreme heels">><<set $activeChild.shoes = "extreme heels">><<replace "#shoes">>$activeChild.shoes<</replace>><</link>>
<</if>>
<<if $activeChild.amp != 1>>
-<br>Leg accessory: ''<span id="legAccessory">$activeChild.legAccessory</span>.''
-<<link "None">><<set $activeChild.legAccessory = "none">><<replace "#legAccessory">>$activeChild.legAccessory<</replace>><</link>>
-| <<link "Short Stockings">><<set $activeChild.legAccessory = "short stockings">><<replace "#legAccessory">>$activeChild.legAccessory<</replace>><</link>>
-| <<link "Long Stockings">><<set $activeChild.legAccessory = "long stockings">><<replace "#legAccessory">>$activeChild.legAccessory<</replace>><</link>>
+ <br>Leg accessory: ''<span id="legAccessory">$activeChild.legAccessory</span>.''
+ <<link "None">><<set $activeChild.legAccessory = "none">><<replace "#legAccessory">>$activeChild.legAccessory<</replace>><</link>>
+ | <<link "Short Stockings">><<set $activeChild.legAccessory = "short stockings">><<replace "#legAccessory">>$activeChild.legAccessory<</replace>><</link>>
+ | <<link "Long Stockings">><<set $activeChild.legAccessory = "long stockings">><<replace "#legAccessory">>$activeChild.legAccessory<</replace>><</link>>
<</if>>
<br>Torso accessory: ''<span id="bellyAccessory">$activeChild.bellyAccessory</span>.''
<<link "None">><<set $activeChild.bellyAccessory = "none">><<replace "#bellyAccessory">>$activeChild.bellyAccessory<</replace>><</link>>
| <<link "Tight corset">><<set $activeChild.bellyAccessory = "a corset">><<replace "#bellyAccessory">>$activeChild.bellyAccessory<</replace>><</link>>
<<if ($activeChild.breedingMark != 1 || $propOutcome == 0)>>
-| <<link "Extreme corset">><<set $activeChild.bellyAccessory = "an extreme corset">><<replace "#bellyAccessory">>$activeChild.bellyAccessory<</replace>><</link>>
+ | <<link "Extreme corset">><<set $activeChild.bellyAccessory = "an extreme corset">><<replace "#bellyAccessory">>$activeChild.bellyAccessory<</replace>><</link>>
<</if>>
<<if ($activeChild.belly > 10000)>>
-| <<link "Supportive band">><<set $activeChild.bellyAccessory = "a support band">><<replace "#bellyAccessory">>$activeChild.bellyAccessory<</replace>><</link>>
+ | <<link "Supportive band">><<set $activeChild.bellyAccessory = "a support band">><<replace "#bellyAccessory">>$activeChild.bellyAccessory<</replace>><</link>>
<</if>>
<<if isItemAccessible("a small empathy belly")>> /* works for all of them */
-<<if $activeChild.belly < 1500 && $activeChild.weight < 130>>
-| <<link "1st Trimester belly">><<set $activeChild.bellyAccessory = "a small empathy belly">><<replace "#bellyAccessory">>$activeChild.bellyAccessory<</replace>><</link>>
-| <<link "2nd Trimester belly">><<set $activeChild.bellyAccessory = "a medium empathy belly">><<replace "#bellyAccessory">>$activeChild.bellyAccessory<</replace>><</link>>
-| <<link "3rd Trimester belly">><<set $activeChild.bellyAccessory = "a large empathy belly">><<replace "#bellyAccessory">>$activeChild.bellyAccessory<</replace>><</link>>
-| <<link "3rd Trimester twins belly">><<set $activeChild.bellyAccessory = "a huge empathy belly">><<replace "#bellyAccessory">>$activeChild.bellyAccessory<</replace>><</link>>
-<<else>>
- | $His stomach is too big to fit an empathy belly around.
-<</if>>
+ <<if $activeChild.belly < 1500 && $activeChild.weight < 130>>
+ | <<link "1st Trimester belly">><<set $activeChild.bellyAccessory = "a small empathy belly">><<replace "#bellyAccessory">>$activeChild.bellyAccessory<</replace>><</link>>
+ | <<link "2nd Trimester belly">><<set $activeChild.bellyAccessory = "a medium empathy belly">><<replace "#bellyAccessory">>$activeChild.bellyAccessory<</replace>><</link>>
+ | <<link "3rd Trimester belly">><<set $activeChild.bellyAccessory = "a large empathy belly">><<replace "#bellyAccessory">>$activeChild.bellyAccessory<</replace>><</link>>
+ | <<link "3rd Trimester twins belly">><<set $activeChild.bellyAccessory = "a huge empathy belly">><<replace "#bellyAccessory">>$activeChild.bellyAccessory<</replace>><</link>>
+ <<else>>
+ | $His stomach is too big to fit an empathy belly around.
+ <</if>>
<</if>>
<br>Anal accessory: ''<span id="buttplug">$activeChild.buttplug</span>.''
<<link "None">><<set $activeChild.buttplug = "none", $activeChild.buttplugAttachment = "none">><<replace "#buttplug">>$activeChild.buttplug<</replace>><</link>>
| <<link "Normal">><<set $activeChild.buttplug = "plug">><<replace "#buttplug">>$activeChild.buttplug<</replace>><</link>>
<<if isItemAccessible("long plug") && ($activeChild.breedingMark != 1 || $propOutcome == 0)>>
-| <<link "Long">><<set $activeChild.buttplug = "long plug">><<replace "#buttplug">>$activeChild.buttplug<</replace>><</link>>
+ | <<link "Long">><<set $activeChild.buttplug = "long plug">><<replace "#buttplug">>$activeChild.buttplug<</replace>><</link>>
<</if>>
| <<link "Large">><<set $activeChild.buttplug = "large plug">><<replace "#buttplug">>$activeChild.buttplug<</replace>><</link>>
<<if isItemAccessible("long, large plug") && ($activeChild.breedingMark != 1 || $propOutcome == 0)>>
-| <<link "Long and large">><<set $activeChild.buttplug = "long, large plug">><<replace "#buttplug">>$activeChild.buttplug<</replace>><</link>>
+ | <<link "Long and large">><<set $activeChild.buttplug = "long, large plug">><<replace "#buttplug">>$activeChild.buttplug<</replace>><</link>>
<</if>>
<<if $activeChild.anus >= 2>>| <<link "Huge">><<set $activeChild.buttplug = "huge plug">><<replace "#buttplug">>$activeChild.buttplug<</replace>><</link>><</if>>
<<if isItemAccessible("long, huge plug")>>
-<<if ($activeChild.breedingMark != 1 || $propOutcome == 0) && $activeChild.anus >= 2>>
-| <<link "Long and huge">><<set $activeChild.buttplug = "long, huge plug">><<replace "#buttplug">>$activeChild.buttplug<</replace>><</link>>
-<</if>>
+ <<if ($activeChild.breedingMark != 1 || $propOutcome == 0) && $activeChild.anus >= 2>>
+ | <<link "Long and huge">><<set $activeChild.buttplug = "long, huge plug">><<replace "#buttplug">>$activeChild.buttplug<</replace>><</link>>
+ <</if>>
<</if>>
<<if isItemAccessible("tail") && $activeChild.buttplug != "none">>
Anal accessory attachment: ''<span id="buttplugAttach">$activeChild.buttplugAttachment</span>.''
@@ -537,30 +537,30 @@
<</if>>
<</if>>
<<if $activeChild.vagina > -1>>
-<br>Vaginal accessory: ''<span id="vaginalAccessory">$activeChild.vaginalAccessory</span>.''
-<<link "None">><<set $activeChild.vaginalAccessory = "none">><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
-| <<link "Dildo">><<set $activeChild.vaginalAccessory = "dildo">><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><</link>>
-<<if isItemAccessible("long dildo") && ($activeChild.breedingMark != 1 || $propOutcome == 0)>>
-| <<link "Long dildo">><<set $activeChild.vaginalAccessory = "long dildo">><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><</link>>
-<</if>>
-| <<link "Large dildo">><<set $activeChild.vaginalAccessory = "large dildo">><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><</link>>
-<<if isItemAccessible("long, large dildo") && ($activeChild.breedingMark != 1 || $propOutcome == 0)>>
-| <<link "Large and long dildo">><<set $activeChild.vaginalAccessory = "long, large dildo">><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><</link>>
-<</if>>
-<<if $activeChild.vagina >= 2>>| <<link "Huge dildo">><<set $activeChild.vaginalAccessory = "huge dildo">><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><</link>><</if>>
-<<if isItemAccessible("long, huge dildo") && ($activeChild.breedingMark != 1 || $propOutcome == 0)>>
-<<if $activeChild.vagina >= 2>>| <<link "Huge and long dildo">><<set $activeChild.vaginalAccessory = "long, huge dildo">><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><</link>><</if>>
-<</if>>
-| <<link "Chastity belt">><<set $activeChild.vaginalAccessory = "chastity belt",$activeChild.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
-| <<link "Anal chastity belt">><<set $activeChild.vaginalAccessory = "anal chastity",$activeChild.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
-| <<link "Combined chastity belt">><<set $activeChild.vaginalAccessory = "combined chastity",$activeChild.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
+ <br>Vaginal accessory: ''<span id="vaginalAccessory">$activeChild.vaginalAccessory</span>.''
+ <<link "None">><<set $activeChild.vaginalAccessory = "none">><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
+ | <<link "Dildo">><<set $activeChild.vaginalAccessory = "dildo">><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><</link>>
+ <<if isItemAccessible("long dildo") && ($activeChild.breedingMark != 1 || $propOutcome == 0)>>
+ | <<link "Long dildo">><<set $activeChild.vaginalAccessory = "long dildo">><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><</link>>
+ <</if>>
+ | <<link "Large dildo">><<set $activeChild.vaginalAccessory = "large dildo">><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><</link>>
+ <<if isItemAccessible("long, large dildo") && ($activeChild.breedingMark != 1 || $propOutcome == 0)>>
+ | <<link "Large and long dildo">><<set $activeChild.vaginalAccessory = "long, large dildo">><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><</link>>
+ <</if>>
+ <<if $activeChild.vagina >= 2>>| <<link "Huge dildo">><<set $activeChild.vaginalAccessory = "huge dildo">><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><</link>><</if>>
+ <<if isItemAccessible("long, huge dildo") && ($activeChild.breedingMark != 1 || $propOutcome == 0)>>
+ <<if $activeChild.vagina >= 2>>| <<link "Huge and long dildo">><<set $activeChild.vaginalAccessory = "long, huge dildo">><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><</link>><</if>>
+ <</if>>
+ | <<link "Chastity belt">><<set $activeChild.chastityVagina = 1,$activeChild.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
+ | <<link "Anal chastity belt">><<set $activeChild.chastityAnis = 1,$activeChild.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
+ | <<link "Combined chastity belt">><<set $activeChild.vaginalAccessory = "combined chastity",$activeChild.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
<</if>>
<<if $activeChild.dick > 0>>
-<br>Dick accessory: ''<span id="dickAccessory">$activeChild.dickAccessory</span>.''
-<<link "None">><<set $activeChild.dickAccessory = "none">><<replace "#dickAccessory">>$activeChild.dickAccessory<</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
-| <<link "Chastity cage">><<set $activeChild.dickAccessory = "chastity",$activeChild.choosesOwnChastity = 0>><<replace "#dickAccessory">>$activeChild.dickAccessory<</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
-| <<link "Anal chastity belt">><<set $activeChild.dickAccessory = "anal chastity",$activeChild.choosesOwnChastity = 0>><<replace "#dickAccessory">>$activeChild.dickAccessory<<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</replace>><</link>>
-| <<link "Combined chastity belt">><<set $activeChild.dickAccessory = "combined chastity",$activeChild.choosesOwnChastity = 0>><<replace "#dickAccessory">>$activeChild.dickAccessory<</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
+ <br>Dick accessory: ''<span id="dickAccessory">$activeChild.dickAccessory</span>.''
+ <<link "None">><<set $activeChild.dickAccessory = "none">><<replace "#dickAccessory">>$activeChild.dickAccessory<</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
+ | <<link "Chastity cage">><<set $activeChild.dickAccessory = "chastity",$activeChild.choosesOwnChastity = 0>><<replace "#dickAccessory">>$activeChild.dickAccessory<</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
+ | <<link "Anal chastity belt">><<set $activeChild.dickAccessory = "anal chastity",$activeChild.choosesOwnChastity = 0>><<replace "#dickAccessory">>$activeChild.dickAccessory<<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</replace>><</link>>
+ | <<link "Combined chastity belt">><<set $activeChild.dickAccessory = "combined chastity",$activeChild.choosesOwnChastity = 0>><<replace "#dickAccessory">>$activeChild.dickAccessory<</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
<</if>>
<<if $arcologies[0].FSRestart != "unset" && $activeChild.devotion > 20 && $activeChild.trust > 0 && $activeChild.choosesOwnClothes == 1>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 310a6ea250f..e2ba769323d 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -13361,7 +13361,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<elseif ($activeSlave.dick > 0)>>
$he's happy to take it up the ass, though there's no sign of an erection from $his useless sissy dick.
<<elseif !canDoVaginal($activeSlave)>>
- $he's obviously ready and willing to get buttfucked, even if $his body has no physically obvious way to shot it off.
+ $he's obviously ready and willing to get buttfucked, even if $his body has no physically obvious way to show it off.
<<else>>
$he's wet and ready and moans happily as you enter $him.
<</if>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index dc602c38c35..17e0336f530 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1055,8 +1055,8 @@
<<if isItemAccessible("long, huge dildo") && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
<<if $activeSlave.vagina >= 2>>| <<link "Huge and long dildo">><<set $activeSlave.vaginalAccessory = "long, huge dildo">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><</link>><</if>>
<</if>>
- | <<link "Chastity belt">><<set $activeSlave.vaginalAccessory = "chastity belt",$activeSlave.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
- | <<link "Anal chastity belt">><<set $activeSlave.vaginalAccessory = "anal chastity",$activeSlave.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
+ | <<link "Chastity belt">><<set $activeSlave.chastityVagina = 1,$activeSlave.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
+ | <<link "Anal chastity belt">><<set $activeSlave.chastityAnis = 1,$activeSlave.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
| <<link "Combined chastity belt">><<set $activeSlave.vaginalAccessory = "combined chastity",$activeSlave.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
<</if>>
<<if $activeSlave.dick > 0>>
diff --git a/src/uncategorized/wardrobeUse.tw b/src/uncategorized/wardrobeUse.tw
index 50da0f50f10..233a198b34c 100644
--- a/src/uncategorized/wardrobeUse.tw
+++ b/src/uncategorized/wardrobeUse.tw
@@ -1064,7 +1064,33 @@ Clothes: ''<span id="clothes">$activeSlave.clothes</span>.''
//Extreme corsets will endanger the life within $him.//
<</if>>
+<br><br>
+Chastity device:
<br>
+<<if $activeSlave.vagina > -1>>
+ <<link "Chastity belt">>
+ <<set $activeSlave.chastityVagina = 1,$activeSlave.choosesOwnChastity = 0>>
+ <<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>>
+ <<replace "#vaginalAccessoryDescription">>//<<vaginalAccessoryDescription>>//<</replace>>
+ <<replace "#buttplugDescription">>//<<buttplugDescription>>//<</replace>>
+ <</link>>
+ |
+</if>>
+<<if $activeSlave.dick > 0>>
+ <<link "Chastity cage">>
+ <<set $activeSlave.chastityPenis = 1,$activeSlave.choosesOwnChastity = 0>>
+ <<replace "#dickAccessory">>$activeSlave.dickAccessory<</replace>>
+ <<replace "#dickAccessoryDescription">><br>//<<dickAccessoryDescription>>//<</replace>>
+ <<replace "#buttplugDescription">>//<<buttplugDescription>>//<</replace>>
+ <</link>>
+ |
+<</if>>
+<<link "Anal chastity belt">>
+ <<set $activeSlave.chastityAnis = 1,$activeSlave.choosesOwnChastity = 0>>
+ <<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>>
+ <<replace "#vaginalAccessoryDescription">>//<<vaginalAccessoryDescription>>//<</replace>>
+ <<replace "#buttplugDescription">>//<<buttplugDescription>>//<</replace>>
+<</link>>
<<if $activeSlave.vagina > -1>>
<br><br>Vaginal accessory: ''<span id="vaginalAccessory">$activeSlave.vaginalAccessory</span>.''
@@ -1121,18 +1147,17 @@ Clothes: ''<span id="clothes">$activeSlave.clothes</span>.''
<</if>>
<</if>>
| <<link "Chastity belt">>
- <<set $activeSlave.vaginalAccessory = "chastity belt",$activeSlave.choosesOwnChastity = 0>>
+ <<set $activeSlave.chastityVagina = 1,$activeSlave.choosesOwnChastity = 0>>
<<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>>
<<replace "#vaginalAccessoryDescription">>//<<vaginalAccessoryDescription>>//<</replace>>
<<replace "#buttplugDescription">>//<<buttplugDescription>>//<</replace>>
<</link>>
| <<link "Anal chastity belt">>
- <<set $activeSlave.vaginalAccessory = "anal chastity",$activeSlave.choosesOwnChastity = 0>>
+ <<set $activeSlave.chastityAnis = 1,$activeSlave.choosesOwnChastity = 0>>
<<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>>
<<replace "#vaginalAccessoryDescription">>//<<vaginalAccessoryDescription>>//<</replace>>
<<replace "#buttplugDescription">>//<<buttplugDescription>>//<</replace>>
<</link>>
-
| <<link "Combined chastity belt">>
<<set $activeSlave.vaginalAccessory = "combined chastity",$activeSlave.choosesOwnChastity = 0>>
<<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>>
--
GitLab