From 86f3aa33837cb43ffa63f4d312c59489725a0b94 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Tue, 14 Feb 2017 00:38:16 -0500
Subject: [PATCH] Vanilla update 0.9.8.0.

---
 slave variables documentation - Pregmod.txt   |   7 +
 src/gui/Encyclopedia/encyclopedia.tw          |  18 +-
 src/gui/css/mainStyleSheet.tw                 |  28 ++
 src/init/storyInit.tw                         |  20 +-
 src/npc/fRelation.tw                          |   2 +-
 src/uncategorized/PESS.tw                     |   6 +-
 src/uncategorized/PETS.tw                     |   2 +-
 src/uncategorized/RECI.tw                     |   2 +-
 src/uncategorized/REFI.tw                     |  16 +-
 src/uncategorized/RESS.tw                     | 223 ++++++++-
 src/uncategorized/RESSTR.tw                   | 430 +++++++++--------
 src/uncategorized/RETS.tw                     |   2 +-
 src/uncategorized/arcadeReport.tw             |   2 +-
 src/uncategorized/assistantEvents.tw          |   2 +
 src/uncategorized/brothelReport.tw            |   4 +-
 src/uncategorized/cellblockReport.tw          |   4 +-
 src/uncategorized/clinicReport.tw             |   4 +-
 src/uncategorized/clubReport.tw               |   4 +-
 src/uncategorized/dairyReport.tw              |   4 +-
 src/uncategorized/economics.tw                |  10 +-
 src/uncategorized/fullReport.tw               |   2 +-
 src/uncategorized/jeSlaveDispute.tw           |   4 +-
 src/uncategorized/longSlaveDescription.tw     |   6 +-
 src/uncategorized/main.tw                     |   6 +-
 src/uncategorized/masterSuiteReport.tw        |   4 +-
 src/uncategorized/matchmaking.tw              |   4 +-
 src/uncategorized/options.tw                  |  31 +-
 src/uncategorized/pRivalryActions.tw          |   4 +-
 src/uncategorized/pUndergroundRailroad.tw     |   4 +-
 src/uncategorized/personalAssistantOptions.tw |   7 +-
 src/uncategorized/randomIndividualEvent.tw    |  46 +-
 src/uncategorized/randomNonindividualEvent.tw |   8 +-
 src/uncategorized/reDevotees.tw               |   2 +-
 src/uncategorized/reNoEvent.tw                |   2 +-
 src/uncategorized/reRelativeRecruiter.tw      |   6 +-
 src/uncategorized/reStandardPunishment.tw     |   2 +-
 src/uncategorized/remoteSurgery.tw            |   4 +-
 src/uncategorized/saHormoneEffects.tw         |   8 +-
 src/uncategorized/saLongTermEffects.tw        |  23 +-
 src/uncategorized/saPleaseYou.tw              |   6 +-
 src/uncategorized/saServeThePublic.tw         |   2 +-
 src/uncategorized/schoolroomReport.tw         |   4 +-
 src/uncategorized/servantsQuartersReport.tw   |   4 +-
 src/uncategorized/slaveInteract.tw            |  40 +-
 src/uncategorized/slaveMarkets.tw             |   3 +-
 src/uncategorized/slaveSummary.tw             | 160 +++----
 src/uncategorized/spaReport.tw                |   4 +-
 src/uncategorized/surgeryDegradation.tw       |  21 +-
 src/utility/miscWidgets.tw                    | 440 +++++++++++++++++-
 49 files changed, 1246 insertions(+), 401 deletions(-)

diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index ac826e6a19a..cfe2e95299a 100644
--- a/slave variables documentation - Pregmod.txt	
+++ b/slave variables documentation - Pregmod.txt	
@@ -199,6 +199,13 @@ $schoolteacherCareers
 "a librarian"
 "a scholar"
 
+-others
+"a breeder"
+"a Futanari Sister"
+"a fuckdoll"
+"a bioreactor"
+"a slave"
+
 ID:
 
 slave's ID
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index ca2050fb224..cf5868585ef 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -1,5 +1,5 @@
 :: Encyclopedia
- 
+
 <<switch $encyclopedia>>\
 <<case "First Game Guide">>\
 Unfortunately, Twine doesn't have a solid tooltip system at the moment. So, a certain amount of confusion is to be expected. Sorry about that. Flip through the encyclopedia, or at least the gameplay section. It answers a lot of frequently asked questions, and if you read it you can save yourself the trouble of asking your frequently asked question on /d/ or the blog and getting told to read the encyclopedia. If you've still got questions, start a game and read what it says. The game is reasonably good about telling you what's happening to your slaves, and why. It bears repetition that almost all stat effects are called out with colored text. Try this opening strategy if you don't know where to start. It isn't an optimal build, but it works reliably and will show you the basics.
@@ -908,7 +908,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr
 &nbsp;&nbsp;&nbsp;&nbsp;Wrote a slave introduction option.
 ''bob22smith2000'' has made major contributions, not limited to close review of thousands of lines of code.
 &nbsp;&nbsp;&nbsp;&nbsp;Improved all facility and most assignment code for v0.5.11, an immense task.
-''Gerald Russell'' went into the code to locate the cause of bugs.
+''Gerald Russell'' went into the code to locate and fix bugs.
 ''Ryllynyth'' contributed many bugfixes and suggestions in convenient code format.
 ''CornCobMan'' contributed several major modpacks, which include clothing, hair and eye colors, a facility name and arcology name expansions, UI improvements, nicknames, names, balance, a huge rework of the Rules Assistant, and more. CornCobMan has indefatigably supported the RA updates.
 ''Klementine'' wrote the fertility goddess skin for the personal assistant.
@@ -934,6 +934,11 @@ __I do not give credit without explicit permission to do so.__ If you have contr
 ''Hicks'' provided minor logic and balance improvements in coded, release-ready form.
 ''Dej'' coded better diet logic for the RA.
 ''Flooby Badoop'' wrote and coded a random recruitment event.
+''FC_BourbonDrinker'' went into the code to locate and fix bugs.
+''Shokushu'' created a rendered imagepack comprising 775 images, and assisted with the code necessary to display them.
+''NovX'' created a vector art system.
+
+''Many other anonymous contributors'' helped fix bugs via GitHub. They will be credited by name upon request.
 
 Thanks are due to all the anons that submitted slaves for inclusion in the pre-owned database and offered content ideas. Many anonymous playtesters also gave crucial feedback and bug reports. May you all ride straight to the gates of Valhalla, shiny and chrome.
 <<case "Anal Skill">>\
@@ -1456,7 +1461,7 @@ Money can be expended to directly advance future societies; the spending level c
 &nbsp;&nbsp;&nbsp;&nbsp;Mutually exclusive with [[Gender Fundamentalism|Encyclopedia][$encyclopedia to "Gender Fundamentalism"]].
 \
 <<case "Gender Fundamentalism">>\
-''Gender Fundamentalism'' is a future society model which approves of pregnancy and fertility and disapproves of slaves who retain testicles. 
+''Gender Fundamentalism'' is a future society model which approves of pregnancy and fertility and disapproves of slaves who retain testicles.
 &nbsp;&nbsp;&nbsp;&nbsp;Removes the slave value penalty due to pregnancy and reduces the beauty of slaves with dicks, though gelding can ameliorate this.
 &nbsp;&nbsp;&nbsp;&nbsp;Like Gender Radicalism, can be developed to affect the biology seen in the slave market, and subtly influence arcology society.
 &nbsp;&nbsp;&nbsp;&nbsp;Provides demand for naturally female slaves from [[the corporation|Encyclopedia][$encyclopedia to "The Corporation"]].
@@ -1720,10 +1725,10 @@ Explore the options and enjoy the benefits of having a complete private military
 \
 \
 <<case "Rules Assistant">>\
-''The Rules Assistant'' is a system to apply multiple rule sets to multiple slaves at once. You can apply rules to slaves based on slave ''devotion'', ''trust'', ''sex drive'', ''health'', ''weight'' and ''age''. 
+''The Rules Assistant'' is a system to apply multiple rule sets to multiple slaves at once. You can apply rules to slaves based on slave ''devotion'', ''trust'', ''sex drive'', ''health'', ''weight'' and ''age''.
 
 __Rule settings:__
-Rules can be used to control certain aspects of slaves everyday lives, for example to automatically give slaves a certain clothing option, collar, footwear or allow slaves to choose their own outfit. They can be used to give unhealthy slaves curatives to improve their health or to put slaves on a diet so that their weight can be closer to the ideal weight. Rules set to 'No default setting' will not apply that particular condition to slaves. 
+Rules can be used to control certain aspects of slaves everyday lives, for example to automatically give slaves a certain clothing option, collar, footwear or allow slaves to choose their own outfit. They can be used to give unhealthy slaves curatives to improve their health or to put slaves on a diet so that their weight can be closer to the ideal weight. Rules set to 'No default setting' will not apply that particular condition to slaves.
 Rules can also be renamed to be more indicative of their intended purpose.
 
 __Rule activation:__
@@ -1751,7 +1756,7 @@ __Applying a rule:__
 Clicking on 'Apply rules' will automatically save the current rule and apply all rules to slaves at once.
 
 __Adding or removing a rule:__
-The game starts with 3 basic default rule settings but more can be added and/or removed as needed. To add a new rule, click 'Add a new rule' at the bottom, removing a rule is the same by clicking 'Remove rule'. 
+The game starts with 3 basic default rule settings but more can be added and/or removed as needed. To add a new rule, click 'Add a new rule' at the bottom, removing a rule is the same by clicking 'Remove rule'.
 
 \
 <<case "Repopulationism">>\
@@ -1965,4 +1970,3 @@ Pregmod: <<click "Repopulationism">><<set $encyclopedia to "Repopulationism">><<
 Lolimod: <<click "Lolis and the Free Cities">><<set $encyclopedia to "Lolis and the Free Cities">><<goto "Encyclopedia">><</click>> | <<click "Fertility Age">><<set $encyclopedia to "Fertility Age">><<goto "Encyclopedia">><</click>> | <<click "Male Fertility">><<set $encyclopedia to "Male Fertility">><<goto "Encyclopedia">><</click>> | <<click "Precocious Puberty">><<set $encyclopedia to "Precocious Puberty">><<goto "Encyclopedia">><</click>> | <<click "Cradle Robbers">><<set $encyclopedia to "Cradle Robbers">><<goto "Encyclopedia">><</click>>
 
 <<click "Credits">><<set $encyclopedia to "Credits">><<goto "Encyclopedia">><</click>>
-
diff --git a/src/gui/css/mainStyleSheet.tw b/src/gui/css/mainStyleSheet.tw
index abcc5d10b0d..c86aaea8f14 100644
--- a/src/gui/css/mainStyleSheet.tw
+++ b/src/gui/css/mainStyleSheet.tw
@@ -10,3 +10,31 @@
 #passages {
     max-width: 76em;
 }
+
+div.imageRef{
+width: 400px;
+height: 400px;
+position: relative;
+float:left;
+}
+
+div.lowPenis{
+width: 400px;
+height: 400px;
+position: absolute;
+left: 2px;
+top: 11px;
+}
+
+div.highPenis{
+width: 400px;
+height: 400px;
+position: absolute;
+}
+
+object
+    {
+      width: 400px;
+      height: 400px;
+      position: absolute;
+    }
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 8e6ab05dc22..1b1fe45f20d 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -121,7 +121,7 @@
 		<</if>>
 		<</if>>
 	<</if>>
-	<<if ($ver != "0.9.5") && ($ver != "0.9.6") && ($ver != "0.9.7")>>
+	<<if ($ver != "0.9.5") && ($ver != "0.9.6") && ($ver != "0.9.7") && ($ver != "0.9.8")>>
 		<<if $slaves[$i].oralSkill > 0>>
 		<<if $slaves[$i].oralSkill == 3>>
 			<<set $slaves[$i].oralSkill = 100>>
@@ -227,6 +227,18 @@
 <<if ndef $positionMainLinks>>
 	<<set $positionMainLinks to -1>>
 <</if>>
+<<if ndef $seeImages>>
+	<<set $seeImages to 0>>
+<</if>>
+<<if ndef $imageChoice>>
+	<<set $imageChoice to 0>>
+<</if>>
+<<if ndef $seeMainFetishes>>
+	<<set $seeMainFetishes to 0>>
+<</if>>
+<<if ndef $seeSummaryImages>>
+	<<set $seeSummaryImages to 1>>
+<</if>>
 <<if $ver == "0.9">>
 	<<if $seeDicks == 2>>
 		<<set $seeDicks = 100>>
@@ -234,7 +246,7 @@
 		<<set $seeDicks = 25>>
 	<</if>>
 <</if>>
-<<if ($ver != "0.9.4") && ($ver != "0.9.5") && ($ver != "0.9.6") && ($ver != "0.9.7")>>
+<<if ($ver != "0.9.4") && ($ver != "0.9.5") && ($ver != "0.9.6") && ($ver != "0.9.7") && ($ver != "0.9.8")>>
 	<<for _r to 0; _r < $defaultRules.length; _r++>>
 		<<if ndef $defaultRules[_r].aphrodisiacs>>
 			<<set $defaultRules[_r].aphrodisiacs = 0>>
@@ -304,7 +316,9 @@
 <<set $seeRace to 1>>
 <<set $seeNationality to 1>>
 <<set $seeImages to 0>>
+<<set $imageChoice to 0>>
 <<set $seeMainFetishes to 0>>
+<<set $seeSummaryImages to 1>>
 <<set $lineSeparations to 1>>
 <<set $showSexualHistory to 1>>
 <<set $showBodyMods to 0>>
@@ -377,7 +391,7 @@
 
 <</if>>
 
-<<set $ver = "0.9.7">>
+<<set $ver = "0.9.8">>
 
 <<set $REFeminizationCheckinIDs to []>>
 <<set $REMILFCheckinIDs to []>>
diff --git a/src/npc/fRelation.tw b/src/npc/fRelation.tw
index 33b7bf6dc92..da23f402972 100644
--- a/src/npc/fRelation.tw
+++ b/src/npc/fRelation.tw
@@ -19,7 +19,7 @@
 	<<set $relation = $slaves>>
 	<<set $relation = $relation.shuffle()>>
 	<<for _i to 0; _i < $relation.length; _i++>>
-		<<if ($activeSlave.ID == $relation[_i].father ||) && isAvailabe($relation[_i])>>
+		<<if $activeSlave.ID == $relation[_i].father && isAvailabe($relation[_i])>>
 			<<set $partner to $relation[_i], _activeSlaveRel to "father", _partnerRel to "daughter">>
 			<<break>>
 		<<elseif $activeSlave.ID == $relation[_i].mother && isAvailabe($relation[_i])>>
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index ec7f1798289..30a1a48e62e 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -1,5 +1,5 @@
 :: PESS [nobr]
- 
+
 <<switch $PESSevent>>
   <<case "madam strategy">>
 	<<set $activeSlave to $Madam.ID>>
@@ -37,7 +37,7 @@
 
 <<set $nextButton to "Continue", $nextLink to "AS Dump", $returnTo to "RIE Eligibility Check">>
 
-<<if $seeImages == 1>><<SlaveImage $activeSlave 2 1>><</if>>
+<<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>>
 
 <<SlaveTitle $activeSlave>>
 
@@ -112,7 +112,7 @@ When you've finished your task, you raise your eyes to examine her. She's standi
 <<elseif ["restrictive latex", "a string bikini", "a comfortable bodysuit", "a latex catsuit", "a leotard", "a fallen nuns habit", "slutty jewelry", "harem gauze", "attractive lingerie", "attractive lingerie for a pregnant woman"].indexOf($activeSlave.clothes) != -1>>
 	Her clothes cover her groin, but they're pretty tight, making it clear thather poor soft member has done its duty today. 
 <<else>>
-	Her clothes are relatively modest, so you can't see it, but it's clear that her poor soft member has done its duty today. 
+	Her clothes are relatively modest, so you can't see it, but it's clear that her poor soft member has done its duty today.
 <</if>>
 She sees you examining at her, and looks back at you submissively, too tired to do much else.
 
diff --git a/src/uncategorized/PETS.tw b/src/uncategorized/PETS.tw
index 7b496189667..dce78f3b9d9 100644
--- a/src/uncategorized/PETS.tw
+++ b/src/uncategorized/PETS.tw
@@ -58,7 +58,7 @@
 
 <<SlaveTitle $activeSlave>>
 
-<<if $seeImages == 1>><<SlaveImage $subSlave 2 1>><<SlaveImage $activeSlave 2 1>><</if>>
+<<if $seeImages == 1>><<SlaveArt $subSlave 2 0>><<SlaveArt $activeSlave 2 0>><</if>>
 
 <<switch $PETSevent>>
 
diff --git a/src/uncategorized/RECI.tw b/src/uncategorized/RECI.tw
index d898f791975..3ad64457e22 100644
--- a/src/uncategorized/RECI.tw
+++ b/src/uncategorized/RECI.tw
@@ -17,7 +17,7 @@
 
 <<set $nextButton to "Continue", $nextLink to "AS Dump", $returnTo to "Next Week">>
 
-<<if $seeImages == 1>><<SlaveImage $activeSlave 2 1>><</if>>
+<<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>>
 
 <<SlaveTitle $activeSlave>>
 
diff --git a/src/uncategorized/REFI.tw b/src/uncategorized/REFI.tw
index 582f390bd82..e334ef849a6 100644
--- a/src/uncategorized/REFI.tw
+++ b/src/uncategorized/REFI.tw
@@ -1,5 +1,5 @@
 :: REFI [nobr]
- 
+
 <<switch $REFIevent>>
   <<case "masochist">>
 	<<for $i to 0; $i < $slaves.length; $i++>>
@@ -83,7 +83,7 @@
 <<break>>
 <</if>>
 <</for>>
-<<if $seeImages == 1>><<SlaveImage $subSlave 2 1>><<SlaveImage $activeSlave 2 1>><</if>>
+<<if $seeImages == 1>><<SlaveArt $subSlave 2 0>><<SlaveArt $activeSlave 2 0>><</if>>
 
 You have $subSlave.slaveName bent over your desk, and are seeing to your own amusement and her masochistic streak at once. She has her body flat on the desk, but is unrestrained, and has been told that she must not rise off it at all. You then tell her to count strokes and begin to flog her ass with a leathern instrument. Before long she is experiencing more pain than the human body can support without involuntary movement, and you tell her to go back one count whenever she does. At long last she completes the required number of blows, and lies quivering and sobbing, thanking you over and over, until she stiffens again at the burning sensation of a cock stretching her anal sphincter. You are not gentle, and the rough sodomy combined with the burning of her outraged buttocks as you slap yourself against them maintains her pain high. After you finish and she leaves, wincing in agony but with a faraway look of release, you notice $activeSlave.slaveName at the door to your office. You call her in.
 <br><br>
@@ -99,7 +99,7 @@ You have $subSlave.slaveName bent over your desk, and are seeing to your own amu
 <<break>>
 <</if>>
 <</for>>
-<<if $seeImages == 1>><<SlaveImage $subSlave 2 1>><<SlaveImage $activeSlave 2 1>><</if>>
+<<if $seeImages == 1>><<SlaveArt $subSlave 2 0>><<SlaveArt $activeSlave 2 0>><</if>>
 
 $subSlave.slaveName gets inspected more regularly than your other slaves, since she's quite pregnant. Her pregnancy is progressing acceptably, but having her belly inspected gets her extremely eager to feel more of <<if def $PC.customTitle>>her $PC.customTitle<<elseif $PC.title != 0>>her master<<else>>her mistress<</if>>'s seed in her fertile cunt. $subSlave.slaveName has been a good girl, so you take her on the couch, spooning so that her heavy belly can rest comfortably as you languidly take her. You have your arms wrapped around her chest to cup both breasts, and she has her neck twisted back to kiss you. After you both finish and she leaves, smiling contentedly at you, you notice $activeSlave.slaveName at the door to your office. You call her in.
 
@@ -115,7 +115,7 @@ $subSlave.slaveName gets inspected more regularly than your other slaves, since
 <<break>>
 <</if>>
 <</for>>
-<<if $seeImages == 1>><<SlaveImage $subSlave 2 1>><<SlaveImage $activeSlave 2 1>><</if>>
+<<if $seeImages == 1>><<SlaveArt $subSlave 2 0>><<SlaveArt $activeSlave 2 0>><</if>>
 
 $subSlave.slaveName is on lunch duty today. That means that as you eat your working lunch, she sits on the edge of your desk right next to you, so that her nipples are conveniently at mouth height. Whenever you feel thirsty, you lean over and take some of her creamy, slightly vanilla-toned milk straight from the source. Every time you do, she shudders convulsively, <<if $subSlave.voice != 0>>giving little mewling whimpers.<<else>>harsh gasping noises that are all she can manage, as a mute.<</if>> Though you never touch anything but her nipples, she climaxes twice. After you finish and she leaves, you notice $activeSlave.slaveName at the door to your office. You call her in.
 <br><br>
@@ -136,7 +136,7 @@ $subSlave.slaveName is on lunch duty today. That means that as you eat your work
 <<break>>
 <</if>>
 <</for>>
-<<if $seeImages == 1>><<SlaveImage $subSlave 2 1>><<SlaveImage $activeSlave 2 1>><</if>>
+<<if $seeImages == 1>><<SlaveArt $subSlave 2 0>><<SlaveArt $activeSlave 2 0>><</if>>
 
 $subSlave.slaveName is lying on the edge of your desk with her body helpless beneath you, your dick in her, and your hands around her neck. It's just breath play, and you're practiced enough that she's in no danger. She's such a sexual submissive that she sometimes acts out if not managed. This happens when she feels the urge to misbehave in order to access punishment, so you personally ensure that she can indulge her submissiveness when she needs it. She does not orgasm with you, her complete servitude to your pleasure fulfilling a deeper need than that. She leaves your office with a serene look on her face, passing <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span>, who is <<if ($activeSlave.heels == 1) && ($activeSlave.shoes != "heels") && ($activeSlave.shoes != "boots") && ($activeSlave.shoes != "extreme heels")>>kneeling in the doorway with a troubled look on her face.<<elseif $activeSlave.amp != 1>>standing in the doorway with a troubled look on her face.<<else>>propped limblessly nearby. She has a troubled look on her face.<</if>>
 <br><br>
@@ -152,7 +152,7 @@ $activeSlave.slaveName hesitates before explaining herself, and the $desc is obv
 <<break>>
 <</if>>
 <</for>>
-<<if $seeImages == 1>><<SlaveImage $subSlave 2 1>><<SlaveImage $activeSlave 2 1>><</if>>
+<<if $seeImages == 1>><<SlaveArt $subSlave 2 0>><<SlaveArt $activeSlave 2 0>><</if>>
 
 In the middle of the afternoon, you take a break from work to fuck $subSlave.slaveName in your office. $subSlave.slaveName is such a complete buttslut that she's enjoying herself to an almost indecent degree: moaning, begging, or just smiling idiotically with her mouth open and her tongue lolling. After you finish and she leaves, you notice $activeSlave.slaveName at the door to your office. You call her in.
 <br><br>
@@ -168,7 +168,7 @@ In the middle of the afternoon, you take a break from work to fuck $subSlave.sla
 <<break>>
 <</if>>
 <</for>>
-<<if $seeImages == 1>><<SlaveImage $subSlave 2 1>><<SlaveImage $activeSlave 2 1>><</if>>
+<<if $seeImages == 1>><<SlaveArt $subSlave 2 0>><<SlaveArt $activeSlave 2 0>><</if>>
 
 You wake up to the sensation of $subSlave.slaveName eagerly sucking your dick. She's industriously pumping her mouth up and down on your member. In truth, $subSlave.slaveName doesn't give the perfect blowjob: she loves cum so much that she mostly enjoys oral sex in an anticipatory way, and usually works to make the recipient cum as soon as possible so as to get her favorite treat into her mouth quicker. Still, her enthusiasm is nice and she does have permission to wake you at your usual time in this way. As you get up after finishing, you notice <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span> at the door to your bedroom. You call her in.
 <br><br>
@@ -189,7 +189,7 @@ $activeSlave.slaveName hesitates before explaining herself, and the $desc is obv
 <<break>>
 <</if>>
 <</for>>
-<<if $seeImages == 1>><<SlaveImage $subSlave 2 1>><<SlaveImage $activeSlave 2 1>><</if>>
+<<if $seeImages == 1>><<SlaveArt $subSlave 2 0>><<SlaveArt $activeSlave 2 0>><</if>>
 
 You have $subSlave.slaveName pinned up against a railing on a balcony that overlooks a public atrium. Passersby below cannot see you, but they can certainly see $subSlave.slaveName's upper body as she takes your dick. She's blushing furiously with the sex and with her trademark mixed arousal and embarrassment at having an audience. She makes a show of trying to disguise the fact that she's getting railed, but it's obvious. When you finish, you pull her off the railing so she can clean up. <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span> saw the denoument of this exhibitionist fun, and seems intrigued.
 <br><br>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 8cb27e95bbf..e90bfca796c 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -17,7 +17,7 @@
 
 <<set $nextButton to "Continue", $nextLink to "AS Dump", $returnTo to "Next Week">>
 
-<<if $seeImages == 1>><<SlaveImage $activeSlave 2 1>><</if>>
+<<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>>
 
 <<SlaveTitle $activeSlave>>
 
@@ -424,7 +424,7 @@ She did not expect to find you here, and is so preoccupied that she doesn't noti
 	her pussy is flushed and moist.
 <</if>>
 <br><br>
-<<if ($activeSlave.drugs is "aphrodisiacs") || ($activeSlave.drugs is "extreme aphrodisiacs")>>
+<<if ($activeSlave.aphrodisiacs > 0)>>
 	The aphrodisiacs racing through her system have her desperate to get off, right now.
 <<elseif ($activeSlave.clitPiercing is 3) && ($activeSlave.clitSetting != "none")>>
 	Her <<if $activeSlave.vagina > -1>>clit<<else>>frenulum<</if>> piercing is keeping her arousal exquisitely balanced for her inspection.
@@ -1108,6 +1108,8 @@ running her tongue over her<<if $activeSlave.lips > 40>> whorish<<elseif $active
 
 <<case "PA flirting">>
 
+<<if $seeImages == 1>><<AssistantArt 2>><</if>>
+
 Partway through <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span>'s weekly inspection, you have to leave for a moment to deal with a minor matter. Inspecting such a devoted slave is a pleasure, but you tear yourself away. Such sacrifices must be made.
 <br><br>
 When you return, the comfortably nude $desc is flirting shamelessly with $assistantName. Your personal assistant's $assistantAppearance avatar is glowing brightly on the desktop, and she and $activeSlave.slaveName are trading increasingly exaggerated compliments.
@@ -1464,6 +1466,24 @@ The penthouse bathroom has a long counter and mirror arrangement with many sinks
 <br><br>
 With her <<if $activeSlave.preg > 20>>enormously pregnant belly<<elseif $activeSlave.weight > 30>>soft belly<<elseif $activeSlave.preg > 10>>pregnant belly<<elseif $activeSlave.muscles > 30>>ripped abs<<elseif $activeSlave.muscles > 5>>toned stomach<<else>>middle<</if>> against the edge of the counter as she leans forward a little to <<if $activeSlave.makeup != 0>>finish her makeup<<else>>apply lotion to her face<</if>>, her $activeSlave.nipples nipples are <<if $activeSlave.boobs > 6000>>pressed against the mirror<<elseif $activeSlave.boobs > 4000>>almost brushing the mirror<<elseif $activeSlave.boobs > 2000>>halfway to the mirror<<else>>over the sink<</if>>. She's concentrating on her task, and every little motion of her arms makes her spectacularly pointed breasts sway a little.
 
