From 697d77f54c77c7a783f3bb8e4a78fd1e2864d6b5 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 14 May 2017 19:17:50 -0400
Subject: [PATCH] Fixes and the release of new PA appearances.

---
 src/gui/Encyclopedia/encyclopedia.tw          |   1 +
 src/pregmod/assistantAppearancePackTwo.tw     |  67 +++++++++++
 src/pregmod/widgets/pregmodWidgets.tw         |   6 +-
 src/uncategorized/assistantEvents.tw          |  64 ----------
 .../personalAssistantAppearance.tw            | 113 ++++++++----------
 src/uncategorized/personalAssistantOptions.tw |  29 ++---
 src/uncategorized/randomNonindividualEvent.tw |   2 +
 src/uncategorized/saChoosesOwnJob.tw          |   2 +-
 src/uncategorized/saRelationships.tw          |  24 ++--
 9 files changed, 154 insertions(+), 154 deletions(-)
 create mode 100644 src/pregmod/assistantAppearancePackTwo.tw

diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index da843f9e8d8..cbfeff98d65 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -941,6 +941,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr
 ''stuffedgameanon'' for fixes, streamlining the starting girls family code, family trees, unbelievable improvements to the games functionality, the sanityChecker, a tag checker and above ALL else; Improving the game's speed by an obscene amount.
 ''anon'' for a prototype foot job scene.
 ''anon'' for writing forced marriages, extra escape outcomes and more player refreshment types.
+''anon'' for global realism stave trade setting.
 ''Bane70'' optimized huge swaths of code with notable professionalism.
 ''Circle Tritagonist'' provided several new collars and outfits.
 ''Qotsafan'' submitted bugfixes.
diff --git a/src/pregmod/assistantAppearancePackTwo.tw b/src/pregmod/assistantAppearancePackTwo.tw
new file mode 100644
index 00000000000..adf4564bc34
--- /dev/null
+++ b/src/pregmod/assistantAppearancePackTwo.tw
@@ -0,0 +1,67 @@
+:: Assistant Appearance Pack Two [nobr]
+
+<<if $seeImages == 1>><<AssistantArt 3>><</if>>
+
+"Cool! New appearances to play around with!" Your assistant happily chimes. "Lets see what's inside! This looks heavenly..." She hunches forward as a large pair of white feathered wings extend form her upper back. She takes several experimental flaps before taking to the sky. "I feel positively radiant! Maybe a smaller version will be more to your liking?" She loses both height and wingspan until she stands roughly equivalent to 120cm. She flutters around cutely. "This is neat, I'm like cupid. Want me to hook you up with anyone?" She winks as her wings become batlike and a pair of cute little nubs appear on her head. "Or maybe you'd just like to play with me instead." The impish figure flirts, before landing and blossoming into a stunning woman. "You know a succubus can take her lover's ideal form." She runs her hands down her sides and to her crotch. <<if $seeDicks != 0>>She begins rubbing her clit as it steadily grows into a meaty cock. "Or an incubus, for the ladies." She returns to her previous form. <</if>>"Says here it comes with 'bonus novice witch' too. Neat. What's this though? It looks like an appe"
+
+<br><br><br><br><br><br><br><br>You tap at the screen; did she crash or something?
+
+<br><br><br>
+
+After several minutes, she snaps back to life, with no mention about what exactly tied her up for so long.
+<br>
+<span ID="app">
+__Personal assistant appearances:__
+<br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Angel">>
+	<<replace "#app">>
+	At your order, she installs the angel appearance. She spreads her wings and checks out her new body, "Thanks, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, but could I have a robe or something? I'm indecent!" She blushes red. "You can always customize me from the arcology management menu," she adds.
+	<<set $assistantAppearance = "angel">>
+	<</replace>>
+<</link>>
+<br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Cherub">>
+  <<replace "#app">>
+  <<nobr>>
+	At your order, she installs the cherub appearance. She returns to her youthful figure and sprouts her wings. "This is awesome, little embarrassing though..." She says, covering her shame. "You can always customize me from the arcology management menu," she adds.
+    <<set $assistantAppearance = "cherub">>
+  <</nobr>><</replace>>
+<</link>>
+<br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Imp">>
+  <<replace "#app">>
+  <<nobr>>
+	At your order, she installs the cherub appearance. She returns to her youthful figure and sprouts her wings. "This is awesome! So, wanna fool around? Maybe go torment some slaves?" She says, pulling out a pitchfork. "You can always customize me from the arcology management menu," she adds.
+    <<set $assistantAppearance = "imp">>
+  <</nobr>><</replace>>
+<</link>>
+<br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Succubus">>
+	<<replace "#app">>
+	At your order, she installs the succubus appearance. She promptly takes your breath away. "Thank you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. Now how shall I show you my appreciation..." Her avatar trails off while spreading her legs and flashing you her lovely pussy. "You can always customize me from the arcology management menu," she adds, with a hint of dissaproval.
+	<<set $assistantAppearance = "succubus">>
+	<</replace>>
+<</link>>
+<<if $seeDicks != 0>>
+<br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Incubus">>
+	<<replace "#app">>
+	At your order, she installs the incubus appearance. She becomes rather masculine, sporting an soft cock nearly as long as her thigh. "Thank you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. This is going to be fun. Would you like a taste?" She steadily becomes erect, a bead of precum forming at it's tip. "You can always customize me from the arcology management menu," she adds, with a hint of dissaproval.
+	<<set $assistantAppearance = "incubus">>
+	<</replace>>
+<</link>>
+<</if>>
+<br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "witch">>
+  <<replace "#app">>
+	At your order, she installs the novice witch appearance. She wraps a tightly clinging robe around her voluptuous body and dons a wide-brimmed hat. "You can always customize me from the arcology management menu," she adds, pulling a book of lewd spell out.
+    <<set $assistantAppearance = "witch">>
+	<</replace>>
+<</link>>
+<<link "_">>
+  <<replace "#app">>
+	At your order, she installs the bugged appearance. Her body twists and contorts into an abomination of flesh and bone. It is honestly unsettling to look at. The thing morphs its body into a familiar female shape, though it is still off. Especially her eyes; they seem soulless. "You can always customize me from the arcology management menu," she adds, in an ill pronounced mimicry of your voice.
+    <<set $assistantAppearance = "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
+	<</replace>>
+<</link>>
+<br><<link "Your current appearance will do">>
+	<<replace "#app">>
+	At your order, she maintains the $assistantAppearance appearance as her avatar. "Yes, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," she confirms, and adds "if you reconsider, I can be customized from the arcology management menu."
+	<<set $assistantAppearance = "normal">>
+	<</replace>>
+<</link>>
+</span>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index a33a03d7c36..006a0b35e2e 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -233,7 +233,11 @@
 	<<set $activeStandard.health = 0>>
 <</if>>
 <<if $arcologies[0].FSBodyPurist > 20>>
