From 5063e78e97e18fd2d33004406fa4e193852d8f04 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sat, 26 Sep 2020 22:25:00 -0400
Subject: [PATCH] use the $activeSlave global less.

---
 .../nursery/nurseryRetrievalWorkaround.tw     |   5 +-
 src/pregmod/incubatorRetrievalWorkaround.tw   |  15 +-
 src/pregmod/seHuskSlaveDelivery.tw            |  86 +++----
 src/uncategorized/bulkSlaveIntro.tw           |   8 +-
 src/uncategorized/pBioreactorPerfected.tw     |  30 +--
 src/uncategorized/pMercenaryRomeo.tw          |  54 ++---
 src/uncategorized/pSnatchAndGrabResult.tw     | 212 +++++++++---------
 src/uncategorized/seCustomSlaveDelivery.tw    | 134 +++++------
 8 files changed, 271 insertions(+), 273 deletions(-)

diff --git a/src/facilities/nursery/nurseryRetrievalWorkaround.tw b/src/facilities/nursery/nurseryRetrievalWorkaround.tw
index 6f87de31a98..f8328a2cd41 100644
--- a/src/facilities/nursery/nurseryRetrievalWorkaround.tw
+++ b/src/facilities/nursery/nurseryRetrievalWorkaround.tw
@@ -4,10 +4,9 @@ $readySlave.slaveName has been discharged from $nurseryName and is ready to beco
 
 <br><br>
 
-<<set $activeSlave = $readySlave>>
 <<set $nurseryChildren-->>
-<<includeDOM App.Desc.longSlave(V.activeSlave)>>
-<<run newSlave($activeSlave)>>
+<<includeDOM App.Desc.longSlave($readySlave)>>
+<<run newSlave($readySlave)>>
 <<set $nextLink = "AS Dump">>
 <<set $returnTo = "Main">>
 /*	TODO:
diff --git a/src/pregmod/incubatorRetrievalWorkaround.tw b/src/pregmod/incubatorRetrievalWorkaround.tw
index 8826d551814..262a86c4d4e 100644
--- a/src/pregmod/incubatorRetrievalWorkaround.tw
+++ b/src/pregmod/incubatorRetrievalWorkaround.tw
@@ -8,14 +8,13 @@
 
 	<br><br>
 
-	<<set $activeSlave = $readySlave>>
 	<<set $incubatorSlaves-->>
-	<<includeDOM App.Desc.longSlave(V.activeSlave)>>
+	<<includeDOM App.Desc.longSlave(V.readySlave)>>
 	<<if $readySlave.tankBaby != 3>>
 		<<if $incubatorOrgans.length > 0>>
 			<<for _irw = 0; _irw < $incubatorOrgans.length; _irw++>>
 				<<if $incubatorOrgans[_irw].ID == $incubatorOldID>>
-					<<set _newOrgan = {type: $incubatorOrgans[_irw].type, weeksToCompletion: $incubatorOrgans[_irw].weeksToCompletion, ID: $activeSlave.ID}>>
+					<<set _newOrgan = {type: $incubatorOrgans[_irw].type, weeksToCompletion: $incubatorOrgans[_irw].weeksToCompletion, ID: $readySlave.ID}>>
 					<<if _newOrgan.weeksToCompletion <= 0>>
 						<<set $completedOrgans.push($incubatorOrgans[_irw])>>
 					<<else>>
@@ -25,7 +24,7 @@
 				<</if>>
 			<</for>>
 		<</if>>
-		<<run newSlave($activeSlave)>>
+		<<run newSlave($readySlave)>>
 		<<include "New Child Intro">>
 	<<else>>
 		A husk is ready to be used.
@@ -34,11 +33,11 @@
 		<span id="result">
 		<<if $cash >= $surgeryCost>>
 			<br>[[Contact the bodyswap surgeon.|husk Slave Swap Workaround]] //Will significantly increase the selected slave's upkeep.//
-			<br>[[Sell the husk to Flesh Heap.|Main][cashX(Math.trunc(slaveCost($activeSlave)/3), "slaveTransfer")]]
-			//This body can be bought by the Flesh Heap for <<print cashFormat(Math.trunc(slaveCost($activeSlave)/3))>>//.
+			<br>[[Sell the husk to Flesh Heap.|Main][cashX(Math.trunc(slaveCost($readySlave)/3), "slaveTransfer")]]
+			//This body can be bought by the Flesh Heap for <<print cashFormat(Math.trunc(slaveCost($readySlave)/3))>>//.
 		<<else>>
-			<<run cashX(Math.trunc(slaveCost($activeSlave)/3), "slaveTransfer")>>
-			//You can't sustain $him and thus must sell $him for <<print cashFormat(Math.trunc(slaveCost($activeSlave)/3))>>.//
+			<<run cashX(Math.trunc(slaveCost($readySlave)/3), "slaveTransfer")>>
+			//You can't sustain $him and thus must sell $him for <<print cashFormat(Math.trunc(slaveCost($readySlave)/3))>>.//
 		<</if>>
 		</span>
 	<</if>>
diff --git a/src/pregmod/seHuskSlaveDelivery.tw b/src/pregmod/seHuskSlaveDelivery.tw
index c2079cb81bd..7694f1a2375 100644
--- a/src/pregmod/seHuskSlaveDelivery.tw
+++ b/src/pregmod/seHuskSlaveDelivery.tw
@@ -9,67 +9,67 @@
 	<<set $fixedRace = $huskSlave.race>>
 <</if>>
 <<if $huskSlave.sex == 2>>
-	<<set $activeSlave = GenerateNewSlave("XY", {mature: 0, nationality: $huskSlave.nationality})>>
-	<<set $activeSlave.boobs = 50>>
-	<<set $activeSlave.boobsImplant = 0>>
-	<<set $activeSlave.boobsImplantType = "none">>
+	<<set _husk = GenerateNewSlave("XY", {mature: 0, nationality: $huskSlave.nationality})>>
+	<<set _husk.boobs = 50>>
+	<<set _husk.boobsImplant = 0>>
+	<<set _husk.boobsImplantType = "none">>
 <<else>>
-	<<set $activeSlave = GenerateNewSlave("XX", {mature: 0, nationality: $huskSlave.nationality})>>
+	<<set _husk = GenerateNewSlave("XX", {mature: 0, nationality: $huskSlave.nationality})>>
 <</if>>
 
-<<set $activeSlave.slaveName = "Doll">>
-<<set $activeSlave.birthName = "">>
-<<set $activeSlave.slaveSurname = "">>
-<<set $activeSlave.surname = "">>
-<<set $activeSlave.origin = "You reserved a mindless slave like $him from the Flesh Heap.">>
-<<set $activeSlave.devotion = 0>>
-<<set $activeSlave.trust = 0>>
-<<set $activeSlave.fetish = "mindbroken">>
-<<set $activeSlave.fetishStrength = 10>>
-<<set $activeSlave.fetishKnown = 1>>
-<<set $activeSlave.career = "a Fuckdoll">>
-<<set $activeSlave.behavioralFlaw = "none">>
-<<set $activeSlave.behavioralQuirk = "none">>
-<<set $activeSlave.sexualFlaw = "none">>
-<<set $activeSlave.sexualQuirk = "none">>
-<<set $activeSlave.intelligence = -100>>
-<<set $activeSlave.intelligenceImplant = 0>>
-<<set $activeSlave.skill.vaginal = 0>>
-<<set $activeSlave.skill.oral = 0>>
-<<set $activeSlave.skill.anal = 0>>
-<<set $activeSlave.skill.whoring = 0>>
-<<set $activeSlave.skill.entertainment = 0>>
-<<set $activeSlave.skill.combat = 0>>
+<<set _husk.slaveName = "Doll">>
+<<set _husk.birthName = "">>
+<<set _husk.slaveSurname = "">>
+<<set _husk.surname = "">>
+<<set _husk.origin = "You reserved a mindless slave like $him from the Flesh Heap.">>
+<<set _husk.devotion = 0>>
+<<set _husk.trust = 0>>
+<<set _husk.fetish = "mindbroken">>
+<<set _husk.fetishStrength = 10>>
+<<set _husk.fetishKnown = 1>>
+<<set _husk.career = "a Fuckdoll">>
+<<set _husk.behavioralFlaw = "none">>
+<<set _husk.behavioralQuirk = "none">>
+<<set _husk.sexualFlaw = "none">>
+<<set _husk.sexualQuirk = "none">>
+<<set _husk.intelligence = -100>>
+<<set _husk.intelligenceImplant = 0>>
+<<set _husk.skill.vaginal = 0>>
+<<set _husk.skill.oral = 0>>
+<<set _husk.skill.anal = 0>>
+<<set _husk.skill.whoring = 0>>
+<<set _husk.skill.entertainment = 0>>
+<<set _husk.skill.combat = 0>>
 
 <<if $huskSlave.sex == 3>>
-	<<set $activeSlave.dick = 1>>
-	<<set $activeSlave.foreskin = 2>>
-	<<set $activeSlave.prostate = 1>>
-	<<set $activeSlave.balls = 1>>
-	<<if $activeSlave.physicalAge >= $potencyAge>>
-		<<set $activeSlave.pubertyXY = 1>>
+	<<set _husk.dick = 1>>
+	<<set _husk.foreskin = 2>>
+	<<set _husk.prostate = 1>>
+	<<set _husk.balls = 1>>
+	<<if _husk.physicalAge >= $potencyAge>>
+		<<set _husk.pubertyXY = 1>>
 	<</if>>
 <</if>>
-<<if $activeSlave.balls > 0>>
-	<<set $activeSlave.scrotum = $activeSlave.balls>>
+<<if _husk.balls > 0>>
+	<<set _husk.scrotum = _husk.balls>>
 <</if>>
-<<if $activeSlave.vagina == -1>>
-	<<set $activeSlave.clit = 0>>
+<<if _husk.vagina == -1>>
+	<<set _husk.clit = 0>>
 <</if>>
 <<if $huskSlave.virgin == 0>>
-	<<set $activeSlave.anus = 0>>
-	<<if $activeSlave.vagina > -1>>
-		<<set $activeSlave.vagina = 0>>
+	<<set _husk.anus = 0>>
+	<<if _husk.vagina > -1>>
+		<<set _husk.vagina = 0>>
 	<</if>>
 <</if>>
 
-<<setLocalPronouns $activeSlave>>
+<<setLocalPronouns _husk>>
 
 A slave came in fitting the description you provided.
 <br>
 //As expected, $he is a complete vegetable, but that is what you ordered after all. You lack the facilities to care for $him in this state, so you should do what you are planning quickly. Or you could return $him to the Flesh Heap, though you won't get your credits back.//
 <br><br>
-<<includeDOM App.Desc.longSlave(V.activeSlave, {market: "generic"})>>
+<<includeDOM App.Desc.longSlave(_husk, {market: "generic"})>>
 <br><br>
 <span id="result">
 <<if $cash >= $surgeryCost>>
diff --git a/src/uncategorized/bulkSlaveIntro.tw b/src/uncategorized/bulkSlaveIntro.tw
index 6672a17328e..75810af08ff 100644
--- a/src/uncategorized/bulkSlaveIntro.tw
+++ b/src/uncategorized/bulkSlaveIntro.tw
@@ -73,17 +73,17 @@
 	<</if>>
 	<br><br>
 
-	/* Set activeSlave to the desired newSlave so that existing code can be used */
-	<<set $activeSlave = $market.newSlaves[$market.newSlaveIndex]>>
+	/* Set slave to the desired newSlave so that existing code can be used */
+	<<set _slave = $market.newSlaves[$market.newSlaveIndex]>>
 
 	/* Due to possible gingering, the Long Slave Description must be displayed before the New Slave Intro */
 	/* policies were applied earlier, if needed */