+<<case "retching cum feeding">>
+
+You are inspecting the slave feeding area early in the week, watching your slaves as they come and go to get their required nourishment for the morning.  You see <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span><<if $cockFeeder == 1>> as she kneels in front of the feeder phallus with a look of disgust on her face  <<else>> as she stares into her cup of nutritional fluid with a look of disgust on her face.<</if>> You quickly check your records and $assistantName confirms that $activeSlave.slaveName is required to ingest<<if $activeSlave.dietCum == 2>> an extreme diet based almost entirely on human ejaculate.<<else>> a large amount of human ejaculate as part of her diet.<</if>>
+<br><br>
+As you watch $activeSlave.slaveName unpleasantly retch as she<<if $cockFeeder == 1>> stimulates the feeder phallus with her mouth<<else>> tentatively drinks from her cup<</if>> and chokes her food down, knowing that if she doesn't eat it willingly, she will be forced to, you can almost see her <<if $activeSlave.intelligence gt 0>> intelligent mind <<else>> stupid mind<</if>> working through the reality of what her life has become. She is now a receptacle for <<if $activeSlave.dietCum == 2>> concentrated <</if>>human ejaculate, and for no other reason than the perverse amusemsent of her owner.  Almost as soon as she swallows her food, she whimpers, burps, and then quickly runs to a nearby bathroom to vomit it back up.  This is a common reaction for unbroken slaves on cum diets,<<if $activeSlave.weight gt 0>> and can also be an effective, if unhealthy, way of forcing them to lose weight.<<else>> but it can also prevent slaves that are already too thin from gaining weight.<</if>>
+
+<<case "subjugation blues">>
+
+It's been <<print $week-$activeSlave.weekAcquired>> week<<if $week-$activeSlave.weekAcquired > 1>>s<</if>> since you acquired <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span> as your slave.  Since then she has been nothing but trouble.  She has been ungrateful, rebellious and particularly hateful toward you since you acquired her.  She often needs to be confined or forced to perform her assignments, and has little regard for your power or authority. You bring her in for inspection and she whines and squirms in resistance as you feel up her $activeSlave.nipples nipples, and grope her <<if $activeSlave.butt < 2>>narrow <<elseif $activeSlave.butt < 5>>average <<elseif $activeSlave.butt < 8>>plump <<else>>impressive <</if>>butt, coldly appraising her potential worth as a sexual service provider. <<if $activeSlave.actualAge < 21>>She is very young, only $activeSlave.actualAge years old, and is still very naive.  Her smooth, $activeSlave.skin skin has yet to experience the hard years of relentless sexual abuse that lie ahead of her.<<else>>At $activeSlave.actualAge years old, she should know by now how the world works, but some slaves are just too stubborn for their own good.<</if>>  Eventually, of course, even the most headstrong girls will bend to your will, but the unique social mores of your arcology and the wonders of modern surgical technology offer a prime opportunity to make a potent example of this <<if $activeSlave.actualAge < 21>>young <<else>>obstinate <</if>>slut.  She is $activeSlave.race, and therefore not considered racially inferior or subject to extreme inequities or neglect, but like most slave characteristics, that can change.
+
+<<case "too thin for cum diet">>
+
+You are in your office, tending the the tedious business of requisition orders for your penthouse when you see  <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span> appear outside your door. She hovers outside in the hall, peeking her head around the entry-way, looking very unsure about disturbing you.  You stop what you're doing and call her in.  She's reticent at first, but then she obediently steps into your office.  She is <<if $activeSlave.clothes  == "no clothing">>forced to remain naked at all times, and the most striking thing about her body is how skinny she is.<<else>>forced to wear $activeSlave.clothes all day, but even through her outfit, it's easy to see how impossibly skinny she is.<</if>>  <<if $activeSlave.weight > -80>> She's not exclusively skin and bones, but she's close.  <<else>> She's so thin that she doesn't look entirely healthy.<</if>>  Her <<if $activeSlave.boobs < 600>><<if $activeSlave.boobs < 300>>tiny <<elseif $activeSlave.boobs < 600>>small <</if>>boobs are barely noticable against her concave tummy, and <<if $arcologies[0].FSSlimnessEnthusiast != "unset">>that can be a very appealing look given the predilection your arcology has for slim girls. <<else>>to most clients, this makes her a less appealing whore.<</if>><<else>><<if $activeSlave.boobs < 900>>large <<else>>massive <</if>> tits are a sharp contrast to her concave belly, and although impressive, they seem to especially stick out on a girl who, in all other ways, seems <<if $activeSlave.weight > -80>>slightly <<else>>alarmingly <</if>> malnourished.<</if>>  Her $activeSlave.faceShape face is clearly conflicted, and her $activeSlave.eyeColor eyes shift with nervous energy.  She is clearly unsure whether she should say what she came here to say.
+<br><br>
+When you finally ask her what she wants, she hestitates for a moment and then suddenly seems to gain her courage<<if $activeSlave.accent > 1>>, speaking in an atrociously thick accent<<elseif $activeSlave.accent > 0>>, speaking in a cute little accent<</if>>.  <<if SlaveStatsChecker.checkForLisp($activeSlave)>> "Pleathe, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>> I'm tho hungry!  It theemth like all I get to eat ith cum.  It'th dithguthting! Pleathe!  I have to eat tho much of it.  Can I be allowed to eat regular food again?  Pleathe, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>, I'm tho hungry!  I need real food!"<<else>> "Please, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>> I'm so hungry!  It seems like all I get to eat is cum.  It's disgusting!  Please!  I have to eat so much of it.  Can I be allowed to eat regular food again?  Please, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, I'm so hungry. I need real food!"<</if>>
+<br><br>
+It's true, cum <<if $activeSlave.dietCum == 1>>supplemented <<elseif $activeSlave.dietCum == 2>>based <</if>>food can be hard on girls who are not fully habituated to being toys for sexual amusement--particularly when you've ordered them to gain weight on it.  You look at the skinny whore and consider your options.
+
 <<default>>
 	ERROR: bad event
 <</switch>>
@@ -1656,15 +1676,13 @@ With her <<if $activeSlave.preg > 20>>enormously pregnant belly<<elseif $activeS
 	You tell her to grab her ankles. She giggles and<<if $activeSlave.preg > 20>> carefully<</if>> complies, relaxing her <<if $activeSlave.anus > 2>>asspussy<<elseif $activeSlave.anus is 2>>asshole<<else>>little ass<</if>> in the expectation of <<if $PC.dick == 1>>your cock<<else>>a strap-on<</if>>, but starts with surprise when she feels two warm, lubricated fingers slide into her rectum.
 	<<if $activeSlave.anus > 2>>
 	  She moans when you add a third, and grunts when you insert a fourth. When she feels you form your hand into a point, thumb included, she understands what's coming and relaxes completely. The wide part of your hand, at the knuckles, squeezes into her without much trouble, and she lets out a huge sigh. When you start to fuck her, though, she collapses to her knees, <<if ($activeSlave.fetish is "buttslut")>><<if canTalk($activeSlave) == false>>whining and begging nonverbally<<elseif SlaveStatsChecker.checkForLisp($activeSlave) is true>> panting, "Pleathe, fitht my hole without merthy, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>!"<<else>>panting, "Please, fist my hole without mercy, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>!"<</if>><<else>>whining and begging nonverbally<</if>>. You kick the lotion towards her hand; she gets the message and starts to frantically <<if ($activeSlave.dickAccessory is "chastity")>>rub her taint<<elseif ($activeSlave.dick > 0) and ((($activeSlave.balls == 0) or ($activeSlave.hormones > 0)))>>rub herself<<elseif $activeSlave.dick > 0>>jerk off<<else>>jill off<</if>>. She manages to climax promptly, her overstimulated sphincter helping, no doubt. She slumps to the ground when you withdraw your hand, gasping, but you haul her around so she can <<if $PC.dick == 1>>suck you off<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>eat you out<</if>>. She complies @@color:hotpink;submissively,@@ drooling and groaning, all pretense of feminine grace gone. It doesn't take long, since that was quite a lot of fun, but by the time you finish she's already masturbating again.
-	  <<set $activeSlave.devotion += 5>>
 	<<elseif $activeSlave.anus is 2>>
 	  She grunts when you add a third, and begins to beg when you insert a fourth. When she feels you form your hand into a point, thumb included, she understands what's coming and does her best to relax. The wide part of your hand, at the knuckles, squeezes into her after some effort on your part and squealing on her part. When you withdraw it and press it back in, slowly starting to fist fuck her ass, though, she collapses to her knees, <<if ($activeSlave.fetish is "buttslut")>><<if canTalk($activeSlave) == false>>crying<<elseif SlaveStatsChecker.checkForLisp($activeSlave) is true>>sobbing, "Pleathe, fitht my tight hole without merthy, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>!"<<else>>sobbing, "Please, fist my tight hole without mercy, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>!"<</if>><<else>>crying<</if>>. You kick the lotion towards her hand; she gets the message and starts to frantically <<if ($activeSlave.dick > 0) and ((($activeSlave.balls == 0) or ($activeSlave.hormones > 0)))>>rub herself<<elseif $activeSlave.dick > 0>>jerk off<<else>>jill off<</if>>. She manages to climax eventually. She slumps to the ground when you withdraw your hand, gasping, but you haul her around so she can <<if $PC.dick == 1>>suck you off<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>eat you out<</if>>. She complies @@color:hotpink;submissively,@@ drooling and weeping, all pretense of feminine grace gone. It doesn't take long, since that was quite a lot of fun, but by the time you finish she's tentatively masturbating again.
-	  <<set $activeSlave.devotion += 5>>
 	<<else>>
 	  She squeals when you add a third, and begins to shamelessly beg for mercy when you insert a fourth. When she feels you form your hand into a point, thumb included, she understands what's coming and collapses to her knees, <<if ($activeSlave.fetish is "buttslut")>><<if canTalk($activeSlave) == false>>begging you to be gentle<<elseif SlaveStatsChecker.checkForLisp($activeSlave) is true>>begging, "Pleathe, don't ruin my favorite hole, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>!"<<else>>sobbing, "Please, don't ruin my favorite hole, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>!"<</if>><<else>>begging you to be gentle<</if>>. You kick the lotion towards her hand; she gets the message and starts to frantically <<if ($activeSlave.dickAccessory is "chastity")>>rub her taint<<elseif ($activeSlave.dick > 0) and ((($activeSlave.balls == 0) or ($activeSlave.hormones > 0)))>>rub herself<<elseif $activeSlave.dick > 0>>jerk off<<else>>jill off<</if>>. As she works her sphincter relaxes bit by bit, and you advance your fist up her butt. She screams in surprise and relief when your knuckles finally make it in, and achieves a crying orgasm shortly thereafter. She slumps to the ground when you withdraw your hand, moaning incoherently, but you haul her around so she can <<if $PC.dick == 1>>suck you off<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>eat you out<</if>>. She complies @@color:hotpink;submissively,@@ crying quietly in confusion and disarray, all pretense of feminine grace gone. It doesn't take long, since that was quite a lot of fun, and by the time you finish she hasn't yet worked up the courage to touch her @@color:lime;newly widened backdoor.@@
-	  <<set $activeSlave.devotion += 5>>
 	  <<set $activeSlave.anus += 1>>
 	<</if>>
+	<<set $activeSlave.devotion += 5>>
 	<</replace>>
 <</click>>
 <<if $activeSlave.vagina > 0>>
@@ -3520,7 +3538,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
 	<<replace "#result">>
 	You take her by the shoulders, look into her eyes, and tell her you'll fix things so she doesn't mind so much. She looks hopeful, even when you tell her to take her pill. She does, and you hand her another. And another. She's crying with dread by the fourth pill, knowing that this is her punishment for complaining. Her pupils dilate, she begins to breathe hard, and her $activeSlave.skin skin flushes badly. She tries to beg you to fuck her but can't seem to find the words. She begins to masturbate compulsively, so hard that she collapses to the kitchen floor with her first spastic orgasm. <<if $activeSlave.dick > 3>>Her big cock is agonizingly erect and doesn't soften at all when she spatters her own chest with cum.<<elseif $activeSlave.dick > 1>>Her cock is agonizingly erect and doesn't soften at all when she spatters her own chest with cum.<<elseif $activeSlave.dick > 0>>Her pathetic dick is agonizingly erect and doesn't soften at all when she weakly dribbles cum.<<else>>Her pussy is dripping with moisture and her ragingly stiff clit doesn't soften at all when she comes.<</if>> For the hour or so it takes her to pass out, slaves using the kitchen have to step over her prostrate, orgasming body, lying in a pool of her own drool, tears, sweat, and fluids. The next time you see her in the kitchen, she takes her medicine like a @@color:gold;good girl.@@ All your aphrodisiac addicts recognize the symptoms and the punishment, and @@color:gold;avoid even thinking@@ about resisting the system.
 	<<for $i to 0; $i < $slaves.length; $i++>>
-	  <<if ($slaves[$i].drugs is "extreme aphrodisiacs") or ($slaves[$i].drugs is "aphrodisiacs")>>
+	  <<if ($slaves[$i].aphrodisiacs > 0)>>
 		<<set $slaves[$i].trust -= 5>>
 	  <</if>>
 	<</for>>
@@ -3932,7 +3950,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
 	<<replace "#name">>$activeSlave.slaveName<</replace>>
 	<<replace "#result">>
 	You explain the effects of the
-	<<if ($activeSlave.drugs is "aphrodisiacs") || ($activeSlave.drugs is "extreme aphrodisiacs")>>
+	<<if ($activeSlave.aphrodisiacs > 0)>>
 		sex drugs
 	<<elseif ($activeSlave.clitPiercing == 3) && ($activeSlave.clitSetting != "none")>>
 		advanced <<if $activeSlave.vagina > -1>>clit<<else>>frenulum<</if>> piercing
@@ -4255,6 +4273,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
 <</click>><<if ($activeSlave.vagina == 0)>> //This option will take her virginity//<</if>>
 <</if>>
 <<if ($activeSlave.fetish != "buttslut") || ($activeSlave.fetishKnown != 1) || ($activeSlave.fetishStrength <= 95)>>
+<<if canDoAnal($activeSlave)>>
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<click "while she takes it up the ass">>
 	<<replace "#name">>$activeSlave.slaveName<</replace>>
 	<<replace "#result">>
@@ -4272,6 +4291,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
 	<</replace>>
 <</click>><<if ($activeSlave.anus == 0)>> //This option will take anal virginity//<</if>>
 <</if>>
+<</if>>
 <<if ($activeSlave.fetish != "humiliation") || ($activeSlave.fetishKnown != 1) || ($activeSlave.fetishStrength <= 95)>>
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<click "in public">>
 	<<replace "#name">>$activeSlave.slaveName<</replace>>
@@ -4789,7 +4809,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
 <br><<click "Place it in your display case">>
 	<<replace "#name">>$activeSlave.slaveName<</replace>>
 	<<replace "#result">>
-	You thank her kindly, and hold out your hand. She places her creation in your hands with something like reverence. You enter a secure command on your desk, and the display case behind you slides open. You place the folded napkin in its own little place within. $activeSlave.slaveName watches incredulously, unable to believe what your doing. When she finally processes it, she bursts into inelegant tears. Cuffing them away from her eyes and sniffling, she tells you @@color:hotpink;she loves you.@@
+	You thank her kindly, and hold out your hand. She places her creation in your hands with something like reverence. You enter a secure command on your desk, and the display case behind you slides open. You place the folded napkin in its own little place within. $activeSlave.slaveName watches incredulously, unable to believe what you're doing. When she finally processes it, she bursts into inelegant tears. Cuffing them away from her eyes and sniffling, she tells you @@color:hotpink;she loves you.@@
 	<<set $activeSlave.devotion += 4>>
 	<<set _napkin = "a cloth napkin skillfully folded into the shape of " + _napkin + " given to you by " + $activeSlave.slaveName>>
 	<<set $trinkets.push(_napkin)>>
@@ -6003,7 +6023,7 @@ You bring $activeSlave.slaveName into your office and stand her in front of your
 $activeSlave.slaveName
 <</replace>>
 <<replace "#result">>
-Your cum training tactics have two components: Cum should be linked with pleasure, and cum should not be disgusting to $activeSlave.slaveName, because even $activeSlave.slaveName produces it. To drive home these lessons, you lead $activeSlave.slaveName to your office's leather couch, arranging her<<if $activeSlave.height < 150>> petite<<elseif $activeSlave.height < 160>> short<<elseif $activeSlave.height >= 170>>  tall<<elseif $activeSlave.height >= 185>> very tall<</if>> form upside down with her head on the cushion, her back on the backrest, and her <<if $activeSlave.amp == 1>>stumps<<else>>legs<</if>> in the air. In this position, her <<if ($activeSlave.dick > 5)>>gigantic<<elseif ($activeSlave.dick > 4)>>huge<<elseif ($activeSlave.dick > 3)>>large<<elseif ($activeSlave.dick > 2)>>average<<elseif ($activeSlave.dick > 1)>>small<<elseif ($activeSlave.dick > 0)>>tiny<</if>> cock <<if $activeSlave.preg > 10>>rests over her early pregnancy and <</if>>hangs directly over her anxious face. <<if ($activeSlave.drugs is "aphrodisiacs") || ($activeSlave.drugs is "extreme aphrodisiacs")>>The aphrodisiacs in her system already have her so aroused she's already dripping precum; as you approach her vulnerable form on the couch, a drop lands on her chin.<<else>>You sit next to her vulnerable form on the couch as she looks at you in anticipation.<</if>> You <<if ($activeSlave.anus > 2)>>insert a wide vibrating plug into her gaping anus<<elseif ($activeSlave.anus > 1)>>insert a big vibrating plug into her ass<<elseif ($activeSlave.anus > 0)>>insert a vibrating plug into her tight ass<<else>>place a bullet vibrator over the pucker of her virgin anus<</if>>, secure a bullet vibrator her quivering perineum, and another to the base of her dick, and set them all to gradually increase the strength of their vibrations. In no time at all she releases a <<if ($activeSlave.dickAccessory is "chastity")>>squirt of ejaculate from her cock cage<<elseif $activeSlave.balls > 0>>torrent of thick, white semen<<else>>pathetic dribble of watery ejaculate<</if>>, all of which lands right on her outstretched tongue and pools in her throat. You nudge her chin to make her close her mouth and swallow. After a week of such treatment, she @@color:lightcoral;acquires a taste for semen.@@<<set ($activeSlave.fetish to "cumslut")>><<set ($activeSlave.fetishKnown to 1)>><<set ($activeSlave.fetishStrength = 10)>>
+Your cum training tactics have two components: Cum should be linked with pleasure, and cum should not be disgusting to $activeSlave.slaveName, because even $activeSlave.slaveName produces it. To drive home these lessons, you lead $activeSlave.slaveName to your office's leather couch, arranging her<<if $activeSlave.height < 150>> petite<<elseif $activeSlave.height < 160>> short<<elseif $activeSlave.height >= 170>>  tall<<elseif $activeSlave.height >= 185>> very tall<</if>> form upside down with her head on the cushion, her back on the backrest, and her <<if $activeSlave.amp == 1>>stumps<<else>>legs<</if>> in the air. In this position, her <<if ($activeSlave.dick > 5)>>gigantic<<elseif ($activeSlave.dick > 4)>>huge<<elseif ($activeSlave.dick > 3)>>large<<elseif ($activeSlave.dick > 2)>>average<<elseif ($activeSlave.dick > 1)>>small<<elseif ($activeSlave.dick > 0)>>tiny<</if>> cock <<if $activeSlave.preg > 10>>rests over her early pregnancy and <</if>>hangs directly over her anxious face. <<if ($activeSlave.aphrodisiacs > 0)>>The aphrodisiacs in her system already have her so aroused she's already dripping precum; as you approach her vulnerable form on the couch, a drop lands on her chin.<<else>>You sit next to her vulnerable form on the couch as she looks at you in anticipation.<</if>> You <<if ($activeSlave.anus > 2)>>insert a wide vibrating plug into her gaping anus<<elseif ($activeSlave.anus > 1)>>insert a big vibrating plug into her ass<<elseif ($activeSlave.anus > 0)>>insert a vibrating plug into her tight ass<<else>>place a bullet vibrator over the pucker of her virgin anus<</if>>, secure a bullet vibrator her quivering perineum, and another to the base of her dick, and set them all to gradually increase the strength of their vibrations. In no time at all she releases a <<if ($activeSlave.dickAccessory is "chastity")>>squirt of ejaculate from her cock cage<<elseif $activeSlave.balls > 0>>torrent of thick, white semen<<else>>pathetic dribble of watery ejaculate<</if>>, all of which lands right on her outstretched tongue and pools in her throat. You nudge her chin to make her close her mouth and swallow. After a week of such treatment, she @@color:lightcoral;acquires a taste for semen.@@<<set ($activeSlave.fetish to "cumslut")>><<set ($activeSlave.fetishKnown to 1)>><<set ($activeSlave.fetishStrength = 10)>>
 <<set $activeSlave.devotion += 4>>
 <</replace>>
 <</click>>
@@ -7299,6 +7319,191 @@ She's obviously @@color:mediumaquamarine;becoming more comfortable@@ playing the
 <</click>><<if (($activeSlave.vagina == 0) && canDoVaginal($activeSlave)) || (($activeSlave.anus == 0) && canDoAnal($activeSlave))>> //This option will take virginity//<</if>>
 <</if>>
 