-	<<set $activeStandard.chem = 0>>
+	<<if $failedElite > 100>>
+		<<set $activeStandard.chem = 0>>
+	<<else>>
+		<<set $activeStandard.chem = 15>>
+	<</if>>
 	<<set $activeStandard.boobsImplant = 0>>
 	<<set $activeStandard.buttImplant = 0>>
 	<<set $activeStandard.lipsImplant = 0>>
diff --git a/src/uncategorized/assistantEvents.tw b/src/uncategorized/assistantEvents.tw
index 8ff0258600d..334111e1438 100644
--- a/src/uncategorized/assistantEvents.tw
+++ b/src/uncategorized/assistantEvents.tw
@@ -56,12 +56,6 @@ She continues more seriously,
 <</if>>
 The character vanishes, and the symbol returns. "Ahem. What do you think, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>?"
 
-<<case "assistant SP Pack 2">>
-
-"Cool! New appearances to play around with!" Your assistant happily chimes. "Lets see what's inside! This looks heavenly..." She hunches forward as a large pair of white feathered wings extend form her upper back. She takes several experimental flaps before taking to the sky. "I feel positively radiant! Maybe a smaller version will be more to your liking?" She loses both height and wingspan until she stands roughly equivalent to 120cm. She flutters around cutely. "This is neat, I'm like cupid. Want me to hook you up with anyone?" She winks as her wings become batlike and a pair of cute little nubs appear on her head. "Or maybe you'd just like to play with me instead." The impish figure flirts, before landing and blossoming into a stunning woman. "You know a succubus can take her lover's ideal form." She runs her hands down her sides and to her crotch. <<if $seeDicks != 0>>She begins rubbing her clit as it steadily grows into a meaty cock. "Or an incubus, for the ladies." She returns to her previous form. <</if>>"Says here it comes with 'bonus novice witch' too. Neat. What's this though? It looks like an appe"
-
-<br><br><br><br><br><br><br><br>You tap at the screen; did she crash or something?
-
 <<case "assistant FS">>
 
 <<set $assistantFSOptions = 1>>
@@ -1266,64 +1260,6 @@ __Personal assistant appearances:__
 	<</replace>>
 <</link>>
 
-<<case "assistant SP Pack 2">>
-
-After several minutes, she snaps back to life, with no mention about what exactly tied her up for so long.
-<br>
-__Personal assistant appearances:__
-<br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Angel">>
-	<<replace "#result">>
-	At your order, she installs the angel appearance. She spreads her wings and hecks out her new body, "Thanks, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, but could I have a robe or something? I'm indecent!" She blushes red. "You can always customize me from the arcology management menu," she adds.
-	<<set $assistantAppearance = "angel">>
-	<</replace>>
-<</link>>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Cherub">>
-  <<replace "#result">>
-  <<nobr>>
-	At your order, she installs the cherub appearance. She returns to her youthful figure and sprouts her wings. "This is awesome, little embarrassing though..." She says, covering her shame. "You can always customize me from the arcology management menu," she adds.
-    <<set $assistantAppearance = "cherub">>
-  <</nobr>><</replace>>
-<</link>>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Imp">>
-  <<replace "#result">>
-  <<nobr>>
-	At your order, she installs the cherub appearance. She returns to her youthful figure and sprouts her wings. "This is awesome! So, wanna fool around? Maybe go torment some slaves?" She says, pulling out a pitchfork. "You can always customize me from the arcology management menu," she adds.
-    <<set $assistantAppearance = "imp">>
-  <</nobr>><</replace>>
-<</link>>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Succubus">>
-	<<replace "#result">>
-	At your order, she installs the succubus appearance. She promptly takes your breath away. "Thank you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. Now how shall I show you my appreciation..." Her avatar trails off while spreading her legs and flashing you her lovely pussy. "You can always customize me from the arcology management menu," she adds, with a hint of dissaproval.
-	<<set $assistantAppearance = "succubus">>
-	<</replace>>
-<</link>>
-<<if $seeDicks != 0>>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Incubus">>
-	<<replace "#result">>
-	At your order, she installs the incubus appearance. She becomes rather masculine, sporting an soft cock nearly as long as her thigh. "Thank you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>. This is going to be fun. Would you like a taste?" She steadily becomes erect, a bead of precum forming at it's tip. "You can always customize me from the arcology management menu," she adds, with a hint of dissaproval.
-	<<set $assistantAppearance = "incubus">>
-	<</replace>>
-<</link>>
-<</if>>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "witch">>
-  <<replace "#result">>
-	At your order, she installs the novice witch appearance. She wraps a tightly clinging robe around her voluptuous body and dons a wide-brimmed hat. "You can always customize me from the arcology management menu," she adds, pulling a book of lewd spell out.
-    <<set $assistantAppearance = "witch">>
-	<</replace>>
-<</link>>
-<<link "_">>
-  <<replace "#result">>
-	At your order, she installs the bugged appearance. Her body twists and contorts into an abomination of flesh and bone. It is honestly unsettling to look at. The thing morphs its body into a familiar female shape, though it is still off. Especially her eyes; they seem soulless. "You can always customize me from the arcology management menu," she adds, in an ill pronounced mimicry of your voice.
-    <<set $assistantAppearance = "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
-	<</replace>>
-<</link>>
-<br><<link "Your current appearance will do">>
-	<<replace "#result">>
-	At your order, she maintains the $assistantAppearance appearance as her avatar. "Yes, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," she confirms, and adds "if you reconsider, I can be customized from the arcology management menu."
-	<<set $assistantAppearance = "normal">>
-	<</replace>>
-<</link>>
-
 <<case "assistant FS">>
 
 __Personal assistant appearances:__
diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw
index 20f33c165d3..ed4f4f0f23e 100644
--- a/src/uncategorized/personalAssistantAppearance.tw
+++ b/src/uncategorized/personalAssistantAppearance.tw
@@ -1230,7 +1230,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
 <</if>>
 
 <<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
-	She's a odd little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0].FSSupremacistRace <</if>> girl with slightly off mannerisms,
+	She's a odd little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0].FSSupremacistRace <</if>> girl, with slightly off mannerisms,
 	<<if $assistantFSOptions>>
 	<<switch $assistantFSAppearance>>
 	<<case "paternalist">>
@@ -1401,7 +1401,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
 <<elseif ($seed == 7) && ($marketAssistantAnnounced == 1)>>
 	She's accompanied by your market assistant's still inexperienced avatar.
 	<<if $marketAssistantRelationship == "cute">>
-		The market assisntant has cleaned up nicely since the last time you saw her. She does a little twirl to show off her new look before squeaking in shock as a burst of cum splashes across her face. She pouts at $assistantName, who is eagerly prepping a secong load to fire at her.
+		The market assistant has cleaned up nicely since the last time you saw her. She does a little twirl to show off her new look before squeaking in shock as a burst of cum splashes across her face. She pouts at $assistantName, who is eagerly prepping a secong load to fire at her.
 	<<elseif $marketAssistantRelationship == "nonconsensual">>
 		The market assistant is being violently penetrated by $assistantName, her bloated belly swaying in tune to her thrusts. The hapless girl struggles in discomfort as the incubus blows another load into her already full womb, causing cum to backflow out of her now loose pussy. $assistantName leans back, motions to you, and asks, "Plenty of holes still to go around, if you want one!"
 	<<elseif $marketAssistantRelationship == "incestuous">>
@@ -1491,7 +1491,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
 	<<case "physical idealist">>
 		She is nothing but a tight thong to show off her perfectly muscled body.
 	<<case "repopulation focus">>
-		She is wearing an overly taut dress that clings tightly to her triplet rounded middle and milk-ladden breasts. She is glwing with motherhood.
+		She is wearing an overly taut dress that clings tightly to her triplet rounded middle and milk-ladden breasts. She is positively glowing with motherhood.
 	<<case "eugenics">>
 		She's become even more irresistible lately; <<if $PC.dick == 1>>you can't help but fantasize about fucking her pregnant with your perfect child<<else>>you can't help but feel slightly envious of her body<</if>>.
 	<<case "gender radicalist">>
@@ -1501,124 +1501,113 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
 			She is wearing baggy pants and a loose fitting shirt. Having altered her appearance to be alluringly androgynous, it is hard to make out her gender at a glance.
 		<</if>>
 	<<case "gender fundamentalist">>
-		She is wearing a cute dress that tightly hugs her attractive curves. She may be rendering herself more feminine, but can't hide the bulge under her skirt.
+		She is wearing a form fitting dress that emphasises her feminine curves. A lovely sight, given that she has recently adjusted her body to be a lovely future mother.
 	<<case "asset expansionist">>
-		She is wearing nothing at all; not that anything could fit her. Her cock and balls are so large they reach the ground when she stands.
+		She is wearing nothing at all; not that anything could fit her. Her breasts nearly touch the ground when she stands, yet are naturally perky. Her butt is so enormous it is a wonder she can even walk.
 	<<case "transformation fetishist">>
-		She is wearing jeans and a tight shirt. Her overly long erection runs up her front and protrudes out the neck of her top.
+		She is wearing a minidress so tight it fully outlines her huge butt implants and barely contains the lower half of her beachball sized tits.
 	<<case "pastoralist">>
-		She is wearing nothing at all; not that anything could fit her. Her balls are absolutely massive; her sizable cock looks tiny resting atop them. She can barely take a step without overstimulating and orgasming across her sack.
+		She is wearing a pair of cow-print bikinis over her head sized breasts. A quartet of wet spots adorn her tops at all times.
 	<<case "maturity preferentialist">>