-	<<includeDOM App.Desc.longSlave(V.activeSlave, {market: "generic"})>>
+	<<includeDOM App.Desc.longSlave(_slave, {market: "generic"})>>
 
 	<br>
 
 	/* Use existing New Slave Intro */
-	<<includeDOM App.UI.newSlaveIntro($activeSlave)>> /* calls removeGingering() if needed */
+	<<includeDOM App.UI.newSlaveIntro(_slave)>> /* calls removeGingering() if needed */
 
 	/* Override nextButton setting from New Slave Intro */
 	<<set $nextButton = "Continue">>
diff --git a/src/uncategorized/pBioreactorPerfected.tw b/src/uncategorized/pBioreactorPerfected.tw
index 5edd82ebd98..41999aa133d 100644
--- a/src/uncategorized/pBioreactorPerfected.tw
+++ b/src/uncategorized/pBioreactorPerfected.tw
@@ -2,9 +2,9 @@
 
 <<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event", $bioreactorsAnnounced = 1>>
 
-<<set $activeSlave = $slaves.find(function(s) { return s.assignment == "work in the dairy" && s.boobs > 48000 && (s.balls == 0 || s.balls >= 10) && s.fetish == "mindbroken"; })>>
+<<set _bioSlave = $slaves.find(function(s) { return s.assignment == "work in the dairy" && s.boobs > 48000 && (s.balls == 0 || s.balls >= 10) && s.fetish == "mindbroken"; })>>
 
-<<if (ndef $activeSlave)>>
+<<if (ndef _bioSlave)>>
 	<<goto "Random Nonindividual Event">>
 <<else>>
 
@@ -12,21 +12,21 @@
 <<set _bioreactorsXY = 0>>
 <<set _bioreactorsHerm = 0>>
 <<set _bioreactorsBarren = 0>>
-<<if ($activeSlave.ovaries == 1)>>
-	<<if ($activeSlave.balls == 0)>>
+<<if (_bioSlave.ovaries == 1)>>
+	<<if (_bioSlave.balls == 0)>>
 		<<set _bioreactorsXX = 1>>
 	<<else>>
 		<<set _bioreactorsHerm = 1>>
 	<</if>>
 <<else>>
-	<<if ($activeSlave.balls == 0)>>
+	<<if (_bioSlave.balls == 0)>>
 		<<set _bioreactorsBarren = 1>>
 	<<else>>
 		<<set _bioreactorsXY = 1>>
 	<</if>>
 <</if>>
 
-<<setLocalPronouns $activeSlave>>
+<<setLocalPronouns _bioSlave>>
 <<setAssistantPronouns>>
 
 When you need peace and quiet to work through a difficult problem, you sometimes take a few minutes to pace through $dairyName. The massive, gently swaying breasts are always an encouraging sight, and the faint, rhythmic sounds of machine milking, machine feeding, and machine sodomy have a stimulating effect on one's thought processes. When you reach the end of the row of machines for the first time today, you turn to walk back again, and then notice that $assistant.name's
@@ -80,10 +80,10 @@ When you need peace and quiet to work through a difficult problem, you sometimes
 <<else>>
 	<<if $PC.title == 1>>"Sir,"<<else>>"Ma'am,"<</if>> _heA says, "I'd like to ask you something about this slave."
 <</if>>
