diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index ea8ab545c58635c0cf7aea13249741960a65d285..264eb597ed5938c7a76d89f4db70acb6c909ad44 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,13 @@
0.10.7.1-0.5.x
+8/11/2018
+
+ 30
+ -fixes
+ -new malefactor
+ -added kitty lingerie
+
8/10/2018
29
diff --git a/src/uncategorized/buySlaves.tw b/src/uncategorized/buySlaves.tw
index 26f2f9d00b01241edb613b98891be407765ffd35..ff23ddc1a0ecd1912e30cf16bc775d69e44734b4 100644
--- a/src/uncategorized/buySlaves.tw
+++ b/src/uncategorized/buySlaves.tw
@@ -146,7 +146,7 @@ __Sex Slave Purchase Options__
<<switch $weeklyMarket>>
<<case "low tier criminals">>
a minor prison is selling inmates.
- //Slaves will tend to be low to mid quality with few redeeming factors//
+ //Slaves will tend to be low to mid quality with few redeeming factors.//
<<case "gangs and smugglers">>
a major prison is selling hardened criminals.
//Slaves will tend to be low quality and difficult but may prove useful once broken.//
@@ -157,7 +157,6 @@ __Sex Slave Purchase Options__
a military prison is selling inmates.
//Slaves will tend to be high quality but defiant.//
<</switch>>
-
<</if>>
<<if ($rep > 5500)>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index a5ae95cd4c8af95d971eeec303e3e81ef0cead21..cf600114b6260c04458fb442ab2eb910c2e6a1f7 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -577,6 +577,9 @@
<<set $malefactor = ["liberator", "whore", "businesswoman", "addict"]>>
<<if $seePreg != 0>>
<<set $malefactor.push("anchorBaby")>>
+ <<if $arcologies[0].FSRepopulationFocus < 50>>
+ <<set $malefactor.push("mule")>> /* blends right in */
+ <</if>>
<</if>>
<<if $seeDicks != 0>>
<<set $malefactor.push("rapist")>>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index 6e0b73eaa78fd92258bd7893b0032234269d5741..18bdb482711f83da78be1575ab1fb4c7da4d7e89 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -133,6 +133,7 @@
<<set $activeSlaveOneTimeMinAge = 35>>
<<set $activeSlaveOneTimeMaxAge = 43>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
<<include "Generate XX Slave">>
<<set $activeSlave.origin = "You sentenced her to enslavement as a punishment for fraud and theft.">>
<<set $activeSlave.career = "a criminal businesswoman">>
@@ -157,6 +158,7 @@
<<elseif $malefactor == "whore">>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
<<include "Generate New Slave">>
<<set $activeSlave.origin = "You sentenced her to enslavement as a punishment for theft and battery.">>
<<set $activeSlave.career = "a prostitute">>
@@ -195,6 +197,7 @@
<<elseif $malefactor == "rapist">>
<<set $activeSlaveOneTimeMinAge = 16>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
<<include "Generate XY Slave">>
<<set $activeSlave.origin = "You sentenced her to enslavement as a punishment for rape of a free woman.">>
<<set $activeSlave.devotion = random(-75,-60)>>
@@ -210,6 +213,45 @@
<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. Nevertheless, it seems one of your tenants saw fit to rape a free woman. Within ten minutes, the inhuman efficiency of $assistantName has compiled video recordings, physical evidence, and even the victim's testimony, which is quite consistent with the first two. Your wretched tenant signed a contract with you that included provisions forbidding this kind of thing. He is entirely at your mercy.
+<<elseif $malefactor == "mule">>
+
+<<set $activeSlaveOneTimeMinAge = 13>>
+<<if $pedo_mode == 1>>
+<<else>>
+ <<set $activeSlaveOneTimeMaxAge = 26>>
+<</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
+<<include "Generate XX Slave">>
+<<set $activeSlave.origin = "You sentenced her to enslavement for smuggling drugs into the arcology.">>
+<<set $activeSlave.career = "a drug mule">>
+<<set $activeSlave.devotion = random(-50,-20)>>
+<<set $activeSlave.trust = random(-100,-75)>>
+<<set $activeSlave.vagina = 2>>
+<<set $activeSlave.preg = -2>>
+<<set $activeSlave.bellyImplant = 0>>
+<<set $activeSlave.cervixImplant = 1>>
+<<set $activeSlave.pubicHStyle = "shaved">>
+<<set $activeSlave.bellySag = 2>>
+<<set $activeSlave.vaginalSkill = 50>>
+<<set $activeSlave.anus = 0>>
+<<set $activeSlave.hips = 0>>
+<<set $activeSlave.weight = -60>>
+<<set $activeSlave.waist = random(-30,-10)>>
+<<set $activeSlave.boobs = random(4,5)*100>>
+<<set $activeSlave.boobShape = "perky">>
+<<set $activeSlave.health = random(-20,10)>>
+<<set $activeSlave.sexualFlaw = "hates penetration">>
+<<set $activeSlave.behavioralFlaw = "shamefast">>
+<<set $activeSlave.accent = 0>>
+
+<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a potential criminal has been detected by your security systems and is now being tailed by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems, but some individuals still make attempts to fool them. In this case, the cameras are fixed on a clearly pregnant, and hugely at that, woman as she works her way through the crowded market sectors. You watch as she repeatedly bumps into other patrons and stalls, pausing to apologize before proceeding on her way, as if she wasn't familiar with her gravid swell. Her body is also clearly underdeveloped for someone ready to drop quadruplets at any moment; thin, with barely any hips to speak of and a pert bust clearly not swollen with milk. She even walks like a woman not burdened with nine months of gestating multiples, let alone a single. As she stumbles under her own weight, her shirt rides up, giving you a clear view of the deep red stretchmarks of a belly that grew far faster than it could handle. You've seen enough and order the drones to corral her until security arrives. Her expression shifts from fear as they encircle her to panic as a groan escapes her lips. She grabs her stomach as a capsule falls to the floor. As another contraction hits her, she drops to the ground and begins to "give birth" to her illegal cargo.
+<<if $bellyImplants == 1>>
+ She likely has belly implant designed to carry foreign objects inside her womb and, having lost her composure, is now vacating its contents.
+<<else>>
+ You have no idea what you are witnessing until <<if $assistantName == "your personal assistant">>your personal assistant pulls up an advertisement for a fillable womb located implant<<else>>$assistantName introduces you to a fillable womb located implant<</if>> that she likely has installed.
+<</if>>
+She is easily taken into custody and her contraband confiscated once the jeering crowd is dispersed enough to reach her.
+
<<else>>
<<set $activeSlaveOneTimeMinAge = random(12,28)>>
@@ -258,23 +300,20 @@
<<link "Enslave her">>
<<set $cash -= $contractCost>>
<<replace "#result">>
- <<if $malefactor == "addict">>
+ <<switch $malefactor>>
+ <<case "addict">>
You complete the legalities and biometric scanning quickly and without fuss. The condemned recovers enough by the end of the process to start masturbating weakly, even as she begins begging for a fix. Then it's off to the penthouse for basic slave induction.
- <<elseif $malefactor == "escapee">>
+ <<case "escapee">>
You complete the legalities and biometric scanning quickly and without fuss. She remains limp throughout the process, only recovering enough to barely grasp the situation as she is enslaved.
- <<elseif $malefactor == "orphanloli">>
+ <<case "orphanloli">>
You complete the legalities and biometric scanning quickly and without fuss. She sobs throughout the process, though stops once she realizes being a slave means free food.
- <<elseif $malefactor == "anchorBaby">>
+ <<case "anchorBaby">>
You complete the legalities and biometric scanning quickly and without fuss. She doesn't stop screaming "citizenship" until her children are taken from her and she is shoved off to the penthouse for basic slave induction.
- <<elseif $malefactor == "businesswoman">>
- You complete the legalities and biometric scanning quickly and without fuss. The condemned sobs and begs throughout the process until you grow tired of the whining and apply punishment. Then it's off to the penthouse for basic slave induction.
- <<elseif $malefactor == "whore">>
+ <<case "whore" "rapist" "businesswoman" "mule">>
You complete the legalities and biometric scanning quickly and without fuss. The condemned sobs and begs throughout the process until you grow tired of the whining and apply punishment. Then it's off to the penthouse for basic slave induction.
- <<elseif $malefactor == "rapist">>
- You complete the legalities and biometric scanning quickly and without fuss. The condemned sobs and begs throughout the process until you grow tired of the whining and apply punishment. Then it's off to the penthouse for basic slave induction.
- <<else>>
+ <<default>>
You complete the legalities and biometric scanning quickly and cautiously. Though the would-be liberator is of course restrained, disarmed, and still sedated, she could awake at any time. Based on the drone logs, she is likely to be violent when she does.
- <</if>>
+ <</switch>>
<<include "New Slave Intro">>
<</replace>>
<</link>>
@@ -283,13 +322,22 @@
<<set $activeSlave.behavioralFlaw = "odd">>
<<set $activeSlave.sexualFlaw = "hates penetration">>
<<set $activeSlave.anus = 2>>
+ <<set _fuckCount = random(20,35)>>
+ <<set $activeSlave.analCount += _fuckCount>>
+ <<set $analTotal += _fuckCount>>
<<if $activeSlave.vagina > -1>>
- <<set $activeSlave.vagina = 2>>
+ <<if $activeSlave.vagina < 2>>
+ <<set $activeSlave.vagina = 2>>
+ <</if>>
<<if isFertile($activeSlave) && $activeSlave.eggType == "human">>
<<= knockMeUp($activeSlave, 40, 2, -2)>>
<</if>>
+ <<set _fuckCount *= 2>>
+ <<set $activeSlave.vaginalCount += _fuckCount>>
+ <<$vaginalTotal += _fuckCount>>
+ <<set _fuckCount += _fuckCount/2>>
<</if>>
- <<if $activeSlave.publicCount>><<set $activeSlave.publicCount += 47>><<else>><<set $activeSlave.publicCount = 47>><</if>>
+ <<if $activeSlave.publicCount>><<set $activeSlave.publicCount += _fuckCount>><<else>><<set $activeSlave.publicCount = _fuckCount>><</if>>
<<set $cash -= $contractCost>>
<<replace "#result">>
<<if $malefactor == "addict">>
@@ -307,6 +355,8 @@
You declare her holes fair game for the entire arcology, to repay her thefts. She spends a torturous day in the stocks before being hauled in for enslavement, somewhat @@.red;the worse for wear@@ and @@.red;acting oddly@@ due to her ordeal, bruises all over her body, cum leaking from her @@.lime;loosened@@ anus<<if $activeSlave.vagina > -1>> and @@.lime;fucked-out@@ pussy<</if>>. The public @@.green;enjoys the fun.@@
<<elseif $malefactor == "rapist">>
You declare her holes fair game for the entire arcology. She spends a torturous day in the stocks before being hauled in for enslavement, somewhat @@.red;the worse for wear@@ and @@.red;acting oddly@@ due to her ordeal, bruises all over her body, cum leaking from her @@.lime;loosened@@ anus<<if $activeSlave.vagina > -1>> and @@.lime;fucked-out@@ pussy<</if>>. The public @@.green;enjoys the fun.@@
+ <<elseif $malefactor == "mule">>
+ You declare her holes fair game for the entire arcology as punishment for trying to smuggle in a load instead of taking one. She spends a torturous day in the stocks before being hauled in for enslavement, somewhat @@.red;the worse for wear@@ and @@.red;acting oddly@@ due to her ordeal, bruises all over her body, cum leaking from her @@.lime;loosened@@ anus<<if $activeSlave.vagina > -1>> and @@.lime;fucked-out@@ pussy<</if>>. The public @@.green;enjoys the fun.@@
<<else>>
Slave ownership is the cornerstone of the society you're building in your arcology, and this woman attempted to undermine it. Her holes are thus fair game for the entire arcology. She spends a torturous day in the stocks before being hauled in for enslavement, somewhat @@.red;the worse for wear@@ and @@.red;acting oddly@@ due to her ordeal, bruises all over her body, cum leaking from her @@.lime;loosened@@ anus<<if $activeSlave.vagina > -1>> and @@.lime;fucked-out@@ pussy<</if>>. The public @@.green;enjoys the fun,@@ and small slaveholders are @@.green;encouraged to do business with your arcology@@ after word of the incident gets around.
<</if>>
@@ -322,28 +372,24 @@
<<set $activeSlave.sentence = 4>>
<<set $cash -= $contractCost>>
<<replace "#result">>
- <<if $malefactor == "addict">>
+ <<switch $malefactor>>
+ <<case "addict">>
You complete the legalities and biometric scanning quickly and cautiously. The condemned recovers enough by the end of the process to start masturbating weakly, even as she begins begging for a fix. When she learns she's headed to the arcade, she actually relaxes a little, having heard the whores there get drugs. The public @@.green;looks forward@@ to seeing her there, especially the owner of the shop she attempted to burglarize.
- <<elseif $malefactor == "escapee">>
- You complete the legalities and biometric scanning quickly, and tell the crowd that her holes will be available at the arcade within the hour. The public @@.green;looks forward@@ to seeing her there, angrily suspecting her of being an escapee and glad that they'll be able to take part in her punishment.
- <<elseif $malefactor == "orphanloli">>
+ <<case "escapee" "orphanloli">>
You complete the legalities and biometric scanning quickly, and tell the crowd that her holes will be available at the arcade within the hour. The public @@.green;looks forward@@ to seeing her there, angrily suspecting her of being an escapee and glad that they'll be able to take part in her punishment.
- <<elseif $malefactor == "anchorBaby">>
+ <<case "anchorBaby">>
You complete the legalities and biometric scanning quickly and have her children taken away. The condemned screeches her displeasure throughout the process until you grow tired of the whining and sedate her for immurement in the arcade. The public @@.green;looks forward@@ to seeing her there and vying to see who gets to fill her womb with another child.
- <<elseif $malefactor == "businesswoman">>
- You complete the legalities and biometric scanning quickly and cautiously. The condemned sobs and begs throughout the process until you grow tired of the whining and sedate her for immurement in the arcade. The public @@.green;looks forward@@ to seeing her there.
- <<elseif $malefactor == "whore">>
+ <<case "whore" "rapist" "mule" "businesswoman">>
You complete the legalities and biometric scanning quickly and cautiously. The condemned sobs and begs throughout the process until you grow tired of the whining and sedate her for immurement in the arcade. The public @@.green;looks forward@@ to seeing her there and getting some of their own back.
- <<elseif $malefactor == "rapist">>
- You complete the legalities and biometric scanning quickly and cautiously. The condemned sobs and begs throughout the process until you grow tired of the whining and sedate her for immurement in the arcade. The public @@.green;looks forward@@ to seeing her there.
- <<else>>
+ <<defualt>>
You complete the legalities and biometric scanning quickly and cautiously. Though the would-be liberator is of course restrained, disarmed, and still sedated, she could awake at any time. It would be best to have her restrained for public use in the arcade first. The public @@.green;looks forward@@ to seeing her there.
- <</if>>
+ <</switch>>
<<set $rep += 50>>
<<AddSlave $activeSlave>> /* skip New Slave Intro */
<</replace>>
<</link>>
<</if>>
+ <<if $malefactor != "mule">>
<<if $dairy > 0>>
<<if $dairyRestraintsSetting > 1>>
<br><<link "Enslave her and send her straight to the industrial dairy">>
@@ -373,6 +419,7 @@
<</link>>
<</if>>
<</if>> /* closes dairy > 0 */
+ <</if>>
<<if $seeExtreme > 0>>
<br><<link "Punitively amputate her limbs, and then enslave her">>
<<set $activeSlave.health -= 20>>
@@ -395,6 +442,8 @@
An example must be made. Free people must understand that criminals who commit outrages against them will be severely punished. The protesting malefactor is stripped and stuffed into your remote surgery on public video feed. She begs and pleads until she sees her doom in the form of the surgical machinery, at which point she switches to fighting vainly to escape. Of course, @@.red;her health is affected@@ and the horrible experience has left her @@.red;acting oddly.@@ Then it's off to the penthouse for basic slave induction. The public @@.green;approves of this harshness,@@ since she can hardly attempt to steal anything without hands.
<<elseif $malefactor == "rapist">>
An example must be made. Rape is rare in your arcology, since citizens are so generously provided with means of sexual outlet. When the price of renting a slave that's impossible to rape is as low as it is, sexual assault of a free woman is doubly unforgivable. The protesting malefactor is stripped and stuffed into your remote surgery on public video feed. She begs and pleads until she sees her doom in the form of the surgical machinery, at which point she switches to fighting vainly to escape. Of course, @@.red;her health is affected@@ and the horrible experience has left her @@.red;acting oddly.@@ Then it's off to the penthouse for basic slave induction. The public @@.green;approves of this harshness,@@ since even if she cheers up and ever manages an erection again, she's not likely to rape anyone without arms or legs.
+ <<elseif $malefactor == "rapist">>
+ An example must be made. With the quantity of drugs consumed in the arcology, quality is everything and attempting to undermine that is unforgivable. The protesting malefactor is stripped and stuffed into your remote surgery on public video feed. She begs and pleads until she sees her doom in the form of the surgical machinery, at which point she switches to fighting vainly to escape. Of course, @@.red;her health is affected@@ and the horrible experience has left her @@.red;acting oddly.@@ Then it's off to the penthouse for basic slave induction. The public @@.green;approves of this harshness,@@ since she can hardly haul contraband into your arcology without the ability to move herself.
<<else>>
An example must be made. Slave ownership is the cornerstone of the society you're building in your arcology, and this woman attempted to undermine it. The protesting malefactor is stripped and stuffed into your remote surgery on public video feed. She begs and pleads until she sees her doom in the form of the surgical machinery, at which point she switches to fighting vainly to escape. Of course, @@.red;her health is affected@@ and the horrible experience has left her @@.red;acting oddly.@@ Then it's off to the penthouse for basic slave induction. The public @@.green;approves of this harshness,@@ since she will scarcely be able to liberate anyone without arms or legs.
<</if>>
@@ -447,23 +496,22 @@
<</if>>
<br><<link "Publicly flog the criminal">>
<<replace "#result">>
- <<if $malefactor == "addict">>
+ <<switch $malefactor>>
+ <<case "addict">>
Naturally, the wretch will be thrown out of the arcology: but an example must first be made. Free people must understand that criminals who commit outrages against them will be severely punished. The twitching, begging malefactor is stripped and flogged on the promenade before being escorted bleeding, and still twitching from withdrawal, out of the arcology. The public @@.green;approves of this harshness.@@
- <<elseif $malefactor == "escapee">>
+ <<case "escapee">>
Naturally, the wretch will be thrown out of the arcology: but an example must first be made. Free people must understand that criminals who commit outrages against them will be severely punished. The begging malefactor is flogged on the promenade before being escorted bleeding and half-dead out of the arcology. The public @@.green;approves of this harshness.@@
- <<elseif $malefactor == "orphanloli">>
+ <<case "orphanloli">>
Naturally, the wretch will be thrown out of the arcology: but an example must first be made. Free people must understand that criminals who commit outrages against them will be severely punished. The crying girl is flogged on the promenade before being dragged bleeding and broken out of the arcology. The public @@.green;approves of this harshness.@@
- <<elseif $malefactor == "anchorBaby">>
+ <<case "anchorBaby">>
Naturally, the wretch will be thrown out of the arcology: but an example must first be made. Free people must understand that criminals who commit outrages against them will be severely punished. The screaming breeder is flogged on the promenade before being dragged bleeding and broken out of the arcology sans her children; they are destined for the slave orphanage. The public @@.green;approves of this harshness.@@
- <<elseif $malefactor == "businesswoman">>
+ <<case "businesswoman">>
Naturally, the wretch will be thrown out of the arcology: but an example must first be made. Free people must understand that criminals who commit outrages against them will be severely punished. The protesting bitch is stripped and flogged on the promenade before being escorted bleeding from the arcology. The public @@.green;approves of this harshness.@@
- <<elseif $malefactor == "whore">>
- Naturally, the wretch will be thrown out of the arcology: but an example must first be made. Free people must understand that criminals who commit outrages against them will be severely punished. The protesting malefactor is stripped and flogged on the promenade before being escorted bleeding from the arcology. The public @@.green;approves of this harshness.@@
- <<elseif $malefactor == "rapist">>
+ <<case "whore" "mule" "rapist">>
Naturally, the wretch will be thrown out of the arcology: but an example must first be made. Free people must understand that criminals who commit outrages against them will be severely punished. The protesting malefactor is stripped and flogged on the promenade before being escorted bleeding from the arcology. The public @@.green;approves of this harshness.@@
- <<else>>
+ <<default>>
An example must be made. Slave ownership is the cornerstone of the society you're building in your arcology, and this woman attempted to undermine it. The protesting bitch is stripped and flogged on the promenade before being escorted bleeding from the arcology. The public @@.green;approves of this harshness.@@
- <</if>>
+ <</switch>>
<<set $rep += 100>>
<</replace>>
<</link>>
@@ -478,27 +526,24 @@
<</if>>
<br><<link "Sell her immediately">>
<<set $cash += $slaveCost>>
- <<if $cash4Babies == 1>>
+ <<if $cash4Babies == 1 && $malefactor == "anchorBaby">>
<<set $cash += random(20,30)>>
<</if>>
<<replace "#result">>
- <<if $malefactor == "addict">>
+ <<switch $malefactor>>
+ <<case "addict">>
You complete the legalities and biometric scanning quickly and without fuss. The condemned recovers enough by the end of the process to start masturbating weakly, even as she begins begging for a fix. Then it's off to slave markets for sale.
- <<elseif $malefactor == "escapee">>
+ <<case "escapee">>
You complete the legalities and biometric scanning quickly and without fuss. She remains limp throughout the process, only recovering enough to barely grasp the situation as she is enslaved and heading to the slave markets.
- <<elseif $malefactor == "orphanloli">>
+ <<case "orphanloli">>
You complete the legalities and biometric scanning quickly and without fuss. She sobs throughout the process, though stops once she realizes being a slave means free food. She starts crying again once she realizes she is heading for the slave markets.
- <<elseif $malefactor == "anchorBaby">>
+ <<case "anchorBaby">>
You complete the legalities and biometric scanning quickly and without fuss. The condemned sobs and begs throughout the process until you grow tired of the whining and apply punishment. Then it's off to slave markets for sale. Her children <<if $cash4Babies == 1>>head off to be sold as well<<else>>will be sent to a slave orphanage for future sale<</if>>.
- <<elseif $malefactor == "businesswoman">>
+ <<case "businesswoman" "whore" rapist" "mule">>
You complete the legalities and biometric scanning quickly and without fuss. The condemned sobs and begs throughout the process until you grow tired of the whining and apply punishment. Then it's off to slave markets for sale.
- <<elseif $malefactor == "whore">>
- You complete the legalities and biometric scanning quickly and without fuss. The condemned sobs and begs throughout the process until you grow tired of the whining and apply punishment. Then it's off to slave markets for sale.
- <<elseif $malefactor == "rapist">>
- You complete the legalities and biometric scanning quickly and without fuss. The condemned sobs and begs throughout the process until you grow tired of the whining and apply punishment. Then it's off to slave markets for sale.
- <<else>>
+ <<default>>
You complete the legalities and biometric scanning quickly and cautiously. Though the would-be liberator is of course restrained, disarmed, and still sedated, she could awake at any time. Based on the drone logs, she is likely to be violent when she does. You make sure that she isn't going to get loose as she is sent off to the slave market; the public would not be pleased if she went on another rampage.
- <</if>>
+ <</switch>>
<</replace>>
<</link>>
</span>
\ No newline at end of file
diff --git a/src/uncategorized/saGuardsYou.tw b/src/uncategorized/saGuardsYou.tw
index 50dc26d0cdaeb0e9f266fc865b286da30ad64f31..4bceee00454f045d6588ec83f1670774a505344c 100644
--- a/src/uncategorized/saGuardsYou.tw
+++ b/src/uncategorized/saGuardsYou.tw
@@ -218,7 +218,7 @@ Being continually trusted with your life @@.hotpink;increases $his devotion to y
<<if ndef $subSlave>>
<<set $subSlave = _successorCandidates.find( function(s) { return s.combatSkill == 0; })>>
<<if def $subSlave>>
- $He does $his best to train $subSlave.slaveName whenever $he can, hoping that _he2 can be made capable of stepping into $his place.
+ $He does $his best to train $subSlave.slaveName whenever $he can, hoping that $his subordinate can be made capable of stepping into $his place.
<</if>>
<</if>>
<<if def $subSlave>>
diff --git a/src/uncategorized/seExpiration.tw b/src/uncategorized/seExpiration.tw
index 99e8e85e6a1973c792ce43552f2d83a329b2db03..04a093b4f7b801716ba20aad14d10519b7722e08 100644
--- a/src/uncategorized/seExpiration.tw
+++ b/src/uncategorized/seExpiration.tw
@@ -37,7 +37,7 @@ $activeSlave.slaveName's indentured servitude is ending this week, meaning that
You plead necessity and place her under another indenture, paying the trivial fees left over once she has been charged for her own forecasted upkeep. Naturally, she offers no response at all to any of this.
<<set $cash -= 1000>>
<<set $ACitizens -= 1>>
- <<set $expired = 0 $expiree = 0>>
+ <<set $expired = 0, $expiree = 0>>
<<for $i = 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].indenture == 0>>
<<set $expiree = $slaves[$i].ID>>
diff --git a/src/uncategorized/seRetirement.tw b/src/uncategorized/seRetirement.tw
index e87772dfe6c4e076f7a456c8295c404f597e9261..cd96f1c035b5935b104a834704b07cd6e3e2b3a8 100644
--- a/src/uncategorized/seRetirement.tw
+++ b/src/uncategorized/seRetirement.tw
@@ -66,7 +66,7 @@ She's certainly going to have some adjustments to make.
<<set $toSearch = $activeSlave.prestigeDesc>>
<</if>>
<<if $activeSlave.pornPrestigeDesc == 0>>
- <<set $toSearch = "null">>
+ <<set $toSearchAlt = "null">>
<<else>>
<<set $toSearchAlt = $activeSlave.pornPrestigeDesc>>
<</if>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index adb8369c10a6d375b8c48cdd70e8f5580b7d59a9..00715b69f65a503318dda0cb00dada7ba5f7279b 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -4212,7 +4212,7 @@
<<set $activeSlave.combatSkill = 1>>
<<case "murder">>
<<if random(1,100) > 70>>
- <<set $activeSlave.origin = "You purchased her life at a prison sale. She was locked away for murder. Her actions weigh heavily on her conscious.">>
+ <<set $activeSlave.origin = "You purchased her life at a prison sale. She was locked away for murder. Her actions weigh heavily on her conscience.">>
<<set $activeSlave.devotion = 0>>
<<set $activeSlave.trust = 0>>
<<set $activeSlave.health = random(-60,-20)>>
@@ -4229,7 +4229,7 @@
<<set $activeSlave.intelligence = either(-2, -2, -1, -1, -1, 0, 0, 0, 1, 1, 2, 2)>>
<<case "arson">>
<<if random(1,100) > 50>>
- <<set $activeSlave.origin = "You purchased her life at a prison sale. She was locked away for arson. Her actions, and those she inadvertently killed, weigh heavily on her conscious.">>
+ <<set $activeSlave.origin = "You purchased her life at a prison sale. She was locked away for arson. Her actions, and those she inadvertently killed, weigh heavily on her conscience.">>
<<set $activeSlave.devotion = 0>>
<<set $activeSlave.trust = 0>>
<<set $activeSlave.health = random(-80,-20)>>
@@ -4298,7 +4298,7 @@
<<set $activeSlave.health = random(-60,0)>>
<<case "manslaughter">>
<<if random(1,100) > 60>>
- <<set $activeSlave.origin = "You purchased her life at a prison sale. She was locked away for manslaughter. Her actions weigh heavily on her conscious.">>
+ <<set $activeSlave.origin = "You purchased her life at a prison sale. She was locked away for manslaughter. Her actions weigh heavily on her conscience.">>
<<set $activeSlave.devotion = 0>>
<<set $activeSlave.trust = 0>>
<<set $activeSlave.health = random(-80,-20)>>
@@ -4423,7 +4423,7 @@
<<set $activeSlave.health = random(-90,-40)>>
<<case "mule">>
<<set $activeSlave.origin = "You purchased her life at a prison sale. She was locked away for smuggling illegal contraband inside her body.">>
- <<set $prisonCrime = "is incarcerated for smuggling drugs in their body.">>
+ <<set $prisonCrime = "is incarcerated for smuggling drugs in her body.">>
<<set $activeSlave.career = "a drug mule">>
<<set $activeSlave.devotion = random(-20,20)>>
<<set $activeSlave.trust = random(0,25)>>