From 8b82f5980508091df3b5befc6c462d68ac723ac6 Mon Sep 17 00:00:00 2001
From: Blank <okp57855@psoxs.com>
Date: Sat, 17 Nov 2018 11:07:02 -0800
Subject: [PATCH] ITT bugfixes/tweaking suggestions.
---
devTools/AutoGitVersionUploadBackground.sh | 10 +-
src/SpecialForce/Report.tw | 2 +-
src/SpecialForce/WeeklyChoices.tw | 311 +++++++++---------
src/init/storyInit.tw | 2 +
src/npc/descriptions/fAnus.tw | 70 ++--
src/npc/descriptions/fButt.tw | 2 +-
src/npc/descriptions/fVagina.tw | 2 +-
src/pregmod/beastFuck.tw | 70 ++--
src/pregmod/beastFucked.tw | 70 ++--
src/pregmod/fDick.tw | 2 +-
src/pregmod/pAssociatesPublicSlut.tw | 2 +-
src/uncategorized/BackwardsCompatibility.tw | 4 +
src/uncategorized/options.tw | 8 +
src/uncategorized/randomNonindividualEvent.tw | 4 +-
src/uncategorized/saDrugs.tw | 4 +-
15 files changed, 294 insertions(+), 269 deletions(-)
diff --git a/devTools/AutoGitVersionUploadBackground.sh b/devTools/AutoGitVersionUploadBackground.sh
index e0a78540509..597c5ba6a29 100755
--- a/devTools/AutoGitVersionUploadBackground.sh
+++ b/devTools/AutoGitVersionUploadBackground.sh
@@ -1,8 +1,8 @@
#!/bin/sh Additional packages required: megatools, MEGAcmd, minify and git
U=anon@anon.anon P=13245 sdr=/tmp/FC-Dev/devTools rdr=FC/ ldr=FC/ gen='bin/*.*' rpo=https://gitgud.io/pregmodfan/fc-pregmod.git preVC=00; echo "Fresh git clone? 0:y 1:n 2:na" && read Opt && clear && mega-login $U $P > /dev/null
while true;do if [ `ls $ldr|echo $?` -eq 0 ]; then cd $ldr;fi ;clear
- if [[ $Opt == 0 ]]; then mkdir $ldr; git clone -q $rpo $ldr && cd $ldr && if [ `git log -n1 --abbrev-commit|grep -m1 commit|sed 's/commit //'` != $preVC ]; then build=1 && sed -Ei "s/preVC=$preVC/preVC=$(git log -n1 --abbrev-commit|grep -m1 commit|sed 's/commit //')/" $sdr/AutoGitVersionUploadBackground.sh;fi
- elif [[ $Opt > 0 || $build < 1 ]]; then git fetch -q origin && if [ `git rev-list HEAD...origin/pregmod-master --count` -gt 0 ]; then build=1 && git pull -q && sed -Ei "s/preVC=$preVC/preVC=$(git log -n1 --abbrev-commit|grep -m1 commit|sed 's/commit //')/" $sdr/AutoGitVersionUploadBackground.sh;fi #A tweak of https://stackoverflow.com/a/17192101 and single line conversion.
- fi
- if [[ $Opt > 1 || $build > 0 ]]; then rm $gen; ./compile --insane && clear && minify -o $gen $gen && mv $gen bin/"FC-pregmod-$(git log -1 --format='%cd' --date='format:%d-%m-%Y-%H-%M')-$(git log -n1 --abbrev-commit|grep -m1 commit|sed 's/commit //')".html && mega-put $gen $rdr && megals -u $U -p $P /Root/$rdr|sed -n '1!p'|tail -n +10|paste -sd " " -|xargs megarm -u $U -p $P;clear;fi
-if [[ $build > 0 ]];then build=0;fi ; if [[ $Opt != -1 ]];then Opt=-1;fi ;sleep 15m ;done
\ No newline at end of file
+ if [[ $Opt == 0 ]]; then mkdir $ldr; git clone -q $rpo $ldr && cd $ldr && if [ `git log -n1 --abbrev-commit|grep -m1 commit|sed 's/commit //'|sed s'/.$//'` != $preVC ]; then build=1 && sed -Ei "s/preVC=$preVC/preVC=$(git log -n1 --abbrev-commit|grep -m1 commit|sed 's/commit //'|sed s'/.$//')/" $sdr/AutoGitVersionUploadBackground.sh;fi
+ elif [[ $Opt > 0 || $build < 1 ]]; then git fetch -q origin && if [ `git rev-list HEAD...origin/pregmod-master --count` -gt 0 ]; then build=1 && git pull -q && sed -Ei "s/preVC=$preVC/preVC=$(git log -n1 --abbrev-commit|grep -m1 commit|sed 's/commit //'|sed s'/.$//')/" $sdr/AutoGitVersionUploadBackground.sh;fi #A tweak of https://stackoverflow.com/a/17192101 and single line conversion.
+ fi #sed s'/.$//' - https://stackoverflow.com/a/3675181
+ if [[ $Opt > 1 || $build > 0 ]]; then rm $gen; ./compile --insane && clear && minify -o $gen $gen && mv $gen bin/"FC-pregmod-$(git log -1 --format='%cd' --date='format:%d-%m-%Y-%H-%M')-$(git log -n1 --abbrev-commit|grep -m1 commit|sed 's/commit //'|sed s'/.$//')".html && mega-put $gen $rdr && megals -u $U -p $P /Root/$rdr|sed -n '1!p'|tail -n +10|paste -sd " " -|xargs megarm -u $U -p $P;clear;fi
+if [[ $build > 0 ]];then build=0;fi ; if [[ $Opt != -1 ]];then Opt=-1;fi ;sleep 30m ;done
diff --git a/src/SpecialForce/Report.tw b/src/SpecialForce/Report.tw
index e9c0547e74e..234126ee92b 100644
--- a/src/SpecialForce/Report.tw
+++ b/src/SpecialForce/Report.tw
@@ -173,7 +173,7 @@ $SF.Caps managed to recruit <<print Math.round(_FNGs/2)>> new soldiers this week
<<link "Hold Fire">> <<set $SF.ROE = "hold">> <<replace "#roe">> ''Hold Fire''
<</replace>> <</link>>
| <<link "Limited Fire">> <<set $SF.ROE = "limited">> <<replace "#roe">>
- 'Limited Fire'' <</replace>> <</link>>
+ ''Limited Fire'' <</replace>> <</link>>
| <<link "Free Fire">> <<set $SF.ROE = "free">> <<replace "#roe">> ''Free Fire''
<</replace>> <</link>>
<br> Accountability:
diff --git a/src/SpecialForce/WeeklyChoices.tw b/src/SpecialForce/WeeklyChoices.tw
index 064f833b990..b9427691779 100644
--- a/src/SpecialForce/WeeklyChoices.tw
+++ b/src/SpecialForce/WeeklyChoices.tw
@@ -12,13 +12,15 @@
<<set $GoodWords1 += 50*(Math.ceil($SF.Units*0.03*_Env))>>
<<set $GoodWords1 = (Number($GoodWords1) ? $GoodWords1 : 500),$SF.WG = 1>>
<<set $rep += $GoodWords1,$choice = 2>>
- <</link>><</if>>
+ <</link>>
+ <</if>>
<<if $arcologies[0].prosperity < $AProsperityCap>>
<br>Or we could hit some businesses that rival the ones in $arcologies[0].name with some sabotage. | <<link "Request sabotage""Firebase">>
<<set $GoodWords2 = _EnvProsp+(Math.ceil($SF.Units/100*_Env)),$SF.WG = 1,$choice = 3>>
<<if $arcologies[0].prosperity + $GoodWords2 > $AProsperityCap>>
<<set $arcologies[0].prosperity = $AProsperityCap>>
- <<else>><<set $arcologies[0].prosperity += $GoodWords2>><</if>> <</link>> <</if>>
+ <<else>> <<set $arcologies[0].prosperity += $GoodWords2>> <</if>> <</link>>
+ <</if>>
<<elseif $SF.WG == 0 && ($SFTradeShow.CanAttend > -1 || ($SFColonel.Talk + $SFColonel.Fun > 0))>>
<br>He looks down a list on his tablet. "<<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>, how can $SF.Lower help you this week?
<br>$SF.Caps can spare some profits from our recent operations. | <<link "Request cash""Firebase">>
@@ -30,168 +32,171 @@
<<set $GoodWords1 += 50*(Math.ceil($SF.Units*0.03*_Env))>>
<<set $GoodWords1 = (Number($GoodWords1) ? $GoodWords1 : 500),$SF.WG = 1>>
<<set $rep += Math.ceil($GoodWords1*0.8),$choice = 2>>
- <</link>> <</if>>
+ <</link>>
+ <</if>>
<<if $arcologies[0].prosperity < $AProsperityCap>>
<br>Or we can target rival businesses for sabotage. | <<link "Request sabotage""Firebase">>
<<set $GoodWords2 = _EnvProsp+(Math.ceil($SF.Units/100*_Env)),$SF.WG = 1,$choice = 3>>
<<if $arcologies[0].prosperity + $GoodWords2 * 0.8 > $AProsperityCap>>
<<set $arcologies[0].prosperity = $AProsperityCap>>
- <<else>><<set $arcologies[0].prosperity += Math.ceil($GoodWords2*0.8)>><</if>> <</link>> <</if>>
+ <<else>> <<set $arcologies[0].prosperity += Math.ceil($GoodWords2*0.8)>> <</if>> <</link>>
+ <</if>>
<</if>>
<<if $SFColonel.Talk === 0 && $SFColonel.Fun === 0 && $SFTradeShow.CanAttend === -1>> <span id="result0">
<br><br>If you need me for anything else, let me know."<br>
-<<if $SFColonel.Status >= 25>>
- <<link "Walk with the Colonel on the surface.">> <<replace "#result0">>
- <<set $SFColonel.Talk = 1>>
- <br><br>You ask the Colonel if she would like to stretch her legs up on the surface. It doesn't take much effort for her to agree.
- <<if $PC.warfare >= 100 && $PC.career == "mercenary">>
- Your mastery of wet work and prior experience in a PMC satisfies the Colonel that between you<<if $Bodyguard != 0>> , $Bodyguard.slaveName,<</if>> and her, there should be little threat to walking around the arcology. Being able to see and interact with the arcology owner directly maintains the false idea that you're just like one of them while also giving them an increased opportunity to try gaining your favor.
- <<set $rep += 10, $cash += _EnvCash2>>
- <<elseif $PC.warfare >= 100>>
- Your mastery of wet work satisfies the Colonel that you only need two soldiers <<if $Bodyguard != 0>> plus $Bodyguard.slaveName<</if>> to walk safely around the arcology. Being able to see and interact with the arcology owner directly maintains the false idea that you're just like one of them while also giving them an increased opportunity to try gaining your favor.
- <<set $rep += 5, $cash += _EnvCash3>>
- <<elseif $PC.warfare >= 60>>
- With some expertise in warfare, the Colonel believes <<if $Bodyguard != 0>>with $Bodyguard.slaveName <</if>>you only need a squad of armed soldiers for a walk through the arcology.
- <<elseif $PC.warfare >= 30>>
- As you have some skill in warfare, the Colonel believes<<if $Bodyguard != 0>> with $Bodyguard.slaveName<</if>> you only need two full squads of armed soldiers for a walk around the arcology.
- <<elseif $PC.warfare >= 10>>
- Your minor skill in warfare convinces the Colonel that <<if $Bodyguard != 0>>in addition to $Bodyguard.slaveName, <</if>>you need two full squads of armed soldiers and an armored car escort for a simple walk around the arcology.
- <<else>>
- Your complete lack of combat skill convinces the Colonel that <<if $Bodyguard != 0>>in addition to $Bodyguard.slaveName, <</if>>you need two full squads of armed soldiers, an armored car escort, and a sniper overwatch for a simple walk around the arcology.
- <</if>><br>As you make your way through the arcology you stop at a
- <<if $arcologies[0].FSPaternalist != "unset">>
- paternalist shop, <<if $SFColonel.Core == "cruel">>earning a sneer from the Colonel.<<else>>helping the Colonel select some luxurious and relaxing slave treatments.<</if>>
- <<elseif $arcologies[0].FSPastoralist != "unset">>
- pastoralist shop, helping the Colonel select a more comfortable breast pump.
- <<else>>shop that catches the Colonel's eye. <</if>>
- <<if $PC.slaving >= 100 && $PC.career == "slaver">>
- Your mastery and extensive history of slaving allows you assist the Colonel greatly. The shop owner is so impressed by your understanding of slavery that she asks you for some advice. Before you leave, you manage to pass on a few tips, helping the business with future customers.
- <<if $arcologies[0].prosperity < $AProsperityCap>>
- <<set $arcologies[0].prosperity++>> <</if>>
- <<elseif $PC.slaving >= 100>>
- Your mastery and extensive history of slaving allows you assist the Colonel greatly. The shop owner is so impressed by your understanding of slavery that she asks you for some advice. Before you leave, you manage to pass on a few tips, helping the business with future customers.
- <<if $arcologies[0].prosperity < $AProsperityCap>>
- <<set $arcologies[0].prosperity++>> <</if>>
- <<elseif $PC.slaving >= 60>>
- Your expertise in slavery allows you to help the Colonel decide what to buy for her main slave.
- <<elseif $PC.slaving >= 30>>
- Your moderate skill in slavery makes you somewhat helpful to the Colonel in deciding what to buy for her main slave.
- <<elseif $PC.slaving >= 10>>
- Your basic skill level of slavery doesn't allow you to help the Colonel at all.
- <<elseif $PC.slaving < 10>>
- Your total lack of slavery skill (which is very unusual and very concerning for an arcology owner) means that you are of little to no help or even a hindrance. The shopkeeper notices your complete ineptitude, and as soon as you've left the rumor mill begins.
- <<set $rep -= 20>><</if>>
- <br>Soon the entourage heads back to the HQ of $SF.Lower.
- <<if random(1,100) > 50>>Along the route you see a homeless citizen with a serious injury begging for help.
- <<if $PC.medicine >= 100 && $PC.career == "medicine">>
- Your expertise in surgery ensures that the citizen receives the best care they'll ever experience in their life. They are so grateful that they are more than happy to try and compensate your time. Word quickly spreads of the kindly medically trained arcology owner who took the time to heal a citizen, providing confidence to the rest of the citizens.
- <<set $rep += 10, $cash += _EnvCash4>>
- <<elseif $PC.medicine >= 100>>
- Your expertise in surgery ensures that the citizen receives the best care they'll ever experience in their life. Word quickly spreads of the kindly arcology owner who took the time to heal a citizen.
- <<set $rep += 5>>
- <<elseif $PC.medicine >= 60>>
- Your proficiency in surgery allows you to properly close their wound with minimal trauma to the patient.
- <<elseif $PC.medicine >= 30>>
- Your moderate surgical skill ensures that you can close the citizen's wound, though not without likely scarring.
- <<elseif $PC.medicine >= 10>>
- Your basic surgical skill in medicine is sufficient only to stabilize the citizen's wounds before medical assistnance arrives.
+ <<if $SFColonel.Status >= 25>>
+ <<link "Walk with the Colonel on the surface.">> <<replace "#result0">>
+ <<set $SFColonel.Talk = 1>>
+ <br><br>You ask the Colonel if she would like to stretch her legs up on the surface. It doesn't take much effort for her to agree.
+ <<if $PC.warfare >= 100 && $PC.career == "mercenary">>
+ Your mastery of wet work and prior experience in a PMC satisfies the Colonel that between you<<if $Bodyguard != 0>> , $Bodyguard.slaveName,<</if>> and her, there should be little threat to walking around the arcology. Being able to see and interact with the arcology owner directly maintains the false idea that you're just like one of them while also giving them an increased opportunity to try gaining your favor.
+ <<set $rep += 10, $cash += _EnvCash2>>
+ <<elseif $PC.warfare >= 100>>
+ Your mastery of wet work satisfies the Colonel that you only need two soldiers <<if $Bodyguard != 0>> plus $Bodyguard.slaveName<</if>> to walk safely around the arcology. Being able to see and interact with the arcology owner directly maintains the false idea that you're just like one of them while also giving them an increased opportunity to try gaining your favor.
+ <<set $rep += 5, $cash += _EnvCash3>>
+ <<elseif $PC.warfare >= 60>>
+ With some expertise in warfare, the Colonel believes <<if $Bodyguard != 0>>with $Bodyguard.slaveName <</if>>you only need a squad of armed soldiers for a walk through the arcology.
+ <<elseif $PC.warfare >= 30>>
+ As you have some skill in warfare, the Colonel believes<<if $Bodyguard != 0>> with $Bodyguard.slaveName<</if>> you only need two full squads of armed soldiers for a walk around the arcology.
+ <<elseif $PC.warfare >= 10>>
+ Your minor skill in warfare convinces the Colonel that <<if $Bodyguard != 0>>in addition to $Bodyguard.slaveName, <</if>>you need two full squads of armed soldiers and an armored car escort for a simple walk around the arcology.
<<else>>
- Your total lack of surgical skill causes the death of the citizen through repeated medical blunders.
- <<set $arcologies[0].prosperity -= .25>><</if>><</if>>
- <<set $SFColonel.Status += 2>><</replace>> <</link>><</if>>
+ Your complete lack of combat skill convinces the Colonel that <<if $Bodyguard != 0>>in addition to $Bodyguard.slaveName, <</if>>you need two full squads of armed soldiers, an armored car escort, and a sniper overwatch for a simple walk around the arcology.
+ <</if>> <br>As you make your way through the arcology you stop at a
+ <<if $arcologies[0].FSPaternalist != "unset">>
+ paternalist shop, <<if $SFColonel.Core == "cruel">>earning a sneer from the Colonel.<<else>>helping the Colonel select some luxurious and relaxing slave treatments.<</if>>
+ <<elseif $arcologies[0].FSPastoralist != "unset">>
+ pastoralist shop, helping the Colonel select a more comfortable breast pump.
+ <<else>>shop that catches the Colonel's eye. <</if>>
+ <<if $PC.slaving >= 100 && $PC.career == "slaver">>
+ Your mastery and extensive history of slaving allows you assist the Colonel greatly. The shop owner is so impressed by your understanding of slavery that she asks you for some advice. Before you leave, you manage to pass on a few tips, helping the business with future customers.
+ <<if $arcologies[0].prosperity < $AProsperityCap>>
+ <<set $arcologies[0].prosperity++>> <</if>>
+ <<elseif $PC.slaving >= 100>>
+ Your mastery and extensive history of slaving allows you assist the Colonel greatly. The shop owner is so impressed by your understanding of slavery that she asks you for some advice. Before you leave, you manage to pass on a few tips, helping the business with future customers.
+ <<if $arcologies[0].prosperity < $AProsperityCap>>
+ <<set $arcologies[0].prosperity++>> <</if>>
+ <<elseif $PC.slaving >= 60>>
+ Your expertise in slavery allows you to help the Colonel decide what to buy for her main slave.
+ <<elseif $PC.slaving >= 30>>
+ Your moderate skill in slavery makes you somewhat helpful to the Colonel in deciding what to buy for her main slave.
+ <<elseif $PC.slaving >= 10>>
+ Your basic skill level of slavery doesn't allow you to help the Colonel at all.
+ <<elseif $PC.slaving < 10>>
+ Your total lack of slavery skill (which is very unusual and very concerning for an arcology owner) means that you are of little to no help or even a hindrance. The shopkeeper notices your complete ineptitude, and as soon as you've left the rumor mill begins.
+ <<set $rep -= 20>><</if>>
+ <br>Soon the entourage heads back to the HQ of $SF.Lower.
+ <<if random(1,100) > 50>>Along the route you see a homeless citizen with a serious injury begging for help.
+ <<if $PC.medicine >= 100 && $PC.career == "medicine">>
+ Your expertise in surgery ensures that the citizen receives the best care they'll ever experience in their life. They are so grateful that they are more than happy to try and compensate your time. Word quickly spreads of the kindly medically trained arcology owner who took the time to heal a citizen, providing confidence to the rest of the citizens.
+ <<set $rep += 10, $cash += _EnvCash4>>
+ <<elseif $PC.medicine >= 100>>
+ Your expertise in surgery ensures that the citizen receives the best care they'll ever experience in their life. Word quickly spreads of the kindly arcology owner who took the time to heal a citizen.
+ <<set $rep += 5>>
+ <<elseif $PC.medicine >= 60>>
+ Your proficiency in surgery allows you to properly close their wound with minimal trauma to the patient.
+ <<elseif $PC.medicine >= 30>>
+ Your moderate surgical skill ensures that you can close the citizen's wound, though not without likely scarring.
+ <<elseif $PC.medicine >= 10>>
+ Your basic surgical skill in medicine is sufficient only to stabilize the citizen's wounds before medical assistnance arrives.
+ <<else>>
+ Your total lack of surgical skill causes the death of the citizen through repeated medical blunders.
+ <<set $arcologies[0].prosperity -= .25>><</if>>
+ <</if>>
+ <<set $SFColonel.Status += 2>> <</replace>> <</link>>
+ <</if>>
-<br><<link "Talk in $SF.Lower's HQ.">> <<replace "#result0">> <span id="result1">
-<br><br>What do you want to do with the Colonel in the HQ?
-<br><<link "Talk">><<replace "#result1">>
-<br><br>You and the Colonel talk over some $PC.refreshment, where she ends up talking about her past. You learn a little more about her.
-<<set $SFColonel.Status +=3>>
-<<switch random(1,6)>>
-<<case 1>>
- <<set $PC.medicine += 1>><<set $PC.trading += 1>><<set $PC.slaving += 1>>
-<<case 2>>
- <<set $PC.trading += 1>><<set $PC.slaving += 1>><<set $PC.engineering += 1>>
-<<case 3>>
- <<set $PC.slaving += 1>><<set $PC.engineering += 1>><<set $PC.hacking += 1>>
-<<case 4>>
- <<set $PC.engineering += 1>><<set $PC.hacking += 1>><<set $PC.warfare += 1>>
-<<case 5>>
- <<set $PC.hacking += 1>><<set $PC.warfare += 1>><<set $PC.medicine += 1>>
-<<case 6>>
- <<set $PC.warfare += 1>><<set $PC.medicine += 1>><<set $PC.trading += 1>>
-<</switch>>
-<</replace>><</link>>
+ <br> <<link "Talk in $SF.Lower's HQ.">> <<replace "#result0">> <span id="result1">
+ <br><br>What do you want to do with the Colonel in the HQ?
+ <br> <<link "Talk">><<replace "#result1">>
+ <br><br>You and the Colonel talk over some $PC.refreshment, where she ends up talking about her past. You learn a little more about her.
+ <<set $SFColonel.Status +=3>>
+ <<switch random(1,6)>>
+ <<case 1>>
+ <<set $PC.medicine += 1>><<set $PC.trading += 1>><<set $PC.slaving += 1>>
+ <<case 2>>
+ <<set $PC.trading += 1>><<set $PC.slaving += 1>><<set $PC.engineering += 1>>
+ <<case 3>>
+ <<set $PC.slaving += 1>><<set $PC.engineering += 1>><<set $PC.hacking += 1>>
+ <<case 4>>
+ <<set $PC.engineering += 1>><<set $PC.hacking += 1>><<set $PC.warfare += 1>>
+ <<case 5>>
+ <<set $PC.hacking += 1>><<set $PC.warfare += 1>><<set $PC.medicine += 1>>
+ <<case 6>>
+ <<set $PC.warfare += 1>><<set $PC.medicine += 1>><<set $PC.trading += 1>>
+ <</switch>>
+ <</replace>><</link>>
-<br><<link "Learn">> <<replace "#result1">>
-<<set $SFColonel.Talk = 1,$SFColonel.Status += 1>>
-<br><br>"Sure boss, I can use a break from all of this," she laughs. The Colonel tells a story about one time when she
-<<switch random(1,6)>>
-<<case 1>>
- used field medicine to save another merc's life, teaching you some medical procedures in the process.
- <<set $PC.medicine += 5>>
-<<case 2>>
- haggled for necessary gear with a stingy quartermaster, teaching you how to get what you want from traders.
- <<set $PC.trading += 5>>
-<<case 3>>
- found a load of human chattel in a raid and had to manage them before they could later be unloaded, teaching you how to better care for your slaves.
- <<set $PC.slaving += 5>>
-<<case 4>>
- was responsible for rebuilding a fort she had seized, teaching you how to better manage construction in your arcology.
- <<set $PC.engineering += 5>>
-<<case 5>>
- was forced to hack her way out of a trap, teaching you how to better penetrate digital security.
- <<set $PC.hacking += 5>>
-<<case 6>>
- fought off an entire battalion with only a small squad, teaching you how to think tactically in battle.
- <<set $PC.warfare += 5>>
-<</switch>>
-<</replace>> <</link>>
+ <br> <<link "Learn">> <<replace "#result1">>
+ <<set $SFColonel.Talk = 1,$SFColonel.Status += 1>>
+ <br><br>"Sure boss, I can use a break from all of this," she laughs. The Colonel tells a story about one time when she
+ <<switch random(1,6)>>
+ <<case 1>>
+ used field medicine to save another merc's life, teaching you some medical procedures in the process.
+ <<set $PC.medicine += 5>>
+ <<case 2>>
+ haggled for necessary gear with a stingy quartermaster, teaching you how to get what you want from traders.
+ <<set $PC.trading += 5>>
+ <<case 3>>
+ found a load of human chattel in a raid and had to manage them before they could later be unloaded, teaching you how to better care for your slaves.
+ <<set $PC.slaving += 5>>
+ <<case 4>>
+ was responsible for rebuilding a fort she had seized, teaching you how to better manage construction in your arcology.
+ <<set $PC.engineering += 5>>
+ <<case 5>>
+ was forced to hack her way out of a trap, teaching you how to better penetrate digital security.
+ <<set $PC.hacking += 5>>
+ <<case 6>>
+ fought off an entire battalion with only a small squad, teaching you how to think tactically in battle.
+ <<set $PC.warfare += 5>>
+ <</switch>>
+ <</replace>> <</link>>
-<<if $SFColonel.Status >= 45>>
-<br><<link "Have some fun.">> <<replace "#result1">>
- @@.orange;<<link "Go back""Firebase">>
- <<set $SFColonel.Fun = 0, $SFColonel.Talk = 0,$SFColonel.Status -= 3>>
- <</link>>@@
- <<set $SFColonel.Fun = 1,$SFColonel.Talk = 1,$SFColonel.Status += 3>>
- Where should this fun take place?
- <br>@@.orange;<<link "In private">> <span id="result6">
- Which orifice do you wish to target?
- @@.orange;<<link "Go back""Firebase">> <</link>>@@
- <br>@@.orange;<<link "Pussy">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 1>> <</link>>@@
- <br>@@.orange;<<link "Ass">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 1>> <</link>>@@
- <br>@@.orange;<<link "Both pussy and ass">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 2>> <</link>>@@
- <br>@@.orange;<<link "Mouth">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 1>> <</link>>@@
- <br>@@.orange;<<link "All three holes">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 3>> <</link>>@@
- </span> <</link>>@@
+ <<if $SFColonel.Status >= 45>> <br> <<link "Have some fun.">> <<replace "#result1">> <span id="result4">
+ <<set $SFColonel.Fun = 1,$SFColonel.Talk = 1,$SFColonel.Status += 3>>
+ <br>Where should this fun take place? <<link "Go back""Firebase">>
+ <<set $SFColonel.Fun = 0, $SFColonel.Talk = 0,$SFColonel.Status -= 3>>
+ <</link>>
+ <br> <<link "In private">> <<replace "#result4">> <span id="result6">
+ <br>Which orifice do you wish to target?
+ <<link "Go back""Firebase">> <</link>>
+ <br> <<link "Pussy">> <<replace "#result6">>
+ <<include "SFColonelSexDec">>
+ <</replace>> <<set $SFColonel.Fun += 1>> <</link>>
+ <br> <<link "Ass">> <<replace "#result6">>
+ <<include "SFColonelSexDec">>
+ <</replace>> <<set $SFColonel.Fun += 1>> <</link>>
+ <br> <<link "Both pussy and ass">> <<replace "#result6">>
+ <<include "SFColonelSexDec">>
+ <</replace>> <<set $SFColonel.Fun += 2>> <</link>>
+ <br> <<link "Mouth">> <<replace "#result6">>
+ <<include "SFColonelSexDec">>
+ <</replace>> <<set $SFColonel.Fun += 1>> <</link>>
+ <br> <<link "All three holes">> <<replace "#result6">>
+ <<include "SFColonelSexDec">>
+ <</replace>> <<set $SFColonel.Fun += 3>> <</link>>
+ </span> <</replace>> <</link>>
- <br>@@.orange;<<link "On The Colonel's throne.">> <span id="result6">
- Which orifice do you wish to target?
- @@.orange;<<link "Go back""Firebase">> <</link>>@@
- <br>@@.orange;<<link "Pussy">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 1>> <</link>>@@
- <br>@@.orange;<<link "Ass">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 1>> <</link>>@@
- <br>@@.orange;<<link "Both pussy and ass">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 2>> <</link>>@@
- <br>@@.orange;<<link "Mouth">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 1>> <</link>>@@
- <br>@@.orange;<<link "All three holes">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 3>> <</link>>@@
- </span> <</link>>@@
-<</replace>><</link>><</if>><br>[[Go back|Firebase]]/*Closes fun*/
-</span> <</replace>> <</link>>@@ <</if>> /*Closes spend time with The Colonel*/
\ No newline at end of file
+ <br> <<link "On The Colonel's throne.">> <<replace "#result4">> <span id="result6">
+ <br>Which orifice do you wish to target?
+ <<link "Go back""Firebase">> <</link>>
+ <br> <<link "Pussy">> <<replace "#result6">>
+ <<include "SFColonelSexDec">>
+ <</replace>> <<set $SFColonel.Fun += 1>> <</link>>
+ <br> <<link "Ass">> <<replace "#result6">>
+ <<include "SFColonelSexDec">>
+ <</replace>> <<set $SFColonel.Fun += 1>> <</link>>
+ <br> <<link "Both pussy and ass">> <<replace "#result6">>
+ <<include "SFColonelSexDec">>
+ <</replace>> <<set $SFColonel.Fun += 2>> <</link>>
+ <br> <<link "Mouth">> <<replace "#result6">>
+ <<include "SFColonelSexDec">>
+ <</replace>> <<set $SFColonel.Fun += 1>> <</link>>
+ <br> <<link "All three holes">> <<replace "#result6">>
+ <<include "SFColonelSexDec">>
+ <</replace>> <<set $SFColonel.Fun += 3>> <</link>>
+ </span> <</replace>> </span> <</link>>
+ </span> <</replace>> <</link>> <</if>> /*Closes fun*/
+ </span> <</replace>> <</link>> /*Closes talk*/
+</span> <</if>> /*Closes spend time with The Colonel*/
\ No newline at end of file
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 6aeb2ca5706..d436f66a500 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1381,4 +1381,6 @@ erectileImplant: 0
<<include "secInit">>
+<<set $postSexCleanUp = 1>>
+
<<goto "Alpha disclaimer">>
diff --git a/src/npc/descriptions/fAnus.tw b/src/npc/descriptions/fAnus.tw
index 78dcd2ea099..d9322b14a6d 100644
--- a/src/npc/descriptions/fAnus.tw
+++ b/src/npc/descriptions/fAnus.tw
@@ -179,40 +179,42 @@ $His anus is invitingly bleached,
<<else>>
<<set _Anus = "anal gape">>
<</if>>
- <<switch $activeSlave.assignment>>
- <<case "work in the brothel">>
- $He goes to wash $his _Anus so $his next customer can have the illusion that he's the first to use it today.
- <<case "serve in the club">>
- $He goes to wash and delicately perfume $his _Anus so it can gratify the finest citizen.
- <<case "work in the dairy">>
- $He goes off to carefully wash $his _Anus to avoid besmirching the nice clean dairy.
- <<case "work as a servant">>
- $He rushes to wash $his _Anus, impatient to get back to $his many chores.
- <<case "work as a nanny">>
- $He goes off to wash $his _Anus, before hurrying to continue taking care of the children in $nurseryName.
- <<case "whore">>
- $He uses an enema to clean $his _Anus before returning to offering it for sale.
- <<case "serve the public">>
- $He uses an enema to clean $his _Anus before returning to offering it for free.
- <<case "be a servant">>
- $He uses an enema to clean $his _Anus, since $his chores didn't perform themselves while you used $his backdoor.
- <<case "rest">>
- $He uses an enema to clean $his _Anus before crawling back into bed, face down.
- <<case "get milked">>
- $He uses an enema to clean $his _Anus <<if $activeSlave.lactation > 0>>before going to get $his uncomfortably milk-filled tits drained<<else>>and then rests until $his balls are ready to be drained again<</if>>.
- <<case "please you">>
- $He uses an enema to clean $his _Anus before returning to await your next use of $his backdoor, as though nothing had happened.
- <<case "be a subordinate slave">>
- $He uses an enema to clean $his _Anus, though it's only a matter of time before another slave decides to play with $his backdoor.
- <<case "be your Head Girl">>
- $He uses an enema to clean $his _Anus, worried that $his charges got up to trouble while $he enjoyed the buttsex.
- <<case "guard you">>
- $He hurries off to wash $his _Anus so you'll be unguarded for as little time as possible.
- <<case "train slaves">>
- $He uses an enema to clean $his _Anus before $he returns to teaching $his classes, a little bow-legged.
- <<default>>
- $He hurries off to wash $his _Anus before going back to $activeSlave.assignment.
- <</switch>>
+ <<if $postSexCleanUp > 0>>
+ <<switch $activeSlave.assignment>>
+ <<case "work in the brothel">>
+ $He goes to wash $his _Anus so $his next customer can have the illusion that he's the first to use it today.
+ <<case "serve in the club">>
+ $He goes to wash and delicately perfume $his _Anus so it can gratify the finest citizen.
+ <<case "work in the dairy">>
+ $He goes off to carefully wash $his _Anus to avoid besmirching the nice clean dairy.
+ <<case "work as a servant">>
+ $He rushes to wash $his _Anus, impatient to get back to $his many chores.
+ <<case "work as a nanny">>
+ $He goes off to wash $his _Anus, before hurrying to continue taking care of the children in $nurseryName.
+ <<case "whore">>
+ $He uses an enema to clean $his _Anus before returning to offering it for sale.
+ <<case "serve the public">>
+ $He uses an enema to clean $his _Anus before returning to offering it for free.
+ <<case "be a servant">>
+ $He uses an enema to clean $his _Anus, since $his chores didn't perform themselves while you used $his backdoor.
+ <<case "rest">>
+ $He uses an enema to clean $his _Anus before crawling back into bed, face down.
+ <<case "get milked">>
+ $He uses an enema to clean $his _Anus <<if $activeSlave.lactation > 0>>before going to get $his uncomfortably milk-filled tits drained<<else>>and then rests until $his balls are ready to be drained again<</if>>.
+ <<case "please you">>
+ $He uses an enema to clean $his _Anus before returning to await your next use of $his backdoor, as though nothing had happened.
+ <<case "be a subordinate slave">>
+ $He uses an enema to clean $his _Anus, though it's only a matter of time before another slave decides to play with $his backdoor.
+ <<case "be your Head Girl">>
+ $He uses an enema to clean $his _Anus, worried that $his charges got up to trouble while $he enjoyed the buttsex.
+ <<case "guard you">>
+ $He hurries off to wash $his _Anus so you'll be unguarded for as little time as possible.
+ <<case "train slaves">>
+ $He uses an enema to clean $his _Anus before $he returns to teaching $his classes, a little bow-legged.
+ <<default>>
+ $He hurries off to wash $his _Anus before going back to $activeSlave.assignment.
+ <</switch>>
+ <</if>>
<</if>>
<</if>>
diff --git a/src/npc/descriptions/fButt.tw b/src/npc/descriptions/fButt.tw
index 5eaaae8fe3f..d24572c4707 100644
--- a/src/npc/descriptions/fButt.tw
+++ b/src/npc/descriptions/fButt.tw
@@ -200,7 +200,7 @@ $His anus is invitingly bleached,
$His still-tight ass keeps your load inside $him.
<</if>>
-<<if canWalk($activeSlave)>>
+<<if canWalk($activeSlave) && $postSexCleanUp > 0>>
<<switch $activeSlave.assignment>>
<<case "whore">>
$He heads to the bathroom to clean $his <<if canDoVaginal($activeSlave) && canDoAnal($activeSlave)>>holes before returning to selling them publicly.<<elseif canDoVaginal($activeSlave) || canDoAnal($activeSlave)>>fuckhole before returning to selling it publicly.<<else>>face before returning to selling $his mouth publicly.<</if>>
diff --git a/src/npc/descriptions/fVagina.tw b/src/npc/descriptions/fVagina.tw
index e26707c0a82..d65aec14ac9 100644
--- a/src/npc/descriptions/fVagina.tw
+++ b/src/npc/descriptions/fVagina.tw
@@ -514,7 +514,7 @@ You call $him over so you can
Your cum slides right out of $his gaping hole.
<</if>>
-<<if canWalk($activeSlave)>>
+<<if canWalk($activeSlave) && $postSexCleanUp > 0>>
$He uses <<if $activeSlave.vagina > 0>>a quick douche to clean $his <<if $activeSlave.vagina < 2>>tight<<elseif $activeSlave.vagina > 3>>loose<</if>> pussy<<else>>an enema to clean $his <<if $activeSlave.anus < 2>>tight<<elseif $activeSlave.anus < 3>>used<<else>>gaping<</if>> butthole<</if>>,
<<switch $activeSlave.assignment>>
<<case "work in the brothel">>
diff --git a/src/pregmod/beastFuck.tw b/src/pregmod/beastFuck.tw
index a3268693334..4625cc26ff6 100644
--- a/src/pregmod/beastFuck.tw
+++ b/src/pregmod/beastFuck.tw
@@ -332,40 +332,42 @@ before calling in the _animal.species. The _animal.species slowly saunters up to
Your cum slides right out of $his gaping hole.
<</if>>
- $He uses <<if $activeSlave.vagina > 0>>a quick douche to clean $his <<if $activeSlave.vagina < 2>>tight<<elseif $activeSlave.vagina > 3>>loose<</if>> pussy<<else>>an enema to clean $his <<if $activeSlave.anus < 2>>tight<<elseif $activeSlave.anus < 3>>used<<else>>gaping<</if>> butthole<</if>>,
-
- <<switch $activeSlave.assignment>>
- <<case "work in the brothel">>
- just like $he does between each customer.
- <<case "serve in the club">>
- just like $he does in the club.
- <<case "work in the dairy">>
- to avoid besmirching the nice clean dairy.
- <<case "work as a servant">>
- mostly to keep everything $he has to clean from getting any dirtier.
- <<case "whore">>
- before returning to offering it for sale.
- <<case "serve the public">>
- before returning to offering it for free.
- <<case "rest">>
- before crawling back into bed.
- <<case "get milked">>
- <<if $activeSlave.lactation > 0>>before going to get $his uncomfortably milk-filled tits drained<<else>>and then rests until $his balls are ready to be drained again<</if>>.
- <<case "be a servant">>
- since $his chores didn't perform themselves while you used $his fuckhole.
- <<case "please you">>
- before returning to await your next use of $his fuckhole, as though nothing had happened.
- <<case "be a subordinate slave">>
- though it's only a matter of time before another slave decides to play with $his fuckhole.
- <<case "be your Head Girl">>
- worried that $his charges got up to trouble while $he enjoyed $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>'s use.
- <<case "guard you">>
- so $he can be fresh and ready for more sexual use even as $he guards your person.
- <<case "be the Schoolteacher">>
- before $he returns to teaching $his classes.
- <<default>>
- before $he returns to $activeSlave.assignment.
- <</switch>>
+ <<if $postSexCleanUp > 0>>
+ $He uses <<if $activeSlave.vagina > 0>>a quick douche to clean $his <<if $activeSlave.vagina < 2>>tight<<elseif $activeSlave.vagina > 3>>loose<</if>> pussy<<else>>an enema to clean $his <<if $activeSlave.anus < 2>>tight<<elseif $activeSlave.anus < 3>>used<<else>>gaping<</if>> butthole<</if>>,
+
+ <<switch $activeSlave.assignment>>
+ <<case "work in the brothel">>
+ just like $he does between each customer.
+ <<case "serve in the club">>
+ just like $he does in the club.
+ <<case "work in the dairy">>
+ to avoid besmirching the nice clean dairy.
+ <<case "work as a servant">>
+ mostly to keep everything $he has to clean from getting any dirtier.
+ <<case "whore">>
+ before returning to offering it for sale.
+ <<case "serve the public">>
+ before returning to offering it for free.
+ <<case "rest">>
+ before crawling back into bed.
+ <<case "get milked">>
+ <<if $activeSlave.lactation > 0>>before going to get $his uncomfortably milk-filled tits drained<<else>>and then rests until $his balls are ready to be drained again<</if>>.
+ <<case "be a servant">>
+ since $his chores didn't perform themselves while you used $his fuckhole.
+ <<case "please you">>
+ before returning to await your next use of $his fuckhole, as though nothing had happened.
+ <<case "be a subordinate slave">>
+ though it's only a matter of time before another slave decides to play with $his fuckhole.
+ <<case "be your Head Girl">>
+ worried that $his charges got up to trouble while $he enjoyed $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>'s use.
+ <<case "guard you">>
+ so $he can be fresh and ready for more sexual use even as $he guards your person.
+ <<case "be the Schoolteacher">>
+ before $he returns to teaching $his classes.
+ <<default>>
+ before $he returns to $activeSlave.assignment.
+ <</switch>>
+ <</if>>
<</if>>
<<set $species = 0>>
diff --git a/src/pregmod/beastFucked.tw b/src/pregmod/beastFucked.tw
index 5b661e5c02c..8f119b3dba8 100644
--- a/src/pregmod/beastFucked.tw
+++ b/src/pregmod/beastFucked.tw
@@ -435,40 +435,42 @@ before calling in the _animal.species. The _animal.species slowly saunters up to
<<= capFirstChar(_animal.species)>> cum slides right out of $his gaping hole.
<</if>>
- $He uses <<if $activeSlave.vagina > 0>>a quick douche to clean $his <<if $activeSlave.vagina < 2>>tight<<elseif $activeSlave.vagina > 3>>loose<</if>> pussy<<else>>an enema to clean $his <<if $activeSlave.anus < 2>>tight<<elseif $activeSlave.anus < 3>>used<<else>>gaping<</if>> butthole<</if>>,
-
- <<switch $activeSlave.assignment>>
- <<case "work in the brothel">>
- just like $he does between each customer.
- <<case "serve in the club">>
- just like $he does in the club.
- <<case "work in the dairy">>
- to avoid besmirching the nice clean dairy.
- <<case "work as a servant">>
- mostly to keep everything $he has to clean from getting any dirtier.
- <<case "whore">>
- before returning to offering it for sale.
- <<case "serve the public">>
- before returning to offering it for free.
- <<case "rest">>
- before crawling back into bed.
- <<case "get milked">>
- <<if $activeSlave.lactation > 0>>before going to get $his uncomfortably milk-filled tits drained<<else>>and then rests until $his balls are ready to be drained again<</if>>.
- <<case "be a servant">>
- since $his chores didn't perform themselves while you used $his fuckhole.
- <<case "please you">>
- before returning to await your next use of $his fuckhole, as though nothing had happened.
- <<case "be a subordinate slave">>
- though it's only a matter of time before another slave decides to play with $his fuckhole.
- <<case "be your Head Girl">>
- worried that $his charges got up to trouble while $he enjoyed $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>'s use.
- <<case "guard you">>
- so $he can be fresh and ready for more sexual use even as $he guards your person.
- <<case "be the Schoolteacher">>
- before $he returns to teaching $his classes.
- <<default>>
- before $he returns to $activeSlave.assignment.
- <</switch>>
+ <<if $postSexCleanUp > 0>>
+ $He uses <<if $activeSlave.vagina > 0>>a quick douche to clean $his <<if $activeSlave.vagina < 2>>tight<<elseif $activeSlave.vagina > 3>>loose<</if>> pussy<<else>>an enema to clean $his <<if $activeSlave.anus < 2>>tight<<elseif $activeSlave.anus < 3>>used<<else>>gaping<</if>> butthole<</if>>,
+
+ <<switch $activeSlave.assignment>>
+ <<case "work in the brothel">>
+ just like $he does between each customer.
+ <<case "serve in the club">>
+ just like $he does in the club.
+ <<case "work in the dairy">>
+ to avoid besmirching the nice clean dairy.
+ <<case "work as a servant">>
+ mostly to keep everything $he has to clean from getting any dirtier.
+ <<case "whore">>
+ before returning to offering it for sale.
+ <<case "serve the public">>
+ before returning to offering it for free.
+ <<case "rest">>
+ before crawling back into bed.
+ <<case "get milked">>
+ <<if $activeSlave.lactation > 0>>before going to get $his uncomfortably milk-filled tits drained<<else>>and then rests until $his balls are ready to be drained again<</if>>.
+ <<case "be a servant">>
+ since $his chores didn't perform themselves while you used $his fuckhole.
+ <<case "please you">>
+ before returning to await your next use of $his fuckhole, as though nothing had happened.
+ <<case "be a subordinate slave">>
+ though it's only a matter of time before another slave decides to play with $his fuckhole.
+ <<case "be your Head Girl">>
+ worried that $his charges got up to trouble while $he enjoyed $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>'s use.
+ <<case "guard you">>
+ so $he can be fresh and ready for more sexual use even as $he guards your person.
+ <<case "be the Schoolteacher">>
+ before $he returns to teaching $his classes.
+ <<default>>
+ before $he returns to $activeSlave.assignment.
+ <</switch>>
+ <</if>>
<</if>>
<</if>>
diff --git a/src/pregmod/fDick.tw b/src/pregmod/fDick.tw
index b80b663b955..3592321da16 100644
--- a/src/pregmod/fDick.tw
+++ b/src/pregmod/fDick.tw
@@ -216,7 +216,7 @@
<</if>>
<</if>>
-<<if canWalk($activeSlave) && $activeSlave.fetish != "mindbroken">>
+<<if canWalk($activeSlave) && $activeSlave.fetish != "mindbroken" && $postSexCleanUp > 0>>
<<switch $activeSlave.assignment>>
<<case "whore">>
$He heads to the bathroom to clean $his dick before returning to selling $his body publicly.
diff --git a/src/pregmod/pAssociatesPublicSlut.tw b/src/pregmod/pAssociatesPublicSlut.tw
index 7db54415209..cdc9c7edb77 100644
--- a/src/pregmod/pAssociatesPublicSlut.tw
+++ b/src/pregmod/pAssociatesPublicSlut.tw
@@ -1,6 +1,6 @@
:: P associates public slut [nobr]
-<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event", _num = random(1,99)>>
+<<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check", _num = random(1,99)>>
The Promenade is especially vibrant today, humming with activity as the wealthier of '' $arcologies[0].name''s citizens go about their business and pleasure. You are a regular sight here, leisurely strolling amidst the bustle of the many shops, boutiques and eateries that line the wide thoroughfare. These regular strolls are, of course, timed in order to allow the citizenry, particularly high society, to feel your presence. Its not all about optics though, there are frequent opportunities for pleasure during these outings, be it shopping, dining or more unique kinds of distraction. One such opportunity presents itself today.
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index ddd803b34bf..86797428cbe 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -3437,3 +3437,7 @@ Done!
<<if $releaseID < 1031>>
<<set $releaseID = 1031>>
<</if>>
+
+<<if ndef $postSexCleanUp>>
+ <<set $postSexCleanUp = 1>>
+<</if>>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index c557c684bf1..d10dd0107ad 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -301,6 +301,14 @@ Slave reactions to facility assignments are
@@.cyan;ENABLED@@. [[Disable|Options][$showAssignToScenes = 0]]
<</if>>
+<br>
+Post sex clean up
+<<if $postSexCleanUp < 1>>
+ @@.cyan;is not@@ displayed. [[Display|Options][$postSexCleanUp = 1]]
+<<else>>
+ @@.cyan;is @@ displayed. [[Do not display|Options][$postSexCleanUp = 0]]
+<</if>>
+
<br>
Appraisal miniscenes on slave sale are
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 89e222f462a..c214795282e 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -59,8 +59,8 @@
<</if>> /* closes no nicknames option */
<</if>> /* CLOSES FUCKDOLL CHECK */
-
- <<if $week >= 10 >>
+
+ <<if $week >= 10>>
<<set $events.push("P associates public slut")>>
<</if>>
<<set $legendaryFacility = 1>>
diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw
index a4496f8e940..a3d6b450e76 100644
--- a/src/uncategorized/saDrugs.tw
+++ b/src/uncategorized/saDrugs.tw
@@ -784,7 +784,7 @@
<<case "super fertility drugs">>
<<if $slaves[$i].pregKnown == 1>>
- @@.yellow$He's already pregnant, so the fertility drugs $he's on do $him no good.@@
+ @@.yellow;$He's already pregnant, so the fertility drugs $he's on do $him no good.@@
<<elseif $slaves[$i].pregWeek < 0>>
$He's still recovering from a recent pregnancy, so the fertility drugs $he's on do $him little good.
<<elseif ($slaves[$i].preg > 1)>>
@@ -824,7 +824,7 @@
<<case "fertility drugs">>
<<if $slaves[$i].pregKnown == 1>>
- @@.yellow$He's already pregnant, so the fertility drugs $he's on do $him no good.@@
+ @@.yellow;$He's already pregnant, so the fertility drugs $he's on do $him no good.@@
<<elseif $slaves[$i].pregWeek < 0>>
$He's still recovering from a recent pregnancy, so the fertility drugs $he's on do $him little good.
<<elseif ($slaves[$i].preg > 1)>>
--
GitLab