+<<case "retching cum feeding">>
+
+<<click "Have mercy on the poor girl and take her off her cum diet for now">>
+  <<replace "#name">>$activeSlave.slaveName<</replace>>
+  <<replace "#result">>
+    You see how $activeSlave.slaveName is suffering and you decide to reconsider her dietary prescription.  You instruct $assistantName to change <<print $activeSlave.slaveName>>'s diet to exclude cum for now.  Slaves who can't eat are unhealthy, and unhealthy slaves are unprofitable slaves.  She is now @@color:mediumorchid;more confident that she can resist you and get her way@@, she also @@color:mediumaquamarine;trusts you a little more@@ to look after her well being.  
+    <<set $activeSlave.trust += 5>>
+    <<set $activeSlave.devotion -= 5>>
+  <<set $activeSlave.dietCum to 0>>
+  <</replace>>
+<</click>>
+<<if $activeSlave.dietCum == 1>>
+	<br><<click "Force her onto a heavy cum diet, and double up on her ejaculate intake">>
+	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<replace "#result">>
+	You instruct $assistantName to double down on <<print $activeSlave.slaveName>>'s cum diet.  Ungrateful little sluts who retch up their expensive food soemtimes need tough love.  Making her cum-food thicker and more concentrated might help her to learn that no matter how bad things seem, you can always make them worse. Initially her new heavy cum diet makes no difference in her ability to keep it down, but you tell her to give it some time.  Eventually she will learn to appreciate cum as the primary ingedient in everything she ingests.  All of your future cumsluts do, sooner or later.  Her pathetic tears reveal how @@color:gold;helpless she feels@@, but they don't hide the @@color:mediumorchid;streak of rebelliousness@@ that remains burning inside her.
+	<<set $activeSlave.devotion -= 3>>
+	<<set $activeSlave.trust -= -3>>
+	<<set $activeSlave.dietCum to 2>>
+	<</replace>>
+<</click>>
+<<elseif $activeSlave.dietCum ==2>>
+	<br><<click "Give the poor girl a break and reduce her cum intake to a more modest level">>
+	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<replace "#result">>
+	$activeSlave.slaveName is on a very heavy cum diet, and it's possible you're forcing her to take too much, too soon.  You decide to give her a break and instruct $assistantName to reduce, but not eliminate the amount of cum in her diet.  Although it doesn't immediately make her hate cum any less, @@color:hotpink;she appreciates your willingness@@ to make things a little less unpleasant for her.  @@color:mediumaquamarine;She is a little less afraid of you too@@, although not as much as if you'd taken her off her cum diet altogether.
+	<<set $activeSlave.devotion += 2>>
+	<<set $activeSlave.trust += 2>>
+	<<set $activeSlave.dietCum to 1>>
+	<</replace>>
+<</click>>
+	<br><<click "Suppress her gag reflex and double her cum intake for a week">>
+  <<replace "#name">>$activeSlave.slaveName<</replace>>
+  <<replace "#result">>
+    She is already on a very heavy cum-based diet, and there's only so much ejaculate you can force a slut to ingest before it negatively affects her health.  However, as a temporary measure, you still have options.  You instruct $assistantName to re-double the amount of ejaculate in <<print $activeSlave.slaveName>>'s diet for the week.  You also have her closely monitored and injected with anti-nausea drugs to help her hold down her food.  Although the idea of being forced to eat large amounts of human reproductive fluid still disgusts her, the week of having a super-concentrated cum-diet, along with the suppressed reflex to purge it has its effect.  Knowing that you monitor and control every aspect of her life @@color:hotpink;breaks down her resistance to your will@@, and by the end of the week, she is grateful that you return her to a more nutritionally viable regemin--even if its cum content is still overwhelmingly high. <<if $activeSlave.fetishKnown == 1>>@@color:lightcoral;Her brain has now begun to accept the sexual perversity of her food as a turn on.@@<<else>>She is now able to eat and digest her prescribed diet without pharmacological assistance.<</if>>
+    <<set $activeSlave.devotion += 5>>
+  <<set $activeSlave.fetish to "cumslut">>
+  <<if $activeSlave.fetishKnown == 1>>
+	<<set $activeSlave.fetishStrength to 10>>
+  <</if>>
+	
+  <</replace>>
+<</click>>
+<</if>>
+<<if ($arcade > 0)>>
+  <br><<click "Sentence her to a day in $arcadeName for cum injection therapy">>
+  <<replace "#name">>$activeSlave.slaveName<</replace>>
+  <<replace "#result">>
+    You have $assistantName inform $activeSlave.slaveName of her unacceptable behavior and sentence her to a day in $arcadeName.  She cries and pleads for mercy, and even begs to be allowed to suck a cock, any cock, so she can prove her newfound enthusiasm for cum, but you are unmerciful as two other slaves drag her off to serve her sentence.  She is forced to wear a<<if $activeSlave.vagina != -1>> combined vaginal and<<else>>n<</if>> anal chastity belt so that the only hole available is her mouth, and is then confined in $arcadeName with her mouth spread open by a ring gag and her head sticking through the hole in the wall.  A sign below her mouth proclaims her to be a "cum extraction tube" and she is used that way for the duration of her stay--a gruelling, 18-hour marathon of relentless throat fucking.  <<if $activeSlave.sexualFlaw != "hates oral">>Her ordeal is so extreme that she now @@color:red;hates oral sex@@<<else>>Her hatred of oral sex makes her ordeal that much more horrific<</if>>, but it @@color:hotpink;breaks down her resistance@@.  She now @@color:gold;better understands the terrifying power you have over her@@, and the sheer amount of cum she is forced to ingest @@color:red;negatively effects her health@@.  Your other cum-fed slaves take note of what you do to girls who can't hold down their assigned diet. 
+    <<set $activeSlave.devotion += 5>>
+    <<set $activeSlave.trust -= 5>>
+    <<set $activeSlave.health -= 5>>
+    <<set $activeSlave.oralCount += 55>>
+    <<set $activeSlave.oralTotal += 55>>
+    <<set $activeSlave.sexualFlaw to "hates oral">>
+    <<set $activeSlave.fetish to "masochist">>
+  <</replace>>
+<</click>>
+<</if>>
+
+<<case "subjugation blues">>
+
+<<click "Surgically alter her to be of the inferior $arcologies[0].FSSubjugationistRace race, and give her a public debut">>
+  <<replace "#name">>$activeSlave.slaveName<</replace>>
+  <<replace "#result">>
+Some slaves have a bigger potential price to pay for disobedience than they realize.  $activeSlave.slaveName is $activeSlave.race, which is<<if $activeSlave.race != $arcologies[0].FSSupremecistRace>> not particularly noteworthy.<<else>> advantageous to her, as it is generally unpopular to enslave a girl of the superior race.<</if>> However, she's about to learn that her racial appearance isn't immutable, and in your arcology, it can make a big difference in how she is treated.  You escort the struggling girl to the surgery center and instruct $assistantName to alter her appearance so that she appears to be <<print $arcologies[0].FSSubjugationistRace>>.  The full meaning of your instructions <<if $activeSlave.intelligence < 0>> slowly start to dawn on <<print $activeSlave.slaveName>>'s stupid face <<else>> spark a quick reaction from <<print $activeSlave.slaveName>>'s intelligent eyes<</if>> and she whimpers and begs for you to reconsider even as she's strapped onto the operating table.  
+<br><br>
+By the time she wakes up from the anesthesia, you've already made the necessary alterations to her permanent records, which now clearly indicate that she was born <<print $arcologies[0].FSSubjugationistRace>>, and as such, can be rightfully regarded as the racially inferior fuck-animal she now is.  Of course, your fellow slave owners and the slave market will be savvy enough to see through the alterations you've forced upon her, but when you make her available for a day of use in the public square, all your average citizen knows is that the girl they are fucking is simply a worthless $arcologies[0].FSSubjugationistRace slut who doesn't deserve much more than a stomach full of cum.  The surgery @@color:red;negatively effects her health@@, but by the end of a long day she'll likely never forget, she has gotten a crash course in what it means to be a $arcologies[0].FSSubjugationistRace slave in your arcology, and any evidence that she was born $activeSlave.race has been efficiently expunged from her records. <<if ($activeSlave.vagina == 0 || $activeSlave.anus == 0)>>@@color:lime;All vestiges of her virginity have been unceremoniously stripped away@@.<</if>> The experience has  @@color:hotpink;broken down her resistance@@, and your willingness to go to such extremes to subjugate her @@color:gold;greatly increases her fear of you@@.  
+       <<set $activeSlave.devotion += 5>>
+       <<set $activeSlave.trust -= 10>>
+       <<set $activeSlave.vagina += 1>>
+       <<set $activeSlave.vaginalCount += 10>>
+       <<set $activeSlave.analcount += 5>>
+       <<set $activeSlave.oralcount += 15>>
+       <<set $analTotal += 5>>
+       <<set $vaginalTotal += 10>>
+       <<set $oralTotal += 15>>
+     <<if ($activeSlave.anus == 0)>>
+       <<set $activeSlave.anus += 1>>
+     <</if>>
+     <<if ($activeSlave.vagina == 0)>>
+       <<set $activeSlave.vagina += 1>>
+     <</if>>
+     <<set $cash -= $surgeryCost>>
+       <<set $activeSlave.health -= 20>>
+       <<set $surgeryType to "race">>
+       <<if ($arcologies[0].FSSubjugationistRace is "white")>>
+           <<set $activeSlave.race to "surgically altered to look white">>
+           <<set $activeSlave.skin to either("pale", "tanned", "fair")>>
+           <<set $activeSlave.eyeColor to either("blue", "brown", "green")>>
+           <<set $activeSlave.hColor to either("black", "blonde", "red", "brown")>>
+       <<elseif ($arcologies[0].FSSubjugationistRace is "latina")>>
+           <<set $activeSlave.race to "surgically altered to look latina">>
+           <<set $activeSlave.skin to either("olive", "brown", "light brown")>>
+           <<set $activeSlave.hColor to either("black", "black", "brown", "brown")>>
+  <<elseif ($arcologies[0].FSSubjugationistRace is "black")>>
+           <<set $activeSlave.race to "surgically altered to look black">>
+     <<set $activeSlave.skin to either("black", "brown", "light brown")>>
+     <<set $activeSlave.hColor to either("black", "black", "black", "brown")>>
+  <<elseif ($arcologies[0].FSSubjugationistRace is "Asian")>>
+     <<set $activeSlave.race to "surgically altered to look asian">>
+     <<set $activeSlave.skin to either("pale", "dark", "light")>>
+     <<set $activeSlave.hColor to either("black")>>
+  <<elseif ($arcologies[0].FSSubjugationistRace is "Middle Eastern")>>
+     <<set $activeSlave.race to "surgically altered to look middle eastern">>
+     <<set $activeSlave.skin to either("pale", "dark", "light")>>
+     <<set $activeSlave.hColor to "black">>
+  <<else>>
+     <<set $activeSlave.race to "surgically altered to look indo-aryan">>
+     <<set $activeSlave.skin to either("dark", "light")>>
+     <<set $activeSlave.hColor to "black">>
+  <</if>>
+     <</replace>>
+  <</click>><<if ($activeSlave.anus == 0) || ($activeSlave.vagina == 0)>> //This option will take virginity//<</if>>
+<br><<click "No surgery today, but give her something to think about">>
+  <<replace "#name">>$activeSlave.slaveName<</replace>>
+  <<replace "#result">>
+You stroke <<print $activeSlave.slaveName>>'s $activeSlave.skin cheek and tell her that she has much more to lose than she realizes.   You decide to give her a tour of the arcology to show her what you mean.  You make sure to point out everything that makes living in your arcology as a $arcologies[0].FSSubjugationistRace slut special.  <<if $dairy > 0>>There are the specially calibrated "<<print $arcologies[0].FSSubjugationistRace>> only" industrial human milking machines in $dairyName which have been set for maximum milking efficiency, disregarding any need for slave comfort. <<else>>There are the segregated milking stalls, where only the dirtiest and most dilapidated machines are reserved for filthy $arcologies[0].FSSubjugationistRace sluts. <</if>><<if $club > 0>>There are the "refresher" sinks in $clubName where normal slaves can go to periodically clean the cum out of their holes before returning to service more citizens--but such a luxury is off limits to $arcologies[0].FSSubjugationistRace animals--who simply have to work through their long shifts with ever increasing amount of ejaculate covering their worthless bodies.<<else>>There are the "animal fuckers" in the public square--groups of racial purists who specifically seek out slaves of the inferior $arcologies[0].FSSubjugationistRace race to mistreat through extreme public use. <</if>>Finally <<if $arcade > 0>>you take her over to $arcadeName, and give her an up close view of the brutal ring gag used to pry open the $arcologies[0].FSSubjugationistRace sluts' mouths for relentless cock-milking purposes. <<else>>you take her over to the glory hole area, where distinct labels adorn the holes reserved for members of the slave race, and $arcologies[0].FSSubjugationistRace fuck-holes are afforded "special attention" by "sympathetic" citizens of the arcology.<</if>>
+<br><br>
+At first $activeSlave.slaveName is confused as to why you are showing her these things, but you soon make your point clear. You explain that if she doesn't start accepting her role, you can easily alter her appearance and force her to accept a much different role instead.  You see her <<if $activeSlave.intelligence < 0>> stupid eyes finally start to show signs of understanding<<else>>intelligent eyes quickly realize what you are talking about<</if>> and she starts to whimper helplessly, begging you not to turn her into a $arcologies[0].FSSubjugationistRace sub-human.  By the end of the tour she better realizes exactly what it means to be a slave.  She is starting to understand the @@color:hotpink;power you have over her@@, and @@color:gold;she fears you even more because of it@@.
+    <<set $activeSlave.devotion += 5>>
+    <<set $activeSlave.trust -= 10>>
+  <</replace>>
+<</click>>
+<br><<click "Discipline her normally.  Artificial racial subjugation is going too far">>
+  <<replace "#name">>$activeSlave.slaveName<</replace>>
+  <<replace "#result">>
+You look $activeSlave.slaveName over, and something about her makes you reconsider playing games with her racial appearance.  <<if $activeSlave.race == $arcologies[0].FSSupremecistRace>>Perhaps her natural $activeSlave.race supremacy is too sacrosanct for you to go to such lengths.  <</if>>You'll not make such an extreme example of her.  Still, she is a disobedient slave, and she cannot be allowed to openly defy your orders and inspections.  You take her over your knee, expose her bare ass and spank her hard and relentlessly.  She screams and whines and struggles, and you call in an obedient slave to help keep control of her as you punish her reddened bottom.  You also make sure to tell her how lucky she is that she isn't one of those worthless sub-human $arcologies[0].FSSubjugationistRace sluts, and that she is getting off easy. But you also remind her that there are worse owners to belong to, and if she continues to resist your will, you will be very selective about who you sell her to.  
+<br><br>
+By the time you've finished with her sensitive ass, it shines red, and she is crying and whimpering in pain.  You send her away, having @@color:hotpink;dampened her resistance a bit@@, and @@color:gold;scared her with your tales of how much worse life could be@@ for her <<if $activeSlave.race == $arcologies[0].FSSupremecistRace>> if she weren't born of the supreme race.<<else>>under a less forgiving owner.<</if>>
+    <<set $activeSlave.devotion += 5>>
+    <<set $activeSlave.trust -= 5>>
+  <</replace>>
+<</click>>
+
+<<case "too thin for cum diet">>
+
+<<click "Give the poor girl a break and take her off her cum diet so she can safely get to a healthier weight">>
+  <<replace "#name">>$activeSlave.slaveName<</replace>>
+  <<replace "#result">>
+    You silently appraise <<print $activeSlave.slaveName>>'s desperate face and lean forward in your chair to check your terminal.  You confirm that <<if $activeSlave.dietCum == 1>> her food is supplmented with cum for flavor.<<else>>she is being fed significant amounts of ejaculate.<</if>>  While her <<if $activeSlave.dietCum == 2>>extreme <</if>>diet is still engineered to <<if $activeSlave.dietCum == 2>>barely <</if>> provide the nutrition she needs, if she can't hold the stuff down, she can't gain weight.  With a few taps on the keyboard you change her orders so that she will be fed a much more nutritionally rich diet that is free of ejaculate.  However, you make sure to warn her that $assistantName will be monitoring her, and you may change your mind once she reaches a more attractive weight.  She thanks you profusely, <<if $activeSlave.vagina != 0>>even attempting to offer her body for use in gratitude,<</if>> but you simply send her away.  You find yourself concerned that you are becoming soft by allowing slaves to dictate what they will and won't eat, but your benevolent decision has already had a @@color:hotpink;positive effect on her attitude@@. She @@color:aquamarine;trusts you a little more@@ too.  
+    <<set $activeSlave.trust += 2>>
+    <<set $activeSlave.devotion += 2>>
+	<<set $activeSlave.dietCum to 0>>
+  <</replace>>
+<</click>>
+<br><<click "Give the emaciated slut your answer in the form of a rough butt-fuck">>
+  <<replace "#name">>$activeSlave.slaveName<</replace>>
+  <<replace "#result">>
+    You stand up behind your desk.  She flinches, but holds her ground, her lip quivering slightly.  You slowly walk toward her, appraising her smooth, skinny body, touching her shoulder as you disappear behind her.  She starts to cry as you <<if $PC.dick == 0>>pull a massive rubber dong attachment off the wall and hook it to your strap-on.<<else>>unbuckle your pants and let her feel your warm dick harden against her tight, bony thigh.<</if>>  Without word or ceremony, you shove her forward so that she is bent over and crushed against your desk.  The tears start to flow out of her as she feels your <<if $PC.dick == 0>>massive rubber dong <<else>>hard, thick cock <</if>>pressing against her unprotected anus.
+	<br><br>
+	When you offer her the opportunity to revise her request, she does.	"<<if SlaveStatsChecker.checkForLisp($activeSlave)>>Pleathe,<<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>!  I'm thorry!  Pleathe don't fuck my ath!  I'll eat all the cum you want!  Pleathe!<<else>>Please, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>!  I'm sorry!   Please don't fuck my ass!  I'll eat all the cum you want!  Please!<</if>>"  She screams <<if $activeSlave.accent > 1>>in her thick accent <</if>> as you force your<<if $PC.dick == 0>> strap-on <<else>>self <</if>> inside her butt-hole and subdue her weak, struggling body against your unforgiving desk. @@color:gold;Horrified tears@@ stream down her face with each brutal thrust as you speak into her ear and remind her that slaves are not allowed to dictate their needs to their owners. You know what's best for her, and right now, her proper role is as an eager little depository for the products of the free-cities ejaculate market.  It's her job to suck down cum at the whim of her owner--plain and simple--until she's told otherwise.  You butt-fuck the cum-fed slag until she simply lays there and accepts her corrective ass-rape.  <<if $activeSlave.anus == 0>>@@color:lime;Her@@ <<if $activeSlave.butt < 5>>@@color:lime;skinny little@@ <<else>>@@color:lime;plump little@@ <</if>>@@color:lime;ass is now broken in@@.  <</if>>She sobs quietly with each thrust of your hips, and when you finally <<if $PC.dick == 1>>make yet another cum deposit into her <<if $activeSlave.weight < -80>>emaciated <<else>>bony <</if>>body and<</if>> pull out, you instruct <<if $activeSlave.dietCum == 1>> $assistantName to dramatically increase the amount of cum in her diet from now on.  You won't have a slave telling you what she eats.  $activeSlave.slaveName hears your instructions and whimpers before rubbing her sore bottom and <<else>>another slave to drag the broken slut to the kitchen, where she's to receive an additional feeding of thick, creamy ejaculate-based nutrients before <</if>>proceeding to her next assignment.
+	<br><br>
+	She's learned a valuable lesson about what it truly means to be a slave today, and it's one she @@color:orchid;won't soon forget@@.
+    <<set $activeSlave.devotion -= 5>>
+	<<set $activeSlave.trust -= 5>>
+	<<if ($activeSlave.anus == 0)>>
+		<<set $activeSlave.anus += 1>>
+	<</if>>
+	<<set $activeSlave.analCount += 1>>
+	<<set $analTotal += 1>>
+	<<if $activeSlave.dietCum == 1>>
+		<<set $activeSlave.dietCum to 2>>
+		<<set $activeSlave.dietMilk to 0>>
+	<</if>>
+    <</replace>>
+<</click>><<if ($activeSlave.anus == 0) || ($activeSlave.dietMilk == 1)>> //This option will//<<if $activeSlave.anus == 0>> //take anal virginity//<<if $activeSlave.dietMilk == 1>>// and//<</if>><</if>><<if $activeSlave.dietMilk == 1>>// remove milk from her diet//<</if>><</if>>
+<br><<click "Use aphrodisiacs and positive reinforcement to make her cum diet more palatable">>
+  <<replace "#name">>$activeSlave.slaveName<</replace>>
+  <<replace "#result">>
+    You do a quick check at your terminal.  She is indeed being fed <<if $activeSlave.dietCum == 1>> food that is supplmented with cum for flavor.<<else>>large amounts of human ejaculate.<</if>>  You tell her that it can't be helped.  When you assign a slave her diet, it's for a reason, and in <<print $activeSlave.slaveName>>'s case, you are using her diet to make her into a better whore.  By the look on her distressed face, you can tell she doesn't understand or appreciate your perspective, but you tell her you have just the thing to help change her outlook.  
+	<br><br>
+	You pull out a heavy dose of aphrodisiacs from the drawer in your desk.  They are expensive, but powerful drugs that can be used in a brute force way to manipulate the sexual urges and tastes of even the most frigid sluts.  The mild dose included in every slave's food is usually enough to affect a slow, inevitable change in attitude for resistant slaves, but sometimes a more acute dose can be an amusing way to turn disgust into dependence.  $activeSlave.slaveName shivers as you reassure her and inject her <<if $activeSlave.weight < -80>>bony <<else>>tiny <</if>>body with the powerful drugs.  You know they are working when she begins to perspire a little, and <<if $activeSlave.vagina > -1>>she starts to leak fresh girl-juice down her shivering thighs<<else>>her dick starts to come to attention<</if>>.  You then book her to be the main attraction at a corporate office party that afternoon, where she will be the target of a blow-bang and bukkake.  You see that she's dosed heavily with the drugs every day this week, and then book the rest of her afternoons for similar duties, making sure she still tends to her regular assignments as well.  In the meantime, you also instruct the kitchen that she is to eat as much cum-based food from the dispensors as she can suck down in order to fuel up for these exhausting escapades.  By the end of the week, the aphrodisiacs and her slide into an inescapable routine of cum immersion have done their job, and she has begun to @@color:lightcoral;view cum as an inevitable component of her daily life@@.  She also manages to @@color:green;gain a little weight@@.  Thanks to your manipulation of her pavlovian responses through extreme drug therapy, her @@color:red;health has suffered a bit@@, but she is also @@color:hotpink;more dependent on you@@ thanks to her <<if $activeSlave.addict == 0>>@@color:cyan;new@@<<else>>@@color:cyan;developing@@<</if>> @@color:cyan;addiction to aphrodisiacs.@@
+    <<set $activeSlave.devotion += 5>>
+	<<set $activeSlave.health -= 10>>
+	<<set $activeSlave.weight += 10>>
+	<<set $activeSlave.fetish = "cumslut">>
+	<<set $activeSlave.fetishKnown to 1>>
+	<<set $activeSlave.fetishStrength to 10>>
+	<<set $activeSlave.oralCount += 50>>
+	<<set $oralTotal += 50>>
+	<<set $activeSlave.addict += 1>>
+    <</replace>>
+<</click>>
+
 <<default>>
 	ERROR: bad event
 <</switch>>
diff --git a/src/uncategorized/RESSTR.tw b/src/uncategorized/RESSTR.tw
index 3a39a1eb65e..a5b31c0f708 100644
--- a/src/uncategorized/RESSTR.tw
+++ b/src/uncategorized/RESSTR.tw
@@ -1,32 +1,63 @@
 :: RESSTR [nobr]
 
-<<set $nextButton to "Continue">>
-<<set $nextLink to "AS Dump">>
-<<set $returnTo to "Next Week">>
+<<set $nextButton to "Continue", $nextLink to "AS Dump", $returnTo to "Next Week">>
 
 <<set $RESSTRevent to $RESSTRevent.random()>>
 <<set $activeSlave to $eventSlave>>
+<<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>>
 <<SlaveTitle $activeSlave>>
 
 <<switch $RESSTRevent>>
 
-<<case "retching cum feeding">>
+<<case "transition anxiety">>
 
-You are inspecting the slave feeding area early in the week, watching your slaves as they come and go to get their required nourishment for the morning.  You see <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span><<if $cockFeeder == 1>> as she kneels in front of the feeder phallus with a look of disgust on her face  <<else>> as she stares into her cup of nutritional fluid with a look of disgust on her face.<</if>> You quickly check your records and $assistantName confirms that $activeSlave.slaveName is required to ingest<<if $activeSlave.dietCum == 2>> an extreme diet based almost entirely on human ejaculate.<<else>> a large amount of human ejaculate as part of her diet.<</if>>
+<span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span> stumbles into your office naked for her weekly inspection, so apprehensive that she can hardly walk. She's been like this ever since she became one of your sex slaves, <<if $week-$activeSlave.weekAcquired == 0>>just this week<<elseif $week-$activeSlave.weekAcquired == 1>>just last week<<else>><<print $week-$activeSlave.weekAcquired>> weeks ago<</if>>. It's not surprising; slaves like her usually require some time and training to accept that they're slave girls. She lacks the natural attraction to men that might have made the idea more comfortable for her, and the resulting sexual anxiety combined with understandable fear of sexual use makes her extremely unhappy to be naked in front of someone she knows can fuck her at will.
 <br><br>
-As you watch $activeSlave.slaveName unpleasantly retch as she<<if $cockFeeder == 1>> stimulates the feeder phallus with her mouth<<else>> tentatively drinks from her cup<</if>> and chokes her food down, knowing that if she doesn't eat it willingly, she will be forced to, you can almost see her <<if $activeSlave.intelligence gt 0>> intelligent mind <<else>> stupid mind<</if>> working through the reality of what her life has become. She is now a receptacle for <<if $activeSlave.dietCum == 2>> concentrated <</if>>human ejaculate, and for no other reason than the perverse amusemsent of her owner.  Almost as soon as she swallows her food, she whimpers, burps, and then quickly runs to a nearby bathroom to vomit it back up.  This is a common reaction for unbroken slaves on cum diets,<<if $activeSlave.weight gt 0>> and can also be an effective, if unhealthy, way of forcing them to lose weight.<<else>> but it can also prevent slaves that are already too thin from gaining weight.<</if>>
+She has her hands balled into fists at her sides, and clearly wants nothing more than to use them to cover her <<if $activeSlave.balls == 0>>pathetic, ballsless bitchclit<<elseif $activeSlave.aphrodisiacs > 0>>aphrodisiac-induced erection<<elseif $activeSlave.dick > 3>>impressively sized but pathetically soft dick<<else>>soft, pathetic little dick<</if>>. She knows that that's not allowed, and keeps her hands where they are, though it's a struggle. She sees you looking at her body like a slaveowner looks at one of <<if $PC.title == 1>>his<<else>>her<</if>> sex slaves, and she shivers.
 
-<<case "subjugation blues">>
+<<case "moist pussy">>
 
-It's been <<print $week-$activeSlave.weekAcquired>> week<<if $week-$activeSlave.weekAcquired > 1>>s<</if>> since you acquired <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span> as your slave.  Since then she has been nothing but trouble.  She has been ungrateful, rebellious and particularly hateful toward you since you acquired her.  She often needs to be confined or forced to perform her assignments, and has little regard for your power or authority. You bring her in for inspection and she whines and squirms in resistance as you feel up her $activeSlave.nipples nipples, and grope her <<if $activeSlave.butt < 2>>narrow <<elseif $activeSlave.butt < 5>>average <<elseif $activeSlave.butt < 8>>plump <<else>>impressive <</if>>butt, coldly appraising her potential worth as a sexual service provider. <<if $activeSlave.actualAge < 21>>She is very young, only $activeSlave.actualAge years old, and is still very naive.  Her smooth, $activeSlave.skin skin has yet to experience the hard years of relentless sexual abuse that lie ahead of her.<<else>>At $activeSlave.actualAge years old, she should know by now how the world works, but some slaves are just too stubborn for their own good.<</if>>  Eventually, of course, even the most headstrong girls will bend to your will, but the unique social mores of your arcology and the wonders of modern surgical technology offer a prime opportunity to make a potent example of this <<if $activeSlave.actualAge < 21>>young <<else>>obstinate <</if>>slut.  She is $activeSlave.race, and therefore not considered racially inferior or subject to extreme inequities or neglect, but like most slave characteristics, that can change.
+Just as you're about to give <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span> her weekly inspection, a minor business matter comes up and diverts your attention. So, for about ten minutes, she has nothing at all to do other than stand in front of your desk in your office, watching you,<<if $assistant > 0>> $assistantName's avatar,<</if>> the other slaves who come and go, and the general lewdness of the arcology, much of which is visible from right here.
+<<if ($activeSlave.attrXY > 50) && ($PC.boobs == 0)>>
+	She finds your strong body attractive, and her gaze rests most frequently on you.
+<<elseif ($activeSlave.attrXX > 50) && ($PC.boobs == 1)>>
+	She finds your prominent breasts attractive, and her gaze rests most frequently on them.
+<<elseif $activeSlave.aphrodisiacs > 0>>
+	The aphrodisiacs she's on never let her libido rest for long.
+<<elseif $activeSlave.energy > 95>>
+	Her nymphomania keeps her perpetually watchful for any sexual sights, especially any which promise her participation.
+<<elseif $activeSlave.energy > 40>>
+	Her healthy sex drive does its work, and with the constant coming and going she's not starved for things she finds attractive.
+<<else>>
+	Despite her weak libido, she's been a sex slave long enough that her body knows that it may be called upon to render sexual service soon.
+<</if>>
+The consequences of the special qualities of her womanhood soon become apparent.
+<br><br>
+Your slaves are all in the very best of vaginal health, so the scent of her female arousal is not strong. But her cunt produces such copious natural lubricant that with nothing to do but stand there, her <<if $activeSlave.births > 0>>motherly<<elseif $activeSlave.weight > 30>>thick<<elseif $activeSlave.muscles > 30>>strong<<else>>feminine<</if>> inner thighs are soon slick with a sheen of healthy pussyjuice. You notice a droplet of the stuff running down her warm $activeSlave.skin skin.
+<<if canAchieveErection($activeSlave)>>
+	Her <<if $activeSlave.dick > 3>>stiff prick<<else>>hard little dick<</if>> is sticking up from atop her pussy, leaving it nice and visible.	
+<<elseif $activeSlave.dick > 0>>
+	Her pussy is <<if $activeSlave.dick > 3>>entirely<<else>>partially<</if>> concealed by her limp dick, which is getting a good coating, since it's resting against the source.
+<</if>>
+<<if $activeSlave.labia > 0>>Her prominent labia are flushed and moist, and frame her womanhood invitingly.<</if>>
+<<if $activeSlave.clit > 0>>Her clit is rapidly becoming visible as the blood rushes there from every other part of her body.<</if>>
+<<if $activeSlave.preg > 20>>Her huge pregnancy heaves a little as she starts to breathe a bit harder, and the visual connection between her gravid belly and her needy womanhood is inescapable.<</if>>
+She's a good $desc, and remains obediently before your desk, filling your office with her subtle perfume as she waits for you.
 
-<<case "too thin for cum diet">>
+<<case "breast expansion blues">>
 
-You are in your office, tending the the tedious business of requisition orders for your penthouse when you see  <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span> appear outside your door. She hovers outside in the hall, peeking her head around the entry-way, looking very unsure about disturbing you.  You stop what you're doing and call her in.  She's reticent at first, but then she obediently steps into your office.  She is <<if $activeSlave.clothes  == "no clothing">>forced to remain naked at all times, and the most striking thing about her body is how skinny she is.<<else>>forced to wear $activeSlave.clothes all day, but even through her outfit, it's easy to see how impossibly skinny she is.<</if>>  <<if $activeSlave.weight > -80>> She's not exclusively skin and bones, but she's close.  <<else>> She's so thin that she doesn't look entirely healthy.<</if>>  Her <<if $activeSlave.boobs < 600>><<if $activeSlave.boobs < 300>>tiny <<elseif $activeSlave.boobs < 600>>small <</if>>boobs are barely noticable against her concave tummy, and <<if $arcologies[0].FSSlimnessEnthusiast != "unset">>that can be a very appealing look given the predilection your arcology has for slim girls. <<else>>to most clients, this makes her a less appealing whore.<</if>><<else>><<if $activeSlave.boobs < 900>>large <<else>>massive <</if>> tits are a sharp contrast to her concave belly, and although impressive, they seem to especially stick out on a girl who, in all other ways, seems <<if $activeSlave.weight > -80>>slightly <<else>>alarmingly <</if>> malnourished.<</if>>  Her $activeSlave.faceShape face is clearly conflicted, and her $activeSlave.eyeColor eyes shift with nervous energy.  She is clearly unsure whether she should say what she came here to say.
+During her routine weekly inspection, <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span> cradles her huge breasts with her arms whenever the maneuvers of being inspected allow her to do so. It's not an unusual gesture for a $desc on breast growth drugs, since slaves whose tits are expanding are, by definition, not used to their weight yet. But $activeSlave.slaveName is more than just uncomfortable. She seems to regard her weighty mammaries with distaste. <<if $activeSlave.intelligence > -1>>She's not stupid, and quickly realizes<<else>>She's an idiot, but she's not dumb enough to completely miss<</if>> that you've noticed her feelings about her boobs. She bites her lower lip, not sure if she should say anything, so you follow your usual policy during slave inspections and ask her about it. <<if $PC.career == "slaver">>If you learned one thing from your long career of slave training, it's that it's<<else>>It's<</if>> typically best to suss these things out.
 <br><br>
-When you finally ask her what she wants, she hestitates for a moment and then suddenly seems to gain her courage<<if $activeSlave.accent > 1>>, speaking in an atrociously thick accent<<elseif $activeSlave.accent > 0>>, speaking in a cute little accent<</if>>.  <<if SlaveStatsChecker.checkForLisp($activeSlave)>> "Pleathe, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>> I'm tho hungry!  It theemth like all I get to eat ith cum.  It'th dithguthting! Pleathe!  I have to eat tho much of it.  Can I be allowed to eat regular food again?  Pleathe, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>, I'm tho hungry!  I need real food!"<<else>> "Please, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>> I'm so hungry!  It seems like all I get to eat is cum.  It's disgusting!  Please!  I have to eat so much of it.  Can I be allowed to eat regular food again?  Please, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, I'm so hungry. I need real food!"<</if>>
-<br><br>
-It's true, cum <<if $activeSlave.dietCum == 1>>supplemented <<elseif $activeSlave.dietCum == 2>>based <</if>>food can be hard on girls who are not fully habituated to being toys for sexual amusement--particularly when you've ordered them to gain weight on it.  You look at the skinny whore and consider your options.
+<<if SlaveStatsChecker.checkForLisp($activeSlave)>>
+	"<<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>," she lisps, "can I pleathe be taken off boob drugth?" She swallows, nervous that she's crossed a line, but she presses on, hefting her tits a little higher to show she's talking about them. "They're tho heavy and awkward. I'm thore every night, and my back hurts. I feel like a cow with boobth thith big,
+<<else>>
+	"<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>," she mumbles, "can I please be taken off the breast expansion drugs?" She swallows, nervous that she's crossed a line, but she presses on, hefting her tits a little higher to show she's talking about them. "They're so heavy and awkward. I'm sore every night, and my back hurts. I feel like a cow with boobs this big,
+<</if>>
+and I can't imagine what it'll be like if they get any bigger."
+In one sense, it's amusing that she feels that way, because<<if ($arcologies[0].FSAssetExpansionist != "unset") || ($arcologies[0].FSTransformationFetishist != "unset") || ($arcologies[0].FSPastoralist != "unset")>> as many slaves in this very arcology know quite well,<</if>> it's possible for the miracles of modern medicine to grow a $desc's tits until they're so heavy they immobilize her completely.
+<<if $activeSlave.muscles > 5>>She has the muscles to carry her boobs around, so some of this may be simple whining.<<else>>It's not surprising that her breasts would be uncomfortable, since she lacks anything in the way of muscle tone to help support them.<</if>>
+<<if $activeSlave.lactation > 0>>She complained of feeling like a cow without detectable irony, despite the fact that her left nipple has a droplet of cream clinging to it right now.<</if>>
+She waits anxiously for your response, wondering if she'll be punished for expressing reservations about your expansion of her breasts and, comically, still cradling her heavy udders as she does so.
 
 <<default>>
 	ERROR: bad event
@@ -36,189 +67,224 @@ It's true, cum <<if $activeSlave.dietCum == 1>>supplemented <<elseif $activeSlav
 <span id="result">
 <<switch $RESSTRevent>>
 
-<<case "retching cum feeding">>
+<<case "transition anxiety">>
 
-<<click "Have mercy on the poor girl and take her off her cum diet for now">>
-  <<replace "#name">>$activeSlave.slaveName<</replace>>
-  <<replace "#result">>
-    You see how $activeSlave.slaveName is suffering and you decide to reconsider her dietary prescription.  You instruct $assistantName to change <<print $activeSlave.slaveName>>'s diet to exclude cum for now.  Slaves who can't eat are unhealthy, and unhealthy slaves are unprofitable slaves.  She is now @@color:mediumorchid;more confident that she can resist you and get her way@@, she also @@color:mediumaquamarine;trusts you a little more@@ to look after her well being.
-    <<set $activeSlave.trust += 5>>
-    <<set $activeSlave.devotion -= 5>>
-  <<set $activeSlave.dietCum to 0>>
-  <</replace>>
-<</click>>
-<<if $activeSlave.dietCum == 1>>
-	<br><<click "Force her onto a heavy cum diet, and double up on her ejaculate intake">>
+<<click "Fuck her">>
 	<<replace "#name">>$activeSlave.slaveName<</replace>>
 	<<replace "#result">>