-You stop and consider the cow, from $his titanic breasts to $his <<if ($activeSlave.balls >= 10) && ($activeSlave.scrotum > 0)>>swollen balls<<elseif $activeSlave.vagina > -1>>slavering cunt<<else>>distended stomach<</if>> to $his dildo-filled anus.
+You stop and consider the cow, from $his titanic breasts to $his <<if (_bioSlave.balls >= 10) && (_bioSlave.scrotum > 0)>>swollen balls<<elseif _bioSlave.vagina > -1>>slavering cunt<<else>>distended stomach<</if>> to $his dildo-filled anus.
 <<if $assistant.personality == 0>>
 	"This slave is permanently dependent on $his milking machine," it continues. "$He cannot be removed without uneconomical expenditures, and is unlikely to be useful elsewhere.
-	Additionally, there is nothing more that can be done to make $his breasts any bigger<<if $activeSlave.balls >= 10>> or $his testicles any more productive<<elseif $activeSlave.ovaries == 1>> or $his womb any more productive<</if>>. $His development is essentially final, and that status can be made official. $He could be redesignated as equipment. Other than $his designation, this would make little difference: the machine would be slightly less cautious with $his drugs, future intubations, and such. $He would be removed from the slave lists."
+	Additionally, there is nothing more that can be done to make $his breasts any bigger<<if _bioSlave.balls >= 10>> or $his testicles any more productive<<elseif _bioSlave.ovaries == 1>> or $his womb any more productive<</if>>. $His development is essentially final, and that status can be made official. $He could be redesignated as equipment. Other than $his designation, this would make little difference: the machine would be slightly less cautious with $his drugs, future intubations, and such. $He would be removed from the slave lists."
 <<else>>
 	"$He's never leaving here, not without surgery. And even then, $he's forgotten almost everything, and $he won't be getting it back."
 	<<switch $assistant.appearance>>