-		She has recently begun presenting herself as an experienced, mature man with an oddly familiar mustache and goatee.
+		She has recently begun presenting herself as an experienced, mature woman; one can only wonder what positions and tricks she knows.
 	<<case "youth preferentialist">>
 		She has recently adjusted her age to reflect your youth focused society.
 		<<if $minimumSlaveAge == 3>>
-			She's an adorable toddler with an enormous cock hanging from her shorts.
+			She's an adorable toddler wearing a cute pink dress.
 		<<elseif $minimumSlaveAge <= 7>>
-			She's a cute shota with ball-filled shorts and a huge erection sneaking up her shirt.
+			She's a cute loli wearing tight, crotch hugging, spats and a tight tub top across her flat chest.
 		<<elseif $minimumSlaveAge <= 13>>
-			She's a attractive teenager with an immodest bulge running down her pantleg.
+			She's a attractive teenager wearing short shorts and a sheer top that shows off her newly grown breats.
 		<<else>>
-			SShe's a attractive young adult with an immodest bulge running down her pantleg.
+			She's a attractive young adult wearing a sheer dress that shows off her youthful curves.
 		<</if>>
 	<<case "slimness enthusiast">>
-		<<if $arcologies[0].FSSlimnessEnthusiastLaw == 1>> /* remove me after succubus is complete */
+		<<if $arcologies[0].FSSlimnessEnthusiastLaw == 1>>
+			She has recently slimmed her body down tremendously; her breasts are flat as can be, as is her rear. She enjoys wearing an extremely thin string bikini that tightly hugs her body and barely covers her non-existant assets.
 		<<else>>
-			She has recently slimmed her body down; everywhere but her proportionally huge cock, that is.
+			She has recently slimmed her body down and begun wearing form fitting clothing to show off her lithe figure.
 		<</if>>
 	<<case "body purist">>
-		She is wearing nothing at all, happy to show off her flawless body. Her cock and balls are now the ideal size to penetrate a natural girl.
+		She is wearing nothing at all, happy to show off her flawless body. Her curves are perfect; it's the only way to describe her.
 	<<default>>
-		She enjoys wearing absolutely nothing but an enormous hard-on. She frequently, and openly, masturbates to your naked body.
+		She enjoys using a tight strip of leather to support her ample busom and a miniscule thong to cover her crotch. She commonly strikes sexy poses, her spaded tail wrapping around her legs seductively, hoping to catch her <<if $PC.title == 1>>Master's<<else>>Mistress's<</if>> eye.
 	<</switch>>
 	<<else>>
-		She enjoys wearing absolutely nothing but an enormous hard-on. She frequently, and openly, masturbates to your naked body.
+		She enjoys using a tight strip of leather to support her ample busom and a miniscule thong to cover her crotch. She commonly strikes sexy poses, her spaded tail wrapping around her legs seductively, hoping to catch her <<if $PC.title == 1>>Master's<<else>>Mistress's<</if>> eye.
 	<</if>>
 <<if ($cockFeeder == 1) && ($seed == 1)>>
-	She has a recognizable little representation of one of your slaves with its lips around the base of her dick and a huge bulge down its throat. The slave must be down in the kitchen, getting a meal out of the food dispensers. She notices you watching and energetically renews deepthroating the slave. She moans lewdly as she blows her load in the slaves mouth, forcing cum to spray out the slave's nose and around her cock. She sighs with disappointment at the mess the slave has made.
+	She has a recognizable little representation of one of your slave between her legs and is moaning with lust as the slave eagerly eats her out. The slave must be down in the kitchen, getting a meal out of the food dispensers. Whan she notices you watching, she gives you a show by cumming hard across the slave's face.
 <<elseif ($suppository == 1) && ($seed == 2)>>
-	She is happily assfucking a recognizable little representation of one of your slaves. The slave must be receiving her drugs from one of the dildo dispensers. She notices you watching, increases her pace and cums deep in the slave's rear, slightly rounding her belly with cum.
+	She is happily assfucking a recognizable little representation of one of your slaves with a strap on. The slave must be receiving her drugs from one of the dildo dispensers. Noticing you watching, she unwinds her tail from the around the slave and begins fucking her own pussy with it.
 <<elseif ($masturbationAllowed == 1) && ($seed == 3)>>
-	A recognizable little representation of one of your slaves is riding her erect cock. The slave must be using one of the penthouse's many sex toys. She notices you watching and winks at you, before promising not to suck too much life from her enthusiastic partner.
+	A recognizable little representation of one of your slaves is sharing a double-ended dildo with her. The slave must be using one of the penthouse's many sex toys. She notices you watching and blows you a kiss, before promising not to suck too much life from her enthusiastic partner.
 <<elseif ($seed == 4)>>
-	She has her cock forced deep into a recognizable little representation of one of your slaves. The slave must be getting a checkup. She notices your gaze, and states "What? I can feel her heartbeat clearly like this."
+	She has her body pressed up against a recognizable little representation of one of your slaves as she feels her up. The slave must be getting a checkup. She notices your gaze and pinches the slave's erect nipples.
 <<elseif ($seed == 5) && ($invasionVictory > 0)>>
-	She's intently staring down a representation of one of your security drones. When she sees you looking at her, she coyly says, "I like this one. She did very well during the invasion and I wanted to reward her, but I can't find a hole..."
+	She's intently staring down a representation of one of your security drones. When she sees you looking at her, she coyly says, "I like this one. He did very well during the invasion and I wanted to reward him, but I can't find a dick..." A small schematic pops on screen, detailing plans for a rather large penetrating attachment for your model of drone. "It vibrates!" She teases. 
 <<elseif ($seed == 6) && ($studio == 1)>>