-	You instruct $assistantName to double down on <<print $activeSlave.slaveName>>'s cum diet.  Ungrateful little sluts who retch up their expensive food soemtimes need tough love.  Making her cum-food thicker and more concentrated might help her to learn that no matter how bad things seem, you can always make them worse. Initially her new heavy cum diet makes no difference in her ability to keep it down, but you tell her to give it some time.  Eventually she will learn to appreciate cum as the primary ingedient in everything she ingests.  All of your future cumsluts do, sooner or later.  Her pathetic tears reveal how @@color:gold;helpless she feels@@, but they don't hide the @@color:mediumorchid;streak of rebelliousness@@ that remains burning inside her.
-	<<set $activeSlave.devotion -= 3>>
-	<<set $activeSlave.trust -= -3>>
-	<<set $activeSlave.dietCum to 2>>
+		You announce that you're going to fuck her <<if $activeSlave.anus == 0>>virgin <</if>>asspussy. To your complete lack of surprise, she can't hide her horror at the prospect of <<if $PC.dick == 1>>having a cock inside her<<else>>being fucked with a strap-on<</if>>, and her wide, $activeSlave.eyeColor eyes track your movements closely as you stand up and <<if $PC.dick == 1>>reveal the formidable member<<else>>don the strap-on<</if>> you're about to breed her with. You order her to kneel on the couch, which she does, @@color:gold;cringing in fear of being buttfucked, but knowing disobedience will be worse;@@ and then you order her to reach down and spread her butt for you, as wide as it'll go. She complies, <<if $activeSlave.butt > 6>>taking a handful of each massive buttock and heaving them apart to reveal her<<elseif $activeSlave.butt > 3>>pulling her plush buttocks apart<<else>>even though her cute ass doesn't have to be spread<</if>> to reveal her <<if $activeSlave.anus > 2>>whorish anal slit<<elseif $activeSlave.butt > 1>>relaxed rear hole<<else>>tight little rosebud<</if>>. You let her soak in her discomfort, <<if $PC.dick == 1>>stroking your cock gently<<else>>rubbing a little lube on the tip of your phallus<</if>> and letting her see how big it is. Her cringing even extends to her asshole, <<if $activeSlave.analArea > 3>>the huge area of crinkled skin<<elseif $activeSlave.analArea > 1>>the crinkled skin around her anus<<else>>her little pucker<</if>> tensing as she anticipates anal sex.
+		<<set $activeSlave.trust -= 3>>
+		<br><br><span id="result2">
+		<<click "Make sure she gets off on it">>
+			<<replace "#result2">>
+				You press <<if $PC.dick == 1>>yourself<<else>>your weapon<</if>> past her sphincter with care, and her posture softens a little as she realizes you aren't going to hurt her. Once you've hilted <<if $PC.dick == 1>>your cock<<else>>the strap-on<</if>> inside her, you caress her <<if $activeSlave.weight > 30>>chubby<<elseif $activeSlave.waist > 0>>wasp<<elseif $activeSlave.muscles > 30>>muscular<<elseif $activeSlave.weight > 10>>soft<<else>>thin<</if>> waist, running your hands across her skin. Then you <<if $activeSlave.clitPiercing == 3>>activate her smart frenulum piercing<<else>>secure a couple of little egg vibes to her dick<</if>>. She gasps as the vibration starts, and then gasps again as her anus tightens involuntarily with the stimulation, squeezing the <<if $PC.dick == 1>>warm penis<<else>>phallus<</if>> that fills it. She <<if $activeSlave.voice > 0>>moans openly<<else>>rasps mutely<</if>> as you pull out and then thrust into her. Much against her will, she <<if $activeSlave.balls > 0>>quickly becomes erect<<else>>starts to drip precum, which is her ballsless body's way of showing arousal<</if>>.
+				<<if $activeSlave.fetish == "buttslut">>
+				<<if $activeSlave.fetishKnown == 1>>
+					<<if $activeSlave.fetishStrength > 95>>
+						Every time she takes it up the butt, she's reminded that she's a natural buttslut, and the reminder @@color:lightsalmon;helps her relax and accept sodomy.@@
+						<<set $activeSlave.fetishStrength += 10>>
+					<<else>>
+						She knows she gets off easily on anal stimulation, but taking it like this still isn't her favorite activity. Still, the prostate stimulation does its work, and she @@color:hotpink;submits to having her favorite hole pleasured.@@
+						<<set $activeSlave.devotion += 3>>
+					<</if>>
+				<<else>>
+					You notice that she stiffens again, looking down at her traitorous member in shock at how much she enjoys the sensation of prostate stimulation. @@color:lightsalmon;She's a buttslut!@@
+					<<set $activeSlave.fetishKnown = 1>>
+				<</if>>
+				<</if>>
+				Not long after you penetrate her, she <<if $activeSlave.balls > 0>>squirts a weak ejaculation onto the couch<<else>>shivers and releases some watery fluid<</if>>. She had almost forgotten that she was being fucked like a girl, and stiffens uncomfortably when she feels you <<if $PC.dick == 1>>fill her rectum with your hot seed<<else>>grip her hips harder and shake with your own climax<</if>>. As she gets up from the couch, she seems @@color:hotpink;subdued and submissive.@@ After all, if she's submitting to you, that absolves her of responsibility for what she's becoming. 
+				<<set $activeSlave.devotion += 5>>
+				<<AnalVCheck>>
+			<</replace>>
+		<</click>>
+		<br><<click "Rape her">>
+			<<replace "#result2">>
+				You grab her hips, getting a good grip, and spear the poor $desc without any hint of mercy. She <<if $activeSlave.voice > 0>>screams in pain and fear<<else>>sucks in a great sobbing gasp<</if>>, and tries to wriggle away despite her intention of submitting to your use, but you hold her in place and rape her ass. She tries to maintain her position, crying openly, but eventually slides off her perch on the couch, pulling her hole off your <<if $PC.dick == 1>>dick<<else>>strap-on<</if>>. You grab her by <<if $activeSlave.hLength > 20>>hair<<else>>neck<</if>> and smash her face into the angle of the couch, leaving her poor butt completely vulnerable. She can't see you line up to ream her again, but she knows it's coming and cries, quivering. After a while, you haul her up to her feet and keep fucking her, the uncomfortable angle of standing anal forcing new <<if $activeSlave.voice > 0>>squeals<<else>>rasps<</if>> out of her. You pour degradation into her ear as you take your pleasure from her unhappy body, telling her that she's your fuckmeat. She believes you, and when you finally orgasm and let her slide off your hateful <<if $PC.dick == 1>>penis<<else>>strap-on<</if>>, shes @@color:gold;already terrified@@ of the next time you feel like fucking her.
+				<<set $activeSlave.trust -= 5>>
+				<<AnalVCheck>>
+			<</replace>>
+		<</click>>
+		</span>
 	<</replace>>
-<</click>>
-<<elseif $activeSlave.dietCum ==2>>
-	<br><<click "Give the poor girl a break and reduce her cum intake to a more modest level">>
+<</click>><<if $activeSlave.anus == 0>> //This option will take anal virginity//<</if>>
+<br><<click "Humiliate her in public">>
 	<<replace "#name">>$activeSlave.slaveName<</replace>>
 	<<replace "#result">>
-	$activeSlave.slaveName is on a very heavy cum diet, and it's possible you're forcing her to take too much, too soon.  You decide to give her a break and instruct $assistantName to reduce, but not eliminate the amount of cum in her diet.  Although it doesn't immediately make her hate cum any less, @@color:hotpink;she appreciates your willingness@@ to make things a little less unpleasant for her.  @@color:mediumaquamarine;She is a little less afraid of you too@@, although not as much as if you'd taken her off her cum diet altogether.
-	<<set $activeSlave.devotion += 2>>
-	<<set $activeSlave.trust += 2>>
-	<<set $activeSlave.dietCum to 1>>
+		You get up from behind your desk, drawing an apprehensive stare. To her bemusement, you order her to follow you and leave your office. She hurries to obey, her footsteps pattering along behind you, but they become much more hesitant as you make your way out of the penthouse and she realizes that she's about to be in public, naked. You don't bother looking back, knowing that she's sufficiently afraid of you to obey. On the border between your private domain and the public hustle and bustle of the arcology's public life, she stops for a long moment before scurrying to catch up with you, barely even noticing that @@color:hotpink;she just swallowed her sense of shame@@ to obey you and avoid punishment. You stroll along, greeting leading citizens and taking in the hum of your people. $activeSlave.slaveName grows increasingly embarrassed under the hot stares of passersby, cringing closer and closer to your protective side as she notices how many gazes rest with open hunger on her mouth, her crotch, and her ass.
+		<<set $activeSlave.devotion += 3>>
+		<br><br><span id="result2">
+		<<click "Make her perform oral on you, right here">>
+			<<replace "#result2">>
+				You reach around, place a dominanting hand on her shoulder, pull her around in front of you, and push her down to her knees. She quickly realizes what's coming, and her $activeSlave.skin cheeks blush furiously as you reveal your <<if $PC.dick == 1>>meaty dick<<else>>flushed pussy<</if>> and offer it to her. She gets busy, burying her head against you with a speed that seems surprising until it occurs to you that this allows her to hide her face. Deciding to accept this tiny compromise, you run a possessive hand <<if $activeSlave.hLength < 5>>across her smooth scalp<<elseif $activeSlave.hLength < 20>>through her short hair<<else>>through her tresses<</if>> and murmur praise for her enthusiasm. She stiffens at the implication that she wants to be <<if $PC.dick == 1>>polishing your penis<<else>>eating you out<</if>> in broad daylight, but after a slight pause she decides that this isn't bad. As <<if $PC.dick == 1>>her head continues to bob back and forth as she sucks your dick<<else>>she continues nuzzling her nose and mouth against your wet cunt<</if>>, she fails to notice her @@color:hotpink;second major submission today.@@
+				<<if $activeSlave.fetish == "humiliation">>
+				<<if $activeSlave.fetishKnown == 1>>
+					Since she has a humiliation fetish, the embarrassment has been arousing her even as it's been torturing her. Unsatisfied with just this, her need to be shamed obliges her to cock her hips and make sure onlookers can see her asspussy as she services you with her mouth.
+					<<if $activeSlave.fetishStrength > 95>>
+						@@color:lightsalmon;Her need for humiliation has deepened.@@
+						<<set $activeSlave.fetishStrength += 10>>
+					<<else>>
+						Such abject sluttery @@color:hotpink;helps convince her of her status as a slave girl.@@
+						<<set $activeSlave.devotion += 3>>
+					<</if>>
+				<<else>>
+					To your surprise, she even starts to glance around, checking to verify that she's still being watched. @@color:lightsalmon;She's a humiliation slut!@@
+					<<set $activeSlave.fetishKnown = 1>>
+				<</if>>
+				<</if>>
+				<<set $activeSlave.oralCount += 1>>
+				<<set $oralTotal += 1>>
+				<<set $activeSlave.devotion += 5>>
+			<</replace>>
+		<</click>>
+		<br><<click "Make her cum in public">>
+			<<replace "#result2">>
+				You produce three little egg vibrators, which instantly steal her anxious attention away from the passersby who stare at her. You require her to hold her dick out while you use an elastic band to attach one of the vibrators to the underside of its head. She doesn't get to touch herself much anymore, and the half-forgotten sensations of doing so almost make her forget that she's naked in public, and almost certainly about to do something very embarrassing. Then you order her to hold her dick up and place another vibrator <<if $activeSlave.scrotum > 0>>against her sensitive scrotum<<else>>against the sensitive skin where her scrotum used to be<</if>>. Finally, you order her to bend over and offer you her asshole. She obeys, with apprehension, and is actually relieved when you just place the final vibrator against, but not inside, her <<if $activeSlave.anus > 1>>asspussy<<else>>pucker<</if>>. She finds herself ordered to kneel and put her hands on her head; and ordering her to hold this position, you use remote control of the vibrators to force her to cum twice. She can't tear her eyes away from the citizens who stare and laugh as she <<if $activeSlave.balls > 0>>spurts her seed<<else>>dribbles weakly<</if>> onto the floor.
+				<<if $activeSlave.fetish == "humiliation">>
+				<<if $activeSlave.fetishKnown == 1>>
+					<<if $activeSlave.fetishStrength > 95>>
+						Though she's still unhappy about being a slave girl, @@color:lightsalmon;appetite for humiliation has deepened.@@
+						<<set $activeSlave.fetishStrength += 10>>
+					<<else>>
+						The abject humiliation slut climaxes harder each time, and can't stop herself @@color:mediumaquamarine;glancing at you with something like trust.@@
+						<<set $activeSlave.trust += 3>>
+					<</if>>
+				<<else>>
+					With a mix of horror and dawning arousal, she discovers that she enjoys the stares. @@color:lightsalmon;She's a humiliation slut!@@
+					<<set $activeSlave.fetishKnown = 1>>
+				<</if>>
+				<</if>>
+				As she follows you back to your penthouse, she seems almost cheerful, and will definitely be @@color:mediumaquamarine;more trusting of strange orders@@ in the future.
+				<<set $activeSlave.trust += 5>>
+			<</replace>>
+		<</click>>
+		</span>
 	<</replace>>
 <</click>>
-	<br><<click "Suppress her gag reflex and double her cum intake for a week">>
-  <<replace "#name">>$activeSlave.slaveName<</replace>>
-  <<replace "#result">>
-    She is already on a very heavy cum-based diet, and there's only so much ejaculate you can force a slut to ingest before it negatively affects her health.  However, as a temporary measure, you still have options.  You instruct $assistantName to re-double the amount of ejaculate in <<print $activeSlave.slaveName>>'s diet for the week.  You also have her closely monitored and injected with anti-nausea drugs to help her hold down her food.  Although the idea of being forced to eat large amounts of human reproductive fluid still disgusts her, the week of having a super-concentrated cum-diet, along with the suppressed reflex to purge it has its effect.  Knowing that you monitor and control every aspect of her life @@color:hotpink;breaks down her resistance to your will@@, and by the end of the week, she is grateful that you return her to a more nutritionally viable regemin--even if its cum content is still overwhelmingly high. <<if $activeSlave.fetishKnown == 1>>@@color:lightcoral;Her brain has now begun to accept the sexual perversity of her food as a turn on.@@<<else>>She is now able to eat and digest her prescribed diet without pharmacological assistance.<</if>>
-    <<set $activeSlave.devotion += 5>>
-  <<set $activeSlave.fetish to "cumslut">>
-  <<if $activeSlave.fetishKnown == 1>>
-	<<set $activeSlave.fetishStrength to 10>>
-  <</if>>
-	
-  <</replace>>
-<</click>>
-<</if>>
-<<if ($arcade > 0)>>
-  <br><<click "Sentence her to a day in $arcadeName for cum injection therapy">>
-  <<replace "#name">>$activeSlave.slaveName<</replace>>
-  <<replace "#result">>
-    You have $assistantName inform $activeSlave.slaveName of her unacceptable behavior and sentence her to a day in $arcadeName.  She cries and pleads for mercy, and even begs to be allowed to suck a cock, any cock, so she can prove her newfound enthusiasm for cum, but you are unmerciful as two other slaves drag her off to serve her sentence.  She is forced to wear a<<if activeSlave.vagina != -1>> combined vaginal and<<else>>n<</if>> anal chastity belt so that the only hole available is her mouth, and is then confined in $arcadeName with her mouth spread open by a ring gag and her head sticking through the hole in the wall.  A sign below her mouth proclaims her to be a "cum extraction tube" and she is used that way for the duration of her stay--a gruelling, 18-hour marathon of relentless throat fucking.  Her ordeal is so extreme that she now @@color:red;hates oral sex@@, but it @@color:hotpink;breaks down her resistance@@.  She now @@color:gold;better understands the terrifying power you have over her@@, and the sheer amount of cum she is forced to ingest @@color:red;negatively effects her health@@.  Your other cum-fed slaves take note of what you do to girls who can't hold down their assigned diet.
-    <<set $activeSlave.devotion += 5>>
-    <<set $activeSlave.trust -= 5>>
-    <<set $activeSlave.health -= 5>>
-    <<set $activeSlave.oralCount += 55>>
-    <<set $activeSlave.oralTotal += 55>>
-    <<set $activeSlave.sexualFlaw to "hates oral">>
-    <<set $activeSlave.fetish to "masochist">>
-  <</replace>>
-<</click>>
-<</if>>
 
-<<case "subjugation blues">>
+<<case "moist pussy">>
 
-<<click "Surgically alter her to be of the inferior $arcologies[0].FSSubjugationistRace race, and give her a public debut">>
-  <<replace "#name">>$activeSlave.slaveName<</replace>>
-  <<replace "#result">>
-Some slaves have a bigger potential price to pay for disobedience than they realize.  $activeSlave.slaveName is $activeSlave.race, which is<<if $activeSlave.race != $arcologies[0].FSSupremecistRace>> not particularly noteworthy.<<else>> advantageous to her, as it is generally unpopular to enslave a girl of the superior race.<</if>> However, she's about to learn that her racial appearance isn't immutable, and in your arcology, it can make a big difference in how she is treated.  You escort the struggling girl to the surgery center and instruct $assistantName to alter her appearance so that she appears to be <<print $arcologies[0].FSSubjugationistRace>>.  The full meaning of your instructions <<if $activeSlave.intelligence < 0>> slowly start to dawn on <<print $activeSlave.slaveName>>'s stupid face <<else>> spark a quick reaction from <<print $activeSlave.slaveName>>'s intelligent eyes<</if>> and she whimpers and begs for you to reconsider even as she's strapped onto the operating table.
-<br><br>
-By the time she wakes up from the anesthesia, you've already made the necessary alterations to her permanent records, which now clearly indicate that she was born <<print $arcologies[0].FSSubjugationistRace>>, and as such, can be rightfully regarded as the racially inferior fuck-animal she now is.  Of course, your fellow slave owners and the slave market will be savvy enough to see through the alterations you've forced upon her, but when you make her available for a day of use in the public square, all your average citizen knows is that the girl they are fucking is simply a worthless $arcologies[0].FSSubjugationistRace slut who doesn't deserve much more than a stomach full of cum.  The surgery @@color:red;negatively effects her health@@, but by the end of a long day she'll likely never forget, she has gotten a crash course in what it means to be a $arcologies[0].FSSubjugationistRace slave in your arcology, and any evidence that she was born $activeSlave.race has been efficiently expunged from her records. <<if ($activeSlave.vagina == 0 || $activeSlave.anus == 0)>>@@color:lime;All vestiges of her virginity have been unceremoniously stripped away@@.<</if>> The experience has  @@color:hotpink;broken down her resistance@@, and your willingness to go to such extremes to subjugate her @@color:gold;greatly increases her fear of you@@.
-       <<set $activeSlave.devotion += 5>>
-       <<set $activeSlave.trust -= 10>>
-       <<set $activeSlave.vagina += 1>>
-       <<set $activeSlave.vaginalCount += 10>>
-       <<set $activeSlave.analcount += 5>>
-       <<set $activeSlave.oralcount += 15>>
-       <<set $analTotal += 5>>
-       <<set $vaginalTotal += 10>>
-       <<set $oralTotal += 15>>
-     <<if ($activeSlave.anus == 0)>>
-       <<set $activeSlave.anus += 1>>
-     <</if>>
-     <<if ($activeSlave.vagina == 0)>>
-       <<set $activeSlave.vagina += 1>>
-     <</if>>
-     <<set $cash -= $surgeryCost>>
-       <<set $activeSlave.health -= 20>>
-       <<set $surgeryType to "race">>
-       <<if ($arcologies[0].FSSubjugationistRace is "white")>>
-           <<set $activeSlave.race to "surgically altered to look white">>
-           <<set $activeSlave.skin to either("pale", "tanned", "fair")>>
-           <<set $activeSlave.eyeColor to either("blue", "brown", "green")>>
-           <<set $activeSlave.hColor to either("black", "blonde", "red", "brown")>>
-       <<elseif ($arcologies[0].FSSubjugationistRace is "latina")>>
-           <<set $activeSlave.race to "surgically altered to look latina">>
-           <<set $activeSlave.skin to either("olive", "brown", "light brown")>>
-           <<set $activeSlave.hColor to either("black", "black", "brown", "brown")>>
-  <<elseif ($arcologies[0].FSSubjugationistRace is "black")>>
-           <<set $activeSlave.race to "surgically altered to look black">>
-     <<set $activeSlave.skin to either("black", "brown", "light brown")>>
-     <<set $activeSlave.hColor to either("black", "black", "black", "brown")>>
-  <<elseif ($arcologies[0].FSSubjugationistRace is "Asian")>>
-     <<set $activeSlave.race to "surgically altered to look asian">>
-     <<set $activeSlave.skin to either("pale", "dark", "light")>>
-     <<set $activeSlave.hColor to either("black")>>
-  <<elseif ($arcologies[0].FSSubjugationistRace is "Middle Eastern")>>
-     <<set $activeSlave.race to "surgically altered to look middle eastern">>
-     <<set $activeSlave.skin to either("pale", "dark", "light")>>
-     <<set $activeSlave.hColor to "black">>
-  <<else>>
-     <<set $activeSlave.race to "surgically altered to look indo-aryan">>
-     <<set $activeSlave.skin to either("dark", "light")>>
-     <<set $activeSlave.hColor to "black">>
-  <</if>>
-     <</replace>>
-  <</click>><<if ($activeSlave.anus == 0) || ($activeSlave.vagina == 0)>> //This option will take virginity//<</if>>
-<br><<click "No surgery today, but give her something to think about">>
-  <<replace "#name">>$activeSlave.slaveName<</replace>>
-  <<replace "#result">>
-You stroke <<print $activeSlave.slaveName>>'s $activeSlave.skin cheek and tell her that she has much more to lose than she realizes.   You decide to give her a tour of the arcology to show her what you mean.  You make sure to point out everything that makes living in your arcology as a $arcologies[0].FSSubjugationistRace slut special.  <<if $dairy > 0>>There are the specially calibrated "<<print $arcologies[0].FSSubjugationistRace>> only" industrial human milking machines in $dairyName which have been set for maximum milking efficiency, disregarding any need for slave comfort. <<else>>There are the segregated milking stalls, where only the dirtiest and most dilapidated machines are reserved for filthy $arcologies[0].FSSubjugationistRace sluts. <</if>><<if $club > 0>>There are the "refresher" sinks in $clubName where normal slaves can go to periodically clean the cum out of their holes before returning to service more citizens--but such a luxury is off limits to $arcologies[0].FSSubjugationistRace animals--who simply have to work through their long shifts with ever increasing amount of ejaculate covering their worthless bodies.<<else>>There are the "animal fuckers" in the public square--groups of racial purists who specifically seek out slaves of the inferior $arcologies[0].FSSubjugationistRace race to mistreat through extreme public use. <</if>>Finally <<if $arcade > 0>>you take her over to $arcadeName, and give her an up close view of the brutal ring gag used to pry open the $arcologies[0].FSSubjugationistRace sluts' mouths for relentless cock-milking purposes. <<else>>you take her over to the glory hole area, where distinct labels adorn the holes reserved for members of the slave race, and $arcologies[0].FSSubjugationistRace fuck-holes are afforded "special attention" by "sympathetic" citizens of the arcology.<</if>>
-<br><br>
-At first $activeSlave.slaveName is confused as to why you are showing her these things, but you soon make your point clear. You explain that if she doesn't start accepting her role, you can easily alter her appearance and force her to accept a much different role instead.  You see her <<if $activeSlave.intelligence < 0>> stupid eyes finally start to show signs of understanding<<else>>intelligent eyes quickly realize what you are talking about<</if>> and she starts to whimper helplessly, begging you not to turn her into a $arcologies[0].FSSubjugationistRace sub-human.  By the end of the tour she better realizes exactly what it means to be a slave.  She is starting to understand the @@color:hotpink;power you have over her@@, and @@color:gold;she fears you even more because of it@@.
-    <<set $activeSlave.devotion += 5>>
-    <<set $activeSlave.trust -= 10>>
-  <</replace>>
-<</click>>
-<br><<click "Discipline her normally.  Artificial racial subjugation is going too far">>
-  <<replace "#name">>$activeSlave.slaveName<</replace>>
-  <<replace "#result">>
-You look $activeSlave.slaveName over, and something about her makes you reconsider playing games with her racial appearance.  <<if $activeSlave.race == $arcologies[0].FSSupremecistRace>>Perhaps her natural $activeSlave.race supremacy is too sacrosanct for you to go to such lengths.  <</if>>You'll not make such an extreme example of her.  Still, she is a disobedient slave, and she cannot be allowed to openly defy your orders and inspections.  You take her over your knee, expose her bare ass and spank her hard and relentlessly.  She screams and whines and struggles, and you call in an obedient slave to help keep control of her as you punish her reddened bottom.  You also make sure to tell her how lucky she is that she isn't one of those worthless sub-human $arcologies[0].FSSubjugationistRace sluts, and that she is getting off easy. But you also remind her that there are worse owners to belong to, and if she continues to resist your will, you will be very selective about who you sell her to.
-<br><br>
-By the time you've finished with her sensitive ass, it shines red, and she is crying and whimpering in pain.  You send her away, having @@color:hotpink;dampened her resistance a bit@@, and @@color:gold;scared her with your tales of how much worse life could be@@ for her <<if $activeSlave.race == $arcologies[0].FSSupremecistRace>> if she weren't born of the supreme race.<<else>>under a less forgiving owner.<</if>>
-    <<set $activeSlave.devotion += 5>>
-    <<set $activeSlave.trust -= 5>>
-  <</replace>>
+<<click "Make love to her ready cunt">>
+	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<replace "#result">>
+		Her body is so perfectly made to be fucked that it's getting itself ready for you, without your even having to give the order. Deciding not to bother with verbal commands, you approach her and reach for one of her hands; she obediently extends it towards your grasp, and follows <<if ($activeSlave.energy > 40) || ($activeSlave.aphrodisiacs > 0)>>eagerly<<else>>willingly<</if>> as you pull her in for a hug<<if $activeSlave.boobs > 5000>> (cushioned by her enormous udders)<<elseif $activeSlave.dick > 5>> (made rather lewd by her enormous penis)<</if>>, kiss her deeply, and slide your arms down her <<if $activeSlave.muscles > 30>>muscular<<elseif $activeSlave.muscles > 10>>toned<<else>>soft<</if>> back to <<if $activeSlave.butt > 6>>heft her monstrous<<elseif $activeSlave.butt > 3>>squeeze her healthy<<else>>cup her cute little<</if>> buttocks. She <<if $activeSlave.voice > 0>>coos<<else>>hums mutely<</if>> at the feeling of your <<if $PC.title == 1>>strong<<else>>feminine<</if>> hands on her bottom, and presses herself against you as you rotate the two of you until you can set her butt on the edge of your desk and <<if $PC.dick == 1>>slide your big dick into her well-lubricated cunt<<else>>assertively press your own pussy against her wet cunt<</if>>.
+		<br><br>
+		She makes as if to lie back and take it, but you keep an arm around her back and hug her <<if $activeSlave.boobs > 2000>>as closely as her big breasts will permit<<else>>closer than ever<</if>>. You take your other hand and place a firm but loving grip under her chin, lifting her $activeSlave.eyeColor-eyed gaze to meet yours before kissing her again. All the while, you <<if $PC.dick == 1>>fuck her powerfully, withdrawing your dick almost all the way and then hilting yourself in her soaked slit<<else>>trib her with assurance, grinding your hips against hers and making her feel your heat<</if>>. She clings to you, accepting the closeness to her <<if $PC.title == 1>>Master<<else>>Mistress<</if>> and enjoying the loving attention, even as the extreme wetness of her cunt and your <<if $PC.dick == 1>>powerful thrusting<<else>>hungry grinding<</if>> begin to produce lewd noises from between you. Her generous natural lubrication lessens the friction and sensation a little, and you go for a long time before you both climax. You lead her into your office shower, since you're both coated in her pussyjuice<<if $PC.dick == 1>> and she's carrying a big load of your cum<<else>>, and your own<</if>>. Under the hot water, you don't even have to pull her close; @@color:hotpink;she presses herself into your arms on her own.@@
+		<<if $activeSlave.sexualQuirk == "romantic">>
+			For an incorrigible romantic like her, this encounter was perfect, and she @@color:hotpink;loves you all the more for it.@@
+			<<set $activeSlave.devotion += 3>>
+		<</if>>
+		<<set $activeSlave.devotion += 5>>
+		<<VaginalVCheck>>
+	<</replace>>
+<</click>><<if $activeSlave.vagina == 0>> //This option will take virginity//<</if>>
+<br><<click "Pound her wet pussy">>
+	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<replace "#result">>
+		She's so generously lubricated that she's ready to take a good hard fuck, so you decide to give her one. You point at the ground, and you don't even have to tell her to get down on all fours and get ready to take it. Your gesture says it for you, and she obediently gets down and gets in position to be bred like a bitch. She angles her hips just right to offer her cunt to you, and even reaches down to spread her<<if $activeSlave.labia > 1>> dangling<</if>> labia to invite you into her pink channel.
+		<<if $PC.dick == 1>><<if $activeSlave.vagina > 1>>She can take your big dick without a twinge<<else>>Your big dick will fill her tight cunt to its limits<</if>>, but you grab her hips and<<else>>You select a strap-on that's right at the limits of her <<if $activeSlave.vagina > 3>>cavernous<<elseif $activeSlave.vagina > 2>>big<<elseif $activeSlave.vagina > 1>>open<<else>>tight little<</if>> cunt's capacity, don it, and<</if>> mount her with such force that your first stroke brings her butt against your hips with an audible smack. There's also a deliciously lewd noise as <<if $PC.dick == 1>>your invading penis<<else>>the invading phallus<</if>> forces a little gush of pussyjuice out of her. She <<if $activeSlave.voice > 0>>shrieks, but it's a shriek<<else>>gasps, but it's a gasp<</if>> of pleasure, and your rutting is so well-lubricated that she has no trouble getting off on it. Wanting her climax, you reach around her and grab hold of her pussy, feeling the slippery fluid between your fingers and the lewd thrusting motion as <<if $PC.dick == 1>>your cock<<else>>the phallus<</if>> pistons in and out of her. That bit of stimulation is enough to tip her over, and you feel a gush of femcum against your hand as <<if $PC.dick == 1>>your dickhead<<else>>the head of the strap-on<</if>> forces an orgasm out of her g-spot. She's so discombobulated that she collapses into the puddle of pussyjuice she left on the floor when you stand up and head off for a shower, but she @@color:hotpink;crawls after you@@ as best she can on rubbery legs.
+		<<if $activeSlave.fetish == "submissive">>
+		<<if $activeSlave.fetishKnown == 1>>
+			The $desc sub loves getting fucked like that, and
+			<<if $activeSlave.fetishStrength > 95>>
+				@@color:lightsalmon;seems even more submissive@@
+				<<set $activeSlave.fetishStrength += 10>>
+			<<else>>
+				since she's fully confirmed in her status as a sub, she @@color:hotpink;glows with devotion@@
+				<<set $activeSlave.devotion += 3>>
+			<</if>>
+			 as she washes herself in the shower with you.
+		<<else>>
+			She seems utterly disspated by the fucking she just got, and may have just had the best sex of her life. @@color:lightsalmon;She's a submissive!@@
+			<<set $activeSlave.fetishKnown = 1>>
+		<</if>>
+		<</if>>
+		<<set $activeSlave.devotion += 5>>
+		<<VaginalVCheck>>
+	<</replace>>
+<</click>><<if $activeSlave.vagina == 0>> //This option will take virginity//<</if>>
+<br><<click "Feed her her own pussyjuice">>
+	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<replace "#result">>
+		You approach her and <<if $activeSlave.dick > 0>>reach under her girldick for her<<else>>cup her<</if>> sopping pussy. She gasps as she feels your cool grasp. Your possessive hand encompasses her vulva, with your index and ring fingers sliding around either side of her pubic mound to grip her entire womanhood.
+		<<if $activeSlave.vagina > 0>>
+			<<if $activeSlave.vagina > 0>>
+				Her relaxed pussy almost draws your middle finger inward and upward, 
+			<<else>>
+				Her pussy welcomes your middle finger,
+			<</if>>
+			and you hook it inside her body, gathering a healthy amouth of pussyjuice and brushing her g-spot.
+		<<else>>
+			You're careful not to penetrate her virgin slit with your middle finger, but you draw it up the exterior of her channel, gathering a healthy amouth of pussyjuice.
+		<</if>>
+		Then you remove your hand, though the horny $desc unconsciously tries to follow the withdrawing digits. She stares at you, waiting to see what you're going to do, and a blush begins to rise on her $activeSlave.skin cheeks as she sees you reaching for her mouth. Her <<if $activeSlave.lips > 95>>facepussy<<elseif $activeSlave.lips > 40>>pillowlike<<elseif $activeSlave.lips > 10>>soft<<else>>thin<</if>> lips part and you insert all three of your fingers into her hot mouth. She quivers at the intimacy of the gesture, and the taste of her own juices. The tremor sends a delicious motion through her <<if ($activeSlave.boobsImplant == 0) && ($activeSlave.boobs > 300)>>natural <<if $activeSlave.boobs > 2000>>udders<<else>>breasts<</if>><<elseif $activeSlave.boobsImplant > 0>>fake tits<<elseif canAchieveErection($activeSlave)>>stiff prick<<elseif $activeSlave.scrotum > 4>>dangling balls<<elseif $activeSlave.dick > 0>>limp bitchclit<<elseif $activeSlave.weight > 30>>chubbiness<<else>>body<</if>>. You keep your fingers where they are until she's licked them really clean; her hot tongue runs repeatedly between each of your digits<<if $activeSlave.tonguePiercing > 0>> and the smooth hardness of her tongue piercing brushes against them<</if>>. She <<if $activeSlave.voice > 0>>moans whorishly<<else>>begins to pant<</if>> when you go back for more, and the third time you harvest her own pussyjuice to feed it to her, she orgasms, adding some femcum to her next little meal licked off your fingers. Her eyes shine with @@color:mediumaquamarine;gratitude and trust.@@
+		<<set $activeSlave.trust += 5>>
+	<</replace>>
 <</click>>
 
