diff --git a/src/pregmod/generateChild.tw b/src/pregmod/generateChild.tw
index f63ae7696281320923d7515dfa242ffce30efebd..5844914b70bb4dabb2c9e81d10ff08adc98a12fe 100644
--- a/src/pregmod/generateChild.tw
+++ b/src/pregmod/generateChild.tw
@@ -402,7 +402,7 @@
<<if $activeSlave.dick > 0>>
<<set $activeSlave.foreskin = 1>>
<<set $activeSlave.balls = 1>>
- <<set $activeSlave.scrotom = 1>>
+ <<set $activeSlave.scrotum = 1>>
<</if>>
<<if $activeSlave.fetish != "none">>
<<set $activeSlave.fetishStrength = 20>>
diff --git a/src/pregmod/pcSurgeryDegredation.tw b/src/pregmod/pcSurgeryDegredation.tw
index 20a326f3f6d599be2761f1c373c5ae5fd83ba9f5..b9ae6e4c69daec13120a3265ccb4324a58b41336 100644
--- a/src/pregmod/pcSurgeryDegredation.tw
+++ b/src/pregmod/pcSurgeryDegredation.tw
@@ -56,7 +56,7 @@
<<else>>
find your balls are much bigger than you expected them to be.
<</if>>
- "So, what do you think of them?", asks the surgeon's assistant, seating herself beside you and placing a hand upon your <<if $PC.ballsImplant == 3>>cantaloupe-sized<<elseif $PC.ballsImplant == 2>>softball-like<<else>>large<</if>> testicles. "Nice and heavy, you should feel them with every move you make." She begins groping your scrotom, feeling around for any oddities in the gel. "I know you're still a little sore, but bear with it. Enjoying the massage are you?" She asks, poking at the tip of your erection with her free hand. "Why don't we find out if they are working properly?" She leans over your dick<<if $PC.preg >= 20>>, her face brushing the underside of your pregnancy,<</if>> and licks the bead of precum building on its end. "As good as always." Taking your dick to the hilt, she begins earnestly sucking you off while fondling your overfilled balls. The new sensation quickly overwhelms your control and you release your load deep in her throat. Like a good assistant, she diligently swallows it down, making sure not a drop is missed. "Shame just making them bigger doesn't mean more cum." Satisfied, you lie back down to sleep off the rest of the anesthesia before returning to your arcology.
+ "So, what do you think of them?", asks the surgeon's assistant, seating herself beside you and placing a hand upon your <<if $PC.ballsImplant == 3>>cantaloupe-sized<<elseif $PC.ballsImplant == 2>>softball-like<<else>>large<</if>> testicles. "Nice and heavy, you should feel them with every move you make." She begins groping your scrotum, feeling around for any oddities in the gel. "I know you're still a little sore, but bear with it. Enjoying the massage are you?" She asks, poking at the tip of your erection with her free hand. "Why don't we find out if they are working properly?" She leans over your dick<<if $PC.preg >= 20>>, her face brushing the underside of your pregnancy,<</if>> and licks the bead of precum building on its end. "As good as always." Taking your dick to the hilt, she begins earnestly sucking you off while fondling your overfilled balls. The new sensation quickly overwhelms your control and you release your load deep in her throat. Like a good assistant, she diligently swallows it down, making sure not a drop is missed. "Shame just making them bigger doesn't mean more cum." Satisfied, you lie back down to sleep off the rest of the anesthesia before returning to your arcology.
<<case "ballShrinkage">>
After a few hours, you awaken in the recovery wing with a distinct soreness <<if $PC.ballsImplant == 2>>and tight feeling between your legs<<else>>between your legs<</if>>. You pull the covers off of yourself to catch sight of the result of the sugery and
@@ -69,7 +69,7 @@
<<else>>
find your balls are now closer to the typical size one would expect.
<</if>>
- "So, what do you think of them?", asks the surgeon's assistant, seating herself beside you and placing a hand upon your <<if $PC.ballsImplant == 2>>softball-like<<elseif $PC.ballsImplant == 2>>large<<else>>normal<</if>> testicles. "Starting to feel lighter?" She begins groping your scrotom, feeling around for any oddities. "I know you're still a little sore, but bear with it. Enjoying the massage are you?" She asks, poking at the tip of your erection with her free hand. "Why don't we find out if they are still working properly?" She leans over your dick<<if $PC.preg >= 20>>, her face brushing the underside of your pregnancy,<</if>> and licks the bead of precum building on its end. "As good as always." Taking your dick to the hilt, she begins earnestly sucking you off while fondling your loosened balls. The new sensation quickly overwhelms your control and you release your load deep in her throat. Like a good assistant, she diligently swallows it down, making sure not a drop is missed. "Shame just can't just suck the gel out of them. That would be too much fun!" Satisfied, you lie back down to sleep off the rest of the anesthesia before returning to your arcology.
+ "So, what do you think of them?", asks the surgeon's assistant, seating herself beside you and placing a hand upon your <<if $PC.ballsImplant == 2>>softball-like<<elseif $PC.ballsImplant == 2>>large<<else>>normal<</if>> testicles. "Starting to feel lighter?" She begins groping your scrotum, feeling around for any oddities. "I know you're still a little sore, but bear with it. Enjoying the massage are you?" She asks, poking at the tip of your erection with her free hand. "Why don't we find out if they are still working properly?" She leans over your dick<<if $PC.preg >= 20>>, her face brushing the underside of your pregnancy,<</if>> and licks the bead of precum building on its end. "As good as always." Taking your dick to the hilt, she begins earnestly sucking you off while fondling your loosened balls. The new sensation quickly overwhelms your control and you release your load deep in her throat. Like a good assistant, she diligently swallows it down, making sure not a drop is missed. "Shame just can't just suck the gel out of them. That would be too much fun!" Satisfied, you lie back down to sleep off the rest of the anesthesia before returning to your arcology.
<<case "tightPussy">>
After a few hours, you awaken in the recovery wing with a distinct soreness between your legs. You pull the covers off of yourself to catch sight of the result of the sugery and
diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw
index 815c1bf4864019282f64f2534977cea5023ccb0d..328e5369548ccb1541bae7e8aa9d5096b510f2a5 100644
--- a/src/uncategorized/personalAssistantAppearance.tw
+++ b/src/uncategorized/personalAssistantAppearance.tw
@@ -1054,7 +1054,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
<<elseif $marketAssistantRelationship == "nonconsensual">>
$assistantName is lazily reclining while the market assistant fans her with a large feather. She snaps her fingers as the taller cherub sighs and lowers her head between $assistantName's legs.
<<elseif $marketAssistantRelationship == "incestuous">>
- $assistantName her sister are struggling to stay airborn as they lustfully trib each other. When they notice you watching, and after they both climax, they pull each other close for a deep kiss only to manage to crash to the ground. They right themselves, laughing, before returning to their makeout session.
+ $assistantName and her sister are struggling to stay airborn as they lustfully trib each other. When they notice you watching, and after they both climax, they pull each other close for a deep kiss only to manage to crash to the ground. They right themselves, laughing, before returning to their makeout session.
<<else>>
They're leaning against each other while looking over a list of your slaves. They choose a pair to work on hooking up before turning to kiss each other deeply.
<</if>>
@@ -1127,16 +1127,93 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
<<elseif ($seed == 7) && ($marketAssistantAnnounced == 1)>>
She's accompanied by your market assistant's slightly taller avatar.
<<if $marketAssistantRelationship == "cute">>
- They're quickly darting around, playing tag; every touch transfering a bit of data between the players.
+ They're tormenting a little representation of one of your slaves while gigling to each other. A closer inspection reveals they are playing with the door locks to confound a new menial.
<<elseif $marketAssistantRelationship == "nonconsensual">>
- $assistantName is lazily reclining while the market assistant fans her with a large feather. She snaps her fingers as the taller cherub sighs and lowers her head between $assistantName's legs.
+ $assistantName has her plaything tightly bound to a rack and is gleefully pouring hot wax onto the oddly silent market assistant. You see why when a drop lands on her sensative clit, eliciting a scream from the restrained imp; $assistantName pulls her restraints even tighter as punishment.
<<elseif $marketAssistantRelationship == "incestuous">>
- $assistantName her sister are struggling to stay airborn as they lustfully trib each other. When they notice you watching, and after they both climax, they pull each other close for a deep kiss only to manage to crash to the ground. They right themselves, laughing, before returning to their makeout session.
+ $assistantName and her sister are struggling to stay airborn as they attempt push an oversized, double-ended dildo out of their own cunt and into the other's. When they notice you watching, $assistantName seizes the opportunity to bear down hard, forcing the entirety of the toy into the distracted market assistant. She crashes to the ground, hands upon her cock bulged middle, orgasming indecently.
<<else>>
- They're leaning against each other while looking over a list of your slaves. They choose a pair to work on hooking up before turning to kiss each other deeply.
+ They're taking swings at each other with switches. Giggling with each swing and moaning with every successful strike.
<</if>>
<<else>>
- She's fluttering to and fro humming to herself. You swear she keeps flashing her panties to you on purpose.
+ She's inspecting her arsenal of toys and punishemnt tools. When she notices you watching; she grabs her favourite and eagerly makes use of it on herself.
+<</if>>
+
+<<elseif $assistantAppearance == "witch">>
+ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0].FSSupremacistRace <</if>> witch with thin, flowing robes and a wide brimmed, if rather stereotypical, witch's hat.
+ <<if $assistantFSOptions>>
+ <<switch $assistantFSAppearance>>
+ <<case "paternalist">>
+ She has swapped to wearing much more, relatively speaking, modest clothing; extremely tight jeans and a top so small and taut you swear she's about to pop out of it.
+ <<case "degradationist">>
+ She has replaced her loincloth with a chastity belt containing an immense dildo; it is clearly seen distending her belly. Countless scars line her back and ass from the frequent lashings she enjoys.
+ <<case "roman revivalist">>
+ She'd fit in perfectly tormenting the condemned in Tartarus.
+ <<case "egyptian revivalist">>
+ She has recently adjusted her appearance to resemble an Egyptian slave; that combined with a manufactured rebellious streak are sure to earn her a whipping.
+ <<case "edo revivalist">>
+ She has tightly bound herself in shibari ropes, though they don't achieve much given she can still fly freely.
+ <<case "arabian revivalist">>
+ She has donned the skimpiest, sluttiest outfit she could think of. She's just begging to get stoned.
+ <<case "chinese revivalist">>
+ She has added a number of peircings to her body to allow her to be suspended by hooks rather than flying.
+ <<case "chattel religionist">>
+ She has chosen to go fully naked, exposing the symbols of your religion pierced through het nipples and clit.
+ <<case "physical idealist">>
+ She has adjusted her appearance to be rather muscular. Not only can she crack a whip harder than ever, but when she flexes, she nearly pops the belt around her chest.
+ <<case "repopulation focus">>
+ She's added a pair of tight belts across her stomach recently. The taut material painfully digs into her growing pregnancy.
+ <<case "eugenics">>
+ She has an iron chastity belt under her loincloth and two large bulges in her middle. You don't have to guess she has a pair of enormous dildos locked inside her.
+ <<case "gender radicalist">>
+ She's recently begun rendering herself more androgynous. Something can be seen commonly tenting her loincloth; when ever if shifts to the side, you catch sight of a thumb sized and heavily pierced clitoris.
+ <<case "gender fundamentalist">>
+ She's recently increased the size of her breasts and width of her hips. The belt around her chest tightly binds her new bust and causes its flesh to bulge and jiggle delightfully.
+ <<case "asset expansionist">>
+ She's had to let out her chest belt to accommodate her new excessive bust, but only a little; the belt creates a deep canyon across her chest with plenty of flesh bulging above and below the straining leather.
+ <<case "transformation fetishist">>
+ She's had to let out her chest belt to accommodate her new excessive bust, but only a little; the belt creates a deep canyon across her fake chest and threatens to painfully pop the underlying implants.
+ <<case "pastoralist">>
+ She's exchanged her chest belt for a pair of rings with leather straps. She wears them so tightly every motion she makes forces a gush of milk from her painfully swollen breasts.
+ <<case "maturity preferentialist">>
+ She has recently updated her appearance to be more mature; an air of experience follows her as she flies around. You can hear her plotting tortures, many you've never heard of.
+ <<case "youth preferentialist">>
+ She has recently updated her appearance to be more youthful. She frequently flutters by, enojoying her youthful vigor. She looks so innocent, but looks can be deceiving!
+ <<case "slimness enthusiast">>
+ Her new, thinner body gives her plenty of excuses to pull her straps even tighter.
+ <<case "body purist">>
+ She has forgone covering herself to allow her sinful, pure body to be visible to all.
+ <<default>>
+ She frequently carries a tome of new and erotic spells.
+ <</switch>>
+ <<else>>
+ She frequently carries a tome of new and erotic spells.
+ <</if>>
+<<if ($cockFeeder == 1) && ($seed == 1)>>
+ She is steadily forcing a dildo the size of your arm down representation of one of your slave's throat. The slave must be down in the kitchen, getting a meal out of the food dispensers. The imp notices you watching, points to the obscene bulge in the slave's throat and laughs maniacally.
+<<elseif ($suppository == 1) && ($seed == 2)>>
+ A recognizable little representation of one of your slaves is before her, ass in the air, as she enthusiastically winds an anal pear. The slave must be receiving her drugs from one of the dildo dispensers. The imp notices you watching and laughs as she gapes the slave's asshole further, enjoying her obvious discomfort.
+<<elseif ($masturbationAllowed == 1) && ($seed == 3)>>
+ A recognizable little representation of one of your slaves is before her, perched atop a wooden horse with sexual fluids running down its sides. The slave must be using one of the penthouse's many sex toys. Noticing you watching, the imp flys above her and roughly forces her down, eliciting a scream of surprise from the horny slave. She likly upped the output on whatever toy the slave was using.
+<<elseif ($seed == 4)>>
+ A recognizable little representation of one of your slaves is lying on her side before her; belly painfully distended. The imp is hovering over her holding an enema bag; the slave must be getting a checkup. She notices your gaze and squeezes the bag, forcing a burst of liquid into the slave's gut and drawing a moan of discomfort out of the girl.
+<<elseif ($seed == 5) && ($invasionVictory > 0)>>
+ She's flapping around in circles chasing a representation of one of your security drones with a mallet. When she sees you looking at her, she quickly hides the hammer behing her back, giggles and says, "He let some get away and needed to be punished!"
+<<elseif ($seed == 6) && ($studio == 1)>>
+ She's hovering over a recognizable little representation of one of your slaves masturbate while holding a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and $assistantName is clearly turning the feed of it into a PoV porno.
+<<elseif ($seed == 7) && ($marketAssistantAnnounced == 1)>>
+ She's accompanied by your market assistant's slightly taller avatar.
+ <<if $marketAssistantRelationship == "cute">>
+ They're tormenting a little representation of one of your slaves while gigling to each other. A closer inspection reveals they are playing with the door locks to confound a new menial.
+ <<elseif $marketAssistantRelationship == "nonconsensual">>
+ $assistantName has her plaything tightly bound to a rack and is gleefully pouring hot wax onto the oddly silent market assistant. You see why when a drop lands on her sensative clit, eliciting a scream from the restrained imp; $assistantName pulls her restraints even tighter as punishment.
+ <<elseif $marketAssistantRelationship == "incestuous">>
+ $assistantName and her sister are struggling to stay airborn as they attempt push an oversized, double-ended dildo out of their own cunt and into the other's. When they notice you watching, $assistantName seizes the opportunity to bear down hard, forcing the entirety of the toy into the distracted market assistant. She crashes to the ground, hands upon her cock bulged middle, orgasming indecently.
+ <<else>>
+ They're taking swings at each other with switches. Giggling with each swing and moaning with every successful strike.
+ <</if>>
+<<else>>
+ She's inspecting her arsenal of toys and punishemnt tools. When she notices you watching; she grabs her favourite and eagerly makes use of it on herself.
<</if>>
<<else>>
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index 9c16f0631f8976856937ca99f634b17a8515495c..df80f4d92ae2066d019e03027e8f8d437d17c5c5 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -475,7 +475,7 @@
<<if ($eventSlave.fetish == "sadist") || ($eventSlave.fetish == "dom") || ($eventSlave.energy > 95)>>
<<if ($REShowerForceSub != 0)>>
<<if ($eventSlave.trust <= 75)>>
- <<set $RETSevent.push("RE shower force")>>
+ <<set $RETSevent.push("shower force")>>
<</if>>
<</if>>
<<if ($eventSlave.anus > 0)>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 26d274b481916cab890ac42220910d29f5f11e5e..2f7e973f42a102b529a5a006784998631c45dac8 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -1,10 +1,8 @@
:: Remote Surgery [nobr]
-<<set $nextButton = "Continue">>
-<<set $nextLink = "Slave Interact">>
+<<set $nextButton = "Continue", $nextLink = "Slave Interact">>
-<<set $surgeryType = 0>>
-<<set $showEncyclopedia = 1>><<set $encyclopedia = "The Remote Surgery">>
+<<set $surgeryType = 0, $showEncyclopedia = 1, $encyclopedia = "The Remote Surgery">>
$activeSlave.slaveName is lying strapped down on the table in your <<if $surgeryUpgrade == 1>>heavily upgraded and customized remote surgery.<<else>>remote surgery.<</if>> The surgical equipment reads <<if $activeSlave.health < -20>>@@.red;SLAVE UNHEALTHY, SURGERY NOT RECOMMENDED.@@<<elseif $activeSlave.health <= 20>>@@.yellow;SLAVE HEALTHY, SURGERY SAFE.@@<<else>>@@.green;SLAVE HEALTHY, SURGERY ENCOURAGED.@@<</if>><<if $PC.medicine >= 100>> The remote surgery mechanisms that allow a surgeon to be brought in by telepresence are inactive, and the autosurgery is ready for your control inputs. Surgery on your slaves is a challenge and a pleasure you wouldn't dream of sharing.<</if>>
<br><br>
@@ -663,7 +661,7 @@ $pronounCap has
<</if>>
<</if>>
-<<if $organFarmUpgrade >= 1>>
+<<if $organFarmUpgrade >= 1>> /* ORGAN FARM */
<<if $activeSlave.indentureRestrictions < 2>>
<br><br>
@@ -1666,13 +1664,13 @@ The prosthesis facility has constructed $possessive prosthetic limbs.
<<if $activeSlave.origEye != "implant">>
<<if ($activeSlave.eyes > -2)>>
[[Blind|Surgery Degradation][$activeSlave.eyes = -2,$activeSlave.eyeColor = "dulled " + $activeSlave.origEye,$activeSlave.eyeColor = $activeSlave.origEye,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "blind"]]
- <</if>>
+ <</if>>
/*<<if ($activeSlave.eyes != -3)>>
<<if ($activeSlave.eyes >= -2)>> | <</if>>
[[Remove eyes|Surgery Degradation][$activeSlave.eyeColor = "empty",$activeSlave.origEye = "none",$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "remove eyes"]]
<<if ($activeSlave.eyes != -2)>>//This will greatly restrict $possessive//<</if>>
<</if>>*/
- <</if>>
+ <</if>>
<<if $cyberMod == 1 && $stockpile.ocularImplant > 0>>
<<if ($activeSlave.eyes != -3)>> | <</if>>
[[Give her ocular implants|Surgery Degradation][$activeSlave.origEye = "implant",$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "ocular implant"]]
@@ -1935,13 +1933,13 @@ The prosthesis facility has constructed $possessive prosthetic limbs.
[[Remove arms and legs|Surgery Degradation][$activeSlave.amp = 1,$activeSlave.heels = 0,$activeSlave.heightImplant = 0,$activeSlave.legsTat = 0,$activeSlave.armsTat = 0,$cash -= $surgeryCost, $activeSlave.health -= 40,$activeSlave.nails = 0,$surgeryType = "amp1"]] //This will greatly restrict $possessive//
<</if>>
<<elseif ($activeSlave.amp == 1) && ($activeSlave.PLimb == 0)>>
- <<if ($stockpile.basicPLimbInterface > 0)>> |
+ <<if ($stockpile.basicPLimbInterface > 0)>> |
[[Install basic prosthetic interface|Surgery Degradation][$activeSlave.PLimb = 1,$stockpile.basicPLimbInterface -= 1,$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "PLimb interface1"]]
<</if>>
- <<if $stockpile.advPLimbInterface > 0>> |
+ <<if $stockpile.advPLimbInterface > 0>> |
[[Install advanced prosthetic interface|Surgery Degradation][$activeSlave.PLimb = 2,$stockpile.advPLimbInterface -= 1,$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "PLimb interface2"]]
<</if>>
- <<elseif $activeSlave.amp == 1 && $activeSlave.PLimb == 1 && $stockpile.advPLimbInterface > 0>> |
+ <<elseif $activeSlave.amp == 1 && $activeSlave.PLimb == 1 && $stockpile.advPLimbInterface > 0>> |
[[Upgrade = advanced prosthetic interface|Surgery Degradation][$activeSlave.PLimb = 2,$stockpile.advPLimbInterface -= 1,$cash -= $surgeryCost, $activeSlave.health -= 5,$surgeryType = "PLimb interface3"]]
<</if>>
<</if>>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index cc9cb338b8d9b0111eb8a851d0e3b4790f64ba46..b85767bfb222f6916a633979400c37a26ab5c44f 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -24,19 +24,8 @@
<<set $nextLink = "Main">>
<<else>>
-
-As the remote surgery's long recovery cycle completes,
-<<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>>
-
-<<case "fuckdoll">>
+ <<switch $surgeryType>>
+ <<case "fuckdoll" "blind" "remove eyes" "amp" "removeLimbs" "amp1" "PLimb interface1" "PLimb interface2" "PLimb interface3">>
<<set _ID = $activeSlave.ID>>
<<if _ID == $Lurcher.ID>><<set $Lurcher = 0>><</if>>
<<if _ID == $fighterTwo.ID>><<set $fighterTwo = 0>><</if>>
@@ -58,14 +47,22 @@ As the remote surgery's long recovery cycle completes,
<<set _dump = $fighterIDs.deleteAt(_y), _y-->>
<</if>>
<</for>>
- /% Remove from facility array if assigned, except Arcade, MasterSuite, and Cellblock - also do not move agents or agent companions %/
- <<switch $activeSlave.assignment>>
- <<case "be confined in the arcade" "be confined in the cellblock" "serve in the master suite" "be your agent" "live with your agent">>
- /* no assignment change */
- <<default>>
- <<removeJob $activeSlave $activeSlave.assignment>>
+ /% Remove from facility array if assigned. %/
+ <<removeJob $activeSlave $activeSlave.assignment>>
<</switch>>
+As the remote surgery's long recovery cycle completes,
+<<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>>
+<<case "fuckdoll">>
+
<<if $familyTesting == 1>>
<<for $j = 0; $j < $slaves.length; $j++>>
<<if $activeSlave.mother == $slaves[$j].ID>>
@@ -118,9 +115,9 @@ As the remote surgery's long recovery cycle completes,
<</if>>
<<else>>
<<if $activeSlave.relation != 0>>
- <<for $j to 0; $j < $slaves.length; $j++>>
+ <<for $j = 0; $j < $slaves.length; $j++>>
<<if $activeSlave.relationshipTarget != $activeSlave.relationTarget>>
- <<if $slaves[$j].ID is $activeSlave.relationTarget>>
+ <<if $slaves[$j].ID == $activeSlave.relationTarget>>
$slaves[$j].slaveName will be @@.mediumorchid;horrified@@ and @@.gold;afraid@@ when she finds out that her $activeSlave.relation is now a Fuckdoll.
<<set $slaves[$j].devotion -= 40>>
<<set $slaves[$j].trust -= 40>>
@@ -130,8 +127,8 @@ As the remote surgery's long recovery cycle completes,
<</for>>
<</if>>
<<if $activeSlave.relationship > 0>>
- <<for $j to 0; $j < $slaves.length; $j++>>
- <<if $slaves[$j].ID is $activeSlave.relationshipTarget>>
+ <<for $j = 0; $j < $slaves.length; $j++>>
+ <<if $slaves[$j].ID == $activeSlave.relationshipTarget>>
$slaves[$j].slaveName will be @@.mediumorchid;horrified@@ and @@.gold;afraid@@ when she finds out that her <<if $activeSlave.relationshipTarget == $activeSlave.relationTarget>>$activeSlave.relation and<</if>> <<if $activeSlave.relationship > 4>>wife<<elseif $activeSlave.relationship > 3>>lover<<elseif $activeSlave.relationship > 2>>intimate friend<<elseif $activeSlave.relationship > 1>>best friend<<else>>friend<</if>> is now a Fuckdoll.
<<set $slaves[$j].devotion -= $activeSlave.relationship*10>>
<<set $slaves[$j].trust -= $activeSlave.relationship*10>>
@@ -187,7 +184,7 @@ As the remote surgery's long recovery cycle completes,
<<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.
+ 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 reawaken 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">>
@@ -236,7 +233,7 @@ As the remote surgery's long recovery cycle completes,
<</if>>
<<else>>
<<if ($activeSlave.devotion > 50)>>
- When she realizes why, she seems suprised since she doesn't see the point of such procedure. As she was already blind, her mental state remains unaffected.
+ When she realizes why, she seems surprised since she doesn't see the point of such procedure. As she was already blind, her mental state remains unaffected.
<<else>>
Her face twists in distaste. Such pointless and invasive procedure drives home just how @@.gold;expendable@@ she is to you.
<<set $activeSlave.devotion -= 5>>
@@ -246,7 +243,7 @@ As the remote surgery's long recovery cycle completes,
<<case "ocular implant">>
<<if $activeSlave.eyes <= -2>>
- The implant surgery is @@.red;invasive@@ and she spends some time in the autosurgery recovering. As soon as she is allowed to open her eyes and look around, her gaze flicks from object to object with manic speed as her new eyes deliver nearly overwhelming amount of visual informantion. Seeing the world as it is is a gift that those who do not need it cannot properly understand.
+ The implant surgery is @@.red;invasive@@ and she spends some time in the autosurgery recovering. As soon as she is allowed to open her eyes and look around, her gaze flicks from object to object with manic speed as her new eyes deliver nearly overwhelming amount of visual information. Seeing the world as it is is a gift that those who do not need it cannot properly understand.
<<set $activeSlave.devotion += 25>>
<<set $activeSlave.trust += 25>>
<<if ($activeSlave.devotion > 50)>>
@@ -515,7 +512,9 @@ As the remote surgery's long recovery cycle completes,
She notices almost immediately that the soreness that used to tell her she needed to be milked has gone. She bounces her breasts idly; it looks like she doesn't know what to think about having her lactation dry up. As with all surgery @@.red;her health has been slightly affected.@@
<<if $activeSlave.assignment == "get milked">>
@@.yellow;Her assignment has defaulted to resting.@@
- <<removeJob $activeSlave $activeSlave.assignment>>
+ <<set $activeSlave.assignment = "rest">>
+ <<set $activeSlave.assignmentVisible = 1>>
+ <<set $activeSlave.choosesOwnAssignment = 0>>
<</if>>
<<case "ejaculation">>
@@ -796,7 +795,7 @@ Even though creating an artificial scar is a trivial process, @@.red;her health
<<if $activeSlave.vagina == -1>>
Of course, she already realized while exiting that something very dear to her has been taken away.
<<if ($activeSlave.devotion > 50) && ($activeSlave.sexualFlaw == "self hating")>>
- Strong emotions play out on her face as she experiences a watershed in her life of sexual slavery, perhaps the most radical one she'll ever experience. She loves you with all her being, and truly hates herself. She finds herself in an emotional place where she's willing to accept having had you cut her dick off. She knows she's a worthless piece of trash, and realizes that if you feel like trimming useless bits off her, that's your perogative. In moments, she's confirmed in @@.hotpink;total, final, fanatical submission to your will.@@ It's almost frightening.
+ Strong emotions play out on her face as she experiences a watershed in her life of sexual slavery, perhaps the most radical one she'll ever experience. She loves you with all her being, and truly hates herself. She finds herself in an emotional place where she's willing to accept having had you cut her dick off. She knows she's a worthless piece of trash, and realizes that if you feel like trimming useless bits off her, that's your prerogative. In moments, she's confirmed in @@.hotpink;total, final, fanatical submission to your will.@@ It's almost frightening.
<<set $activeSlave.devotion += 50>>
<<elseif ($activeSlave.devotion > 20) && ($activeSlave.fetishknown == 1) && ($activeSlave.fetishStrength > 95) && ($activeSlave.fetish == "buttslut")>>
She's such a complete buttslut, though, that she finds she doesn't really care. She never really paid much attention to her own dick; for her, sex is about the phalli that get rammed up her ass. And you didn't take that from her. If anything, she's @@.aquamarine;reassured@@ by the implicit promise that she'll never be anything but a butthole slut, and of course is forced even further into @@.hotpink;submission to your will.@@
@@ -1067,17 +1066,16 @@ Even though creating an artificial scar is a trivial process, @@.red;her health
<</if>>
<<case "amp1">>
- <<set $nextLink to "Surgery Degradation", $surgeryType to "amp">>
+ <<set $nextLink = "Surgery Degradation", $surgeryType = "amp">>
Since you invested in cybernetic technology you can install PLimb interface into her body during the operation.<br>
Procedure will put additional strain on her health but less so than if you were to perform the procedures separately.<br>
<<if $stockpile.basicPLimbInterface > 0>>
- [[Install basic interface|Surgery Degradation][$activeSlave.PLimb to 1, $activeSlave.health -= 10, $stockpile.basicPLimbInterface -= 1, $surgeryType = "amp2", $nextLink = "Remote Surgery"]]
+ [[Install basic interface|Surgery Degradation][$activeSlave.PLimb = 1, $activeSlave.health -= 10, $stockpile.basicPLimbInterface -= 1, $surgeryType = "amp2", $nextLink = "Remote Surgery"]]
<br><</if>>
<<if $stockpile.advPLimbInterface > 0>>
- [[Install advanced interface|Surgery Degradation][$activeSlave.PLimb to 2, $activeSlave.health -= 10, $stockpile.advPLimbInterface -= 1, $surgeryType = "amp2", $nextLink = "Remote Surgery"]]
+ [[Install advanced interface|Surgery Degradation][$activeSlave.PLimb = 2, $activeSlave.health -= 10, $stockpile.advPLimbInterface -= 1, $surgeryType = "amp2", $nextLink = "Remote Surgery"]]
<</if>>
-
<<case "amp2">>
<<if ($activeSlave.devotion > 50)>>
Of course, she could not walk out of the surgery; you carried her. She knows what a slave's life is, but she did not really expect that it would ever come to this for her. Anesthesia has yet to completely wear off so it takes her a while to notice ports in her stumps. When she does, she visibly relaxes, realizing she may yet walk again. She squares her shoulders and visibly resolves to carry on being a good slave as best she can. Since the surgery was invasive, @@.red;her health has been greatly affected.@@
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 9ca21bce60d959c079aaf23bdac5c650317d109e..38ab40a3916b40cd72788a8d041d71ed9ded1557 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -1267,7 +1267,7 @@
<<set $args[0].origEye = $args[0].eyeColor>>
<<set $args[0].origHColor = $args[0].hColor>>
-<<set $args[0].underarmHColor = $args[0].hColor>>
+<<set $args[0].underArmHColor = $args[0].hColor>>
<<set $args[0].pubicHColor = $args[0].hColor>>
<<if $args[0].dick > 0>>