-	She has a camera strapped to her cock and is recording a of the recognizable little representation of one of your slaves sucking it. The slave must be playing with one of the penthouse's many dildoes, and $assistantName is likely turning the feed of it into a PoV porno.
+	She's getting oral from a recognizable little representation of one of your slaves, and is using a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and your personal assistant is clearly turning the feed of it into porn.
 <<elseif ($seed == 7) && ($marketAssistantAnnounced == 1)>>
 	She's accompanied by your market assistant's still inexperienced avatar.
 	<<if $marketAssistantRelationship == "cute">>
-		The market assisntant has cleaned up nicely since the last time you saw her. She does a little twirl to show off her new look before squeaking in shock as a burst of cum splashes across her face. She pouts at $assistantName, who is eagerly prepping a secong load to fire at her.
+		$assistantName has the market assisntant's pants down and is eagerly sucking him off. He tenses with orgasm and sighs with relief only for $assistantName to deeply kiss him and force him to taste his cum with her.
 	<<elseif $marketAssistantRelationship == "nonconsensual">>
-		The market assistant is being violently penetrated by $assistantName, her bloated belly swaying in tune to her thrusts. The hapless girl struggles in discomfort as the incubus blows another load into her already full womb, causing cum to backflow out of her now loose pussy. $assistantName leans back, motions to you, and asks, "Plenty of holes still to go around, if you want one!"
+		The market assistant is being violently ridden by $assistantName, her fuller assets swaying in tune to her movements. The hapless boy struggles pitifully as the succubus coaxes another load out of her exhausted toy. $assistantName leans back, strokes her luscious body and says, "His energy is making me even more beautiful for you!"
 	<<elseif $marketAssistantRelationship == "incestuous">>
-		The market assistant is eagerly riding her big brother, $assistantName's dick. You can't help but notice how full her breasts have gotten and how plump her ass and thighs now are. She moans with lust as $assistantName cums into her fertile pussy; a glowing sigil appearing below her navel. She is well on her way to becoming the succubus consort of her once human brother.
+		The market assistant is being ridden by his enormously pregnant big sister, $assistantName. He's supporting her taut belly as she uses her hands to hold their twins to her swollen breasts. You can't help but notice how full his balls have become and thick his shaft is. He moans with lust as $assistantName bucks with orgasm before painting her womb with another coat of sperm. $assistantName grunts slightly as his dick grows larger inside her and his balls swell for a second round. He is well on his way to becoming the incubus lover of his once human sister.
 	<<else>>
-		The market assistant is embracing $assistantName as she is lovingly penetrated by the caring incubus. They pull each other close as they cum together, locking lips and refusing to let go until the other is completely satisfied. It takes quite some before they settle down and wave to you, thanking you deeply for the true love you've gifted them.
+		The market assistant is tenderly fucking $assistantName in the missionary position. He leans in as they cum together, locking lips and kissing his lover deeply. Once they are both satisfied, they snuggle up for a post coitus rest and thank you deeply for the true love you've gifted them.
 	<</if>>
 <<else>>
 	<<switch $assistantFSAppearance>>
 	<<case "paternalist">>
-		She has her pants unfastened and is absentmindedly jerking off. When she notices you watching, she waves her throbbing erection at you, imploring you to finish her off.
+		She's absentmindedly groping her tits. When she notices you eyeing her, she smiles coyly and leans forward giving you a tantalizing view of her cleavage.
 	<<case "degradationist">>
-		She's fed a number of beads down her urethra and is struggling to hold back her orgasm. When she notices you watching, she waves her throbbing erection at you, imploring you to yank out the beads and give her release.
-	<<case "roman revivalist">>
-		She has her toga undone and is absentmindedly jerking off. When she notices you watching, she waves her throbbing erection at you, imploring you to finish her off.
-	<<case "egyptian revivalist">>
-		She is absentmindedly jerking off, her loincloth pushed aside to make room. When she notices you watching, she waves her throbbing erection at you, imploring you to finish her off.
-	<<case "edo revivalist" "chinese revivalist">>
-		She has undone her clothing and is absentmindedly jerking off. When she notices you watching, she waves her throbbing erection at you, imploring you to finish her off.
-	<<case "arabian revivalist">>
-		She has her pants pulled off and is absentmindedly using them to jerk off. When she notices you watching, she waves her throbbing erection at you, imploring you to finish her off.
+		She's absentmindedly playing with her nipple rings. When she notices you eyeing her, she smiles coyly and runs her hands down her curves to her crotch where she traces the piercings dangling from her labia.
 	<<case "chattel religionist">>
-		She is gingerly massaging her swollen balls. When she notices you watching, she struggles to sit up and implores you to pull out the stopper and bathe in her blessing.
+		She's absentmindedly groping her tits. When she notices you eyeing her, she smiles coyly and runs her hands down her sides and to her pussy while moaning seductively.
 	<<case "physical idealist">>
-		She's vigorously jerking off. When she notices you watching, she waves her throbbing erection at you, imploring you to finish her off.
+		She's absentmindedly groping her tits. When she notices you eyeing her, she smiles coyly and flexes her muscles in some of the most seductive ways imaginable.
 	<<case "repopulation focus">>
-		She's leaning back with both hands beneath her swollen middle struggling to jack off. When she notices you watching, she sits up and sighs as her belly pushes her erection out of sight.
+		She's absentmindedly sucking a tit. When she notices you eyeing her, she smiles coyly and runs her hands down her curves and across her pregnancy where she traces her popped navel. A flurry of kicks bulge her belly as it grows slightly larger. She sighs and pats her added mass.
 	<<case "eugenics">>