-<<case "too thin for cum diet">>
+<<case "breast expansion blues">>
 
-<<click "Give the poor girl a break and take her off her cum diet so she can safely get to a healthier weight">>
-  <<replace "#name">>$activeSlave.slaveName<</replace>>
-  <<replace "#result">>
-    You silently appraise <<print $activeSlave.slaveName>>'s desperate face and lean forward in your chair to check your terminal.  You confirm that <<if $activeSlave.dietCum == 1>> her food is supplmented with cum for flavor.<<else>>she is being fed significant amounts of ejaculate.<</if>>  While her <<if $activeSlave.dietCum == 2>>extreme <</if>>diet is still engineered to <<if $activeSlave.dietCum == 2>>barely <</if>> provide the nutrition she needs, if she can't hold the stuff down, she can't gain weight.  With a few taps on the keyboard you change her orders so that she will be fed a much more nutritionally rich diet that is free of ejaculate.  However, you make sure to warn her that $assistantName will be monitoring her, and you may change your mind once she reaches a more attractive weight.  She thanks you profusely, <<if $activeSlave.vagina != 0>>even attempting to offer her body for use in gratitude,<</if>> but you simply send her away.  You find yourself concerned that you are becoming soft by allowing slaves to dictate what they will and won't eat, but your benevolent decision has already had a @@color:hotpink;positive effect on her attitude@@. She @@color:aquamarine;trusts you a little more@@ too.  
-    <<set $activeSlave.trust += 2>>
-    <<set $activeSlave.devotion += 2>>
-	<<set $activeSlave.dietCum to 0>>
-  <</replace>>
+<<click "Let her know she'll be growing as fast as possible">>
+	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<replace "#result">>
+		Rather than punishing her directly, you address yourself to your personal assistant. You order <<if $assistant > 0>>her<<else>>it<</if>> to make a note in $activeSlave.slaveName's drug schedule that she's to remain on a breast expansion regime until further notice. The $desc's face falls as she hears this, and $assistantName doesn't help matters by
+		<<if $assistant == 0>>
+			confirming the order in disturbingly clinical tones.
+		<<elseif $assistantAppearance is "monstergirl">>
+			using her avatar's tentacle hair to caress her own tits as she concurs in disturbingly kind tones.
+		<<elseif $assistantAppearance is "shemale">>
+			shaking her avatar's enormous endowments, making a lewd comment, and then giving herself a titjob.
+		<<elseif $assistantAppearance is "amazon">>
+			observing that a good slave girl should have big tits, since strong warriors like fertile, big-boobed girls back home to breed with.
+		<<elseif $assistantAppearance is "businesswoman">>
+			having her avatar give $activeSlave.slaveName a disturbingly appraising glance, as though she and her breasts are an interesting entry on a balance sheet.
+		<<elseif $assistantAppearance is "schoolgirl">>
+			bending her avatar over to show off its cleavage, and then giving her tits a jiggle, as though the point wasn't clear enough already.
+		<<elseif $assistantAppearance is "goddess">>
+			hefting her own motherly breasts and telling $activeSlave.slaveName that she should be happy, since bigger breasts are a sign of health and fertility.
+		<<else>>
+			purring that she'd love to.
+		<</if>>
+		You talk through the $activeSlave.slaveName's medical condition with her, and give her a <<if $PC.career == "medicine">>personal examination with the speed and accuracy of years of general practice<<else>>thorough exam<</if>>. Once this is done, you give $assistantName technical directions to make minor changes to $activeSlave.slaveName's drug regime, designed to make her @@color:lime;breasts grow just slightly faster.@@ The effect is minimal, but the point is made. She's still not happy to be transformed into a big-breasted sex slave, but she's relieved that was her only punishment for expressing her unhappiness about it.
+		<<set $activeSlave.boobs += 100>>
+	<</replace>>
+<</click>>
+<br><<click "Praise her breasts and reassure her">>
+	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<replace "#result">>
+		You decide to reassure her, and sit her on your lap. <<if $activeSlave.height > 185>>She's a big girl, and has trouble fitting there, but you put her there anyway, enjoying the absurdity.<<elseif $activeSlave.preg > 10>>Her pregnancy is very apparent to you in this posture, and she's quite aware of it too.<<elseif $activeSlave.butt > 3>>Her big soft butt is nice and comfortable on your thighs.<<else>>She's hesitant, but obeys anyway.<</if>> Pulling her back against your <<if $PC.boobs == 1>>own bosom<<else>>muscular chest<</if>>, you reach around her and take over the breast-cradling responsibilities. You say nothing for a while, just hefting her weighty udders, rolling them from side to side slightly. After letting her get used to the gentle treatment, you tell her that you're her owner, and you find big breasts very attractive. You tell her that you understand that they can be uncomfortable at times, but you expect her to tolerate that without complaint. It isn't easy to be pretty, but it's easier to be a pretty slave than to be a homely one. This last point affects her, and she seems to @@color:mediumaquamarine;take heart in the idea that you're improving her,@@ at least from your perspective. After all, she's sitting atop <<if $PC.dick == 1>>your hard dick, which she can definitely feel<<else>>your hot cunt, which she can probably detect<</if>> through your clothes. She does understand that having her <<if $PC.title == 1>>Master<<else>>Mistress<</if>> enjoy touching her boobs will be advantageous to her.
+		<<set $activeSlave.trust += 5>>
+	<</replace>>
 <</click>>
-<br><<click "Give the emaciated slut your answer in the form of a rough butt-fuck">>
-  <<replace "#name">>$activeSlave.slaveName<</replace>>
-  <<replace "#result">>
-    You stand up behind your desk.  She flinches, but holds her ground, her lip quivering slightly.  You slowly walk toward her, appraising her smooth, skinny body, touching her shoulder as you disappear behind her.  She starts to cry as you <<if $PC.dick == 0>>pull a massive rubber dong attachment off the wall and hook it to your strap-on.<<else>>unbuckle your pants and let her feel your warm dick harden against her tight, bony thigh.<</if>>  Without word or ceremony, you shove her forward so that she is bent over and crushed against your desk.  The tears start to flow out of her as she feels your <<if $PC.dick == 0>>massive rubber dong <<else>>hard, thick cock <</if>>pressing against her unprotected anus.
-	<br><br>
-	When you offer her the opportunity to revise her request, she does.	"<<if SlaveStatsChecker.checkForLisp($activeSlave)>>Pleathe,<<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>!  I'm thorry!  Pleathe don't fuck my ath!  I'll eat all the cum you want!  Pleathe!<<else>>Please, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>!  I'm sorry!   Please don't fuck my ass!  I'll eat all the cum you want!  Please!<</if>>"  She screams <<if $activeSlave.accent > 1>>in her thick accent <</if>> as you force your<<if $PC.dick == 0>> strap-on <<else>>self <</if>> inside her butt-hole and subdue her weak, struggling body against your unforgiving desk. @@color:gold;Horrified tears@@ stream down her face with each brutal thrust as you speak into her ear and remind her that slaves are not allowed to dictate their needs to their owners. You know what's best for her, and right now, her proper role is as an eager little depository for the products of the free-cities ejaculate market.  It's her job to suck down cum at the whim of her owner--plain and simple--until she's told otherwise.  You butt-fuck the cum-fed slag until she simply lays there and accepts her corrective ass-rape.  <<if $activeSlave.anus == 0>>@@color:lime;Her@@ <<if $activeSlave.butt < 5>>@@color:lime;skinny little@@ <<else>>@@color:lime;plump little@@ <</if>>@@color:lime;ass is now broken in@@.  <</if>>She sobs quietly with each thrust of your hips, and when you finally <<if $PC.dick == 1>>make yet another cum deposit into her <<if $activeSlave.weight < -80>>emaciated <<else>>bony <</if>>body and<</if>> pull out, you instruct <<if $activeSlave.dietCum == 1>> $assistantName to dramatically increase the amount of cum in her diet from now on.  You won't have a slave telling you what she eats.  $activeSlave.slaveName hears your instructions and whimpers before rubbing her sore bottom and <<else>>another slave to drag the broken slut to the kitchen, where she's to receive an additional feeding of thick, creamy ejaculate-based nutrients before <</if>>proceeding to her next assignment.
-	<br><br>
-	She's learned a valuable lesson about what it truly means to be a slave today, and it's one she @@color:orchid;won't soon forget@@.
-    <<set $activeSlave.devotion -= 5>>
-	<<set $activeSlave.trust -= 5>>
-	<<if ($activeSlave.anus == 0)>>
-		<<set $activeSlave.anus += 1>>
-	<</if>>
-	<<set $activeSlave.analCount += 1>>
-	<<set $analTotal += 1>>
-	<<if $activeSlave.dietCum == 1>>
-		<<set $activeSlave.dietCum to 2>>
-		<<set $activeSlave.dietMilk to 0>>
-	<</if>>
-    <</replace>>
-<</click>><<if ($activeSlave.anus == 0) || ($activeSlave.dietMilk == 1)>> //This option will//<<if $activeSlave.anus == 0>> //take anal virginity//<<if $activeSlave.dietMilk == 1>>// and//<</if>><</if>><<if $activeSlave.dietMilk == 1>>// remove milk from her diet//<</if>><</if>>
-<br><<click "Use aphrodisiacs and positive reinforcement to make her cum diet more palatable">>
-  <<replace "#name">>$activeSlave.slaveName<</replace>>
-  <<replace "#result">>
-    You do a quick check at your terminal.  She is indeed being fed <<if $activeSlave.dietCum == 1>> food that is supplmented with cum for flavor.<<else>>large amounts of human ejaculate.<</if>>  You tell her that it can't be helped.  When you assign a slave her diet, it's for a reason, and in <<print $activeSlave.slaveName>>'s case, you are using her diet to make her into a better whore.  By the look on her distressed face, you can tell she doesn't understand or appreciate your perspective, but you tell her you have just the thing to help change her outlook.  
-	<br><br>
-	You pull out a heavy dose of aphrodisiacs from the drawer in your desk.  They are expensive, but powerful drugs that can be used in a brute force way to manipulate the sexual urges and tastes of even the most frigid sluts.  The mild dose included in every slave's food is usually enough to affect a slow, inevitable change in attitude for resistant slaves, but sometimes a more acute dose can be an amusing way to turn disgust into dependence.  $activeSlave.slaveName shivers as you reassure her and inject her <<if $activeSlave.weight < -80>>bony <<else>>tiny <</if>>body with the powerful drugs.  You know they are working when she begins to perspire a little, and <<if $activeSlave.vagina > -1>>she starts to leak fresh girl-juice down her shivering thighs<<else>>her dick starts to come to attention<</if>>.  You then book her to be the main attraction at a corporate office party that afternoon, where she will be the target of a blow-bang and bukkake.  You see that she's dosed heavily with the drugs every day this week, and then book the rest of her afternoons for similar duties, making sure she still tends to her regular assignments as well.  In the meantime, you also instruct the kitchen that she is to eat as much cum-based food from the dispensors as she can suck down in order to fuel up for these exhausting escapades.  By the end of the week, the aphrodisiacs and her slide into an inescapable routine of cum immersion have done their job, and she has begun to @@color:lightcoral;view cum as an inevitable component of her daily life@@.  She also manages to @@color:green;gain a little weight@@.  Thanks to your manipulation of her pavlovian responses through extreme drug therapy, her @@color:red;health has suffered a bit@@, but she is also @@color:hotpink;more dependent on you@@ thanks to her <<if $activeSlave.addict == 0>>@@color:cyan;new@@<<else>>@@color:cyan;developing@@<</if>> @@color:cyan;addiction to aphrodisiacs.@@
-    <<set $activeSlave.devotion += 5>>
-	<<set $activeSlave.health -= 10>>
-	<<set $activeSlave.weight += 10>>
-	<<set $activeSlave.fetish = "cumslut">>
-	<<set $activeSlave.fetishKnown to 1>>
-	<<set $activeSlave.fetishStrength to 10>>
-	<<set $activeSlave.oralCount += 50>>
-	<<set $oralTotal += 50>>
-	<<set $activeSlave.addict += 1>>
-    <</replace>>
+<br><<click "Weight her breasts as punishment">>
+	<<replace "#name">>$activeSlave.slaveName<</replace>>
+	<<replace "#result">>
+		You announce that you're resolved to continue growing her breasts, and they need to be stretched out to accomodate the growth. The statement is absurd, but she's experienced enough to know not to question it, and to @@color:gold;be afraid.@@ She's right to fear. You secure her with her hands over her head, using the wrist shackles placed high on the office walls for this purpose. Then you
+		<<if $activeSlave.nipples == "inverted">>cruelly pop her inverted nipples out and<</if>>
+		<<if $activeSlave.nipplesPiercing == 0>>
+			attach a clip to each of <<if $activeSlave.nipples == "inverted">>them<<else>>her nipples<</if>>. The clips aren't painful, not yet, but they're very robust, and the reason is immediately apparent to her.
+		<<elseif $activeSlave.nipplesPiercing == 1>>
+			remove her nipple piercings, one by one, and replace them with big rings. Then you give each of them a tug to ensure it's ready to bear some serious pulling.
+		<<else>>
+			give each of her nipple rings a tug to ensure it's ready to bear some serious pulling.
+		<</if>>
+		You hang a weight from each, eliciting a moan of pain. $activeSlave.slaveName struggles against the restraints that hold her hands up high, desperately trying to find a comfortable way to stand, but it's impossible and the motion sets her udders swaying, making the weights pulling at her nipples even more uncomfortable.
+		<<switch $activeSlave.boobShape>>
+		<<case "perky">>
+			Her perky tits do their best to retain their pointy shape despite the tugging.
+		<<case "downward-facing">>
+			The nipples that cap her downward-facing udders are tugged even farther towards the ground.
+		<<case "torpedo-shaped">>
+			Her torpedos are long enough that the weights are a long way from her chest, allowing them to tug her nipples a long way down.
+		<<case "wide-set">>
+			Her wide-set its are dragged together for once as their nipples are tugged downward.
+		<<case "saggy">>
+			Her poor, saggy boobs cause her real trouble, letting the weights tug her nipples quite a ways down.
+		<<default>>
+			Her heavy breasts let the weights tug her nipples down to face at the ground.
+		<</switch>>
+		The first time she tries begging, you add another weight to each breast, which drives her over the edge into open crying. You leave her there for a while, letting anyone who comes into the office experience the sight of $activeSlave.slaveName alternately sobbing, trying not to sob because doing so jiggles her boobs, and then sobbing again because her boobs hurt.
+		<<set $activeSlave.trust -= 5>>
+	<</replace>>
 <</click>>
 
 <<default>>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 64bbb409c88..fbcf8cc19ad 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -110,7 +110,7 @@
 
 <<SlaveTitle $activeSlave>>
 
-<<if $seeImages == 1>><<SlaveImage $subSlave 2 1>><<SlaveImage $activeSlave 2 1>><</if>>
+<<if $seeImages == 1>><<SlaveArt $subSlave 2 0>><<SlaveArt $activeSlave 2 0>><</if>>
 
 <<switch $RETSevent>>
 
diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw
index 067e6b60b4b..5fb58f9e875 100644
--- a/src/uncategorized/arcadeReport.tw
+++ b/src/uncategorized/arcadeReport.tw
@@ -10,7 +10,7 @@
 
 <<for $i to 0; $i < $slaves.length; $i++>>
 <<if ($slaves[$i].assignment is "be confined in the arcade")>>
-	<<if $seeImages == 1>><<SlaveImage $slaves[$i] 0 1>><</if>>
+	<<if $seeImages == 1>><<SlaveArt $slaves[$i] 0 0>><</if>>
 	<<set $slaves[$i].trust -= 5>>
 	<<set $arcadeSlaves += 1>>
 	<<silently>>
diff --git a/src/uncategorized/assistantEvents.tw b/src/uncategorized/assistantEvents.tw
index 64c6a336405..b067aaff54e 100644
--- a/src/uncategorized/assistantEvents.tw
+++ b/src/uncategorized/assistantEvents.tw
@@ -4,6 +4,8 @@
 
 <<set $nextButton to "Continue", $nextLink to "Random Nonindividual Event", $returnTo to "RIE Eligibility Check">>
 
+<<if $seeImages == 1>><<AssistantArt 3>><</if>>
+
 <<switch $Event>>
 <<case "assistant">>
 
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index a324bf9d595..a953fd83ff3 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -1,5 +1,5 @@
 :: Brothel Report [nobr]
- 
+
 ''Brothel Report''<hr style="margin:0">
 
 <<set $brothelSlaves to 0>>
@@ -23,7 +23,7 @@
 
 <<for $i to 0; $i < $slaves.length; $i++>>
 <<if ($slaves[$i].assignment is "work in the brothel")>>
-	<<if $seeImages == 1>><<SlaveImage $slaves[$i] 0 1>><</if>>
+	<<if $seeImages == 1>><<SlaveArt $slaves[$i] 0 0>><</if>>
 	<<set $brothelSlaves += 1>>
 <</if>>
 <</for>>
diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw
index efa6e33b743..c124347c463 100644
--- a/src/uncategorized/cellblockReport.tw
+++ b/src/uncategorized/cellblockReport.tw
@@ -1,5 +1,5 @@
 :: Cellblock Report [nobr]
- 
+
 ''Cellblock Report''<hr style="margin:0">
 
 <<set $brokenSlaves to 0>>
@@ -10,7 +10,7 @@
 
 <<for $i to 0; $i < $slaves.length; $i++>>
 <<if ($slaves[$i].assignment is "be confined in the cellblock")>>
-	<<if $seeImages == 1>><<SlaveImage $slaves[$i] 0 1>><</if>>
+	<<if $seeImages == 1>><<SlaveArt $slaves[$i] 0 0>><</if>>
 	<<set $cellblockSlaves += 1>>
 	<<silently>>
 	<<display [[SA stay confined]]>>
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index 08ddb951772..62e7ccf4144 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -1,5 +1,5 @@
 :: Clinic Report [nobr]
- 
+
 ''Clinic Report''<hr style="margin:0">
 
 <<set $nurseUsedCure to 0>>
@@ -10,7 +10,7 @@
 
 <<for $i to 0; $i < $slaves.length; $i++>>
 <<if ($slaves[$i].assignment is "get treatment in the clinic")>>
-	<<if $seeImages == 1>><<SlaveImage $slaves[$i] 0 1>><</if>>
+	<<if $seeImages == 1>><<SlaveArt $slaves[$i] 0 0>><</if>>
 	<<set $clinicSlaves += 1>>
 	<<silently>>
 	<<display [[SA rest]]>>
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index b5817ae492f..b24bd8ad3af 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -1,5 +1,5 @@
 :: Club Report [nobr]
- 
+
 ''Club Report''<hr style="margin:0">
 
 <<set $clubSlaves to 0>>
@@ -22,7 +22,7 @@
 
 <<for $i to 0; $i < $slaves.length; $i++>>
 <<if ($slaves[$i].assignment is "serve in the club")>>
-	<<if $seeImages == 1>><<SlaveImage $slaves[$i] 0 1>><</if>>
+	<<if $seeImages == 1>><<SlaveArt $slaves[$i] 0 0>><</if>>
 	<<set $clubSlaves += 1>>
 <</if>>
 <</for>>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index 4cd82a456f3..b478935a37c 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -1,5 +1,5 @@
 :: Dairy Report [nobr]
- 
+
 ''Dairy Report''<hr style="margin:0">
 
 <<set $dairySlaves to 0>>
@@ -103,7 +103,7 @@
 
 <<for $i to 0; $i < $slaves.length; $i++>>
 <<if ($slaves[$i].assignment is "work in the dairy")>>
-	<<if $seeImages == 1>><<SlaveImage $slaves[$i] 0 1>><</if>>
+	<<if $seeImages == 1>><<SlaveArt $slaves[$i] 0 0>><</if>>
 	<<set $dairySlaves += 1>>
 	<<if ($legendaryCowID == 0) && ($slaves[$i].lactation > 0) && (($slaves[$i].boobs-$slaves[$i].boobsImplant) > 6000) && ($slaves[$i].devotion > 50) && ($slaves[$i].prestige == 0)>>
 	<<set $legendaryCowID to $slaves[$i].ID>>
diff --git a/src/uncategorized/economics.tw b/src/uncategorized/economics.tw
index f7a4c5d6b64..a6abe899d91 100644
--- a/src/uncategorized/economics.tw
+++ b/src/uncategorized/economics.tw
@@ -639,14 +639,14 @@ On formal occasions, you are announced as $PCTitle.
 	<<set $arcologies[0].FSEdoRevivalist -= 0.05*$FSSingleSlaveRep>>
 	<</if>>
 <<elseif $arcologies[0].FSArabianRevivalist != "unset">>
-	<<if $bedSlaves < $rep/3500>>
+	<<if $fuckSlaves < $rep/3500>>
 	Society @@color:red;disapproves@@ of the small size of your harem, feeling that you do not have enough fucktoys or slaves in your master suite for your reputation.
-	<<set $rep -= 2*$FSSingleSlaveRep*($arcologies[0].FSArabianRevivalist/$FSLockinLevel)*Math.trunc(($rep/3500) - $bedSlaves)>>
-	<<set $arcologies[0].FSArabianRevivalist -= 0.05*$FSSingleSlaveRep*Math.trunc(($rep/3500) - $bedSlaves)>>
+	<<set $rep -= 2*$FSSingleSlaveRep*($arcologies[0].FSArabianRevivalist/$FSLockinLevel)*Math.trunc(($rep/3500) - $fuckSlaves)>>
+	<<set $arcologies[0].FSArabianRevivalist -= 0.05*$FSSingleSlaveRep*Math.trunc(($rep/3500) - $fuckSlaves)>>
 	<<else>>
 	Society @@color:green;approves@@ of the size of your harem, feeling that you have a good number of fucktoys and slaves in your master suite for your reputation.
-	<<set $rep += 10*$FSSingleSlaveRep*($arcologies[0].FSArabianRevivalist/$FSLockinLevel)*Math.trunc($bedSlaves - ($rep/3500))>>
-	<<set $arcologies[0].FSArabianRevivalist += 0.1*$FSSingleSlaveRep*Math.trunc($bedSlaves - ($rep/3500))>>
+	<<set $rep += 10*$FSSingleSlaveRep*($arcologies[0].FSArabianRevivalist/$FSLockinLevel)*Math.trunc($fuckSlaves - ($rep/3500))>>
+	<<set $arcologies[0].FSArabianRevivalist += 0.1*$FSSingleSlaveRep*Math.trunc($fuckSlaves - ($rep/3500))>>
 	<</if>>
 	<<if $language != "Arabic">>
 	Continuing to use $language as the lingua franca of $arcologies[0].name rather than the Arabic in which the word of God was passed to Muhammad @@color:red;disappoints@@ society and causes doubt about your revivalist project.
diff --git a/src/uncategorized/fullReport.tw b/src/uncategorized/fullReport.tw
index 3b9fbe710f5..13e5476f2c1 100644
--- a/src/uncategorized/fullReport.tw
+++ b/src/uncategorized/fullReport.tw
@@ -1,6 +1,6 @@
 :: Full Report [nobr]
 
-<<if $seeImages == 1>><<SlaveImage $slaves[$i] 2 1>><</if>>
+<<if $seeImages == 1>><<SlaveArt $slaves[$i] 2 0>><</if>>
 
 <<SlavePronouns $slaves[$i]>>
 
diff --git a/src/uncategorized/jeSlaveDispute.tw b/src/uncategorized/jeSlaveDispute.tw
index 8d39ed7e677..80901ba5810 100644
--- a/src/uncategorized/jeSlaveDispute.tw
+++ b/src/uncategorized/jeSlaveDispute.tw
@@ -1,5 +1,5 @@
 :: JE slave dispute
- 
+
 <<nobr>>
 
 <<set $nextLink to "RIE Eligibility Check">>
@@ -142,6 +142,8 @@
 \
 <<nobr>>
 
+<<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>>
+
 <<if $event is "slave deal">>
 	<<if $assistantName is "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> breaks in on your sleep with an urgent message. You push a slave off you and sit up to take it. As the owner of the arcology, you perform some functions that would traditionally be the province of a government. In this anarcho-liberal polity, it's still necessary for people making deals to have someone to appeal to when disputes arise. Part of your agreement with your tenants is that you will perform this duty on deals between two tenants. The message is about just such a disagreement; they always seem to happen in the middle of the night, and they're always urgent.
 	<br><br>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index b1d78796842..c14e0faa1c3 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -2,7 +2,7 @@
 
 <<SlavePronouns $activeSlave>>
 
-<<if $seeImages == 1>><<SlaveImage $activeSlave 3 1>><</if>>
+<<if $seeImages == 1>><<SlaveArt $activeSlave 3 0>><</if>>
 
 &nbsp;&nbsp;&nbsp;&nbsp;
 
@@ -1732,9 +1732,9 @@ $pronounCap is
 <</if>>
 
 <<if $activeSlave.waist == 1>>
-	She has a lovely @@color:pink;narrow waist@@ that gives her an hourglass figure.
+	$pronounCap has a lovely @@color:pink;narrow waist@@ that gives $object an hourglass figure.
 <<elseif $activeSlave.waist > 1>>
-	She has an @@color:pink;unnaturally narrow waist@@ that gives her a cartoonishly hourglass figure.
+	$pronounCap has an @@color:pink;unnaturally narrow waist@@ that gives $object a cartoonishly hourglass figure.
 <</if>>
 
 <<if $activeSlave.corsetPiercing > 0>>
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index 792c06ee2cd..2c893d2ddbe 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -1,12 +1,12 @@
 :: Main [nobr]
 
 <<if $ver.contains("0.9") or $ver.contains("0.8") or $ver.contains("0.7") or $ver.contains("0.6")>>
-	<<if ($ver != "0.9.7")>>
-		''@@color:red;INCOMPATIBLE SAVE WARNING:@@'' your saved game was created using version $ver and you are using version 0.9.7. Please select New Game Plus from the Options menu or start a new game.
+	<<if ($ver != "0.9.7") && ($ver != "0.9.8")>>
+		''@@color:red;INCOMPATIBLE SAVE WARNING:@@'' your saved game was created using version $ver and you are using version 0.9.8. Please select New Game Plus from the Options menu or start a new game.
 		<br><br>
 	<</if>>
 <<else>>
-	''@@color:red;INCOMPATIBLE SAVE WARNING:@@'' your saved game was created using version $ver and you are a later version which New Game Plus cannot reconcile. Please start a new game.
+	''@@color:red;INCOMPATIBLE SAVE WARNING:@@'' your saved game was created using version $ver and you are using later version which New Game Plus cannot reconcile. Please start a new game.
 	<br><br>
 <</if>>
 
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index 4b8b86d25cb..db31a3916fe 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -1,5 +1,5 @@
 :: Master Suite Report [nobr]
- 
+
 ''Master Suite Report''<hr style="margin:0">
 
 <<set $legendaryAbolitionistID to 0>>
@@ -15,7 +15,7 @@
 
 <<for $i to 0; $i < $slaves.length; $i++>>
 <<if ($slaves[$i].assignment is "serve in the master suite") || ($slaves[$i].assignment is "be your Concubine")>>
-	<<if $seeImages == 1>><<SlaveImage $slaves[$i] 0 1>><</if>>
+	<<if $seeImages == 1>><<SlaveArt $slaves[$i] 0 0>><</if>>
 	<<set $masterSuiteSlaves += 1>>
 	<<set $masterSuiteAverageEnergy += $slaves[$i].energy>>
 	<<if $masterSuiteUpgradeLuxury == 2>>
diff --git a/src/uncategorized/matchmaking.tw b/src/uncategorized/matchmaking.tw
index 4da409605be..49354e2e78c 100644
--- a/src/uncategorized/matchmaking.tw
+++ b/src/uncategorized/matchmaking.tw
@@ -5,7 +5,7 @@
 <<if $subSlave == 0>>
 
 <<SlaveTitle $eventSlave>>
-<<if $seeImages == 1>><<SlaveImage $eventSlave 2 1>><</if>>
+<<if $seeImages == 1>><<SlaveArt $eventSlave 2 0>><</if>>
 
 You order $eventSlave.slaveName to come to your office. The <<if $eventSlave.relationship == -2>>worshipful<<else>>slutty<</if>> $desc arrives promptly, greets you correctly, and waits <<if $eventSlave.relationship == -2>>adoringly for a command<<else>>eagerly for you to fuck her<</if>>. You consider the situation carefully.
 <<if $eventSlave.relationship == -2>>
@@ -313,7 +313,7 @@ Despite her devotion and trust, she is still a slave, and probably knows that he
 
 <<else>>
 
