diff --git a/src/Corporation/corporateMarket.tw b/src/Corporation/corporateMarket.tw
index 641e5b782de7e6501b81bd3ddd4fefe5c2f7a3d8..def8ba4ea05d20a1121887dc37b82053d0e98327 100644
--- a/src/Corporation/corporateMarket.tw
+++ b/src/Corporation/corporateMarket.tw
@@ -65,7 +65,9 @@ Of course, you know all about the corporation, but sales<<if $corp.SpecAge == 3>
_HeU explains that the corporation captures many people, so it only retains and trains those that fit its product lines.
-<<= generateMarketSlave("corporate")>>
+<<set _marketResult = generateMarketSlave("corporate")>>
+<<set $activeSlave = _marketResult.slave>>
+<<print _marketResult.text>>
<br><br>
_HisU presentation done, the
diff --git a/src/pregmod/criminalMarkets.tw b/src/pregmod/criminalMarkets.tw
index 748463c9075dee405bbb0ab442d8c6c8d37953a4..a319abe3279873040c31da4cd256fe09057f1def 100644
--- a/src/pregmod/criminalMarkets.tw
+++ b/src/pregmod/criminalMarkets.tw
@@ -41,7 +41,9 @@ You board the transport to
<</switch>>
-<<= generateMarketSlave($weeklyMarket)>>
+<<set _marketResult = generateMarketSlave($weeklyMarket)>>
+<<set $activeSlave = _marketResult.slave>>
+<<print _marketResult.text>>
<br><br>
diff --git a/src/pregmod/nuevaUniversidadDeLibertad.tw b/src/pregmod/nuevaUniversidadDeLibertad.tw
index d37f37816437209721328a3124cb8c3ed6a8926a..a3c476b56aafde79344bdebcad9ddfa30090eea7 100644
--- a/src/pregmod/nuevaUniversidadDeLibertad.tw
+++ b/src/pregmod/nuevaUniversidadDeLibertad.tw
@@ -11,7 +11,9 @@
<br><br>Nueva Universidad de Libertad offers a fresh graduate for inspection via video call. The interview takes place in said graduate's dormitory. The room is sparse and utilitarian, and immaculately clean. Likely by design, it looks like the set from an old sci-fi movie.
-<<= generateMarketSlave("NUL")>>
+<<set _marketResult = generateMarketSlave("NUL")>>
+<<set $activeSlave = _marketResult.slave>>
+<<print _marketResult.text>>
<<set _slaveCost = slaveCost($activeSlave)>>
<<if $NUL.schoolSale != 0>>
<<set _slaveCost = Math.trunc(_slaveCost*0.5)>>
diff --git a/src/pregmod/theCattleRanch.tw b/src/pregmod/theCattleRanch.tw
index ce0cd6693adc66e4573f4b33b01313d8092194c4..a217cb1026652a6a28d736dccf2987f9be10dc6f 100644
--- a/src/pregmod/theCattleRanch.tw
+++ b/src/pregmod/theCattleRanch.tw
@@ -11,7 +11,9 @@
<br><br>The Cattle Ranch parades a choice selection of cows for your viewing pleasure. You're free to do as you please to the slaves, as long as you don't cause lasting harm to them.<<if isFertile($PC) && $PC.preg != -1>> You can't help but notice the number of bulls lining up along the fence sniffing at you.<</if>>
-<<= generateMarketSlave("TCR")>>
+<<set _marketResult = generateMarketSlave("TCR")>>
+<<set $activeSlave = _marketResult.slave>>
+<<print _marketResult.text>>
<<set _slaveCost = slaveCost($activeSlave)>>
<<if $TCR.schoolSale != 0>>
<<set _slaveCost = Math.trunc(_slaveCost*0.5)>>
diff --git a/src/pregmod/theHippolytaAcademy.tw b/src/pregmod/theHippolytaAcademy.tw
index a9a3c60c50cb83b9d3cd3b405a5975cdb7725acb..c141d463568455b3a47fe6ba250e462634749cb8 100644
--- a/src/pregmod/theHippolytaAcademy.tw
+++ b/src/pregmod/theHippolytaAcademy.tw
@@ -20,7 +20,9 @@ The Hippolyta Academy is one of the most famous slave bodyguarding schools in al
<br><br>The Hippolyta Academy offers a fresh graduate for inspection. The interview takes place in one of the many training areas of the school, where the physical prowess of the candidate can be easily showcased.
-<<= generateMarketSlave("HA")>>
+<<set _marketResult = generateMarketSlave("HA")>>
+<<set $activeSlave = _marketResult.slave>>
+<<print _marketResult.text>>
<<set _slaveCost = slaveCost($activeSlave)>>
<<if $HA.schoolSale != 0>>
<<set _slaveCost = Math.trunc(_slaveCost*0.6)>>
diff --git a/src/pregmod/wetwareCPUs.tw b/src/pregmod/wetwareCPUs.tw
index d1970d04a09ae393ea9859650421a5e3df19136e..01307db09bbac0a53fcb39b441552be38552d0f4 100644
--- a/src/pregmod/wetwareCPUs.tw
+++ b/src/pregmod/wetwareCPUs.tw
@@ -11,7 +11,9 @@
<br><br>
-<<= generateMarketSlave("wetware")>>
+<<set _marketResult = generateMarketSlave("wetware")>>
+<<set $activeSlave = _marketResult.slave>>
+<<print _marketResult.text>>
<<set _slaveCost = slaveCost($activeSlave)>>
<<if $slavesSeen > $slaveMarketLimit>><<set _slaveCost += Math.trunc(_slaveCost*(($slavesSeen-$slaveMarketLimit)*0.1))>><</if>>
diff --git a/src/uncategorized/bulkSlaveGenerate.tw b/src/uncategorized/bulkSlaveGenerate.tw
index 496e71fccfa5da2607c268ec6adabf2df4889406..68cdeb14ad28de7ac911bfad1d058124d8ad3ad2 100644
--- a/src/uncategorized/bulkSlaveGenerate.tw
+++ b/src/uncategorized/bulkSlaveGenerate.tw
@@ -81,7 +81,8 @@
<</switch>>
<<for _i = 0; _i < $numSlaves; _i++>>
- <<run generateMarketSlave($slaveMarket, $numArcology)>>
+ <<set _marketResult = generateMarketSlave($slaveMarket, $numArcology)>>
+ <<set $activeSlave = _marketResult.slave>>
<<set $slavesSeen++>>
<<if $applyLaw == 0>>
<<set _slaveCost = slaveCost($activeSlave)>>
diff --git a/src/uncategorized/growthResearchInstitute.tw b/src/uncategorized/growthResearchInstitute.tw
index 869d8babdf9a84e2f4d6222230c73699fd702bd1..31c25fa7001c27bffa46fea5aaab4a6cea15694a 100644
--- a/src/uncategorized/growthResearchInstitute.tw
+++ b/src/uncategorized/growthResearchInstitute.tw
@@ -11,7 +11,9 @@
<br><br>GRI offers a fresh graduate for inspection via video call. The interview takes place in the graduate's bare-metal holding cell. Disturbingly, it is strongly reminiscent of an enclosure for a lab animal, only scaled up to contain a lab animal of human dimensions.
-<<= generateMarketSlave("GRI")>>
+<<set _marketResult = generateMarketSlave("GRI")>>
+<<set $activeSlave = _marketResult.slave>>
+<<print _marketResult.text>>
<<set _slaveCost = slaveCost($activeSlave)>>
<<setLocalPronouns $activeSlave>>
<<if $GRI.schoolSale != 0>>
diff --git a/src/uncategorized/lecoleDesEnculees.tw b/src/uncategorized/lecoleDesEnculees.tw
index 608f2a2856fb0c9e866969bcf5e57500b6c0521a..66a9733cd7c43023fe71a14447e2a3bec4cccd12 100644
--- a/src/uncategorized/lecoleDesEnculees.tw
+++ b/src/uncategorized/lecoleDesEnculees.tw
@@ -11,7 +11,9 @@
<br><br>L'École des Enculées offers a fresh graduate for inspection via video call. The interview takes place in the dormitory for the oldest class of girls. Absurdly sexual squeals repeatedly interrupt the call, making it very clear that someone close by the interviewee is experiencing a strong combination of anal pain and anal pleasure.
-<<= generateMarketSlave("LDE")>>
+<<set _marketResult = generateMarketSlave("LDE")>>
+<<set $activeSlave = _marketResult.slave>>
+<<print _marketResult.text>>
<<set _slaveCost = slaveCost($activeSlave)>>
<<if $LDE.schoolSale != 0>>
<<set _slaveCost = Math.trunc(_slaveCost*0.5)>>
diff --git a/src/uncategorized/resSale.tw b/src/uncategorized/resSale.tw
index b72d74e7b62896c8a0a37ee95a385db5402c3ebc..3f378be64c8a73ed6371b1ee67e3da587856ce19 100644
--- a/src/uncategorized/resSale.tw
+++ b/src/uncategorized/resSale.tw
@@ -7,35 +7,53 @@
/* generate sales slave for images and pronouns */
<<if $RESSale == "TSS">>
<<set $TSS.schoolSale = 1>>
- <<= generateMarketSlave("TSS")>>
+ <<set _marketResult = generateMarketSlave("TSS")>>
+ <<set $activeSlave = _marketResult.slave>>
+ <<print _marketResult.text>>
<<set $activeSlave.clothes = "a schoolgirl outfit">>
<<elseif $RESSale == "GRI">>
<<set $GRI.schoolSale = 1>>
- <<= generateMarketSlave("GRI")>>
+ <<set _marketResult = generateMarketSlave("GRI")>>
+ <<set $activeSlave = _marketResult.slave>>
+ <<print _marketResult.text>>
<<set $activeSlave.clothes = "a slave gown">>
<<elseif $RESSale == "SCP">>
<<set $SCP.schoolSale = 1>>
- <<= generateMarketSlave("SCP")>>
+ <<set _marketResult = generateMarketSlave("SCP")>>
+ <<set $activeSlave = _marketResult.slave>>
+ <<print _marketResult.text>>
<<set $activeSlave.clothes = "a string bikini">>
<<elseif $RESSale == "LDE">>
<<set $LDE.schoolSale = 1>>
- <<= generateMarketSlave("LDE")>>
+ <<set _marketResult = generateMarketSlave("LDE")>>
+ <<set $activeSlave = _marketResult.slave>>
+ <<print _marketResult.text>>
<<elseif $RESSale == "TGA">>
<<set $TGA.schoolSale = 1>>
- <<= generateMarketSlave("TGA")>>
+ <<set _marketResult = generateMarketSlave("TGA")>>
+ <<set $activeSlave = _marketResult.slave>>
+ <<print _marketResult.text>>
<<elseif $RESSale == "TCR">>
<<set $TCR.schoolSale = 1>>
- <<= generateMarketSlave("TCR")>>
+ <<set _marketResult = generateMarketSlave("TCR")>>
+ <<set $activeSlave = _marketResult.slave>>
+ <<print _marketResult.text>>
<<elseif $RESSale == "HA">>
<<set $HA.schoolSale = 1>>
- <<= generateMarketSlave("HA")>>
+ <<set _marketResult = generateMarketSlave("HA")>>
+ <<set $activeSlave = _marketResult.slave>>
+ <<print _marketResult.text>>
<<set $activeSlave.clothes = "a nice maid outfit">>
<<elseif $RESSale == "NUL">>
<<set $NUL.schoolSale = 1>>
- <<= generateMarketSlave("NUL")>>
+ <<set _marketResult = generateMarketSlave("NUL")>>
+ <<set $activeSlave = _marketResult.slave>>
+ <<print _marketResult.text>>
<<else>>
<<set $TFS.schoolSale = 1>>
- <<= generateMarketSlave("TFS")>>
+ <<set _marketResult = generateMarketSlave("TFS")>>
+ <<set $activeSlave = _marketResult.slave>>
+ <<print _marketResult.text>>
<</if>>
<<setLocalPronouns $activeSlave>>
diff --git a/src/uncategorized/slaveMarkets.tw b/src/uncategorized/slaveMarkets.tw
index 219e66cc40a73d5316a0b1c80cad05cd5f092fa7..35a819ff6c06f54b2959b966e62068e56abe30bd 100644
--- a/src/uncategorized/slaveMarkets.tw
+++ b/src/uncategorized/slaveMarkets.tw
@@ -171,7 +171,9 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
<</switch>>
-<<= generateMarketSlave($slaveMarket, ($numArcology || 1))>>
+<<set _marketResult = generateMarketSlave($slaveMarket, ($numArcology || 1))>>
+<<set $activeSlave = _marketResult.slave>>
+<<print _marketResult.text>>
<br><br>
diff --git a/src/uncategorized/stClaverPreparatory.tw b/src/uncategorized/stClaverPreparatory.tw
index d2431778c1260f2dd086a434a67a319c5182be66..5a1b3102d96fb635d6eedc1707c3e8df73203c7c 100644
--- a/src/uncategorized/stClaverPreparatory.tw
+++ b/src/uncategorized/stClaverPreparatory.tw
@@ -11,7 +11,9 @@
<br><br>St. Claver Preparatory offers a fresh graduate for inspection via video call. The interview takes place in a very obviously medical office, with medical supply robots wheeling past its glass walls and nurses hurrying to and fro.
-<<= generateMarketSlave("SCP")>>
+<<set _marketResult = generateMarketSlave("SCP")>>
+<<set $activeSlave = _marketResult.slave>>
+<<print _marketResult.text>>
<<set _slaveCost = slaveCost($activeSlave)>>
<<if $SCP.schoolSale != 0>>
<<set _slaveCost = Math.trunc(_slaveCost*0.5)>>
diff --git a/src/uncategorized/theFutanariSisters.tw b/src/uncategorized/theFutanariSisters.tw
index 096b4e634d9e043aa3cccbced83dfff3deda3deb..78100e15ae859101b99cb122d613e6b885c15314 100644
--- a/src/uncategorized/theFutanariSisters.tw
+++ b/src/uncategorized/theFutanariSisters.tw
@@ -132,7 +132,9 @@ The Sisters offer a member selected for sale into slavery for inspection via vid
<br><br>
-<<= generateMarketSlave("TFS")>>
+<<set _marketResult = generateMarketSlave("TFS")>>
+<<set $activeSlave = _marketResult.slave>>
+<<print _marketResult.text>>
<<set _slaveCost = slaveCost($activeSlave)>>
<<set _slaveCost = Math.trunc(_slaveCost*0.8)>>
<<if $TFS.schoolSale != 0>>
diff --git a/src/uncategorized/theGymnasiumAcademy.tw b/src/uncategorized/theGymnasiumAcademy.tw
index 6a8926ece9ed83898f51cf9502f2894a70787a7e..5cd8f84550e1966d8a8f7289b3e832be49264eeb 100644
--- a/src/uncategorized/theGymnasiumAcademy.tw
+++ b/src/uncategorized/theGymnasiumAcademy.tw
@@ -11,7 +11,9 @@
<br><br>The Gymnasium-Academy offers a fresh graduate for inspection via video call. The interview takes place in an office overlooking an expansive workout room, in which a large number of naked, fit young bodies are performing punishing workout routines.
-<<= generateMarketSlave("TGA")>>
+<<set _marketResult = generateMarketSlave("TGA")>>
+<<set $activeSlave = _marketResult.slave>>
+<<print _marketResult.text>>
<<set _slaveCost = slaveCost($activeSlave)>>
<<if $TGA.schoolSale != 0>>
<<set _slaveCost = Math.trunc(_slaveCost*0.5)>>
diff --git a/src/uncategorized/theSlavegirlSchool.tw b/src/uncategorized/theSlavegirlSchool.tw
index 169ca27671c4478821373a1a985aaa8398dc1ad4..fcd88b0d60026825e5985814eecfc48f49131f3f 100644
--- a/src/uncategorized/theSlavegirlSchool.tw
+++ b/src/uncategorized/theSlavegirlSchool.tw
@@ -11,7 +11,9 @@
<br><br>The Slavegirl School offers a fresh graduate for inspection via video call. The interview takes place in a faculty member's office. Absurdly, it's barely distinguishable from an office at any traditional institution of higher education. The only giveaway is the profusion of sex toys on the desk and the pornography on the walls.
-<<= generateMarketSlave("TSS")>>
+<<set _marketResult = generateMarketSlave("TSS")>>
+<<set $activeSlave = _marketResult.slave>>
+<<print _marketResult.text>>
<<set _slaveCost = slaveCost($activeSlave)>>
<<if $TSS.schoolSale != 0>>
<<set _slaveCost = Math.trunc(_slaveCost*0.5)>>