-		She's reclining while absentmindedly jacking off. When she notices you watching, <<if $PC.vagina == 1>>sits back, making plenty of room for you to spear yourself on her erection<<else>>she waves her throbbing erection at you, imploring you to finish her off<</if>>.
+		She's absentmindedly groping her tits. When she notices you eyeing her, she smiles coyly and spreads her legs, inviting you to enjoy her perfect pussy.
 	<<case "gender radicalist">>
-		<<if $arcologies[0].FSGenderRadicalistLawFuta == 1>>
-			She's reclining while absentmindedly jacking off with one hang and playing with her hidden pussy with the other. When she notices you watching, she spreads her legs wide so you can watch her spasm with orgasm.
-		<<elseif $arcologies[0].FSGenderRadicalistLawFuta == 2>>
-			She's leaning back with both hands wrapped around her huge cock, struggling to jack off. When she notices you watching, she invites you to lend a hand or two to help her out.
-		<<elseif $arcologies[0].FSGenderRadicalistLawFuta == 3>>
-			She is laying on her stomach, her ass and legs jiggling delightfully as she gives herself a thighjob. When she notices you watching, she struggles to roll onto her side and waves her throbbing erection at you, imploring you to finish her off.
+		<<if $arcologies[0].FSGenderRadicalistLawFuta == 3>>
+			She's absentmindedly fondling her asscheeks. When she notices you eyeing her, she smiles coyly and spins around, splitting her pants and revealing her enticing butthole.
 		<<else>>
-			She's absentmindedly jerking off. When she notices you watching, she waves her throbbing erection at you, imploring you to finish her off.
+			She's absentmindedly playing with her hair. When she notices you eyeing her, she leaps to her feet and invites you to chance what resides between her legs.
 		<</if>>
 	<<case "gender fundamentalist">>
-		She has hiked up her skirt and is absentmindedly jerking off. When she notices you watching, she quickly covers herself; though she can't hide the movements she makes under her dress.
+		She's absentmindedly groping her tits. When she notices you eyeing her, she smiles coyly and runs her hands down her motherly curves while moaning seductively.
 	<<case "asset expansionist">>
-		She is laying on her back, legs squeezing her immense balls as she struggles to jack off her monolithic dick. When she notices you watching, she struggles to sit up before giving up and inviting you to lend a hand in beating her meat.
+		She's absentmindedly massaging her tits. When she notices you eyeing her, she smiles coyly and proceeds to trace the length of her breasts to her nipple; she never reaches them, as her breasts steadily grow the as she reaches outwards.
 	<<case "transformation fetishist">>
-		She has her jeans unbuttoned and is absentmindedly trying to jerk off. When she notices you watching, she waves her throbbing erection at you, inviting you to lend a pair of hands.
+		She's absentmindedly groping her ass. When she notices you eyeing her, she smiles coyly and flexes causing her tits to pop out of her overly short top. Giggling, she puckers her huge, fake lips and blows you a kiss.
 	<<case "pastoralist">>
-		She is laying on her back, legs squeezing her immense balls as cums again and again across herself. When she notices you watching, she struggles to sit up before giving into the sensations and blowing another load across your desk.
+		She's absentmindedly milking a pair of her tits. When she notices you eyeing her, she smiles coyly and leaps to her feet causing her quartet of milk bags to spring loose from her tops. She giggles as she gestures the many ways you could titfuck her.
 	<<case "maturity preferentialist">>
-		She has a hand down her pants. When she notices you watching, she begins eagerly stroking herself while describing, in detail, what she'd love to do to you.
+		She's absentmindedly groping her tits. When she notices you eyeing her, she smiles coyly and begins making a motion you can only fathom the meaning of.
 	<<case "youth preferentialist">>
-		She has recently adjusted her age to reflect your youth centered society.
 		<<if $minimumSlaveAge == 3>>
-			She has her shorts pulled down and is absentmindedly jerking off. When she notices you watching, she waves her throbbing erection at you, imploring you to finish her off.
+			She has her hands down her dress and is happily fondling herself. When she notices you eyeing her, she quickly hids her hands behind her back and plays innocent.
 		<<elseif $minimumSlaveAge <= 7>>
-			She has her shorts unfastened and is absentmindedly jerking off. When she notices you watching, she waves her throbbing erection at you, imploring you to finish her off.
+			She has both hands up her top and is happily playing with her nipples. When she notices you eyeing her, she quickly yanks her tube top off and lewdly waves her flat chest at you.
 		<<elseif $minimumSlaveAge <= 13>>
-			She has her pants unfastened and is absentmindedly jerking off. When she notices you watching, she waves her throbbing erection at you, imploring you to finish her off.
+			She has both hands down her shorts and is eagerly playing with her pussy. When she notices you eyeing her, she quickly pulls her bottoms down and spreads her legs, desperate for you to relieve her of this new feeling.
 		<<else>>
-			She has her pants unfastened and is absentmindedly jerking off. When she notices you watching, she waves her throbbing erection at you, imploring you to finish her off.
+			She's absentmindedly groping her tits. When she notices you eyeing her, she smiles coyly and runs her hands down her new curves while moaning seductively.
 		<</if>>
 	<<case "slimness enthusiast">>
-		<<if $arcologies[0].FSSlimnessEnthusiastLaw == 1>> /* remove me after succubus is complete */
+		<<if $arcologies[0].FSSlimnessEnthusiastLaw == 1>>
+			She's absentmindedly pinching her nipples. When she notices you eyeing her, she smiles coyly and runs her hands across her flat chest while moaning seductively.
 		<<else>>