-<<if $seeImages == 1>><<SlaveImage $eventSlave 2 1>><<SlaveImage $subSlave 2 1>><</if>>
+<<if $seeImages == 1>><<SlaveArt $eventSlave 2 0>><<SlaveArt $subSlave 2 0>><</if>>
 
 You decide to set $eventSlave.slaveName up with $subSlave.slaveName. Telling the former to wait, you have the latter hurry up to your office. When the <<if $eventSlave.relationship == -2>>slaves are waiting adoringly<<else>>sluts are waiting with barely concealed lust<</if>> in front of your desk together, you inform them of your decision.
 <<if $eventSlave.relationship == -2>>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 68d0015a0d0..de2bb0fdb19 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -1,5 +1,5 @@
 :: Options [nobr]
- 
+
 <<set $showEncyclopedia to 0>>
 <<set $slavesForImport to []>>
 
@@ -15,18 +15,31 @@ End of week autosaving is currently @@color:cyan;ENABLED@@. [[Disable|Options][$
 
 <br><br>
 
-Slave images
+Image display
 <<if $seeImages == 1>>
-@@color:cyan;ENABLED@@. [[Disable|Options][$seeImages to 0]]
-	<br>
-	Slave summary fetish images
-	<<if $seeMainFetishes == 1>>
-	@@color:cyan;ENABLED@@. [[Disable|Options][$seeMainFetishes to 0]]
+	@@color:cyan;ENABLED@@. [[Disable|Options][$seeImages = 0]]
+	<br>&nbsp;&nbsp;&nbsp;&nbsp;
+	<<if $imageChoice == 1>>
+		@@color:yellow;Vector art by NoX@@ is selected. [[Switch to rendered imagepack|Options][$imageChoice = 0]]
+	<<else>>
+		@@color:yellow;Rendered imagepack by Shokushu@@ is selected. [[Switch to vector art|Options][$imageChoice = 1]]
+		<br>&nbsp;&nbsp;&nbsp;&nbsp;
+		Slave summary fetish images
+		<<if $seeMainFetishes == 1>>
+			@@color:cyan;ENABLED@@. [[Disable|Options][$seeMainFetishes = 0]]
+		<<else>>
+			@@color:red;DISABLED@@. [[Enable|Options][$seeMainFetishes = 1]]
+		<</if>>
+	<</if>>
+	<br>&nbsp;&nbsp;&nbsp;&nbsp;
+	Slave images in lists are
+	<<if $seeSummaryImages == 1>>
+		@@color:cyan;ENABLED@@. [[Disable|Options][$seeSummaryImages = 0]]
 	<<else>>
-	@@color:red;DISABLED@@. [[Enable|Options][$seeMainFetishes to 1]]
+		@@color:red;DISABLED@@. [[Enable|Options][$seeSummaryImages = 1]]
 	<</if>>
 <<else>>
-@@color:red;DISABLED@@. [[Enable|Options][$seeImages to 1]] //Requires imagepack.//
+	@@color:red;DISABLED@@. [[Enable|Options][$seeImages = 1]] //Requires image resources.//
 <</if>>
 
 <br><br>
diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw
index d80687663fe..f5f38f732cd 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -1,9 +1,9 @@
 :: P rivalry actions [nobr]
- 
+
 <<set $nextButton to "Continue">>
 <<set $nextLink to "RIE Eligibility Check">>
 
-<<if $hostageAnnounced == 1>><<if $seeImages == 1>><<SlaveImage $hostage 2 1>><</if>><</if>>
+<<if $hostageAnnounced == 1>><<if $seeImages == 1>><<SlaveArt $hostage 2 0>><</if>><</if>>
 
 <<set $rivalryDuration += 1>>
 <<set _num to random(1,99)>>
diff --git a/src/uncategorized/pUndergroundRailroad.tw b/src/uncategorized/pUndergroundRailroad.tw
index 506d670cdf6..6c6d30eb6ba 100644
--- a/src/uncategorized/pUndergroundRailroad.tw
+++ b/src/uncategorized/pUndergroundRailroad.tw
@@ -1,5 +1,5 @@
 :: P underground railroad
- 
+
 <<nobr>>
 
 <<set $nextButton to " ">>
@@ -10,6 +10,7 @@
 <<if $activeSlave == 0>>
 	<<for $i to 0; $i < $slaves.length; $i++>>
 	<<if ($slaves[$i].devotion < 75)>>
+	<<if ($slaves[$i].fuckdoll == 0)>>
 	<<if ($slaves[$i].amp != 1)>>
 	<<if canTalk($slaves[$i])>>
 		<<if ($slaves[$i].assignment is "serve the public")>>
@@ -31,6 +32,7 @@
 	<</if>>
 	<</if>>
 	<</if>>
+	<</if>>
 	<</for>>
 <</if>>
 <<if $activeSlave == 0>>
diff --git a/src/uncategorized/personalAssistantOptions.tw b/src/uncategorized/personalAssistantOptions.tw
index 76b830e692f..b5b113e58b2 100644
--- a/src/uncategorized/personalAssistantOptions.tw
+++ b/src/uncategorized/personalAssistantOptions.tw
@@ -1,12 +1,11 @@
 :: Personal assistant options [nobr]
 
-
- 
-<<set $nextButton to "Back">>
-<<set $nextLink to "Manage Arcology">>
+<<set $nextButton to "Back", $nextLink to "Manage Arcology">>
 
 <<if $marketAssistantLimit>><<set $marketAssistantLimit to Math.clamp($marketAssistantLimit, 10000, 10000000)>><</if>>
 
+<<if $seeImages == 1>><<AssistantArt 3>><</if>>
+
 Seated at your desk, you glance at the visual representation of $assistantName, down in one corner of your desk's glass top.
 
 <<set $masturbationAllowed to 0>>
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index f5e687f6547..ff570d0575b 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -632,7 +632,7 @@
 <<if ($eventSlave.dietCum > 0)>>
 <<if ($eventSlave.devotion < 20)>>
 <<if (($eventSlave.fetish != "cumslut") && ($eventSlave.fetish != "masochist")  && ($eventSlave.fetishStrength < 60)) || ($eventSlave.fetishKnown == 0)>>
-  <<set $RESSTRevent.push("retching cum feeding")>>
+  <<set $RESSevent.push("retching cum feeding")>>
 <</if>>
 <</if>>
 <</if>>
@@ -647,7 +647,7 @@
 <<set $toSearch to $eventSlave.race>>
 <<if ($toSearch.indexOf("surgically") is -1)>>
 <<if ($eventSlave.indentureRestrictions < 1)>>
-  <<set $RESSTRevent.push("subjugation blues")>>
+  <<set $RESSevent.push("subjugation blues")>>
 <</if>>
 <</if>>
 <</if>>
@@ -668,7 +668,7 @@
 <<if ($eventSlave.behavioralFlaw != "anorexic")>>
 <<if ($eventSlave.sexualFlaw != "self hating")>>
 <<if ($eventSlave.fetishStrength <= 60) or ($eventSlave.fetishKnown != 1)>>
-  <<set $RESSTRevent.push("too thin for cum diet")>>
+  <<set $RESSevent.push("too thin for cum diet")>>
 <</if>>
 <</if>>
 <</if>>
@@ -680,8 +680,44 @@
 <</if>>
 <</if>>
 
+<<if $eventSlave.drugs == "breast injections">>
+<<if $eventSlave.boobs <= 8000>>
+<<if $eventSlave.boobs > 2000>>
+<<if $eventSlave.devotion <= 50>>
+<<if $eventSlave.devotion >= -50>>
+<<if $eventSlave.trust >= -50>>
+<<if $eventSlave.fetish != "boobs">>
+<<if $eventSlave.intelligence > -2>>
+	<<set $RESSTRevent.push("breast expansion blues")>>
+<</if>>
+<</if>>
+<</if>>
+<</if>>
+<</if>>
+<</if>>
+<</if>>
+<</if>>
+
 <</if>> /* closes mute exempt */
 
+<<if $eventSlave.vaginaLube > 0>>
+<<if $eventSlave.devotion > 20>>
+<<if $eventSlave.vagina > -1>>
+	<<set $RESSTRevent.push("moist pussy")>>
+<</if>>
+<</if>>
+<</if>>
+
+<<if $eventSlave.devotion <= 20>>
+<<if $eventSlave.trust <= -20>>
+<<if $eventSlave.dick > 0>>
+<<if $eventSlave.attrXY < 50>>
+	<<set $RESSTRevent.push("transition anxiety")>>
+<</if>>
+<</if>>
+<</if>>
+<</if>>
+
 <<if $seeAge == 1>>
 
 <<if ($eventSlave.devotion >= 20)>>
@@ -1104,7 +1140,7 @@
 	<</if>>
 	<<if ($PC.vagina == 1)>>
 	<<if ($eventSlave.dick == 0)>>
-	<<if ($bedSlaves > 2)>>
+	<<if ($fuckSlaves > 2)>>
 		<<set $RESSevent.push("fucktoy tribbing")>>
 	<</if>>
 	<</if>>
@@ -1503,7 +1539,7 @@
 	<<set $seed to 0>>
   <</if>>
 <</if>> /* closes nickname check */
-<</if>> /* closes no nicknames option */ 
+<</if>> /* closes no nicknames option */
 
 <</if>> /* closes mindbreak exempt */
 
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index b52b7ef54b5..d43c92c453f 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -390,10 +390,10 @@
 <</if>>
 <</if>>
 
-<<if $bedSlaves > 1>>
+<<if $fuckSlaves > 1>>
 	<<set $events.push("RE full bed")>>
 <</if>>
-<<if $bedSlaves > 3>>
+<<if $fuckSlaves > 3>>
 	<<set $events.push("RE staffed morning")>>
 <</if>>
 
@@ -443,7 +443,7 @@
 <<if ($HeadGirl != 0)>>
 
 	<<if ($Concubine != 0)>>
-	<<if $bedSlaves > 1>>
+	<<if $fuckSlaves > 1>>
 	<<if canTalk($Concubine)>>
 		<<set $events.push("PE headgirl concubine")>>
 	<</if>>
@@ -1223,4 +1223,4 @@
 	<<goto "random event roll">>
 <</if>>
 
-<</silently>>
\ No newline at end of file
+<</silently>>
diff --git a/src/uncategorized/reDevotees.tw b/src/uncategorized/reDevotees.tw
index 2a63cf36bb0..36b817691e6 100644
--- a/src/uncategorized/reDevotees.tw
+++ b/src/uncategorized/reDevotees.tw
@@ -3,7 +3,7 @@
 <<set $nextButton to "Continue">>
 <<set $nextLink to "RIE Eligibility Check">>
 
-<<if $seeImages == 1>><<SlaveImage $slaves[0] 2 0>><<SlaveImage $slaves[1] 2 0>><<SlaveImage $slaves[2] 2 0>><<SlaveImage $slaves[3] 2 0>><</if>>
+<<if $seeImages == 1>><<SlaveArt $slaves[0] 2 0>><<SlaveArt $slaves[1] 2 0>><<SlaveArt $slaves[2] 2 0>><<SlaveArt $slaves[3] 2 0>><</if>>
 
 You have a mature, well-trained household of slaves. $slaves[0].slaveName, $slaves[1].slaveName, $slaves[2].slaveName, and $slaves[3].slaveName are all devoted to you. There are all manner of ways you could display this coterie of loyal sex slaves to show off your wealth and power.
 <br><br>
diff --git a/src/uncategorized/reNoEvent.tw b/src/uncategorized/reNoEvent.tw
index 837f23c18f1..ef306a137b0 100644
--- a/src/uncategorized/reNoEvent.tw
+++ b/src/uncategorized/reNoEvent.tw
@@ -9,7 +9,7 @@
 <<set $activeSlave.devotion += 3>>
 <<set $activeSlave.trust += 3>>
 
-<<if $seeImages == 1>><<SlaveImage $activeSlave 2 1>><</if>>
+<<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>>
 
 This is a placeholder event.
 <br><br>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index 4c5def49f65..d7851bfbdfe 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -1,8 +1,6 @@
 :: RE relative recruiter [nobr]
 
-<<set $nextButton to "Continue">>
-<<set $nextLink to "RIE Eligibility Check">>
-<<set $returnTo to "RIE Eligibility Check">>
+<<set $nextButton to "Continue", $nextLink to "RIE Eligibility Check", $returnTo to "RIE Eligibility Check">>
 
 <<if $familyTesting == 1>>
 
@@ -749,7 +747,7 @@ You look up the $activeSlave.relation. She costs ¤$slaveCost, a bargain, but yo
 	<</if>>
 <</for>>
 
-<<if $seeImages == 1>><<SlaveImage $eventSlave 2 1>><</if>>
+<<if $seeImages == 1>><<SlaveArt $eventSlave 2 0>><</if>>
 
 $eventSlave.slaveName requests an interview with you. She's a devoted slave, and you grant it, and are happy you did when you see the troubled expression on her face. She explains<<if canTalk($eventSlave) == false>> with desperate gestures
 <</if>> that
diff --git a/src/uncategorized/reStandardPunishment.tw b/src/uncategorized/reStandardPunishment.tw
index 99911513532..b9cacaf7cc2 100644
--- a/src/uncategorized/reStandardPunishment.tw
+++ b/src/uncategorized/reStandardPunishment.tw
@@ -4,7 +4,7 @@
 
 <<set $nextButton to "Continue", $nextLink to "AS Dump", $returnTo to "Next Week">>
 
-<<if $seeImages == 1>><<SlaveImage $activeSlave 2 1>><</if>>
+<<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>>
 
 <<SlaveTitle $activeSlave>>
 
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 981a7ebaae2..7f32012240e 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -1722,10 +1722,10 @@ $pronounCap has doorway-jamming hips.
 <<if $activeSlave.fuckdoll == 0>>
 	$pronounCap is a normal sex slave, not a living sex toy.
 	<<if $activeSlave.indentureRestrictions < 1 && $activeSlave.breedingMark != 1>>
-		[[Encase in a Fuckdoll suit|Surgery Degradation][$activeSlave.subTarget=0, $activeSlave.choosesOwnAssignment=0, $activeSlave.assignment="rest", $activeSlave.assignmentVisible=1, $activeSlave.sentence=0, $activeSlave.training=0, $activeSlave.toyHole="all her holes", $activeSlave.pubicHStyle="waxed", $activeSlave.livingRules="spare", $activeSlave.speechRules="restrictive", $activeSlave.releaseRules="restrictive", $activeSlave.relationshipRules="restrictive", $activeSlave.fuckdoll=1, $activeSlave.choosesOwnClothes=0, $activeSlave.clothes="a Fuckdoll suit", $activeSlave.collar="none", $activeSlave.shoes="heels", $activeSlave.vaginalAccessory="none", $activeSlave.dickAccessory="none", $activeSlave.buttplug="none", $activeSlave.attrKnown=1, $activeSlave.fetishKnown=1, $surgeryType to "fuckdoll"]]	//This is permanent and will greatly restrict $possessive//
+		[[Encase in a Fuckdoll suit|Surgery Degradation][$activeSlave.subTarget=0, $activeSlave.choosesOwnAssignment=0, $activeSlave.assignment="rest", $activeSlave.assignmentVisible=1, $activeSlave.sentence=0, $activeSlave.training=0, $activeSlave.toyHole="all her holes", $activeSlave.pubicHStyle="waxed", $activeSlave.livingRules="spare", $activeSlave.speechRules="restrictive", $activeSlave.releaseRules="restrictive", $activeSlave.relationshipRules="restrictive", $activeSlave.fuckdoll=1, $activeSlave.choosesOwnClothes=0, $activeSlave.clothes="a Fuckdoll suit", $activeSlave.collar="none", $activeSlave.shoes="heels", $activeSlave.vaginalAccessory="none", $activeSlave.dickAccessory="none", $activeSlave.buttplug="none", $activeSlave.attrKnown=1, $activeSlave.fetishKnown=1, $surgeryType to "fuckdoll"]] //This is permanent and will greatly restrict $possessive//
 	<</if>>
 <<else>>
-	$pronounCap is encased in a Fuckdoll suit.
+	$pronounCap is encased in a Fuckdoll suit. [[Extract it|Surgery Degradation][$activeSlave.fuckdoll=0, $surgeryType to "fuckdollExtraction"]] 
 <</if>>
 <</if>>
 
diff --git a/src/uncategorized/saHormoneEffects.tw b/src/uncategorized/saHormoneEffects.tw
index 9ae9e5e57e9..bb5caaa2ccb 100644
--- a/src/uncategorized/saHormoneEffects.tw
+++ b/src/uncategorized/saHormoneEffects.tw
@@ -160,10 +160,10 @@
 	<</if>>
 
 <<elseif ($hormones <= -2)>>
-	<<if ($slaves[$i].dick < 3)>>
+	<<if ($slaves[$i].dick > 0) && ($slaves[$i].dick < 3)>>
 		<<set _Effects.push("DickGrow")>>
 	<</if>>
-	<<if ($slaves[$i].balls < 3)>>
+	<<if ($slaves[$i].balls > 0) && ($slaves[$i].balls < 3)>>
 		<<set _Effects.push("BallsGrow")>>
 	<</if>>
 	<<if ($slaves[$i].clit < 2) && ($slaves[$i].dick == 0)>>
@@ -216,10 +216,10 @@
 	<</if>>
 
 <<elseif ($hormones < 0) && ($slaves[$i].balls == 0)>>
-	<<if ($slaves[$i].dick < 2)>>
+	<<if ($slaves[$i].dick > 0) && ($slaves[$i].dick < 2)>>
 		<<set _Effects.push("DickGrow")>>
 	<</if>>
-	<<if ($slaves[$i].balls < 2)>>
+	<<if ($slaves[$i].balls > 0) && ($slaves[$i].balls < 2)>>
 		<<set _Effects.push("BallsGrow")>>
 	<</if>>
 	<<if ($slaves[$i].clit < 1) && ($slaves[$i].dick == 0)>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index ebf876602da..cea0e86ce8a 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -26,6 +26,10 @@
 			With no stimulation other than use, it @@color:red;quickly forgets what used to make its behavior special.@@
 			<<set $slaves[$i].behavioralQuirk = "none">>
 		<</if>>
+		<<if $slaves[$i].career != "a Fuckdoll">>
+			Its procedural memory has largely been overwritten by tonal commands; @@color:yellow;its only meaningful career experience is now the profession of a living sex toy.@@
+			<<set $slaves[$i].career = "a Fuckdoll">>
+		<</if>>
 	<<elseif $slaves[$i].fuckdoll <= 35>>
 		This week it @@color:green;learns more advanced posture commands.@@ <<if $slaves[$i].amp == 1>>These remain quite simple, since it lacks limbs.<<else>>It practices balance in the heels integral to the suit, and learns to stand and bend at the waist, all the way down, while keeping its legs straight, putting its face hole and its <<if $slaves[$i].vagina > -1>>lower holes<<else>>rear hole<</if>> at convenient waist height.<</if>>
 		<<if $slaves[$i].sexualQuirk != "none">>
@@ -48,18 +52,30 @@
 			Being trained to suck so hard @@color:red;quickly erases its finer oral habits.@@
 			<<set $slaves[$i].oralSkill = 25>>
 		<</if>>
+		<<if $slaves[$i].behavioralFlaw != "none">>
+			It has now been obeying its suit out of a desire to avoid punishment for so long that @@color:green;it loses any propensity to misbehave in distinctive ways.@@
+			<<set $slaves[$i].behavioralFlaw = "none">>
+		<</if>>
 	<<elseif $slaves[$i].fuckdoll <= 65>>
 		This week it @@color:green;receives training for finer arousal control@@ from its suit. It can now be warmed up before use, to make it as desperate as possible; or it can be warmed up and left to suffer.
 		<<if $slaves[$i].fetishStrength > 50>>
 			It's now so desperate for any stimulation that it @@color:pink;begins to forget what once aroused it.@@ It now wants whatever it can get.
 			<<set $slaves[$i].fetishStrength = 50>>
 		<</if>>
+		<<if $slaves[$i].sexualFlaw != "none">>
+			It's trained to perform throuigh mechanical obedience, @@color:green;utterly destroying its sexual deficiencies.@@
+			<<set $slaves[$i].sexualFlaw = "none">>
+		<</if>>
 	<<elseif $slaves[$i].fuckdoll <= 75>>
 		This week it @@color:green;begins to learn more advanced commands@@ from its suit. It is taught a command that instructs it to take a more active role in penetrative sex. When that command is given, it must fuck itself against any <<if $PC.dick == 1>>cocks<<else>>phalli<</if>> that are currently inside it, as hard as it possibly can.
 		<<if $slaves[$i].fetish != "none">>
 			It @@color:pink;no longer retains any sexual preferences@@ at all. It just wants to be penetrated.
 			<<set $slaves[$i].fetish = "none", $slaves[$i].fetishStrength = 0>>
 		<</if>>
+		<<if $slaves[$i].intelligence > 1>>
+			It was once highly intelligent, but total concentration of all its mental abilities on simple tonal commands @@color:red;dulls its intelligence.@@
+			<<set $slaves[$i].intelligence = 1>>
+		<</if>>
 	<<elseif $slaves[$i].fuckdoll <= 85>>
 		This week it @@color:green;learns more more advanced commands@@ from its suit. <<if $slaves[$i].amp == 1>>If its limbless torso is placed atop a dick and a command is given, it is to do its best to bounce on it.<<else>>It learns a special command, on which it is to slowly squat down, impaling itself on any phallus beneath it. Once its hole is filled, it is to bounce up and down, using its hole to milk the phallus.<</if>>
 		<<if $slaves[$i].entertainSkill > 15>>
@@ -73,7 +89,7 @@
 	<<elseif $slaves[$i].fuckdoll <= 95>>
 		This week it @@color:green;begins its final adaptation@@ into a perfect living sex toy. Its suit starts to actively punish any detectable mental activity when it is not obeying commands or being used.
 		<<if $slaves[$i].intelligence > -1>>
-			It was once highly intelligent, but the incredible stress of this treatment @@color:red;suppresses its ability to think coherently.@@
+			It was once reasonably intelligent, but the incredible stress of this treatment @@color:red;suppresses its ability to think coherently.@@
 			<<set $slaves[$i].intelligence = -1>>
 		<</if>>
 	<</if>>
@@ -796,7 +812,7 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr
 	<</if>>
 	<</if>>
 	<<if $slaves[$i].anus < 3>>
-		<<if random(1,2) == 1>>
+		<<if ($slaves[$i].anus < 1) || (random(1,2) == 1)>>
 			Constantly wearing a large plug up her ass @@color:lime;loosens her sphincter.@@
 			<<set $slaves[$i].anus += 1>>
 		<<else>>
@@ -2015,6 +2031,9 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr
 <<if $slaves[$i].career is "a slave">>
 	She has been a slave so long that she can barely remember making decisions for herself, and @@color:hotpink;feels naturally drawn@@ to her <<if $PC.title == 1>>Master<<else>>Mistress<</if>>.
 	<<set $slaves[$i].devotion += 1>>
+<<elseif $slaves[$i].career is "a Fuckdoll">>
+	She was once a Fuckdoll, leaving her @@color:hotpink;willing to obey on an instinctual level.@@
+	<<set $slaves[$i].devotion += 5>>
 <<elseif $slaves[$i].career is "a breeder">>
 	<<if $slaves[$i].preg > 1 && $arcologies[0].FSRepopulation != "unset">>
 		Her life used to revolve around being pregnant all the time, and nothing has changed. However, being surrounded with happy, heavily pregnant women leaves her  @@color:hotpink;slightly more accepting@@ of her fate and @@color:mediumaquamarine;hopeful@@ that her trained body will be useful to you.
diff --git a/src/uncategorized/saPleaseYou.tw b/src/uncategorized/saPleaseYou.tw
index 79aa078b62d..6849f2f677b 100644
--- a/src/uncategorized/saPleaseYou.tw
+++ b/src/uncategorized/saPleaseYou.tw
@@ -1,10 +1,6 @@
 :: SA please you [nobr]
- 
-serves you this week.
 
-<<if ($slaves[$i].anus > 0) && ($slaves[$i].devotion > 50)>>
-	<<set $bedSlaves += 1>>
-<</if>>
+serves you this week.
 
 <<set _trainingEfficiency = 5+Math.trunc($slaves[$i].devotion/30)+$slaves[$i].intelligence>>
 <<set $skillIncrease = _trainingEfficiency>>
diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw
index 002c705b0de..36a24d29a61 100644
--- a/src/uncategorized/saServeThePublic.tw
+++ b/src/uncategorized/saServeThePublic.tw
@@ -425,7 +425,7 @@ Her appearance attracted $beauty members of the public (<<print Math.trunc($beau
 		<<set $skillIncrease = 5+$slaves[$i].intelligence+$oralUseWeight>>
 		<<OralSkillIncrease $slaves[$i]>>
 		<<if canDoAnal($slaves[$i])>>
-			<<set $skillIncrease = 5+$slaves[$i].intelligence+$vaginalUseWeight>>
+			<<set $skillIncrease = 5+$slaves[$i].intelligence+$AnalUseWeight>>
 			<<AnalSkillIncrease $slaves[$i]>>
 		<</if>>
 		<<if canDoVaginal($slaves[$i])>>
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index d06710f628a..de6a5ef5ffd 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -1,5 +1,5 @@
 :: Schoolroom Report [nobr]
- 
+
 ''Schoolroom Report''<hr style="margin:0">
 
 <<set $schoolroomSlaves to 0>>
@@ -8,7 +8,7 @@
 
 <<for $i to 0; $i < $slaves.length; $i++>>
 <<if ($slaves[$i].assignment is "learn in the schoolroom")>>
-	<<if $seeImages == 1>><<SlaveImage $slaves[$i] 0 1>><</if>>
+	<<if $seeImages == 1>><<SlaveArt $slaves[$i] 0 0>><</if>>
 	<<set $schoolroomSlaves += 1>>
 	<<silently>>
 	<<display [[SA take classes]]>>
diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw
index 9f014fcf3d4..8d5130c5553 100644
--- a/src/uncategorized/servantsQuartersReport.tw
+++ b/src/uncategorized/servantsQuartersReport.tw
@@ -1,5 +1,5 @@
 :: Servants' Quarters Report [nobr]
- 
+
 ''Servants' Quarters Report''<hr style="margin:0">
 
 <<set $servantsQuartersSlaves to 0>>
@@ -29,7 +29,7 @@
 <<set $servantMilkersMultiplier = 0.5>>
 <<for $i to 0; $i < $slaves.length; $i++>>
 <<if ($slaves[$i].assignment is "work as a servant")>>
-	<<if $seeImages == 1>><<SlaveImage $slaves[$i] 0 1>><</if>>
+	<<if $seeImages == 1>><<SlaveArt $slaves[$i] 0 0>><</if>>
 	<<set $servantsQuartersSlaves += 1>>
 	<<silently>>
 	<<display [[SA servant]]>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index ebba2504dbc..e3dab87617e 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -106,7 +106,7 @@
 	<</if>>
 	<</if>>
 	<span id = "impreg">
-	<<if canGetPregnant($activeSlave)>>
+	<<if ((canGetPregnant($activeSlave)) && ($activeSlave.clothes != "a Fuckdoll suit"))>>
 			<<if ($PC.dick != 0)>>
 			| <<click "Impregnate her yourself">><<replace "#miniscene">><<display "FPCImpreg">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</click>>
 			<</if>>
@@ -546,16 +546,25 @@ __Aphrodisiacs__: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs
 <br>&nbsp;&nbsp;&nbsp;&nbsp;
 
 <span id="fertilityblock">
+<<if $activeSlave.clothes != "a Fuckdoll suit">>
 <<if ($activeSlave.preg < -1)>>
 	//She is sterile//
 <<elseif ($activeSlave.pubertyXX == 0) && (($activeSlave.ovaries > 0) || ($activeSlave.mpreg == 0))>>
 	//She is not yet fertile//
+<<elseif $activeSlave.physicalAge >= 47>>
+	//She is too old to become pregnant//
 <<elseif (($activeSlave.preg >= -1) && (($activeSlave.ovaries != 0)) || ($activeSlave.mpreg == 1))>>
 __Contraception__: <span id="fertility"><strong><<if $activeSlave.preg is -1>><<print "using contraceptives">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong></span>.
 <<if ($activeSlave.preg == 0)>>
-	<<click "Use contraceptives">><<set $activeSlave.preg to -1>><<replace "#fertility">><strong><<if $activeSlave.preg is -1>><<print "using contraceptives">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong><</replace>><</click>>
+	<<click "Use contraceptives">><<set $activeSlave.preg to -1>>
+	<<SlaveInteractFertility>>
+	<<SlaveInteractImpreg>>
+	<</click>>
 <<elseif ($activeSlave.preg is -1)>>
-	<<click "Let her get pregnant">><<set $activeSlave.preg to 0>><<replace "#fertility">><strong><<if $activeSlave.preg is -1>><<print "using contraceptives">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong><</replace>><</click>>
+	<<click "Let her get pregnant">><<set $activeSlave.preg to 0>>
+	<<SlaveInteractFertility>>
+	<<SlaveInteractImpreg>>
+	<</click>>
 <<elseif $activeSlave.induce == 1>>
 	//Hormones are being slipped into her food, she will give birth suddenly and rapidly this week//
 <<elseif ($activeSlave.preg > 30) && ($activeSlave.pregType < 50) && ($activeSlave.labor == 0)>>
@@ -567,7 +576,30 @@ __Contraception__: <span id="fertility"><strong><<if $activeSlave.preg is -1>><<
 <<elseif ($activeSlave.preg > 0) && ($activeSlave.pregType < 50)>>
 	[[Abort her pregnancy|Abort]]
 <</if>>
-
+<</if>>
+<<else>>
+<<if ($activeSlave.preg < -1)>>
+	//It is sterile//
+<<elseif ($activeSlave.pubertyXX == 0) && (($activeSlave.ovaries > 0) || ($activeSlave.mpreg == 0))>>
+	//It is not yet fertile//
+<<elseif $activeSlave.physicalAge >= 47>>
+	//It is too old to become pregnant//
+<<elseif (($activeSlave.preg >= -1) && (($activeSlave.ovaries != 0)) || ($activeSlave.mpreg == 1))>>
+__Contraception__: <span id="fertility"><strong><<if $activeSlave.preg is -1>><<print "using contraceptives">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong></span>.
+<<if ($activeSlave.preg == 0)>>
+	<<click "Use contraceptives">><<set $activeSlave.preg to -1>>
+	<<SlaveInteractFertility>>
+	<</click>>
+<<elseif ($activeSlave.preg is -1)>>
+	<<click "Let her get pregnant">><<set $activeSlave.preg to 0>>
+	<<SlaveInteractFertility>>
+	<</click>>
+<<elseif ($activeSlave.pregType is 50) && ($activeSlave.preg > 30)>>
+	[[Induce mass childbirth|BirthStorm]]
+<<elseif ($activeSlave.preg > 0) && ($activeSlave.pregType < 50)>>
+	[[Abort her pregnancy|Abort]]
+<</if>>
+<</if>>
 <</if>>
 </span>
 
diff --git a/src/uncategorized/slaveMarkets.tw b/src/uncategorized/slaveMarkets.tw
index 457d1f92559..61c2ad50d6e 100644
--- a/src/uncategorized/slaveMarkets.tw
+++ b/src/uncategorized/slaveMarkets.tw
@@ -216,6 +216,7 @@ You're in the area of the slave market owned by your corporation. The corporatio
 	Slaves with balls have them removed, rendering them feminine and obedient.
 	<<if ($activeSlave.balls != 0)>>
 		<<set $activeSlave.balls = 0>>
+		<<set $activeSlave.scrotum = 0>>
 		<<set $activeSlave.dick = Math.clamp($activeSlave.dick-1, 1, 6)>>
 		<<set $activeSlave.boobs += 100*random(2,4)>>
 		<<set $activeSlave.butt += random(1,2)>>
@@ -1076,7 +1077,6 @@ You're in the area of the slave market populated by slave trainers, easily the w
 
 <br><br>
 
-
 <<slaveCost $activeSlave>>
 <<if $slavesSeen > $slaveMarketLimit>><<set $slaveCost += $slaveCost*(($slavesSeen-$slaveMarketLimit)*0.1)>><</if>>
 
@@ -1108,7 +1108,6 @@ You're in the area of the slave market populated by slave trainers, easily the w
 
 <<set $slaveCost to 500*Math.trunc($slaveCost/500)>>
 The offered price is ¤<<print $slaveCost>>.<<if $slavesSeen > $slaveMarketLimit>> You have cast such a wide net for slaves this week that it is becoming more expensive to find more for sale. Your reputation helps determine your reach within the slave market.<</if>>
-
 <br>
 <<if $cash >= $slaveCost>>
 	[[Buy her slave contract|New Slave Intro][$cash -= $slaveCost,$nextButton to "Continue",$nextLink to "AS Dump",$returnTo to "Main"]]
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index 34095ea3836..1581e30da1e 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -11,7 +11,7 @@
 		<<set _Slave to $slaves[_i]>>
 	<</if>>
 	<<if _Slave.assignmentVisible != 1>><<continue>><</if>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>>
 	<<if "be your Head Girl" is _Slave.assignment>>''HG''
 	<<elseif "recruit girls" is _Slave.assignment>>''RC''
 	<<elseif "guard you" is _Slave.assignment>>''BG''
@@ -21,7 +21,7 @@
 <<case "Personal Attention Select">>
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
 <<if _Slave.assignmentVisible == 1>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>>
 	<<print "[[_Slave.slaveName|Personal Attention Select][$personalAttention to $slaves[" + _i + "].ID, $activeSlave to $slaves[" + _i + "], $personalAttentionChanged to 1]]">>
 <<else>>
 	<<continue>>
@@ -29,28 +29,28 @@
 <<case "Agent Select">>
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
 <<if (_Slave.assignmentVisible == 1) && (_Slave.assignment != "guard you") && (_Slave.assignment != "recruit girls") && (_Slave.assignment != "be your Head Girl") && (_Slave.devotion >= 20) && (_Slave.intelligence > 0) && (_Slave.intelligenceImplant > 0) && canWalk(_Slave) && canSee(_Slave) && canTalk(_Slave) && _Slave.pregType < 50 && _Slave.breedingMark != 1>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Agent Workaround][$activeSlave to $slaves[" + _i + "]]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Agent Workaround][$activeSlave to $slaves[" + _i + "]]]">>
 <<else>>
 	<<continue>>
 <</if>>
 <<case "BG Select">>
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
 <<if (_Slave.assignmentVisible == 1) && (_Slave.devotion > 50) && (_Slave.assignment != "guard you") && (_Slave.assignment != "recruit girls") && (_Slave.assignment != "be your Head Girl") and canWalk(_Slave) and canSee(_Slave) && _Slave.breedingMark != 1>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Bodyguard Workaround][$Bodyguard to $slaves[" + _i + "]]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Bodyguard Workaround][$Bodyguard to $slaves[" + _i + "]]]">>
 <<else>>
 	<<continue>>
 <</if>>
 <<case "Recruiter Select">>
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
 <<if (_Slave.assignmentVisible == 1) && (_Slave.devotion > 50) && (_Slave.assignment != "guard you") && (_Slave.assignment != "recruit girls") && (_Slave.assignment != "be your Head Girl") && canWalk(_Slave) && canSee(_Slave) && canTalk(_Slave)>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Recruiter Workaround][$Recruiter to $slaves[" + _i + "]]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Recruiter Workaround][$Recruiter to $slaves[" + _i + "]]]">>
 <<else>>
 	<<continue>>
 <</if>>
 <<case "HG Select">>
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
 <<if (_Slave.assignmentVisible == 1) && (_Slave.devotion > 50) && (_Slave.assignment != "guard you") && (_Slave.assignment != "recruit girls") && (_Slave.assignment != "be your Head Girl") && canWalk(_Slave) && canSee(_Slave) && canTalk(_Slave)>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|HG Workaround][$HeadGirl to $slaves[" + _i + "]]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|HG Workaround][$HeadGirl to $slaves[" + _i + "]]]">>
 <<else>>
 	<<continue>>
 <</if>>