@@ -126,7 +126,7 @@ You stop and consider the cow, from $his titanic breasts to $his <<if ($activeSl
 	<<default>>
 		The symbol on the screen dissolves down to create a gentle backlight behind the slave.
 	<</switch>>
-	"$He's beautiful, isn't $he? Perfect. There's nothing more that can be done, to make $his udders any bigger<<if $activeSlave.balls >= 10>> or $his balls any more productive<<elseif $activeSlave.ovaries == 1>> or $his womb any more productive<</if>>. $He's complete, and $he's part of this machine now, and that's all $he'll ever be. I can make that status official, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>. I'd redesignate $him as equipment. It wouldn't change much, other than a designation. I'd just be a little less cautious with $his drugs, future intubations, things like that. But for slave purposes, $he'd be gone. Just a part of $dairyName, forever. Or, until $he wears out in <<if $retirementAge-$activeSlave.physicalAge <= 3>>a few years<<elseif $retirementAge-$activeSlave.physicalAge <= 10>>a decade or so<<elseif $retirementAge-$activeSlave.physicalAge >= 20>>a couple of decades<</if>>."
+	"$He's beautiful, isn't $he? Perfect. There's nothing more that can be done, to make $his udders any bigger<<if _bioSlave.balls >= 10>> or $his balls any more productive<<elseif _bioSlave.ovaries == 1>> or $his womb any more productive<</if>>. $He's complete, and $he's part of this machine now, and that's all $he'll ever be. I can make that status official, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>. I'd redesignate $him as equipment. It wouldn't change much, other than a designation. I'd just be a little less cautious with $his drugs, future intubations, things like that. But for slave purposes, $he'd be gone. Just a part of $dairyName, forever. Or, until $he wears out in <<if $retirementAge-_bioSlave.physicalAge <= 3>>a few years<<elseif $retirementAge-_bioSlave.physicalAge <= 10>>a decade or so<<elseif $retirementAge-_bioSlave.physicalAge >= 20>>a couple of decades<</if>>."
 <</if>>
 
 <br><br>
@@ -134,9 +134,9 @@ You stop and consider the cow, from $his titanic breasts to $his <<if ($activeSl
 <span id="result">
 <<link "Do it, and do it to all maximized dairy slaves">>
 	<<replace "#result">>
-		Your assistant pauses, and then says, "Redesignation complete, <<= properTitle()>>. This milking machine has been equipped with biological components. This combination is projected to produce approximately <<if $activeSlave.balls > 0>><<print 1000*Math.trunc((3*52*($retirementAge-$activeSlave.physicalAge))/1000)>> liters of cum,<</if>>
-		<<if $activeSlave.ovaries == 1>><<print 100*Math.trunc((52*($retirementAge-$activeSlave.physicalAge))/100)>> liters of vaginal secretions, <<print 5*($retirementAge-$activeSlave.physicalAge)>> slaves,<</if>>
-		and <<print 1000*Math.trunc((300*52*($retirementAge-$activeSlave.physicalAge))/1000)>> liters of milk over a <<print $retirementAge-$activeSlave.physicalAge>> year period before its biological components must be replaced."
+		Your assistant pauses, and then says, "Redesignation complete, <<= properTitle()>>. This milking machine has been equipped with biological components. This combination is projected to produce approximately <<if _bioSlave.balls > 0>><<print 1000*Math.trunc((3*52*($retirementAge-_bioSlave.physicalAge))/1000)>> liters of cum,<</if>>
+		<<if _bioSlave.ovaries == 1>><<print 100*Math.trunc((52*($retirementAge-_bioSlave.physicalAge))/100)>> liters of vaginal secretions, <<print 5*($retirementAge-_bioSlave.physicalAge)>> slaves,<</if>>
+		and <<print 1000*Math.trunc((300*52*($retirementAge-_bioSlave.physicalAge))/1000)>> liters of milk over a <<print $retirementAge-_bioSlave.physicalAge>> year period before its biological components must be replaced."
 		<<if $assistant.personality > 0>>
 			<<switch $assistant.appearance>>
 			<<case "monstergirl">>
@@ -184,7 +184,7 @@ You stop and consider the cow, from $his titanic breasts to $his <<if ($activeSl
 		<<set $bioreactorsXY += _bioreactorsXY>>
 		<<set $bioreactorsHerm += _bioreactorsHerm>>
 		<<set $bioreactorsBarren += _bioreactorsBarren>>
-		<<= removeSlave($activeSlave)>>
+		<<= removeSlave(_bioSlave)>>
 		<<set $createBioreactors = 1>>
 	<</replace>>
 <</link>>
@@ -236,8 +236,8 @@ You stop and consider the cow, from $his titanic breasts to $his <<if ($activeSl
 		As a bioreactor, she might gross <<print cashFormatColor(_cashX)>> and cost just <<print cashFormatColor(-100)>>, bringing in <<print cashFormatColor(_cashX - 100)>>
 	</p>
 	<div class="indent">
-		$His current task is to <<print $activeSlave.assignment>><<if $assignmentRecords[$activeSlave.ID]>>, and before that to <<print $assignmentRecords[$activeSlave.ID]>><</if>>.
+		$His current task is to <<print _bioSlave.assignment>><<if $assignmentRecords[_bioSlave.ID]>>, and before that to <<print $assignmentRecords[_bioSlave.ID]>><</if>>.
 	</div>
-	<<includeDOM slaveExpenses(V.activeSlave)>>
+	<<includeDOM slaveExpenses(_bioSlave)>>
 </div>
 <</if>> /* closes validity check */
diff --git a/src/uncategorized/pMercenaryRomeo.tw b/src/uncategorized/pMercenaryRomeo.tw
index 5817bc70791..5b3a8964626 100644
--- a/src/uncategorized/pMercenaryRomeo.tw
+++ b/src/uncategorized/pMercenaryRomeo.tw
@@ -8,20 +8,20 @@
 	<<if _romeoSlaves.length == 0>>
 		<<set _name = setup.whiteAmericanSlaveNames.random()>>
 	<<else>>
-		<<set $activeSlave = _romeoSlaves.random()>>
+		<<set _juliet = _romeoSlaves.random()>>
 	<</if>>
 <<else>>
-	<<set $activeSlave = _romeoSlaves.random()>>
+	<<set _juliet = _romeoSlaves.random()>>
 <</if>>
-<<if ndef $activeSlave>>
+<<if ndef _juliet>>
 	<<set _name = setup.whiteAmericanSlaveNames.random()>>
 <</if>>
 
 <<if _name == 0>>
-	<<set _slaveCost = slaveCost($activeSlave)>>
+	<<set _slaveCost = slaveCost(_juliet)>>
 	<<set _slaveCost = (random(60,70)*Math.trunc(_slaveCost/100))>>
 	<<set _slaveCost = 100*Math.trunc(_slaveCost/100)>>
-	<<setLocalPronouns $activeSlave>>
+	<<setLocalPronouns _juliet>>
 <</if>>
 <<setNonlocalPronouns $seeDicks>>
 
@@ -50,10 +50,10 @@ proffered by an attentive slave _girlU, he seems almost bashful.
 	<<setNonlocalPronouns $seeDicks>>
 	I've been seeing _name a lot, and _heU makes the years sit a little lighter on me. I've scraped together what I can, and I can pay <<print cashFormat(50000)>>." It's a huge sum for a mercenary; it's probably his entire savings, but there is a slight problem; the slave he is looking for isn't one of yours. "Well then," he says in embarrassment, "Have to say this is a little awkward." He gives a fake cough, "You wouldn't happen to, you know, know who _hisU owner is?" You shake your head. A run in with a _girlU named _name isn't much to go by and it really isn't your problem. "Ah well, I'm sure I'll see _himU around again. Anyway, that was a fine victory the other day, <<= properTitle()>>; come down to the bar and join the boys and I. We'll buy you a drink. Devil knows, thanks to you we can afford to. Hell, maybe you'll even get to meet _name too, get to see just how much of a looker _heU is."
 <<else>>
-	<<if ["serve in the club", "serve the public", "whore", "work in the brothel"].includes($activeSlave.assignment)>>
-		I've been seeing <<= App.UI.slaveDescriptionDialog($activeSlave)>> a lot, and $he makes the years sit a little lighter on me.
+	<<if ["serve in the club", "serve the public", "whore", "work in the brothel"].includes(_juliet.assignment)>>
+		I've been seeing <<= App.UI.slaveDescriptionDialog(_juliet)>> a lot, and $he makes the years sit a little lighter on me.
 	<<else>>
-		I've seen <<= App.UI.slaveDescriptionDialog($activeSlave)>> here and there and I can't stop thinking about $him. I feel $he'd make the years sit a little lighter on me.
+		I've seen <<= App.UI.slaveDescriptionDialog(_juliet)>> here and there and I can't stop thinking about $him. I feel $he'd make the years sit a little lighter on me.
 	<</if>>
 	I've scraped together what I can, and I can pay <<print cashFormat(_slaveCost)>>." It's a decent price, probably a little less than you could get at auction. It's a huge sum for a mercenary; it's probably his entire savings. You ask what he would do with $him. "Well," he says, actually blushing, "I'd free $him. And marry $him, if $he'd have me."
 
@@ -62,22 +62,22 @@ proffered by an attentive slave _girlU, he seems almost bashful.
 	<span id="result">
 	<<link "Decline, and tell $him not to see him">>
 		<<replace "#result">>
-			$activeSlave.slaveName obeys your orders not to see the old mercenary. Though neither he or $activeSlave.slaveName says a word about it, his squadmates are not so closemouthed. Soon the tragic story of The Mercenary and the Slave $Girl is being told in bars and brothels across the Free City, with you naturally playing @@.red;the role of the villain.@@
+			_juliet.slaveName obeys your orders not to see the old mercenary. Though neither he or _juliet.slaveName says a word about it, his squadmates are not so closemouthed. Soon the tragic story of The Mercenary and the Slave $Girl is being told in bars and brothels across the Free City, with you naturally playing @@.red;the role of the villain.@@
 			<<run repX(-1000, "event")>>
 		<</replace>>
 	<</link>>
 	<br><<link "Politely decline">>
 		<<replace "#result">>
 			"Ah well," he says, "didn't think you would, but I had to ask. If you'd be so kind as to keep $him assigned so's I can see $him, I would be grateful. That was a fine victory, <<= properTitle()>>; come down to the bar and join the boys and I. We'll buy you a drink. Devil knows, thanks to you we can afford to."
-			<<if $activeSlave.relationship == -3 && $activeSlave.fetish != "mindbroken" && $activeSlave.devotion+$activeSlave.trust > 190>>$activeSlave.slaveName politely thanks you for not letting him take $him away.<</if>>
+			<<if _juliet.relationship == -3 && _juliet.fetish != "mindbroken" && _juliet.devotion+_juliet.trust > 190>>_juliet.slaveName politely thanks you for not letting him take $him away.<</if>>
 		<</replace>>
 	<</link>>
 	<br><<link "Accept">>
 		<<replace "#result">>
-			The mercenary leaves to collect his purchase. On the video feeds, you see that $activeSlave.slaveName can hardly believe what's
-			<<if $activeSlave.relationship == -3 && $activeSlave.fetish != "mindbroken" && $activeSlave.devotion+$activeSlave.trust > 190>>
+			The mercenary leaves to collect his purchase. On the video feeds, you see that _juliet.slaveName can hardly believe what's
+			<<if _juliet.relationship == -3 && _juliet.fetish != "mindbroken" && _juliet.devotion+_juliet.trust > 190>>
 				happening. You can't hear what he says as he takes out a ring, but $his reaction speaks clearly. $He says "No."
-				<<if canWalk($activeSlave) && hasAnyArms($activeSlave)>>
+				<<if canWalk(_juliet) && hasAnyArms(_juliet)>>
 					$He points back into your penthouse and returns to $his home.
 				<<else>>
 					$He gestures towards the nearest camera and he helps $him back into your penthouse.
@@ -87,23 +87,23 @@ proffered by an attentive slave _girlU, he seems almost bashful.
 				Since $he returned to slavery, it's only fair to return the credits he paid for $him. He thanks you hollowly before heading on his way.
 			<<else>>
 				happened.
-				<<if hasAnyArms($activeSlave) && hasBothLegs($activeSlave)>>
+				<<if hasAnyArms(_juliet) && hasBothLegs(_juliet)>>
 					$He hugs him, sobbing into his shoulder. As they walk hand in hand down towards his quarters,
 				<<else>>
-					As he <<if !isAmputee($activeSlave)>>gives<<else>>picks up $his limbless form to give<</if>> $him a hug,
+					As he <<if !isAmputee(_juliet)>>gives<<else>>picks up $his limbless form to give<</if>> $him a hug,
 				<</if>>
-				$he gives the nearest camera a little nod and silently mouths the words "Thank you, <<= getWrittenTitle($activeSlave)>>." Soon the romantic story of The Mercenary and the Slave $Girl is being told in bars and brothels across the Free City, with you naturally playing @@.green;a supporting role.@@
+				$he gives the nearest camera a little nod and silently mouths the words "Thank you, <<= getWrittenTitle(_juliet)>>." Soon the romantic story of The Mercenary and the Slave $Girl is being told in bars and brothels across the Free City, with you naturally playing @@.green;a supporting role.@@
 				<<run cashX(_slaveCost, "slaveTransfer")>>
-				<<= removeSlave($activeSlave)>>
+				<<= removeSlave(_juliet)>>
 			<</if>>
 		<</replace>>
 	<</link>>
 	<br><<link "Give $him to him as a gift">>
 		<<replace "#result">>
-			The mercenary cannot believe his ears. After you repeat yourself twice, he leaves to collect your gift, thanking you clumsily. On the video feeds, you see that $activeSlave.slaveName can hardly believe what's
-			<<if $activeSlave.relationship == -3 && $activeSlave.fetish != "mindbroken" && $activeSlave.devotion+$activeSlave.trust > 190>>
+			The mercenary cannot believe his ears. After you repeat yourself twice, he leaves to collect your gift, thanking you clumsily. On the video feeds, you see that _juliet.slaveName can hardly believe what's
+			<<if _juliet.relationship == -3 && _juliet.fetish != "mindbroken" && _juliet.devotion+_juliet.trust > 190>>
 				happening. You can't hear what he says as he takes out a ring, but $his reaction speaks clearly. $He says "No."
-				<<if canWalk($activeSlave) && hasAnyArms($activeSlave)>>
+				<<if canWalk(_juliet) && hasAnyArms(_juliet)>>
 					$He points back into your penthouse and returns to $his home.
 				<<else>>
 					$He gestures towards the nearest camera and he helps $him back into your penthouse.
@@ -112,16 +112,16 @@ proffered by an attentive slave _girlU, he seems almost bashful.
 				"I thought I was giving $him a better life... But $he already had everything $he wanted. I'm sorry for putting you in such a position." You can hear the sadness in his voice. "Thank you for your time. I'm sorry to have bothered you."
 			<<else>>
 				happened.
-				<<if hasAnyArms($activeSlave) && hasAnyLegs($activeSlave)>>
+				<<if hasAnyArms(_juliet) && hasAnyLegs(_juliet)>>
 					$He hugs him, sobbing into his shoulder. As they walk hand in hand down towards his quarters,
 				<<else>>
-					As he <<if !isAmputee($activeSlave)>>gives<<else>>picks up $his limbless form to give<</if>> $him a hug,
+					As he <<if !isAmputee(_juliet)>>gives<<else>>picks up $his limbless form to give<</if>> $him a hug,
 				<</if>>
-				$he gives the nearest camera a little nod and silently mouths the words "Thank you, <<= getWrittenTitle($activeSlave)>>." You smile to yourself; when they get there they'll find flowers and a paid reservation at the arcology's best restaurant. Soon the story is being told in bars and brothels across the Free City, with you naturally playing @@.green;a starring role.@@ Some days later, you hear a dramatization is being filmed, with an aging action star playing the mercenary, a rising starlet playing $activeSlave.slaveName, and a noted character actor playing you.
+				$he gives the nearest camera a little nod and silently mouths the words "Thank you, <<= getWrittenTitle(_juliet)>>." You smile to yourself; when they get there they'll find flowers and a paid reservation at the arcology's best restaurant. Soon the story is being told in bars and brothels across the Free City, with you naturally playing @@.green;a starring role.@@ Some days later, you hear a dramatization is being filmed, with an aging action star playing the mercenary, a rising starlet playing _juliet.slaveName, and a noted character actor playing you.
 				<<run repX(15000, "event")>>
-				<<set _poster = "a poster for the movie that was made about the love between one of your mercenaries and " + $activeSlave.slaveName>>
+				<<set _poster = "a poster for the movie that was made about the love between one of your mercenaries and " + _juliet.slaveName>>
 				<<set $trinkets.push(_poster)>>
-				<<= removeSlave($activeSlave)>>
+				<<= removeSlave(_juliet)>>
 			<</if>>
 		<</replace>>
 	<</link>>
@@ -130,9 +130,9 @@ proffered by an attentive slave _girlU, he seems almost bashful.
 	<h3>$His records...</h3>
 	<div class="note">
 		<div class="indent">
-			$His current task is to <<print $activeSlave.assignment>><<if $assignmentRecords[$activeSlave.ID]>>, and before that to <<print $assignmentRecords[$activeSlave.ID]>><</if>>.
+			$His current task is to <<print _juliet.assignment>><<if $assignmentRecords[_juliet.ID]>>, and before that to <<print $assignmentRecords[_juliet.ID]>><</if>>.
 		</div>
-		<<includeDOM slaveImpactLongTerm(V.activeSlave)>>
+		<<includeDOM slaveImpactLongTerm(_juliet)>>
 	</div>
 
 <</if>>
diff --git a/src/uncategorized/pSnatchAndGrabResult.tw b/src/uncategorized/pSnatchAndGrabResult.tw
index 6571b1af54c..e10d7bcaea8 100644
--- a/src/uncategorized/pSnatchAndGrabResult.tw
+++ b/src/uncategorized/pSnatchAndGrabResult.tw
@@ -6,133 +6,133 @@
 
 <<set $activeSlaveOneTimeMaxAge = $minimumSlaveAge>>
 <<set $oneTimeDisableDisability = 1>>
-<<set $activeSlave = GenerateNewSlave("XX")>>
-<<set $activeSlave.origin = "$He is your share of a raid on an illegal laboratory by your mercenaries.">>
-<<set $activeSlave.career = "a slave">>
-<<set $activeSlave.devotion = 100>>
-<<set $activeSlave.trust = 100>>
-<<run setHealth($activeSlave, 250, 0, 0, 0, 0)>>
-<<set $activeSlave.face = 15>>
-<<set $activeSlave.faceShape = "exotic">>
-<<set $activeSlave.anus = 0>>
+<<set _snatched = GenerateNewSlave("XX")>>
+<<set _snatched.origin = "$He is your share of a raid on an illegal laboratory by your mercenaries.">>
+<<set _snatched.career = "a slave">>
+<<set _snatched.devotion = 100>>
+<<set _snatched.trust = 100>>
+<<run setHealth(_snatched, 250, 0, 0, 0, 0)>>
+<<set _snatched.face = 15>>
+<<set _snatched.faceShape = "exotic">>
+<<set _snatched.anus = 0>>
 <<if $seeDicks != 100>>
-	<<set $activeSlave.vagina = 0>>
-	<<set $activeSlave.ovaries = 1>>
+	<<set _snatched.vagina = 0>>
+	<<set _snatched.ovaries = 1>>
 <</if>>
 <<if $seeDicks == 0>>
-	<<set $activeSlave.dick = 0>>
-	<<set $activeSlave.balls = 0>>
-	<<set $activeSlave.scrotum = 0>>
+	<<set _snatched.dick = 0>>
+	<<set _snatched.balls = 0>>
+	<<set _snatched.scrotum = 0>>
 <<elseif $seeDicks > 75>>
-	<<set $activeSlave.dick = 2>>
-	<<if $activeSlave.foreskin > 0>><<set $activeSlave.foreskin = $activeSlave.dick>><</if>>
-	<<set $activeSlave.balls = 1>>
-	<<set $activeSlave.scrotum = $activeSlave.balls>>
+	<<set _snatched.dick = 2>>
+	<<if _snatched.foreskin > 0>><<set _snatched.foreskin = _snatched.dick>><</if>>
+	<<set _snatched.balls = 1>>
+	<<set _snatched.scrotum = _snatched.balls>>
 <<else>>
-	<<set $activeSlave.dick = 1>>
-	<<set $activeSlave.foreskin = 1>>
-	<<set $activeSlave.balls = 1>>
-	<<set $activeSlave.scrotum = $activeSlave.balls>>
+	<<set _snatched.dick = 1>>
+	<<set _snatched.foreskin = 1>>
+	<<set _snatched.balls = 1>>
+	<<set _snatched.scrotum = _snatched.balls>>
 <</if>>
-<<set $activeSlave.boobs += 6000>>
-<<set $activeSlave.boobShape = "saggy">>
-<<set $activeSlave.nipples = "partially inverted">>
-<<set $activeSlave.areolae = 3>>
-<<set $activeSlave.butt += 2>>
-<<set $activeSlave.lips = 15>>
-<<set $activeSlave.skill.vaginal = 0>>
-<<set $activeSlave.skill.oral = 0>>
-<<set $activeSlave.skill.anal = 0>>
-<<set $activeSlave.skill.whoring = 0>>
-<<set $activeSlave.skill.entertainment = 0>>
-<<set $activeSlave.birthWeek = 0>>
-<<set $activeSlave.voice = 2>>
-<<set $activeSlave.weight = 60>>
-<<set $activeSlave.muscles = 0>>
-<<set $activeSlave.shoulders = -2>>
-<<set $activeSlave.hips = 0>>
-<<set $activeSlave.waist = 10>>
-<<set $activeSlave.hStyle = "shaved bald">>
-<<set $activeSlave.hLength = 0>>
-<<set $activeSlave.custom.desc = "$His skin is unnaturally perfect, totally without blemishes. $He radiates unnatural health and resilience.">>
-<<set $activeSlave.custom.tattoo = "$He has a barcode tattooed on the top of $his head.">>
-<<set $activeSlave.behavioralFlaw = "odd">>
-<<set $activeSlave.fetish = "none">>
-<<set $activeSlave.energy = 100>>
-<<set $activeSlave.fetishKnown = 1>>
-<<set $activeSlave.attrKnown = 1>>
-<<if $activeSlave.physicalAge >= 12>>
-	<<set $activeSlave.teeth = "normal">>
+<<set _snatched.boobs += 6000>>
+<<set _snatched.boobShape = "saggy">>
+<<set _snatched.nipples = "partially inverted">>
+<<set _snatched.areolae = 3>>
+<<set _snatched.butt += 2>>
+<<set _snatched.lips = 15>>
+<<set _snatched.skill.vaginal = 0>>
+<<set _snatched.skill.oral = 0>>
+<<set _snatched.skill.anal = 0>>
+<<set _snatched.skill.whoring = 0>>
+<<set _snatched.skill.entertainment = 0>>
+<<set _snatched.birthWeek = 0>>
+<<set _snatched.voice = 2>>
+<<set _snatched.weight = 60>>
+<<set _snatched.muscles = 0>>
+<<set _snatched.shoulders = -2>>
+<<set _snatched.hips = 0>>
+<<set _snatched.waist = 10>>
+<<set _snatched.hStyle = "shaved bald">>
+<<set _snatched.hLength = 0>>
+<<set _snatched.custom.desc = "$His skin is unnaturally perfect, totally without blemishes. $He radiates unnatural health and resilience.">>
+<<set _snatched.custom.tattoo = "$He has a barcode tattooed on the top of $his head.">>
+<<set _snatched.behavioralFlaw = "odd">>
+<<set _snatched.fetish = "none">>
+<<set _snatched.energy = 100>>
+<<set _snatched.fetishKnown = 1>>
+<<set _snatched.attrKnown = 1>>
+<<if _snatched.physicalAge >= 12>>
+	<<set _snatched.teeth = "normal">>
 <</if>>
-<<set $activeSlave.pubicHStyle = "hairless">>
-<<set $activeSlave.underArmHStyle = "hairless">>
+<<set _snatched.pubicHStyle = "hairless">>
+<<set _snatched.underArmHStyle = "hairless">>
 
 <<else>>
 
 <<set $activeSlaveOneTimeMaxAge = 18>>
 <<set $oneTimeDisableDisability = 1>>
-<<set $activeSlave = GenerateNewSlave("XX")>>
-<<set $activeSlave.origin = "$He is your share of a raid on an illegal laboratory by your mercenaries.">>
-<<set $activeSlave.career = "a slave">>
-<<set $activeSlave.devotion = 100>>
-<<set $activeSlave.trust = 100>>
-<<run setHealth($activeSlave, 250, 0, 0, 0, 0)>>
-<<set $activeSlave.face = 15>>
-<<set $activeSlave.faceShape = "androgynous">>
-<<set $activeSlave.anus = 0>>
+<<set _snatched = GenerateNewSlave("XX")>>
+<<set _snatched.origin = "$He is your share of a raid on an illegal laboratory by your mercenaries.">>
+<<set _snatched.career = "a slave">>
+<<set _snatched.devotion = 100>>
+<<set _snatched.trust = 100>>
+<<run setHealth(_snatched, 250, 0, 0, 0, 0)>>
+<<set _snatched.face = 15>>
+<<set _snatched.faceShape = "androgynous">>
+<<set _snatched.anus = 0>>
 <<if $seeDicks != 100>>
-	<<set $activeSlave.vagina = 0>>
-	<<set $activeSlave.ovaries = 1>>
+	<<set _snatched.vagina = 0>>
+	<<set _snatched.ovaries = 1>>
 <</if>>
 <<if $seeDicks == 0>>
-	<<set $activeSlave.dick = 0>>
-	<<set $activeSlave.balls = 0>>
-	<<set $activeSlave.scrotum = $activeSlave.balls>>
+	<<set _snatched.dick = 0>>
+	<<set _snatched.balls = 0>>
+	<<set _snatched.scrotum = _snatched.balls>>
 <<elseif $seeDicks > 75>>
-	<<set $activeSlave.dick = 6>>
-	<<if $activeSlave.foreskin > 0>><<set $activeSlave.foreskin = $activeSlave.dick>><</if>>
-	<<set $activeSlave.balls = 1>>
-	<<set $activeSlave.scrotum = $activeSlave.balls>>
+	<<set _snatched.dick = 6>>
+	<<if _snatched.foreskin > 0>><<set _snatched.foreskin = _snatched.dick>><</if>>
+	<<set _snatched.balls = 1>>
+	<<set _snatched.scrotum = _snatched.balls>>
 <<else>>
-	<<set $activeSlave.dick = 1>>
-	<<set $activeSlave.foreskin = 1>>
-	<<set $activeSlave.balls = 1>>
-	<<set $activeSlave.scrotum = $activeSlave.balls>>
+	<<set _snatched.dick = 1>>
+	<<set _snatched.foreskin = 1>>
+	<<set _snatched.balls = 1>>
+	<<set _snatched.scrotum = _snatched.balls>>
 <</if>>
-<<set $activeSlave.boobs += 200>>
-<<set $activeSlave.butt += 1>>
-<<if $activeSlave.lips < 10>>
-	<<set $activeSlave.lips += 5>>
+<<set _snatched.boobs += 200>>
+<<set _snatched.butt += 1>>
+<<if _snatched.lips < 10>>
+	<<set _snatched.lips += 5>>
 <</if>>
-<<set $activeSlave.skill.vaginal = 0>>
-<<set $activeSlave.skill.oral = 0>>
-<<set $activeSlave.skill.anal = 0>>
-<<set $activeSlave.skill.whoring = 0>>
-<<set $activeSlave.skill.entertainment = 0>>
-<<set $activeSlave.birthWeek = 0>>
-<<set $activeSlave.height = Math.round(Height.random($activeSlave, {skew: 1, limitMult: [0, 2]}))>>
-<<set $activeSlave.weight = 0>>
-<<set $activeSlave.muscles = 20>>
-<<set $activeSlave.waist = -75>>
-<<set $activeSlave.hStyle = "shaved bald">>
-<<set $activeSlave.hLength = 0>>
-<<set $activeSlave.custom.desc = "$His skin is unnaturally perfect, totally without blemishes. $He radiates unnatural health and resilience.">>
-<<set $activeSlave.custom.tattoo = "$He has a barcode tattooed on the top of $his head.">>
-<<set $activeSlave.behavioralFlaw = "odd">>
-<<set $activeSlave.fetish = "none">>
-<<set $activeSlave.energy = 100>>
-<<set $activeSlave.fetishKnown = 1>>
-<<set $activeSlave.attrKnown = 1>>
-<<if $activeSlave.physicalAge >= 12>>
-	<<set $activeSlave.teeth = "normal">>
+<<set _snatched.skill.vaginal = 0>>
+<<set _snatched.skill.oral = 0>>
+<<set _snatched.skill.anal = 0>>
+<<set _snatched.skill.whoring = 0>>
+<<set _snatched.skill.entertainment = 0>>
+<<set _snatched.birthWeek = 0>>
+<<set _snatched.height = Math.round(Height.random(_snatched, {skew: 1, limitMult: [0, 2]}))>>
+<<set _snatched.weight = 0>>
+<<set _snatched.muscles = 20>>
+<<set _snatched.waist = -75>>
+<<set _snatched.hStyle = "shaved bald">>
+<<set _snatched.hLength = 0>>
+<<set _snatched.custom.desc = "$His skin is unnaturally perfect, totally without blemishes. $He radiates unnatural health and resilience.">>
+<<set _snatched.custom.tattoo = "$He has a barcode tattooed on the top of $his head.">>
+<<set _snatched.behavioralFlaw = "odd">>
+<<set _snatched.fetish = "none">>
+<<set _snatched.energy = 100>>
+<<set _snatched.fetishKnown = 1>>
+<<set _snatched.attrKnown = 1>>
+<<if _snatched.physicalAge >= 12>>
+	<<set _snatched.teeth = "normal">>
 <</if>>
-<<set $activeSlave.pubicHStyle = "hairless">>
-<<set $activeSlave.underArmHStyle = "hairless">>
+<<set _snatched.pubicHStyle = "hairless">>
+<<set _snatched.underArmHStyle = "hairless">>
 
 <</if>>
 
-<<setLocalPronouns $activeSlave>>
-<<set $activeSlave.slaveCost = -10000>>
+<<setLocalPronouns _snatched>>
+<<set _snatched.slaveCost = -10000>>
 
 In the middle of the night, there is a polite knock on your penthouse door. You are alerted by $assistant.name, who observes <<if $assistant.personality == 1>>with some irritation <</if>>that the mercenary who knocked has gone, has left a large case outside the door, and has satisfied the security systems that the case contains nothing hazardous.
 
@@ -141,6 +141,6 @@ The case prompts you for a handprint code; your hand works just fine. It contain
 When you state that, apparently, you are, $he climbs out of the case, prostrates $himself in the hall before you, and says reverentially into the floor, "I love you, <<if $PC.title != 0>>Master<<else>>Mistress<</if>>."
 
 <br><br>
-<<includeDOM App.Desc.longSlave(V.activeSlave)>>
+<<includeDOM App.Desc.longSlave(_snatched)>>
 
-<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
+<<includeDOM App.UI.newSlaveIntro(_snatched)>>
diff --git a/src/uncategorized/seCustomSlaveDelivery.tw b/src/uncategorized/seCustomSlaveDelivery.tw
index 18dd7919c27..23b9c3ca820 100644
--- a/src/uncategorized/seCustomSlaveDelivery.tw
+++ b/src/uncategorized/seCustomSlaveDelivery.tw
@@ -110,105 +110,105 @@
 	<<set $fixedRace = $customSlave.race>>
 <</if>>
 <<if $customSlave.sex == 2>>
-	<<set $activeSlave = GenerateNewSlave("XY", {mature: 0, nationality: _nationality})>>
-	<<set $activeSlave.dick = $customSlave.dick>>
-	<<set $activeSlave.balls = $customSlave.balls>>
-	<<set $activeSlave.scrotum = $activeSlave.balls>>
-	<<set $activeSlave.foreskin = $activeSlave.dick>>
+	<<set _delivery = GenerateNewSlave("XY", {mature: 0, nationality: _nationality})>>
+	<<set _delivery.dick = $customSlave.dick>>
+	<<set _delivery.balls = $customSlave.balls>>
+	<<set _delivery.scrotum = _delivery.balls>>
+	<<set _delivery.foreskin = _delivery.dick>>
 <<else>>
-	<<set $activeSlave = GenerateNewSlave("XX", {mature: 0, nationality: _nationality})>>
+	<<set _delivery = GenerateNewSlave("XX", {mature: 0, nationality: _nationality})>>
 	<<if $customSlave.virgin == 0>>
-		<<set $activeSlave.vagina = $customSlave.virgin>>
+		<<set _delivery.vagina = $customSlave.virgin>>
 	<</if>>
-	<<set $activeSlave.labia = $customSlave.labia>>
-	<<set $activeSlave.vaginaLube = $customSlave.vaginaLube>>
-	<<set $activeSlave.skill.vaginal = $customSlave.skills>>
+	<<set _delivery.labia = $customSlave.labia>>
+	<<set _delivery.vaginaLube = $customSlave.vaginaLube>>
+	<<set _delivery.skill.vaginal = $customSlave.skills>>
 	<<if $customSlave.sex == 3>>
-		<<set $activeSlave.dick = $customSlave.dick>>
-		<<set $activeSlave.balls = $customSlave.balls>>
-		<<set $activeSlave.scrotum = $activeSlave.balls>>
-		<<set $activeSlave.foreskin = $activeSlave.dick>>
-		<<if $activeSlave.dick == 0>>
-			<<set $activeSlave.clit = $customSlave.clit>>
-			<<set $activeSlave.foreskin = $activeSlave.clit>>
+		<<set _delivery.dick = $customSlave.dick>>
+		<<set _delivery.balls = $customSlave.balls>>
+		<<set _delivery.scrotum = _delivery.balls>>
+		<<set _delivery.foreskin = _delivery.dick>>
+		<<if _delivery.dick == 0>>
+			<<set _delivery.clit = $customSlave.clit>>
+			<<set _delivery.foreskin = _delivery.clit>>
 		<</if>>
 	<<else>>
-		<<set $activeSlave.clit = $customSlave.clit>>
+		<<set _delivery.clit = $customSlave.clit>>
 	<</if>>
 <</if>>
 
 /* I have no clue what I'm doing here */
 <<if $customSlave.heightMod == "greatly below average">>
-	<<set $activeSlave.height = Math.round(Height.random($activeSlave, {skew: -5, spread: .15, limitMult: [-5, -2]}))>>
+	<<set _delivery.height = Math.round(Height.random(_delivery, {skew: -5, spread: .15, limitMult: [-5, -2]}))>>
 <<elseif $customSlave.heightMod == "below average">>
-	<<set $activeSlave.height = Math.round(Height.random($activeSlave, {skew: -1, limitMult: [-2, 0]}))>>
+	<<set _delivery.height = Math.round(Height.random(_delivery, {skew: -1, limitMult: [-2, 0]}))>>
 <<elseif $customSlave.heightMod == "normal">>
-	<<set $activeSlave.height = Math.round(Height.random($activeSlave, {limitMult: [-1, 1]}))>>
+	<<set _delivery.height = Math.round(Height.random(_delivery, {limitMult: [-1, 1]}))>>
 <<elseif $customSlave.heightMod == "above average">>
-	<<set $activeSlave.height = Math.round(Height.random($activeSlave, {skew: 1, limitMult: [0, 2]}))>>
+	<<set _delivery.height = Math.round(Height.random(_delivery, {skew: 1, limitMult: [0, 2]}))>>
 <<else>>
-	<<set $activeSlave.height = Math.round(Height.random($activeSlave, {skew: 5, spread: .15, limitMult: [2, 5]}))>>
+	<<set _delivery.height = Math.round(Height.random(_delivery, {skew: 5, spread: .15, limitMult: [2, 5]}))>>
 <</if>>
 
 <<if $customSlave.intelligence == 3>>
-	<<set $activeSlave.intelligence = random(96,100)>>
+	<<set _delivery.intelligence = random(96,100)>>
 <<elseif $customSlave.intelligence == 2>>
-	<<set $activeSlave.intelligence = random(51,95)>>
+	<<set _delivery.intelligence = random(51,95)>>
 <<elseif $customSlave.intelligence == 1>>
-	<<set $activeSlave.intelligence = random(15,50)>>
+	<<set _delivery.intelligence = random(15,50)>>
 <<elseif $customSlave.intelligence == -1>>
-	<<set $activeSlave.intelligence = random(-50,-16)>>
+	<<set _delivery.intelligence = random(-50,-16)>>
 <<elseif $customSlave.intelligence == -2>>
-	<<set $activeSlave.intelligence = random(-95,-51)>>
+	<<set _delivery.intelligence = random(-95,-51)>>
 <<elseif $customSlave.intelligence == -3>>
-	<<set $activeSlave.intelligence = random(-100,-96)>>
+	<<set _delivery.intelligence = random(-100,-96)>>
 <<else>>
-	<<set $activeSlave.intelligence = random(-15,15)>>
+	<<set _delivery.intelligence = random(-15,15)>>
 <</if>>
-<<set $activeSlave.intelligenceImplant = $customSlave.intelligenceImplant>>
+<<set _delivery.intelligenceImplant = $customSlave.intelligenceImplant>>
 
 <<if $customSlave.analVirgin == 0>>
-	<<set $activeSlave.anus = $customSlave.analVirgin>>
+	<<set _delivery.anus = $customSlave.analVirgin>>
 <</if>>
 <<if (def $customSlave.voice) && ($customSlave.voice != -1)>>
-	<<set $activeSlave.voice = $customSlave.voice>>
+	<<set _delivery.voice = $customSlave.voice>>
 <<else>>
-	<<set $activeSlave.voice = random(0,3)>>
+	<<set _delivery.voice = random(0,3)>>
 <</if>>
-<<run setHealth($activeSlave, $customSlave.health * 80, 0, 0, 0, 0)>>
-<<set $activeSlave.muscles = $customSlave.muscles>>
-<<set $activeSlave.weight = $customSlave.weight>>
-<<set $activeSlave.face = $customSlave.face>>
-<<set $activeSlave.lips = $customSlave.lips>>
+<<run setHealth(_delivery, $customSlave.health * 80, 0, 0, 0, 0)>>
+<<set _delivery.muscles = $customSlave.muscles>>
+<<set _delivery.weight = $customSlave.weight>>
+<<set _delivery.face = $customSlave.face>>
+<<set _delivery.lips = $customSlave.lips>>
 <<if $customSlave.skin != "left natural">>
-	<<set $activeSlave.origSkin = $customSlave.skin>>
-	<<set $activeSlave.skin = getGeneticSkinColor($activeSlave)>>
+	<<set _delivery.origSkin = $customSlave.skin>>
+	<<set _delivery.skin = getGeneticSkinColor(_delivery)>>
 <</if>>
-<<set $activeSlave.boobs = $customSlave.boobs>>
-<<set $activeSlave.butt = $customSlave.butt>>
-<<set $activeSlave.skill.anal = $customSlave.skills>>
-<<set $activeSlave.skill.oral = $customSlave.skills>>
-<<set $activeSlave.skill.entertainment = $customSlave.skill.whore>>
-<<set $activeSlave.skill.whoring = $customSlave.skill.whore>>
-<<set $activeSlave.skill.combat = $customSlave.skill.combat>>
-<<set $activeSlave.eye.left.vision = $customSlave.eye.left.vision>>
-<<set $activeSlave.eye.right.vision = $customSlave.eye.right.vision>>
-<<set $activeSlave.hears = $customSlave.hears>>
-<<set $activeSlave.smells = $customSlave.smells>>
-<<set $activeSlave.tastes = $customSlave.tastes>>
-<<set $activeSlave.arm = $customSlave.arm>>
-<<set $activeSlave.leg = $customSlave.leg>>
-<<set $activeSlave.weekAcquired = $week>>
-<<set $activeSlave.origin = "You purchased $him by special order.">>
-<<set $activeSlave.career = "a slave">>
-<<set $activeSlave.sexualFlaw = either("none")>>
-<<set $activeSlave.behavioralFlaw = either("none")>>
-<<set $activeSlave.devotion = random(-10,10)>>
-<<set $activeSlave.trust = random(-10,10)>>
+<<set _delivery.boobs = $customSlave.boobs>>
+<<set _delivery.butt = $customSlave.butt>>
+<<set _delivery.skill.anal = $customSlave.skills>>
+<<set _delivery.skill.oral = $customSlave.skills>>
+<<set _delivery.skill.entertainment = $customSlave.skill.whore>>
+<<set _delivery.skill.whoring = $customSlave.skill.whore>>
+<<set _delivery.skill.combat = $customSlave.skill.combat>>
+<<set _delivery.eye.left.vision = $customSlave.eye.left.vision>>
+<<set _delivery.eye.right.vision = $customSlave.eye.right.vision>>
+<<set _delivery.hears = $customSlave.hears>>
+<<set _delivery.smells = $customSlave.smells>>
+<<set _delivery.tastes = $customSlave.tastes>>
+<<set _delivery.arm = $customSlave.arm>>
+<<set _delivery.leg = $customSlave.leg>>
+<<set _delivery.weekAcquired = $week>>
+<<set _delivery.origin = "You purchased $him by special order.">>
+<<set _delivery.career = "a slave">>
+<<set _delivery.sexualFlaw = either("none")>>
+<<set _delivery.behavioralFlaw = either("none")>>
+<<set _delivery.devotion = random(-10,10)>>
+<<set _delivery.trust = random(-10,10)>>
 
-<<set _slaveCost = slaveCost($activeSlave)>>
+<<set _slaveCost = slaveCost(_delivery)>>
 <<set _slaveCost = _slaveCost*2>>
-<<setLocalPronouns $activeSlave>>
+<<setLocalPronouns _delivery>>
 
 A slave dealer has submitted a slave to satisfy the order you posted.
 
@@ -218,7 +218,7 @@ A slave dealer has submitted a slave to satisfy the order you posted.
 
 <br><br>
 
-<<includeDOM App.Desc.longSlave(V.activeSlave, {market: "generic"})>>
+<<includeDOM App.Desc.longSlave(_delivery, {market: "generic"})>>
 
 <br><br>
 
@@ -229,10 +229,10 @@ $His price is <<print cashFormat(_slaveCost)>>.
 <span id="result">
 <<if $cash >= _slaveCost>>
 	<<link "Accept the offered slave">>
-		<<run cashX(forceNeg(_slaveCost), "slaveTransfer", $activeSlave)>>
+		<<run cashX(forceNeg(_slaveCost), "slaveTransfer", _delivery)>>
 		<<replace "#result">>
 			$He has been reasonably broken by the dealer that offered $him to you. $He has also picked up on the fact that $he was specially selected, and is a little hopeful that this means $he may be treated well. $He is now awaiting your instructions.
-			<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
+			<<includeDOM App.UI.newSlaveIntro(_delivery)>>
 			<<if def $customSlaveOrderedReorder>><<run delete $customSlaveOrderedReorder>><</if>>
 		<</replace>>
 	<</link>>
-- 
GitLab