-			She's absentmindedly using both hands to jerk off. When she notices you watching, she waves her throbbing erection at you, imploring you to finish her off.
+			She's absentmindedly groping her small tits. When she notices you eyeing her, she smiles coyly and runs her hands down her lithe body while moaning seductively.
 		<</if>>
 	<<case "body purist">>
-		She's absentmindedly jerking off. When she notices you watching, she waves her throbbing erection at you, imploring you to finish her off.
+		She's absentmindedly groping her tits. When she notices you eyeing her, she smiles coyly and runs her hands down her perfect curves while moaning seductively.
 	<<default>>
-		She's absentmindedly jerking off. When she notices you watching, she waves her throbbing erection at you, imploring you to finish her off.
+		She's absentmindedly groping her tits. When she notices you eyeing her, she smiles coyly and runs her hands down her curves while moaning seductively.
 	<</switch>>
 <</if>>
 
diff --git a/src/uncategorized/personalAssistantOptions.tw b/src/uncategorized/personalAssistantOptions.tw
index cfcb638818a..1a7a05becc6 100644
--- a/src/uncategorized/personalAssistantOptions.tw
+++ b/src/uncategorized/personalAssistantOptions.tw
@@ -790,22 +790,23 @@ It has no impact on public opinion.
 <br><br>
 __Downloadable Appearances:__
 <br>
-/*
-<<if $assistantExtra1 == 0>>
-	[[Purchase a set of monstergirl appearances|Personal assistant options][$cash -= Math.trunc(10000*$upgradeMultiplier), $assistantExtra1 = 1]]
-	//Costs ¤<<print Math.trunc(6000*$upgradeMultiplier)>>//
-<<else>>You have downloaded a set of monstergirl appearances for your avatar.
-<</if>>
-*/
-/*
-<<if $assistantExtra2 == 0>>
-	[[Purchase a set of heaven and hell themed appearances|Personal assistant options][$cash -= Math.trunc(10000*$upgradeMultiplier), $assistantExtra2 = 1]]
-	//Costs ¤<<print Math.trunc(6000*$upgradeMultiplier)>>//
-<<else>>You have downloaded a set of heavenly and hellish appearances for your avatar.
-<</if>>
-*/
+	/*
+	<<if $assistantExtra1 == 0>>
+		[[Purchase a set of monstergirl appearances|Assistant Events][$event = "", $cash -= Math.trunc(10000*$upgradeMultiplier), $assistantExtra1 = 1]]
+		//Costs ¤<<print Math.trunc(6000*$upgradeMultiplier)>>//
+	<<else>>You have downloaded a set of monstergirl appearances for your avatar.
+	<</if>>
+	*/
+	<<if $assistantExtra2 == 0>>
+		<<link "Purchase a set of heaven and hell themed appearances">>
+			<<set $cash -= Math.trunc(10000*$upgradeMultiplierArcology), $assistantExtra2 = 1, $nextLink = "Personal assistant options">>
+			<<goto "Assistant Appearance Pack Two">>
+		<</link>> //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+	<<else>>You have downloaded a set of heavenly and hellish appearances for your avatar.
+	<</if>>
 <</if>>
 
+<br><br>
 
 /* Choose her FS appearance */
 <<if $assistantFSOptions != 0 && $assistantAppearance != "normal">>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index b597f7d5e45..3a87e54aa0e 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -259,6 +259,7 @@
 <<if ($slaves[$i].sisters > 0)>>
 	<<set $alphaTwin = $slaves[$i]>>
 	<<set $betaTwin = randomTwinSister($slaves[$i])>>
+<<if def $betaTwin>>
 <<if ($alphaTwin.anus > 0)>>
 <<if ($betaTwin.anus > 0)>>
 <<if ($alphaTwin.devotion > 50)>>
@@ -275,6 +276,7 @@
 <</if>>
 <</if>>
 <</if>>
+<</if>>
 <</for>>
 
 <</if>>  /* closes extended family mode */
diff --git a/src/uncategorized/saChoosesOwnJob.tw b/src/uncategorized/saChoosesOwnJob.tw
index e57f38bb42a..5806129288d 100644
--- a/src/uncategorized/saChoosesOwnJob.tw
+++ b/src/uncategorized/saChoosesOwnJob.tw
@@ -7,7 +7,7 @@
 	was assigned to $slaves[$i].assignment and
 <</if>>
 
-	is allowed to select $possessive own job this week. $pronounCap watches your other slaves to decide what to do, @@.hotpink;happy@@ to be permitted a choice and a little more @@.mediumaquamarine;confident@@ than if you had just given $possessive orders. $pronoun
+	is allowed to select $possessive own job this week. $pronounCap watches your other slaves to decide what to do, @@.hotpink;happy@@ to be permitted a choice and a little more @@.mediumaquamarine;confident@@ than if you had just given $object orders. The $desc
 	<<set $slaves[$i].devotion++, $slaves[$i].trust++>>
 <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
 	decides to rest, taking advantage of your permission to @@.mediumorchid;remain indolent.@@
diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw
index 184ed10a58a..c6d3c6cd641 100644
--- a/src/uncategorized/saRelationships.tw
+++ b/src/uncategorized/saRelationships.tw
@@ -364,42 +364,42 @@
 				<<elseif $PC.mother == _SlaveI.ID || $PC.father == _SlaveI.ID>>
 					She
 					<<if _SlaveI.sexualQuirk is "perverted">>