@@ -58,7 +58,7 @@
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
 <<if $Flag == 0>>
 	<<if (_Slave.assignmentVisible == 1) && (_Slave.assignment != "be your Head Girl") && (_Slave.indentureRestrictions <= 0) && _Slave.breedingMark != 1>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
 	<<else>>
 		<<continue>>
 	<</if>>
@@ -66,13 +66,13 @@
 	<<if _Slave.assignment != "live with your Head Girl">>
 		<<continue>>
 	<<else>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
 	<</if>>
 <</if>>
 <<case "Subordinate Targeting">>
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
 <<if ($activeSlave.ID != _Slave.ID) && (_Slave.devotion >= -20)>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Subordinate Targeting][$activeSlave.subTarget to $slaves[" + _i + "].ID]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Subordinate Targeting][$activeSlave.subTarget to $slaves[" + _i + "].ID]]">>
 <<else>>
 	<<continue>>
 <</if>>
@@ -83,7 +83,7 @@
 	<<if _Slave.assignmentVisible != 1>><<continue>><</if>>
 	<<if (_Slave.health < 20) || (_Slave.trust < 60) || (_Slave.devotion <= 60) || (_Slave.fetish is "mindbroken")>>
 	<<if _Slave.devotion >= -20  || _Slave.fetish is "mindbroken">>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
 	<<else>>
 		<br>//_Slave.slaveName cannot be trusted in the spa//
 		<<continue>>
@@ -96,7 +96,7 @@
 	<<if _Slave.assignment != "rest in the spa">>
 		<<continue>>
 	<<else>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
 	<</if>>
 <<else>>
 	<<if _Slave.ID != $Attendant.ID>>
@@ -108,7 +108,7 @@
 <<case "Attendant Select">>
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
 <<if (_Slave.assignmentVisible == 1) && (_Slave.devotion > 50) and canWalk(_Slave)>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Attendant Workaround][$Attendant to $slaves[" + _i + "]]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Attendant Workaround][$Attendant to $slaves[" + _i + "]]]">>
 <<else>>
 	<<continue>>
 <</if>>
@@ -119,7 +119,7 @@
 	<<if _Slave.assignmentVisible != 1>><<continue>><</if>>
 	<<if _Slave.breedingMark != 1>>
 	<<if (_Slave.devotion > 50) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) or  (_Slave.trust < -50) || (_Slave.trust > 50)>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
 	<<else>>
 		<br>//_Slave.slaveName must be either more fearful of you or devoted to you//
 		<<continue>>
@@ -132,7 +132,7 @@
 	<<if _Slave.assignment != "work in the brothel">>
 		<<continue>>
 	<<else>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
 	<</if>>
 <<else>>
 	<<if _Slave.ID != $Madam.ID>>
@@ -144,7 +144,7 @@
 <<case "Madam Select">>
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
 <<if (_Slave.assignmentVisible == 1) && (_Slave.devotion > 50) && (_Slave.intelligence > -2) and canWalk(_Slave) and canSee(_Slave) && _Slave.breedingMark != 1>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Madam Workaround][$Madam to $slaves[" + _i + "]]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Madam Workaround][$Madam to $slaves[" + _i + "]]]">>
 <<else>>
 	<<continue>>
 <</if>>
@@ -155,7 +155,7 @@
 	<<if _Slave.assignmentVisible != 1>><<continue>><</if>>
 	<<if _Slave.breedingMark != 1>>
 	<<if (_Slave.devotion > 50) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50) || (_Slave.trust > 50)>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
 	<<else>>
 		<br>//_Slave.slaveName must be either more fearful of you or devoted to you//
 		<<continue>>
@@ -168,7 +168,7 @@
 	<<if _Slave.assignment != "serve in the club">>
 		<<continue>>
 	<<else>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
 	<</if>>
 <<else>>
 	<<if _Slave.ID != $DJ.ID>>
@@ -180,7 +180,7 @@
 <<case "DJ Select">>
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
 <<if (_Slave.assignmentVisible == 1) && (_Slave.devotion > 50) && (_Slave.intelligence > -2) and canWalk(_Slave) && _Slave.breedingMark != 1>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|DJ Workaround][$DJ to $slaves[" + _i + "]]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|DJ Workaround][$DJ to $slaves[" + _i + "]]]">>
 <<else>>
 	<<continue>>
 <</if>>
@@ -190,7 +190,7 @@
 	<<if $clinic <= $clinicSlaves>><<continue>><</if>>
 	<<if _Slave.assignmentVisible != 1>><<continue>><</if>>
 	<<if (_Slave.health < 20) || ((_Slave.chem > 15) && ($clinicUpgradeFilters == 1)) || ((_Slave.bellyImplant > 100) && ($bellyImplants == 1))>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
 	<<else>>
 		<br>//_Slave.slaveName cannot benefit from the clinic//
 		<<continue>>
@@ -199,7 +199,7 @@
 	<<if _Slave.assignment != "get treatment in the clinic">>
 		<<continue>>
 	<<else>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
 	<</if>>
 <<else>>
 	<<if _Slave.ID != $Nurse.ID>>
@@ -211,7 +211,7 @@
 <<case "Nurse Select">>
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
 <<if (_Slave.assignmentVisible == 1) && (_Slave.devotion > 50) and canWalk(_Slave) and canSee(_Slave)>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Nurse Workaround][$Nurse to $slaves[" + _i + "]]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Nurse Workaround][$Nurse to $slaves[" + _i + "]]]">>
 <<else>>
 	<<continue>>
 <</if>>
@@ -222,7 +222,7 @@
 	<<if _Slave.assignmentVisible != 1>><<continue>><</if>>
 	<<if (_Slave.devotion >= -20) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50)>>
 		<<if (_Slave.intelligenceImplant < 1) || (_Slave.accent+$schoolroomUpgradeLanguage > 2) || (_Slave.oralSkill <= 10) || (_Slave.whoreSkill <= 10) || (_Slave.entertainSkill <= 10) || (_Slave.analSkill < 1) || ((_Slave.vaginalSkill < 1) && (_Slave.vagina > 0))>>
-			<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+			<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
 		<<else>>
 			/* <br>//_Slave.slaveName already has a basic education// */
 			<<continue>>
@@ -235,7 +235,7 @@
 	<<if _Slave.assignment != "learn in the schoolroom">>
 		<<continue>>
 	<<else>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
 	<</if>>
 <<else>>
 	<<if _Slave.ID != $Schoolteacher.ID>>
@@ -247,7 +247,7 @@
 <<case "Schoolteacher Select">>
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
 <<if (_Slave.assignmentVisible == 1) && (_Slave.devotion > 50) && canTalk(_Slave) and canWalk(_Slave) and canSee(_Slave)>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Schoolteacher Workaround][$Schoolteacher to $slaves[" + _i + "]]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Schoolteacher Workaround][$Schoolteacher to $slaves[" + _i + "]]]">>
 <<else>>
 	<<continue>>
 <</if>>
@@ -273,7 +273,7 @@
 			<<if (_Slave.devotion > 20) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) or  (_Slave.trust < -50) || (_Slave.amp == 1) || ($dairyRestraintsUpgrade == 1)>>
 				<<if ($dairyStimulatorsSetting < 2) || (_Slave.anus > 2) || ($dairyPrepUpgrade == 1)>>
 					<<if ($dairyPregSetting < 2) || (_Slave.vagina > 2) || (_Slave.ovaries == 0) || ($dairyPrepUpgrade == 1)>>
-						<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+						<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
 						<<else>>
 							<br>//_Slave.slaveName's vagina cannot accommodate current machine settings//
 							<<continue>>
@@ -298,7 +298,7 @@
 	<<if _Slave.assignment != "work in the dairy">>
 		<<continue>>
 	<<else>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
 	<</if>>
 <<else>>
 	<<if _Slave.ID != $Milkmaid.ID>>
@@ -310,7 +310,7 @@
 <<case "Milkmaid Select">>
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
 <<if (_Slave.assignmentVisible == 1) && (_Slave.devotion > 20) and canWalk(_Slave) and canWalk(_Slave)>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Milkmaid Workaround][$Milkmaid to $slaves[" + _i + "]]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Milkmaid Workaround][$Milkmaid to $slaves[" + _i + "]]]">>
 <<else>>
 	<<continue>>
 <</if>>
@@ -320,7 +320,7 @@
 	<<if $servantsQuarters <= $servantsQuartersSlaves>><<continue>><</if>>
 	<<if $slaves[_i].assignmentVisible != 1>><<continue>><</if>>
 	<<if (_Slave.devotion >= -20) || ((_Slave.devotion >= -50) && (_Slave.trust <= 20)) or  (_Slave.trust < -20)>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
 	<<else>>
 		<br>//_Slave.slaveName must be either more fearful of you or devoted to you//
 		<<continue>>
@@ -329,7 +329,7 @@
 	<<if _Slave.assignment != "work as a servant">>
 		<<continue>>
 	<<else>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
 	<</if>>
 <<else>>
 	<<if _Slave.ID != $Stewardess.ID>>
@@ -341,7 +341,7 @@
 <<case "Stewardess Select">>
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
 <<if (_Slave.assignmentVisible == 1) && (_Slave.devotion > 50) && (_Slave.intelligence > -2) and canWalk(_Slave) and canWalk(_Slave)>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Stewardess Workaround][$Stewardess to $slaves[" + _i + "]]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Stewardess Workaround][$Stewardess to $slaves[" + _i + "]]]">>
 <<else>>
 	<<continue>>
 <</if>>
@@ -350,7 +350,7 @@
 	<<if $masterSuite <= $masterSuiteSlaves>><<continue>><</if>>
 	<<if _Slave.assignmentVisible != 1>><<continue>><</if>>
 	<<if (_Slave.devotion > 20) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) or  (_Slave.trust < -50)>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
 	<<else>>
 		<br>//_Slave.slaveName is not sufficiently broken for the master suite//
 		<<continue>>
@@ -359,7 +359,7 @@
 	<<if _Slave.assignment != "serve in the master suite">>
 		<<continue>>
 	<<else>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>>
 		<<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
 	<</if>>
 <<else>>
@@ -372,7 +372,7 @@
 <<case "Concubine Select">>
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
 <<if (_Slave.assignmentVisible == 1) && (_Slave.devotion > 50) and canWalk(_Slave) and canWalk(_Slave)>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Concubine Workaround][$Concubine to $slaves[" + _i + "]]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Concubine Workaround][$Concubine to $slaves[" + _i + "]]]">>
 <<else>>
 	<<continue>>
 <</if>>
@@ -381,7 +381,7 @@
 	<<if $cellblock <= $cellblockSlaves>><<continue>><</if>>
 	<<if _Slave.assignmentVisible != 1>><<continue>><</if>>
 	<<if ((_Slave.devotion < -20) && (_Slave.trust >= -20)) || ((_Slave.devotion < -50) && (_Slave.trust >= -50))>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
 	<<else>>
 		<<continue>>
 	<</if>>
@@ -389,7 +389,7 @@
 	<<if _Slave.assignment != "be confined in the cellblock">>
 		<<continue>>
 	<<else>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
 	<</if>>
 <<else>>
 	<<if _Slave.ID != $Wardeness.ID>>
@@ -400,7 +400,7 @@
 <</if>>
 <<case "Wardeness Select">>
 <<if (_Slave.assignmentVisible == 1) && (_Slave.devotion > 50) and canWalk(_Slave) and canWalk(_Slave)>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>>
 	<<print "[[_Slave.slaveName|Wardeness Workaround][$Wardeness to $slaves[" + _i + "]]]">>
 <<else>>
 	<<continue>>
@@ -411,7 +411,7 @@
 	<<if (_Slave.assignmentVisible != 1)>><<continue>><</if>>
 	<<if _Slave.breedingMark != 1>>
 	<<if (_Slave.indentureRestrictions <= 0)>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
 	<<else>>
 		<br>//_Slave.slaveName's indenture forbids arcade service.//
 		<<continue>>
@@ -424,7 +424,7 @@
 	<<if _Slave.assignment != "be confined in the arcade">>
 		<<continue>>
 	<<else>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
 	<</if>>
 <</if>>
 <<case "Pit">>
@@ -444,7 +444,7 @@
 			<<if ($fighterIDs.contains(_Slave.ID))>>
 				<<continue>>
 			<<else>>
-				<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Assign][$activeSlave to $slaves[" + _i + "]]]">>
+				<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Assign][$activeSlave to $slaves[" + _i + "]]]">>
 			<</if>>
 		<<else>>
 			<<continue>>
@@ -454,7 +454,7 @@
 	<</if>>
 <<else>>
 	<<if $fighterIDs.contains(_Slave.ID)>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Retrieve][$activeSlave to $slaves[" + _i + "]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Retrieve][$activeSlave to $slaves[" + _i + "]]]">>
 	<<else>>
 		<<continue>>
 	<</if>>
@@ -463,7 +463,7 @@
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
 <<if $Flag == 0>>
 	<<if canWalk(_Slave) && ($Lurcher.ID != _Slave.ID)>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Assign][$activeSlave to $slaves[" + _i + "]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Assign][$activeSlave to $slaves[" + _i + "]]]">>
 	<<else>>
 		<<continue>>
 	<</if>>
@@ -471,7 +471,7 @@
 	<<if $Lurcher.ID != _Slave.ID>>
 		<<continue>>
 	<<else>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Retrieve][$activeSlave to $slaves[" + _i + "]]]">>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Retrieve][$activeSlave to $slaves[" + _i + "]]]">>
 	<</if>>
 <</if>>
 <<case "New Game Plus">>
@@ -525,7 +525,7 @@
 	<<if $slaves[_i].devotion < 100>><<continue>><</if>>
 	<<if $slaves[_i].relationship != $activeSlave.relationship>><<continue>><</if>>
 	<<if $slaves[_i].ID == $activeSlave.ID>><<continue>><</if>>
-	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveImage $slaves[_i] 1 $seeMainFetishes>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
 <</switch>>
 
 
@@ -635,7 +635,7 @@ will
 <<set _Slave to $slaves[_i]>>
 <</if>>
 
-<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
+<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 
 <<if $abbreviateDevotion == 1>>
 	<<if _Slave.fetish is "mindbroken">>@@color:red;MB@@
@@ -948,7 +948,7 @@ Release rules: _Slave.releaseRules.
 	''Barr''
 <<elseif _Slave.pubertyXX == 0 && (_Slave.ovaries == 1 || _Slave.mpreg == 1)>>
 	''Prepub''
-<<elseif _Slave.physicalAge >= 47>>
+<<elseif _Slave.physicalAge >= 47 && (_Slave.ovaries == 1 || _Slave.mpreg == 1)>>
 	''Meno''
 <<elseif _Slave.preg == -1>>
 	''CC''
@@ -1004,7 +1004,7 @@ Release rules: _Slave.releaseRules.
 	Barren.
 <<elseif _Slave.pubertyXX == 0 && (_Slave.ovaries == 1 || _Slave.mpreg == 1)>>
 	Not ovulating yet.
-<<elseif _Slave.physicalAge >= 47>>
+<<elseif _Slave.physicalAge >= 47 && (_Slave.ovaries == 1 || _Slave.mpreg == 1)>>
 	Menopausal.
 <<elseif _Slave.preg == -1>>
 	On contraceptives.
@@ -1050,7 +1050,7 @@ Release rules: _Slave.releaseRules.
 <</if>>
 
 <<if $abbreviateNationality+$abbreviateGenitalia+$abbreviatePhysicals+$abbreviateSkills+$abbreviateMental != 0>>
-	<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
+	<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 <</if>>
 
 <<SlaveTitle _Slave>>
@@ -1890,7 +1890,7 @@ _Slave.faceShape face.
 @@
 <</if>>
 
-<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
+<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 
 <<if $abbreviateSkills == 1>>
 ''<<if _Slave.fetish is "mindbroken">>
@@ -2186,11 +2186,11 @@ _Slave.faceShape face.
 	@@color:green;XX++ [_Slave.attrXX]@@
 <<elseif _Slave.attrXY <= 95>>
 	@@color:green;XX+++ [_Slave.attrXX]@@
-<</if>>	
+<</if>>
 <<if _Slave.energy > 95>>
 	<<if (_Slave.attrXY <= 95) || (_Slave.attrXX <= 95)>>
 		@@color:green;Nympho!@@
-	<</if>>	
+	<</if>>
 <<elseif _Slave.energy > 80>>
 	@@color:green;SD++ [_Slave.energy]@@
 <<elseif _Slave.energy > 60>>
@@ -2713,7 +2713,7 @@ _Slave.faceShape face.
 <<if _Slave.customLabel != "">>''@@color:yellow;_Slave.customLabel@@''<</if>>
 
 <<if (_Slave.relationship != 0) || (_Slave.relation != 0) || ($abbreviateClothes is 2) || ($abbreviateRulesets is 2)>>
-	<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
+	<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 <</if>>
 
 <<if $abbreviateMental == 1>>
@@ -2978,7 +2978,7 @@ _Slave.faceShape face.
 <</for>>
 <</if>>
 <</if>>
-	
+
 <<if $abbreviateClothes is 2>>
 <<if _Slave.choosesOwnClothes == 1>>
 	Dressing herself.
@@ -3092,7 +3092,7 @@ _Slave.faceShape face.
 <<case "stylish leather">>
 	Stylish leather collar.
 <<case "satin choker">>
-	Satin choker.	
+	Satin choker.
 <<case "silk ribbon">>
 	Silken ribbon.	
 <<case "heavy gold">>
@@ -3183,21 +3183,21 @@ _Slave.faceShape face.
 <<if $abbreviateRulesets is 2>>
 <<if (def _Slave.currentRules) && (_Slave.currentRules.length > 0)>>
 	&nbsp;&nbsp;&nbsp;&nbsp;
-	<<for _r to 0; _r < _Slave.currentRules.length; _r++>>	
+	<<for _r to 0; _r < _Slave.currentRules.length; _r++>>
 		<<for _s to 0; _s < $defaultRules.length; _s++>>
 			<<set _currentRule to $defaultRules[_s]>>
 			<<set _num to (_s+1)>>
 			<<if _Slave.currentRules[_r] == _currentRule.ID>>
 				Rule _num (_currentRule.name).
 			<</if>>
-		<</for>>	
-	<</for>>	
+		<</for>>
+	<</for>>
 <</if>>
 <</if>>
 
 <<if $abbreviateOrigins is 2>>
 <<if _Slave.origin neq 0>>
-	<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
+	<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
     @@color:gray;_Slave.origin@@
 <</if>>
 <</if>>
@@ -3209,11 +3209,11 @@ _Slave.faceShape face.
 	<<continue>>
 <<case "HG Select">>
 <<if $HGCareers.contains(_Slave.career)>>
-	<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
+	<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
 <</if>>
 <<case "Head Girl Suite">>
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
-<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
+<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 <<if $Flag == 0>>
 	<<print "[[Send her to live with your Head Girl|Assign][$activeSlave to $slaves[" + _i + "]]]">>
 <<else>>
@@ -3226,11 +3226,11 @@ _Slave.faceShape face.
 <</if>>
 <<case "BG Select">>
 <<if $bodyguardCareers.contains(_Slave.career)>>
-	<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
+	<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
 <</if>>
 <<case "Spa">>
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
-<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
+<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 <<if $Flag == 0>>
 	<<print "[[Send her to the Spa|Assign][$activeSlave to $slaves[" + _i + "]]]">>
 <<elseif $Flag == 1>>
@@ -3241,11 +3241,11 @@ _Slave.faceShape face.
 <</if>>
 <<case "Attendant Select">>
 <<if $attendantCareers.contains(_Slave.career)>>
-	<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
+	<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
 <</if>>
 <<case "Brothel">>
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
-<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
+<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 <<if $Flag == 0>>
 	<<print "[[Send her to the Brothel|Assign][$activeSlave to $slaves[" + _i + "]]]">>
 <<elseif $Flag == 1>>
@@ -3256,11 +3256,11 @@ _Slave.faceShape face.
 <</if>>
 <<case "Madam Select">>
 <<if $madamCareers.contains(_Slave.career)>>
-	<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
+	<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
 <</if>>
 <<case "Club">>
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
-<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
+<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 <<if $Flag == 0>>
 	<<print "[[Send her to the Club|Assign][$activeSlave to $slaves[" + _i + "]]]">>
 <<elseif $Flag == 1>>
@@ -3270,7 +3270,7 @@ _Slave.faceShape face.
 	<<break>>
 <</if>>
 <<case "Arcade">>
-<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
+<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 <<if $Flag == 0>>
 	<<print "[[Confine her in the Arcade|Assign][$activeSlave to $slaves[" + _i + "]]]">>
 <<else>>
@@ -3278,11 +3278,11 @@ _Slave.faceShape face.
 <</if>>
 <<case "DJ Select">>
 <<if $DJCareers.contains(_Slave.career)>>
-	<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
+	<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
 <</if>>
 <<case "Clinic">>
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
-<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
+<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 <<if $Flag == 0>>
 	<<if $clinicUpgradeScanner == 1>>
 		@@color:cyan;Estimated DNA error value: <<print Math.trunc($slaves[_i].chem/10)>>@@
@@ -3296,11 +3296,11 @@ _Slave.faceShape face.
 <</if>>
 <<case "Nurse Select">>
 <<if $nurseCareers.contains(_Slave.career)>>
-	<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
+	<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
 <</if>>
 <<case "Schoolroom">>
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
-<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
+<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 <<if $Flag == 0>>
 	<<print "[[Assign her to the Schoolroom|Assign][$activeSlave to $slaves[" + _i + "]]]">>
 <<elseif $Flag == 1>>
@@ -3311,11 +3311,11 @@ _Slave.faceShape face.
 <</if>>
 <<case "Schoolteacher Select">>
 <<if $schoolteacherCareers.contains(_Slave.career)>>
-	<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
+	<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
 <</if>>
 <<case "Dairy">>
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
-<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
+<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 <<if $Flag == 0>>
 	<<print "[[Send her to the Dairy|Assign][$activeSlave to $slaves[" + _i + "]]]">>
 <<elseif $Flag == 1>>
@@ -3326,11 +3326,11 @@ _Slave.faceShape face.
 <</if>>
 <<case "Milkmaid Select">>
 <<if $milkmaidCareers.contains(_Slave.career)>>
-	<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
+	<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
 <</if>>
 <<case "Servants' Quarters">>
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
-<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
+<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 <<if $Flag == 0>>
 	<<print "[[Assign her to the Servants' Quarters|Assign][$activeSlave to $slaves[" + _i + "]]]">>
 <<elseif $Flag == 1>>
@@ -3341,10 +3341,10 @@ _Slave.faceShape face.
 <</if>>
 <<case "Stewardess Select">>
 <<if $stewardessCareers.contains(_Slave.career)>>
-	<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
+	<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
 <</if>>
 <<case "Master Suite">>
-<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
+<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 <<if $Flag == 0>>
 	<<print "[[Add her to the Suite|Assign][$activeSlave to $slaves[" + _i + "]]]">>
 <<elseif $Flag == 1>>
@@ -3355,7 +3355,7 @@ _Slave.faceShape face.
 <</if>>
 <<case "Cellblock">>
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
-<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
+<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 <<if $Flag == 0>>
 	<<print "[[Confine her in the cellblock|Assign][$activeSlave to $slaves[" + _i + "]]]">>
 <<elseif $Flag == 1>>
@@ -3366,10 +3366,10 @@ _Slave.faceShape face.
 <</if>>
 <<case "Wardeness Select">>
 <<if $wardenessCareers.contains(_Slave.career)>>
-	<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
+	<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>@@color:lime;Has an applicable career experience.@@
 <</if>>
 <<case "New Game Plus">>
-<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
+<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 <<if $Flag == 0>>
 	<<print "[[Add to import list|NGP Workaround][$slavesToImport to 1, $activeSlave to $slaves[" + _i + "]]]">>
 <<else>>
@@ -3381,7 +3381,7 @@ _Slave.faceShape face.
 	<<if $slaves[_i].devotion < 100>><<continue>><</if>>
 	<<if $slaves[_i].relationship != $activeSlave.relationship>><<continue>><</if>>
 	<<if $slaves[_i].ID == $activeSlave.ID>><<continue>><</if>>