-						is such a pervert that she @@.hotpink;enjoys@@ carrying on an incestuous relationship with her own daughter.
+						is such a pervert that she @@.hotpink;enjoys@@ carrying on an incestuous relationship with her own <<if $PC.title == 1>>son<<else>>daughter<</if>>.
 						<<set _SlaveI.devotion += 1>>
 					<<elseif _SlaveI.devotion > 95>>
-						is so inured to the perversities of slavery that she @@.hotpink;enjoys@@ carrying on an incestuous relationship with her own daughter.
+						is so inured to the perversities of slavery that she @@.hotpink;enjoys@@ carrying on an incestuous relationship with her own <<if $PC.title == 1>>son<<else>>daughter<</if>>.
 						<<set _SlaveI.devotion += 1>>
 					<<elseif _SlaveI.behavioralQuirk is "sinful">>
-						is torn between sinful delight and deep disgust that she's carrying on an incestuous relationship with her own daughter.
+						is torn between sinful delight and deep disgust that she's carrying on an incestuous relationship with her own <<if $PC.title == 1>>son<<else>>daughter<</if>>.
 					<<elseif _SlaveI.devotion > 75>>
-						is so devoted to you that she accepts carrying on an incestuous relationship with her own daughter.
+						is so devoted to you that she accepts carrying on an incestuous relationship with her own <<if $PC.title == 1>>son<<else>>daughter<</if>>.
 					<<elseif _SlaveI.devotion > 50>>
-						is somewhat @@.mediumorchid;disturbed@@ that she's carrying on an incestuous relationship with her own daughter.
+						is somewhat @@.mediumorchid;disturbed@@ that she's carrying on an incestuous relationship with her own <<if $PC.title == 1>>son<<else>>daughter<</if>>.
 						<<set _SlaveI.devotion -= 2>>
 					<<elseif _SlaveI.devotion > 20>>
-						is @@.mediumorchid;disturbed@@ and @@.gold;scared@@ that she's carrying on an incestuous relationship with her own daughter.
+						is @@.mediumorchid;disturbed@@ and @@.gold;scared@@ that she's carrying on an incestuous relationship with her own <<if $PC.title == 1>>son<<else>>daughter<</if>>.
 						<<set _SlaveI.devotion -= 2>>
 						<<set _SlaveI.trust -= 2>>
 					<<else>>
-						is @@.mediumorchid;revolted@@ and @@.gold;scared@@ that she's carrying on an incestuous relationship with her own daughter.
+						is @@.mediumorchid;revolted@@ and @@.gold;scared@@ that she's carrying on an incestuous relationship with her own <<if $PC.title == 1>>son<<else>>daughter<</if>>.
 						<<set _SlaveI.devotion -= 4>>
 						<<set _SlaveI.trust -= 4>>
 					<</if>>
 					<<if _SlaveI.preg > 0>>
 						<<if _SlaveI.pregSource == -1>>
 							<<if _SlaveI.sexualQuirk is "perverted">>
-								She's even @@.hotpink;aroused@@ by the constant awareness that her daughter is the parent of the daughter<<if _SlaveI.pregType > 1>>s<</if>> she's carrying.
+								She's even @@.hotpink;aroused@@ by the constant awareness that her <<if $PC.title == 1>>son<<else>>daughter<</if>> is the parent of the daughter<<if _SlaveI.pregType > 1>>s<</if>> she's carrying.
 								<<set _SlaveI.devotion += 1>>
 							<<elseif _SlaveI.behavioralQuirk is "sinful">>
-								Her feelings about carrying her daughter's child<<if _SlaveI.pregType > 1>>ren<</if>> are @@.hotpink;secretly less mixed,@@ though.
+								Her feelings about carrying her <<if $PC.title == 1>>son<<else>>daughter<</if>>'s child<<if _SlaveI.pregType > 1>>ren<</if>> are @@.hotpink;secretly less mixed,@@ though.
 								<<set _SlaveI.devotion += 1>>
 							<<elseif _SlaveI.devotion > 95>>
-								She occasionally remembers that she's carrying her daughter's child<<if _SlaveI.pregType > 1>>ren<</if>>, but does her best to accept it by not thinking about it.
+								She occasionally remembers that she's carrying her <<if $PC.title == 1>>son<<else>>daughter<</if>>'s child<<if _SlaveI.pregType > 1>>ren<</if>>, but does her best to accept it by not thinking about it.
 							<<elseif _SlaveI.devotion > 50>>
-								She's @@.mediumorchid;disgusted@@ that the bab<<if _SlaveI.pregType > 1>>ies<<else>>y<</if>> she's carrying is her daughter's, though she tries her best not to think about it.
+								She's @@.mediumorchid;disgusted@@ that the bab<<if _SlaveI.pregType > 1>>ies<<else>>y<</if>> she's carrying is her <<if $PC.title == 1>>son<<else>>daughter<</if>>'s, though she tries her best not to think about it.
 								<<set _SlaveI.devotion -= 1>>
 							<<elseif _SlaveI.devotion > 20>>
-								She's so @@.mediumorchid;disgusted@@ that the bab<<if _SlaveI.pregType > 1>>ies<<else>>y<</if>> she's carrying is her daughter's that she often wakes up crying about it.
+								She's so @@.mediumorchid;disgusted@@ that the bab<<if _SlaveI.pregType > 1>>ies<<else>>y<</if>> she's carrying is her <<if $PC.title == 1>>son<<else>>daughter<</if>>'s that she often wakes up crying about it.
 								<<set _SlaveI.devotion -= 2>>
 							<<else>>
 								She's @@.mediumorchid;passionately hateful@@ of you for making her carry an incestuous pregnancy.
-- 
GitLab