-	<br><<if $seeImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
+	<br><<if $seeImages != 1 || $seeSummaryImages != 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 	<<print "[[Match them|Matchmaking][$subSlave to $slaves[" + _i + "]]]">>
 <</switch>>
 <</for>>
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index fd66fecf21a..72e0bbc5de1 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -1,5 +1,5 @@
 :: Spa Report [nobr]
- 
+
 ''Spa Report''<hr style="margin:0">
 
 <<set $attendantUsedCure to 0>>
@@ -11,7 +11,7 @@
 
 <<for $i to 0; $i < $slaves.length; $i++>>
 <<if ($slaves[$i].assignment is "rest in the spa")>>
-	<<if $seeImages == 1>><<SlaveImage $slaves[$i] 0 1>><</if>>
+	<<if $seeImages == 1>><<SlaveArt $slaves[$i] 0 0>><</if>>
 	<<set $spaSlaves += 1>>
 	<<silently>>
 	<<display [[SA rest]]>>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index 428b9c7f5ed..632f612910a 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -13,10 +13,12 @@
 <<else>>
 
 As the remote surgery's long recovery cycle completes,
-<<if $surgeryType != "fuckdoll">>
-	$activeSlave.slaveName <<if ($activeSlave.amp != 1)>>walks<<else>>is carried<</if>> out of the surgery room<<if canSee($activeSlave)>> and catches sight of herself in the floor-length mirror outside the door<<else>> and is detailed the modifications done to her body, assuming she hasn't already realized them<</if>>.
-<<else>>
+<<if $surgeryType == "fuckdoll">>
 	your new Fuckdoll <<if ($activeSlave.amp != 1)>>stumbles<<else>>is carried<</if>> out of the surgery room. The only <<if $activeSlave.vagina > -1>>areas of skin visible are those around its vulva and anus<<else>>area of skin visible is that around its anus<</if>><<if $activeSlave.lips > 95>>, though its lips are also visible as its facepussy makes the standard Fuckdoll mouth insert unnecessary<</if>>. You can see it starting to struggle against the constricting material of the Fuckdoll suit as the sedation wears off. Other than the tiny area of exposed skin and the slight movement, there's no indication that the sex doll in front of you is alive at all.
+<<elseif $surgeryType == "fuckdollExtraction">>
+	$activeSlave.slaveName <<if ($activeSlave.amp != 1)>>walks<<else>>is carried<</if>> out of the surgery room.
+<<else>>
+	$activeSlave.slaveName <<if ($activeSlave.amp != 1)>>walks<<else>>is carried<</if>> out of the surgery room<<if canSee($activeSlave)>> and catches sight of herself in the floor-length mirror outside the door<<else>> and is detailed the modifications done to her body, assuming she hasn't already realized them<</if>>.
 <</if>>
 
 <<switch $surgeryType>>
@@ -80,6 +82,19 @@ The Fuckdoll's rear hole is extremely eye-catching from behind, since it's the o
 <<if $activeSlave.dick > 0>>Its penis has its own pouch in the material.<</if>>
 The Fuckdoll continues to struggle. Since it is new, it is not yet able to obey the tonal command system the suit uses to transfer orders to its inhabitant, who cannot otherwise hear. It will have to learn by painful experience, and eventually, that is all it will know.
 
+<<case "fuckdollExtraction">>
+	If you were expecting a great return to humanity after extracting her from her Fuckdoll suit, you're to be disappointed.
+	<<if $activeSlave.eyes != 0>>
+		You're denied any reaction from her to the sight of herself in the mirror outside the recovery area, as she's wearing a pair of very dark glasses she'll have to keep on for a few hours yet. She's been denied almost all vision for a long time, and though her recovery included light therapy, she's still very sensitive to it.
+	<</if>>
+	<<if $activeSlave.fetish == "mindbroken">>
+		Her mind remains just as broken outside the suit as it was inside it. In many ways, she's as much of a living sex toy now as she was when she was a Fuckdoll; she's unresponsive to almost everything, though she will probably still understand how to get fucked. Her personality is probably somewhere back there in the Fuckdoll maintenance areas, like the scraps of the suit that was just cut off her. Just another piece of refuse.
+	<<elseif $activeSlave.fuckdoll > 20>>
+		Though she retains possession of some of her faculties, she's been severely affected by the weeks she's spent as a living sex toy. Any joy or relief at being liberated from the Fuckdoll suit is probably being suppressed by the similarity of the extraction procedure to the routine suit maintenance she received weekly. If she even understands that she's been freed, she's been trained so thoroughly that she will struggle to adapt to life more complex than tonal commands and sexual use.
+	<<else>>
+		Though she hasn't been a Fuckdoll long enough to be permanently damaged, she's so emotionally exhausted by everything she's experienced over the past few weeks that she betrays no relief or joy, or even any fear that she'll be turned into a Fuckdoll again. Her posture bespeaks something like apathy. She should reawake gradually, but for now she's still actively remembering how to live as a human, rather than as a living sex toy.
+	<</if>>
+
 <<case "mindbreak">>
 	Her gaze is placid and empty. <<if canSee($activeSlave)>>She looks at<<else>>You cough causing her to turn to face<</if>> you, and there is nothing there: no recognition, no fear, no love. Nothing. @@color:red;She will forget this in a few hours. She will forget everything in a few hours.@@
 	<<set $activeSlave.sexualFlaw to "none">>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index e13d314f16b..8f37e734bae 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -62,7 +62,7 @@
 		@@color:lime;This breaks in $activeSlave.slaveName's virgin pussy.@@
 		<<if ($activeSlave.devotion > 20)>>
 			You ease yourself into her pussy, since it's her first time, then gradually speed up your thrusts while she slowly learns to move her hips along with you. She moans loudly. @@color:hotpink;She enjoys losing her cherry to you.@@ She looks forward to having her pussy fucked by you again.
-			<<set  $activeSlave.devotion += 4>>
+			<<set $activeSlave.devotion += 4>>
 		<<elseif ($activeSlave.devotion < -20)>>
 			You force yourself into her pussy. She sobs and cries with disgust while you continue working her fuck hole. She @@color:mediumorchid;hates@@ and @@color:gold;fears@@ you for taking her virginity.
 			<<set $activeSlave.trust -= 5, $activeSlave.devotion -= 5>>
@@ -273,7 +273,7 @@
 %/
 <<widget "SlaveInteractImpreg">>
 <<replace #impreg>>
-	<<if canGetPregnant($activeSlave)>>
+	<<if ((canGetPregnant($activeSlave)) && ($activeSlave.clothes != "a Fuckdoll suit"))>>
 		<<if ($PC.dick != 0)>>
 		| <<click "Impregnate her yourself">><<replace "#miniscene">><<display "FPCImpreg">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</click>>
 		<</if>>
@@ -317,7 +317,7 @@
 		| [[Use another slave to forcefeed her|SlaveOnSlaveFeedingWorkAround]]
 	<</if>>
 	<</if>>
-<</replace>>
+	<</replace>>
 <</widget>>
 
 /%
@@ -325,10 +325,13 @@
 %/
 <<widget "SlaveInteractFertility">>
 <<replace #fertilityblock>>
+<<if $activeSlave.clothes != "a Fuckdoll suit">>
 	<<if ($activeSlave.preg < -1)>>
 		//She is sterile//
-	<<elseif ($activeSlave.pubertyXX == 0) && (($activeSlave.ovaries > 0) || ($activeSlave.mpreg == 1))>>
+	<<elseif ($activeSlave.pubertyXX == 0) && (($activeSlave.ovaries > 0) || ($activeSlave.mpreg == 0))>>
 		//She is not yet fertile//
+	<<elseif $activeSlave.physicalAge >= 47>>
+		//She is too old to become pregnant//
 	<<elseif (($activeSlave.preg >= -1) && (($activeSlave.ovaries != 0)) || ($activeSlave.mpreg == 1))>>
 	__Contraception__: <span id="fertility"><strong><<if $activeSlave.preg is -1>><<print "using contraceptives">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong></span>.
 	<<if ($activeSlave.preg == 0)>>
@@ -346,8 +349,27 @@
 	<<elseif ($activeSlave.preg > 0) && ($activeSlave.pregType < 50)>>
 		[[Abort her pregnancy|Abort]]
 	<</if>>
-
 	<</if>>
+<<else>>
+	<<if ($activeSlave.preg < -1)>>
+		//It is sterile//
+	<<elseif ($activeSlave.pubertyXX == 0) && (($activeSlave.ovaries > 0) || ($activeSlave.mpreg == 0))>>
+		//It is not yet fertile//
+	<<elseif $activeSlave.physicalAge >= 47>>
+		//It is too old to become pregnant//
+	<<elseif (($activeSlave.preg >= -1) && (($activeSlave.ovaries != 0)) || ($activeSlave.mpreg == 1))>>
+	__Contraception__: <span id="fertility"><strong><<if $activeSlave.preg is -1>><<print "using contraceptives">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong></span>.
+	<<if ($activeSlave.preg == 0)>>
+		<<click "Use contraceptives">><<set $activeSlave.preg to -1>><<SlaveInteractFertility>><</click>>
+	<<elseif ($activeSlave.preg is -1)>>
+		<<click "Let her get pregnant">><<set $activeSlave.preg to 0>><<SlaveInteractFertility>><</click>>
+	<<elseif ($activeSlave.pregType is 50) && ($activeSlave.preg > 30)>>
+		[[Induce mass childbirth|BirthStorm]]
+	<<elseif ($activeSlave.preg > 0) && ($activeSlave.pregType < 50)>>
+		[[Abort her pregnancy|Abort]]
+	<</if>>
+	<</if>>
+<</if>>
 <</replace>>
 <</widget>>
 /%
@@ -1077,7 +1099,7 @@
 	<</if>>
 <<elseif $args[0].analSkill <= 60>>
 	<<if $args[0].analSkill+$skillIncrease > 60>>
-		@@color:green;She is now a anal sex expert,@@ and knows how to use her spincter to please.
+		@@color:green;She is now a anal sex expert,@@ and knows how to use her sphincter to please.
 	<</if>>
 <<elseif $args[0].analSkill < 100>>
 	<<if $args[0].analSkill+$skillIncrease >= 100>>
@@ -1145,13 +1167,397 @@
 <</widget>>
 
 /%
- Call as <<SlaveImage>>
- Displays images. Currently passage-based.
- $args[0]: Slave.
- $args[1]: Image size/center.
- $args[2]: Fetishes displayed.
+Call as <<AssistantArt>>
+Displays assistant images. Currently passage-based.
+$args[0]: Image size/center.
+	3: Large, right. Example: description.
+	2: Medium, right. Example: random events.
 %/
-<<widget "SlaveImage">>
+<<widget "AssistantArt">>
+
+<<if $imageChoice == 0>> /* RENDERED IMAGES BY SHOKUSHU */
+
+<<switch $assistantAppearance>>
+<<case "monstergirl">>
+	<<set _fileName = "'resources/renders/assistant monstergirl.png' ">>
+<<case "shemale">>
+	<<set _fileName = "'resources/renders/assistant shemale.png' ">>
+<<case "amazon">>
+	<<set _fileName = "'resources/renders/assistant amazon.png' ">>
+<<case "businesswoman">>
+	<<set _fileName = "'resources/renders/assistant businesswoman.png' ">>
+<<case "goddess">>
+	<<set _fileName = "'resources/renders/assistant goddess.png' ">>
+<<case "schoolgirl">>
+	<<set _fileName = "'resources/renders/assistant schoolgirl.png' ">>
+<<default>>
+	<<set _fileName = "'resources/renders/assistant default.png' ">>
+<</switch>>
+<<if $args[1] == 3>>
+	<<print "<img src=" + _fileName + "style='float:right; border:3px hidden'/>">>
+<<else>>
+	<<print "<img src=" + _fileName + "style='float:right; border:3px hidden' width='300' height='300'/>">>
+<</if>>
+
+<</if>> /* CLOSES IMAGE CHOICE */
+
+<</widget>>
+
+/%
+Call as <<SlaveArt>>
+Displays slave images. Currently passage-based.
+$args[0]: Slave.
+$args[1]: Image size/center.
+	3: Large, right. Example: long slave description.
+	2: Medium, right. Example: random events.
+	1: Small, left. Example: lists.
+	0: Tiny, left. Example: facilities
+$args[2]: icon UI Display for vector art, 1 for on.
+%/
+<<widget "SlaveArt">>
+
+<<if $imageChoice == 1>> /* VECTOR ART BY NOX */
+
+<<if $args[1] != 0>> /* IMAGE DOES NOT HAVE TO BE TINY */
+<<if ($args[1] != 1) || ($seeSummaryImages != 0)>> /* IMAGE IS NOT PART OF A LIST, OR IMAGES ARE TO BE DISPLAYED IN LISTS */
+
+<div class="imageRef">
+
+<<set _folderLoc = "'resources/vector">>
+
+<<if $args[2] == 1 >>
+	<<print "<object type='image/svg+xml' data=" + _folderLoc + "/test ui.svg'" + "/></object>">>
+<</if>>
+
+/% Set skin colour %/
+<<set _imgSkinLoc = _folderLoc + "/body/">>
+<<switch $args[0].skin>>
+<<case "light" "white" "fair" "lightened" "extremely pale" "pale">>
+	<<set _imgSkinLoc = _imgSkinLoc + "white">>
+<<case "light brown" "dark">>
+	<<set _imgSkinLoc = _imgSkinLoc + "brown">>
+<<case "brown" "black">>
+	<<set _imgSkinLoc = _imgSkinLoc + "dark brown">>
+<<default>>
+	<<set _imgSkinLoc = _imgSkinLoc + "tanned">>
+<</switch>>
+
+/% Shoulder width and arm or no arm %/
+<<if $args[0].amp != 1>>
+<<if $args[0].fuckdoll == 0>>
+	<<if $args[0].devotion > 50>>
+		<<set _leftArmType = "high">>
+		<<set _rightArmType = "high">>
+	<<elseif $args[0].trust >= -20>>
+		<<if $args[0].devotion < -20>>
+			<<set _leftArmType = "rebel">>
+			<<set _rightArmType = "low">>
+		<<elseif $args[0].devotion <= 20>>
+			<<set _leftArmType = "low">>
+			<<set _rightArmType = "low">>
+		<<else>>
+			<<set _leftArmType = "mid">>
+			<<set _rightArmType = "high">>
+		<</if>>
+	<<else>>
+		<<set _leftArmType = "mid">>
+		<<set _rightArmType = "mid">>
+	<</if>>
+	<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/arm left " + _leftArmType + ".svg'" + "/></object>">>
+	<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/arm right " + _rightArmType + ".svg'" + "/></object>">>
+<<else>>
+	<<set _leftArmType = "mid latex">>
+	<<set _rightArmType = "mid latex">>
+	<<print "<object type='image/svg+xml' data=" + _folderLoc + "/outfit/arm left " + _leftArmType + ".svg'" + "/></object>">>
+	<<print "<object type='image/svg+xml' data=" + _folderLoc + "/outfit/arm right " + _rightArmType + ".svg'" + "/></object>">>
+<</if>>
+<</if>>
+
+/% Hair Aft %/
+<<if $args[0].hStyle != "shaved">>
+<<if $args[0].fuckdoll == 0>>
+	<<switch $args[0].hColor>>
+	<<case "blonde" "golden" "platinum blonde" "strawberry-blonde">>
+		<<set _hairColor = "blonde">>
+	<<case "brown" "hazel" "chestnut" "chocolate brown" "auburn" "dark brown">>
+		<<set _hairColor = "brown">>
+	<<case "red" "copper" "ginger" "burgundy">>
+		<<set _hairColor = "red">>
+	<<case "green">>
+		<<set _hairColor = "green">>
+	<<case "blue">>
+		<<set _hairColor = "blue">>
+	<<case "pink">>
+		<<set _hairColor = "pink">>
+	<<case "black" "grey" "silver" "white">>
+		<<set _hairColor = "black">>
+	<<default>>
+		<<set _hairColor = "black">>
+	<</switch>>
+	<<print "<object type='image/svg+xml' data=" + _folderLoc + "/body/addon/hair aft neat " + _hairColor + ".svg'" + "/></object>">>
+<</if>>
+<</if>>
+
+/% Butt %/
+<<if $args[0].amp != 1>>
+<<if $args[0].butt > 5>>
+	<<set _buttSize = 3>>
+<<elseif $args[0].butt > 4>>
+	<<set _buttSize = 2>>
+<<elseif $args[0].butt > 3>>
+	<<set _buttSize = 1>>
+<<elseif $args[0].butt > 2>>
+	<<set _buttSize = 0>>
+<</if>>
+<<if $args[0].fuckdoll != 0 >>
+	<<set _buttSize = _buttSize + " latex">>
+<</if>>
+<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/butt " + _buttSize + ".svg'" + "/></object>">>
+<</if>>
+
+/% Leg + 1 size up when chubby or fat%/
+<<if $args[0].hips < 0>>
+	<<if $args[0].weight <= 95>>/%Chubby%/
+		<<set _legSize = "normal">>
+	<<else>>
+		<<set _legSize = "narrow">>
+	<</if>>
+<<elseif $args[0].hips == 0>>
+	<<if $args[0].weight <= 95>>/%Chubby%/
+		<<set _legSize = "wide">>
+	<<else>>
+		<<set _legSize = "normal">>
+	<</if>>
+<<elseif $args[0].hips > 0>>
+	<<set _legSize = "wide">>
+<</if>>
+<<if $args[0].amp != 0>>
+	<<set _legSize = "stump " + _legSize>>
+<</if>>
+<<if $args[0].fuckdoll != 0 and $args[0].amp != 1>>
+	<<set _legSize = _legSize + " latex">>
+	<<print "<object type='image/svg+xml' data=" + _folderLoc + "/outfit/leg " + _legSize + ".svg'" + "/></object>">>
+<<else>>
+	<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/leg " + _legSize + ".svg'" + "/></object>">>
+<</if>>
+
+/% Feet %/
+<<if $args[0].amp != 1>>
+<<if $args[0].shoes is "heels">>
+	<<set _shoesType = "heel">>
+<<elseif $args[0].shoes is "extreme heels">>
+	<<if $args[0].weight <= 95>>/%Chubby%/
+		<<set _shoesType = "extreme heel wide">>
+	<<else>>
+		<<set _shoesType = "extreme heel">>
+	<</if>>
+<<elseif $args[0].shoes is "boots">>
+	<<if $args[0].weight <= 95>>/%Chubby%/
+		<<set _shoesType = "boot wide">>
+	<<else>>
+		<<set _shoesType = "boot">>
+	<</if>>
+<<elseif $args[0].shoes is "flats">>
+	<<set _shoesType = "flat">>
+<<else>>
+	<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/feet.svg'" + "/></object>">>
+<</if>>
+<<if $args[0].shoes is "extreme heels" or $args[0].shoes is "boots">>
+	<<if $args[0].fuckdoll != 0>>
+		<<set _shoesType = _shoesType + " latex">>
+	<</if>>
+	<<print "<object type='image/svg+xml' data=" + _folderLoc + "/outfit/" + _shoesType + ".svg'" + "/></object>">>
+<</if>>
+<<if $args[0].shoes is "heels" or $args[0].shoes is "flats">>
+	<<if $args[0].fuckdoll != 0>>
+		<<set _shoesType = _shoesType + " latex">>
+		<<print "<object type='image/svg+xml' data=" + _folderLoc + "/outfit/" + _shoesType + ".svg'" + "/></object>">>
+	<<else>>
+		<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/" + _shoesType + ".svg'" + "/></object>">>
+	<</if>>
+<</if>>
+<</if>>
+
+/% Torso %/
+<<if $args[0].waist is 1>>/%Hour glass%/
+	<<if $args[0].weight <= 95>>/%Chubby%/
+		<<set _torsoSize = "normal">>
+	<<else>>
+		<<set _torsoSize = "hourglass">>
+	<</if>>
+<<elseif $args[0].waist is 2>>/*Unnatural*/
+	<<if $args[0].weight <= 95>>/%Chubby%/
+		<<set _torsoSize = "hourglass">>
+	<<else>>
+		<<set _torsoSize = "unnatural">>
+	<</if>>
+<<elseif $args[0].waist is 0>>/*Normal*/
+	<<set _torsoSize = "normal">>
+<</if>>
+<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/torso " + _torsoSize + ".svg'" + "/></object>">>
+<<if $args[0].fuckdoll != 0>>
+	<<set _torsoSize = _torsoSize + " latex">>
+	<<print "<object type='image/svg+xml' data=" + _folderLoc + "/outfit/torso " + _torsoSize + ".svg'" + "/></object>">>
+<</if>>
+
+/*Navel Piercing*/
+<<if $args[0].navelPiercing >= 1>>
+	<<print "<object type='image/svg+xml' data=" + _folderLoc + "/body/addon/navel piercing.svg'" + "/></object>">>
+<</if>>
+<<if $args[0].navelPiercing == 2>>
+	<<print "<object type='image/svg+xml' data=" + _folderLoc + "/body/addon/navel piercing heavy.svg'" + "/></object>">>
+<</if>>
+
+/% Vagina %/
+<<if $args[0].vagina >= 0>>
+	<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/vagina.svg'" + "/></object>">>
+	<<if $args[0].clitPiercing == 1>>
+		<<print "<object type='image/svg+xml' data=" + _folderLoc + "/body/addon/clit piercing.svg'" + "/></object>">>
+	<<elseif $args[0].clitPiercing == 2>>
+		<<print "<object type='image/svg+xml' data=" + _folderLoc + "/body/addon/clit piercing heavy.svg'" + "/></object>">>
+	<<elseif $args[0].clitPiercing == 3>>
+		<<print "<object type='image/svg+xml' data=" + _folderLoc + "/body/addon/clit piercing smart.svg'" + "/></object>">>
+	<</if>>
+	<<if $args[0].vaginaPiercing == 1>>
+		<<print "<object type='image/svg+xml' data=" + _folderLoc + "/body/addon/pussy piercing.svg'" + "/></object>">>
+	<<elseif $args[0].vaginaPiercing == 2>>
+		<<print "<object type='image/svg+xml' data=" + _folderLoc + "/body/addon/pussy piercing heavy.svg'" + "/></object>">>
+	<</if>>
+<</if>>
+
+/%if pregnant%/
+<<if $args[0].preg > 0>>
+	<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/preg belly.svg'" + "/></object>">>
+	<<if $args[0].navelPiercing >= 1>>/*Navel Piercing*/
+		<<print "<object type='image/svg+xml' data=" + _folderLoc + "/body/addon/preg navel piercing.svg'" + "/></object>">>
+	<</if>>
+	<<if $args[0].navelPiercing == 2>>
+		<<print "<object type='image/svg+xml' data=" + _folderLoc + "/body/addon/preg navel piercing heavy.svg'" + "/></object>">>
+	<</if>>
+<</if>>
+
+/% Head base image %/
+<<if $args[0].fuckdoll != 0>>
+	<<print "<object type='image/svg+xml' data=" + _folderLoc + "/outfit/head latex.svg'" + "/></object>">>
+<<else>>
+	<<print "<object type='image/svg+xml' data=" +_imgSkinLoc + "/head.svg'" + "/></object>">>
+<</if>>
+
+/% Collar %/
+<<if $args[0].collar is "dildo gag">>
+	<<print "<object type='image/svg+xml' data=" + _folderLoc + "/outfit/gag.svg'" + "/></object>">>
+<</if>>
+
+/% Glasses %/
+<<if $args[0].eyewear is "corrective glasses" or $args[0].eyewear is "glasses" or $args[0].eyewear is "blurring glasses">>
+	<<print "<object type='image/svg+xml' data=" + _folderLoc + "/outfit/glasses.svg'" + "/></object>">>
+<</if>>
+
+/% Boob %/
+<<if $args[0].boobs < 100>>
+	<<set _boobSize = 0>>
+<<elseif $args[0].boobs < 400>>
+	<<set _boobSize = 1>>
+<<elseif $args[0].boobs < 800>>
+	<<set _boobSize = 2>>
+<<elseif $args[0].boobs < 1600>>
+	<<set _boobSize = 3>>
+<<elseif $args[0].boobs < 3200>>
+	<<set _boobSize = 4>>
+<<elseif $args[0].boobs < 6400>>
+	<<set _boobSize = 5>>
+<<elseif $args[0].boobs < 12000>>
+	<<set _boobSize = 6>>
+<<else>>
+	<<set _boobSize = 7>>
+<</if>>
+<<if $args[0].fuckdoll != 0>>
+	<<print "<object type='image/svg+xml' data=" + _folderLoc + "/outfit/boob " +_boobSize +" latex.svg'" + "/></object>">>
+<<else>>
+	<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/boob " +_boobSize +".svg'" + "/></object>">>
+<</if>>
+<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/boob " +_boobSize + " areola.svg'" + "/></object>">>
+<<if$args[0].nipplesPiercing ==1>>
+	<<print "<object type='image/svg+xml' data=" + _folderLoc + "/body/addon/boob " +_boobSize +" piercing.svg'" + "/></object>">>
+<<elseif$args[0].nipplesPiercing ==2>>
+	<<print "<object type='image/svg+xml' data=" + _folderLoc + "/body/addon/boob " +_boobSize +" piercing heavy.svg'" + "/></object>">>
+<</if>>
+<<if$args[0].areolaePiercing ==1>>
+	<<print "<object type='image/svg+xml' data=" + _folderLoc + "/body/addon/boob " +_boobSize +" areola piercing.svg'" + "/></object>">>
+<</if>>
+
+/% Scrotum %/
+<<if $args[0].scrotum > 0>>
+	<<if $args[0].scrotum >= 6>>
+		<<set _ballSize = 4>>
+	<<elseif $args[0].scrotum >= 4>>
+		<<set _ballSize = 3>>
+	<<elseif $args[0].scrotum >= 3>>
+		<<set _ballSize = 2>>
+	<<elseif $args[0].scrotum >= 2>>
+		<<set _ballSize = 1>>
+	<<else>>
+		<<set _ballSize = 0>>
+	<</if>>
+<</if>>
+
+/% Penis %/
+<<if $args[0].dick > 0>>
+	<<if $args[0].dick >= 8>>
+		<<set _penisSize = 6>>
+	<<elseif $args[0].dick >= 7>>
+		<<set _penisSize = 5>>
+	<<elseif $args[0].dick >= 6>>
+		<<set _penisSize = 4>>
+	<<elseif $args[0].dick >= 5>>
+		<<set _penisSize = 3>>
+	<<elseif $args[0].dick >= 4>>
+		<<set _penisSize = 2>>
+	<<elseif $args[0].dick >= 2>>
+		<<set _penisSize = 1>>
+	<<else>>
+		<<set _penisSize = 0>>
+	<</if>>
+<</if>>
+
+<<if _boobSize <= 5>>
+<<if $args[0].vagina > 0>>
+	<<if $args[0].dick > 0>>
+		<div class="highPenis">
+		<<if $args[0].scrotum > 0>>
+			<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/ball " + _ballSize + ".svg'" + "/></object>">>
+		<</if>>
+		<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/penis " + _penisSize + ".svg'" + "/></object>">>
+		</div>
+	<</if>>
+<<else>>
+	<<if $args[0].dick > 0>>
+		<div class="lowPenis">
+		<<if $args[0].scrotum > 0>>
+			<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/ball " + _ballSize + ".svg'" + "/></object>">>
+		<</if>>
+		<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/penis " + _penisSize + ".svg'" + "/></object>">>
+		</div>
+	<</if>>
+<</if>>
+<</if>>
+
+/% clavicle %/
+<<print "<object type='image/svg+xml' data=" + _folderLoc + "/body/addon/clavicle.svg'" + "/></object>">>
+
+/% Hair Foreground%/
+<<if $args[0].hStyle != "shaved">>
+<<if $args[0].fuckdoll == 0 >>
+<<print "<object type='image/svg+xml' data=" + _folderLoc + "/body/addon/hair fore neat " + _hairColor + ".svg'" + "/></object>">>
+<</if>>
+<</if>>
+
+</div>
+
+<</if>>
+<</if>> /* CLOSES EXEMPTIONS FOR IMAGE SIZES NOT CURRENTLY SUPPORTED BY VECTOR ART */
+
+<<else>> /* RENDERED IMAGES BY SHOKUSHU */
 
 <<if $args[0].vagina gt -1>>
 	<<if $args[0].dick gt 0>>
@@ -1197,7 +1603,7 @@
 	<</if>>
 <<elseif $args[0].fetish == "mindbroken">>
 	<<set _fileName = _fileName + " reluctant">>
-<<elseif $args[0].devotion <= 50 || $args[0].fetishKnown != 1 || $args[2] == 0>>
+<<elseif $args[0].devotion <= 50 || $args[0].fetishKnown != 1 || ($seeMainFetishes == 0 && $args[1] < 2)>>
 	<<set _fileName = _fileName + " obedient">>
 <<else>>
 	<<if $args[0].fetish == "none">>
@@ -1207,15 +1613,17 @@
 	<</if>>
 <</if>>
 
-<<set _fileName = "'resources/character types/" + _fileName + ".png' ">>
+<<set _fileName = "'resources/renders/" + _fileName + ".png' ">>
 <<if $args[1] == 3>>
 	<<print "<img src=" + _fileName + "style='float:right; border:3px hidden'/>">>
 <<elseif $args[1] == 2>>
 	<<print "<img src=" + _fileName + "style='float:right; border:3px hidden' width='300' height='300'/>">>
 <<elseif $args[1] == 1>>
-	<<print "<img src=" + _fileName + "style='float:left; border:3px hidden' width='150' height='150'/>">>
+	<<if $seeSummaryImages != 0>><<print "<img src=" + _fileName + "style='float:left; border:3px hidden' width='150' height='150'/>">><</if>>
 <<else>>
 	<<print "<img src=" + _fileName + "style='float:left; border:3px hidden' width='120' height='120'/>">>
 <</if>>
 
-<</widget>>
+<</if>> /* CLOSES IMAGE CHOICE */
+
+<</widget>>
\ No newline at end of file
-- 
GitLab