SlaveFullName conversion

src/SecExp/propagandaHub.tw

@@ -16,10 +16,10 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the
 
 <<if $Recruiter != 0>><br><br>
 <<if $RecuriterOffice == 0>>
-	<<link "Give ''__@@.pink;<<SlaveFullName $Recruiter>>@@__'' an office.""propagandaHub">>
+	<<link "Give ''__@@.pink;<<= SlaveFullName($Recruiter)>>@@__'' an office.""propagandaHub">>
 	<<set $RecuriterOffice = 1>> <</link>>
 <<else>>
-	<<link "Remove ''__@@.pink;<<SlaveFullName $Recruiter>>@@__'' from her office.""propagandaHub">>
+	<<link "Remove ''__@@.pink;<<= SlaveFullName($Recruiter)>>@@__'' from her office.""propagandaHub">>
 		<<set $RecuriterOffice = 0>> <</link>>
 <</if>>
 <</if>>

src/SecExp/securityReport.tw

@@ -260,7 +260,7 @@
 				<<set _recruits += 1>>
 			<</if>>
 		<<else>>
-			''__@@.pink;<<SlaveFullName $Recruiter>>@@__'' is able to further boost your militia recruitement campaign from her PR hub office.
+			''__@@.pink;<<= SlaveFullName($Recruiter)>>@@__'' is able to further boost your militia recruitement campaign from her PR hub office.
 			<<if $propCampaignBoost == 1>>
 				<<set _recruits += 4+$Recruiter.intelligence+$Recruiter.intelligenceImplant>>
 			<<else>>

src/npc/startingGirls/commitStartingGirl.tw

@@ -25,7 +25,7 @@
 	<<set $hostage = $slaveWithoutBonuses, $hostageCost = $slaveCost, $hostageAnnounced = -1>>
 <</if>>
 
-<<SlaveFullName $activeSlave>> has been added to your starting stable of slaves. You now have <<print cashFormat($cash)>> remaining.
+<<= SlaveFullName($activeSlave)>> has been added to your starting stable of slaves. You now have <<print cashFormat($cash)>> remaining.
 <br>
 <<if $cash >= $minimumSlaveCost>>
 	<br>

src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw

@@ -61,7 +61,7 @@
 	<br><br>
 	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ''$SupportFacilityName:''
 	<<if $LieutenantColonel == 1>>
-		<<SlaveFullName $LieutenantColonel>> is the Lieutenant Colonel of $securityForceName, primarily in charge of this facility.
+		<<= SlaveFullName($LieutenantColonel)>> is the Lieutenant Colonel of $securityForceName, primarily in charge of this facility.
 	<</if>>
 	There are
 	<<if $SupportFacilitySlaves > 0>>

src/pregmod/widgets/pregmodWidgets.tw

@@ -747,12 +747,12 @@ $activeSlave.slaveName is up for review:
 <</if>>
 <br><br>
 <<if _passing == 2>>
-	The slave known as "<<SlaveFullName $activeSlave>>" has been deemed @@.yellow;currently unsuitable@@ for breeding, but may be resubmitted after corrections are applied. We understand the subjective nature of "fit" and do not wish to preclude the use a viable breeder over such a trivial fix. She has been placed on a contraceptive routine to protect against "accidents" in the interim.
+	The slave known as "<<= SlaveFullName($activeSlave)>>" has been deemed @@.yellow;currently unsuitable@@ for breeding, but may be resubmitted after corrections are applied. We understand the subjective nature of "fit" and do not wish to preclude the use a viable breeder over such a trivial fix. She has been placed on a contraceptive routine to protect against "accidents" in the interim.
 <<elseif _passing != 0>>
-	The slave known as "<<SlaveFullName $activeSlave>>" has been deemed @@.red;unsuitable@@ for breeding and has been @@.green;sterilized@@ as per agreement.
+	The slave known as "<<= SlaveFullName($activeSlave)>>" has been deemed @@.red;unsuitable@@ for breeding and has been @@.green;sterilized@@ as per agreement.
 	<<set $activeSlave.preg = -3>>
 <<else>>
-	The slave known as "<<SlaveFullName $activeSlave>>" has been deemed @@.green;worthy@@ of being used for breeding and has been marked as such. Please note the increased restrictions on breeding slaves.
+	The slave known as "<<= SlaveFullName($activeSlave)>>" has been deemed @@.green;worthy@@ of being used for breeding and has been marked as such. Please note the increased restrictions on breeding slaves.
 	<br>They are not permitted for public use or anything that may harm their growing child. The child within them is considered a member of the elite class and as such, any harm that comes to them will result in severe penalties to the breeder's owner. Development of the child will be closely monitored; should the fetus be identified as not of the owner's blood (or any other member of the Elite class), said owner shall face severe fines.
 	<<set $activeSlave.breedingMark = 1, $activeSlave.pregControl = "none">>
 <</if>>

src/uncategorized/RESS.tw

@@ -18375,7 +18375,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
 				<<replace "#result2">>
 					She seems to be focusing on the purely physical aspects of the degradation here. The true meaning of this place is so much more, and you decide to share it with her. You call her name, tearing her attention away from the spectacle mere centimeters over your heads, and <<if canSee($activeSlave)>>point<<else>>direct her<</if>> to a particular slave. You tell $activeSlave.slaveName that this particular Arcade inmate's name is
 					<<set _ress = $slaveIndices[$ArcadeiIDs.random()]>>
-					<<SlaveFullName $slaves[_ress]>>. You tell her that she is $slaves[_ress].actualAge years old, that she is $slaves[_ress].nationality, and that she was once $slaves[_ress].career. You list more details of her life before she was placed here to be fucked endlessly. $activeSlave.slaveName's eyes widen as you recite the details of the prior life of this piece of human sexual equipment and the sheer weight of the intellectual sadism smashes into her. Then the slave above you both jerks a little. <<if $activeSlave.dick == 0>>There's no visible sign her pussy's being fucked, so it must be<<else>>Her cock hardens involuntarily, indicating that it's<</if>> going into her ass. You resume, mentioning that she's been buttfucked $slaves[_ress].analCount times.
+					<<= SlaveFullName($slaves[_ress])>>. You tell her that she is $slaves[_ress].actualAge years old, that she is $slaves[_ress].nationality, and that she was once $slaves[_ress].career. You list more details of her life before she was placed here to be fucked endlessly. $activeSlave.slaveName's eyes widen as you recite the details of the prior life of this piece of human sexual equipment and the sheer weight of the intellectual sadism smashes into her. Then the slave above you both jerks a little. <<if $activeSlave.dick == 0>>There's no visible sign her pussy's being fucked, so it must be<<else>>Her cock hardens involuntarily, indicating that it's<</if>> going into her ass. You resume, mentioning that she's been buttfucked $slaves[_ress].analCount times.
 					$activeSlave.slaveName jerks suddenly, <<if canAchieveErection($activeSlave)>>shooting her cum onto the floor<<elseif $activeSlave.vagina < 0>>dribbling a little<<elseif $activeSlave.vaginaLube > 0>>squirting onto the floor<<else>>orgasming<</if>>. She came without being touched. She <<if canSee($activeSlave)>>stares at<<else>>faces<</if>> the mess she made just by being in the presence of the arcology's @@.hotpink;undisputed preeminent sadist;@@ she shudders at the sheer gothic glory of it. She has a new moment to think of when she feels like @@.lightsalmon;indulging her own sadism.@@
 				<</replace>>
 				<<set $activeSlave.devotion += 5, $activeSlave.fetishStrength = Math.clamp($activeSlave.fetishStrength+10, 0, 100)>>

src/uncategorized/SFMBarracks.tw

 :: SFM Barracks [nobr]
 
-<<set _Name = "<<if $CurrentTradeShowAttendance == 1 && $LieutenantColonel == 2>>Lieutenant Colonel <<SlaveFullName $LieutenantColonel>> <<elseif $CurrentTradeShowAttendance == 1 && $LieutenantColonel != 2>> a soldier <<elseif $CurrentTradeShowAttendance == 0>> The Colonel<</if>>">>
+<<set _Name = "<<if $CurrentTradeShowAttendance == 1 && $LieutenantColonel == 2>>Lieutenant Colonel <<= SlaveFullName($LieutenantColonel)>> <<elseif $CurrentTradeShowAttendance == 1 && $LieutenantColonel != 2>> a soldier <<elseif $CurrentTradeShowAttendance == 0>> The Colonel<</if>>">>
 
 <<if ndef $ColonelRelationship>>
 	<<set $ColonelRelationship = 0>> /* 0 - Employee and boss, 10 - Friend, 25 - Close friend, 45 - Girlfriend, 65 - Lover */

src/uncategorized/arcadeReport.tw

@@ -69,7 +69,7 @@
 		</div>
 		<</if>>
 		/* 000-250-006 */
-		''__@@.pink;<<SlaveFullName $slaves[$i]>>@@__''
+		''__@@.pink;<<= SlaveFullName($slaves[$i])>>@@__''
 		<<if $slaves[$i].choosesOwnAssignment == 2>>
 			<<include "SA chooses own job">>
 		<<else>>

src/uncategorized/arcmgmt.tw

@@ -116,7 +116,7 @@ This week, <<if _flux >= 20>>many<<elseif _flux >= 5>>some<<else>>few to none<</
 					<<set _immigrants += random(1,4) * $propCampaign>>
 				<</if>>
 			<<else>>
-				''__@@.pink;<<SlaveFullName $Recruiter>>@@__'' is able to further boost your imgration campaign from her PR hub office.
+				''__@@.pink;<<= SlaveFullName($Recruiter)>>@@__'' is able to further boost your imgration campaign from her PR hub office.
 				<<if $propCampaignBoost == 0>>
 					<<set _immigrants += random(2,5+$Recruiter.intelligence+$Recruiter.intelligenceImplant) * $propCampaign>>
 				<<else>>
@@ -372,7 +372,7 @@ earning you @@.yellowgreen;<<print cashFormat(_earnings)>>.@@
 				<<set _refugees += random(0,2)>>
 			<</if>>
 		<<else>>
-			''__@@.pink;<<SlaveFullName $Recruiter>>@@__'' is able to further boost your self-enslavement campaign from her PR hub office.
+			''__@@.pink;<<= SlaveFullName($Recruiter)>>@@__'' is able to further boost your self-enslavement campaign from her PR hub office.
 			<<if $propCampaignBoost == 1>>
 				<<set _refugees += random(0,5+$Recruiter.intelligence+$Recruiter.intelligenceImplant)>>
 			<<else>>

src/uncategorized/attendantSelect.tw

@@ -3,7 +3,7 @@
 <<set $nextButton = "Back", $nextLink = "Spa", $showEncyclopedia = 1, $encyclopedia = "Attendant">>
 <<showallAssignmentFilter>>
 <<if ($Attendant != 0)>>
-	''__@@.pink;<<SlaveFullName $Attendant>>@@__'' is serving as your Attendant.<br><br>She will help pamper and counsel your slaves.
+	''__@@.pink;<<= SlaveFullName($Attendant)>>@@__'' is serving as your Attendant.<br><br>She will help pamper and counsel your slaves.
 <<else>>
 	You have not selected an Attendant.
 <</if>>

src/uncategorized/bgSelect.tw

@@ -3,7 +3,7 @@
 <<set $nextButton = "Back to Main", $nextLink = "Main", $showEncyclopedia = 1, $encyclopedia = "Bodyguard">>
 <<showallAssignmentFilter>>
 <<if ($Bodyguard != 0)>>
-	''__@@.pink;<<SlaveFullName $Bodyguard>>@@__'' is serving as your bodyguard.<br><br>She will remain close to you at all times and guard your person.
+	''__@@.pink;<<= SlaveFullName($Bodyguard)>>@@__'' is serving as your bodyguard.<br><br>She will remain close to you at all times and guard your person.
 <<else>>
 	You have not selected a bodyguard.
 <</if>>

src/uncategorized/bodyModification.tw

@@ -9,7 +9,7 @@
 
 <h1>Body Modification Studio</h1>
 
-<<SlaveFullName $activeSlave>> is lying strapped down on the table in your body modification studio. $pronounCap is entirely at your mercy.
+<<= SlaveFullName($activeSlave)>> is lying strapped down on the table in your body modification studio. $pronounCap is entirely at your mercy.
 
 <<if $brandApplied || $degradation>>
 	<<if $activeSlave.fuckdoll == 0>>

src/uncategorized/brothelReport.tw

@@ -46,7 +46,7 @@
 	/% Make sure we have registered living expenses as for any other slave %/
 	<<run getSlaveStatisticData($Madam, $facility.brothel)>>
 	<<set $Madam = $slaves[_FLs]>>
-	&nbsp;&nbsp;&nbsp;&nbsp;<<SlaveFullName $Madam>> is serving as the Madam.
+	&nbsp;&nbsp;&nbsp;&nbsp;<<= SlaveFullName($Madam)>> is serving as the Madam.
 	<<if $Madam.relationship == -3 && $Madam.devotion > 50>>
 		As your loving wife, she does her best to attract attention to your brothel.
 		<<set $madamCashBonus += 0.25>>
@@ -229,7 +229,7 @@
 		</div>
 		<</if>>
 		/* 000-250-006 */
-		''__@@.pink;<<SlaveFullName $slaves[_FLs]>>@@__'' is serving as the Madam.
+		''__@@.pink;<<= SlaveFullName($slaves[_FLs])>>@@__'' is serving as the Madam.
 		<br>&nbsp;&nbsp;&nbsp;
 		<<= saChoosesOwnClothes($slaves[$i])>>
 		<<include "SA rules">>
@@ -342,7 +342,7 @@
 			</div>
 			<</if>>
 			/* 000-250-006 */
-			''__@@.pink;<<SlaveFullName $slaves[$i]>>@@__''
+			''__@@.pink;<<= SlaveFullName($slaves[$i])>>@@__''
 			<<if $slaves[$i].choosesOwnAssignment == 2>>
 				<<include "SA chooses own job">>
 			<<else>>

src/uncategorized/cellblockReport.tw

@@ -46,7 +46,7 @@
 	<<if ($Wardeness.energy > 95) || ($Wardeness.fetish == "sadist")>>
 		<<set _devBonus++, _trustMalus++, _idleBonus++>>
 	<</if>>
-	&nbsp;&nbsp;&nbsp;&nbsp;<<SlaveFullName $Wardeness>> is serving as the Wardeness.
+	&nbsp;&nbsp;&nbsp;&nbsp;<<= SlaveFullName($Wardeness)>> is serving as the Wardeness.
 	<<if $Wardeness.relationship == -3 && $Wardeness.devotion > 50>>
 		<<set _devBonus++, _trustMalus++, _idleBonus++>>
 		As your wife, she tries her best to break the disobedient slaves to your will.
@@ -151,7 +151,7 @@
 		</div>
 		<</if>>
 		/* 000-250-006 */
-		''__@@.pink;<<SlaveFullName $slaves[$i]>>@@__'' is serving as the Wardeness in $cellblockName.
+		''__@@.pink;<<= SlaveFullName($slaves[$i])>>@@__'' is serving as the Wardeness in $cellblockName.
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;
 		<<= saChoosesOwnClothes($slaves[$i])>>
 		<<include "SA rules">>
@@ -258,7 +258,7 @@
 		</div>
 		<</if>>
 		/* 000-250-006 */
-		''__@@.pink;<<SlaveFullName $slaves[$i]>>@@__''
+		''__@@.pink;<<= SlaveFullName($slaves[$i])>>@@__''
 		<<if $slaves[$i].choosesOwnAssignment == 2>>
 			<<include "SA chooses own job">>
 		<<else>>

src/uncategorized/clinicReport.tw

@@ -39,7 +39,7 @@
 		<</if>>
 	<</if>>
 	<<set $Nurse = $slaves[_FLs]>>
-	&nbsp;&nbsp;&nbsp;&nbsp;<<SlaveFullName $Nurse>> is serving as the clinical nurse.
+	&nbsp;&nbsp;&nbsp;&nbsp;<<= SlaveFullName($Nurse)>> is serving as the clinical nurse.
 	<<if $Nurse.relationship == -3 && $Nurse.devotion > 50>>
 		She does her best to be a caring and nurturing wife.
 		<<set _healthBonus += 2>>
@@ -213,7 +213,7 @@
 		</div>
 		<</if>>
 		/* 000-250-006 */
-		''__@@.pink;<<SlaveFullName $slaves[_FLs]>>@@__'' is serving as the clinical nurse.
+		''__@@.pink;<<= SlaveFullName($slaves[_FLs])>>@@__'' is serving as the clinical nurse.
 		<br>&nbsp;&nbsp;&nbsp;
 		<<= saChoosesOwnClothes($slaves[$i])>>
 		<<include "SA rules">>
@@ -289,7 +289,7 @@
 		</div>
 		<</if>>
 		/* 000-250-006 */
-		''__@@.pink;<<SlaveFullName $slaves[$i]>>@@__''
+		''__@@.pink;<<= SlaveFullName($slaves[$i])>>@@__''
 		<<if $slaves[$i].choosesOwnAssignment == 2>>
 			<<include "SA chooses own job">>
 		<<else>>

src/uncategorized/clubReport.tw

@@ -46,7 +46,7 @@
 	/% Make sure we have registered living expenses as for any other slave %/
 	<<run getSlaveStatisticData($DJ, $facility.club)>>
 	<<set $DJ = $slaves[_FLs]>>
-	&nbsp;&nbsp;&nbsp;&nbsp;<<SlaveFullName $DJ>> is performing as the DJ.
+	&nbsp;&nbsp;&nbsp;&nbsp;<<= SlaveFullName($DJ)>> is performing as the DJ.
 	<<if $DJ.relationship == -3 && $DJ.devotion > 50>>
 		She tries her best to be your energetic, cheerful wife.
 		<<set $DJRepBonus += 0.1>>
@@ -138,7 +138,7 @@
 		</div>
 		<</if>>
 		/* 000-250-006 */
-		''__@@.pink;<<SlaveFullName $slaves[_FLs]>>@@__'' is performing as the DJ in $clubName.
+		''__@@.pink;<<= SlaveFullName($slaves[_FLs])>>@@__'' is performing as the DJ in $clubName.
 		<br>&nbsp;&nbsp;&nbsp;
 		<<= saChoosesOwnClothes($slaves[$i])>>
 		<<include "SA rules">>
@@ -238,7 +238,7 @@
 			</div>
 			<</if>>
 			/* 000-250-006 */
-			''__@@.pink;<<SlaveFullName $slaves[$i]>>@@__''
+			''__@@.pink;<<= SlaveFullName($slaves[$i])>>@@__''
 			<<if $slaves[$i].choosesOwnAssignment == 2>>
 				<<include "SA chooses own job">>
 			<<else>>

src/uncategorized/concubineSelect.tw

@@ -3,7 +3,7 @@
 <<set $nextButton = "Back", $nextLink = "Master Suite", $showEncyclopedia = 1, $encyclopedia = "Concubine">>
 <<showallAssignmentFilter>>
 <<if ($Concubine != 0)>>
-	''__@@.pink;<<SlaveFullName $Concubine>>@@__'' is serving as your Concubine.<br><br>She will take the lead in seeing to your pleasure.
+	''__@@.pink;<<= SlaveFullName($Concubine)>>@@__'' is serving as your Concubine.<br><br>She will take the lead in seeing to your pleasure.
 <<else>>
 	You have not selected a Concubine.
 <</if>>

src/uncategorized/coursingAssociation.tw

@@ -9,7 +9,7 @@ You are a member of $arcologies[0].name's Coursing Association. Coursing is a Fr
 <br><br>The chasing slaves are known as lurchers, the term once used for the sighthounds. They require speed most of all, but must also be able to tackle their quarry; lurchers with the ability and willingness to make a spectacle of molesting the hares can improve their owners' reputations.
 <<showallAssignmentFilter>>
 <<if $Lurcher != 0>>
-	<<SlaveFullName $Lurcher>> is assigned to compete as your lurcher.
+	<<= SlaveFullName($Lurcher)>> is assigned to compete as your lurcher.
 <<else>>
 	You have not selected a lurcher, meaning that you will not participate in coursing events.
 <</if>>

src/uncategorized/dairyReport.tw

@@ -50,7 +50,7 @@
 	<</if>>
 	<<run getSlaveStatisticData($Milkmaid, $facility.dairy)>>
 	<<set $Milkmaid = $slaves[_FLs], $i = _FLs>>
-	&nbsp;&nbsp;&nbsp;&nbsp;<<SlaveFullName $Milkmaid>> is serving as your Milkmaid.
+	&nbsp;&nbsp;&nbsp;&nbsp;<<= SlaveFullName($Milkmaid)>> is serving as your Milkmaid.
 	<<if $Milkmaid.relationship == -3 && $Milkmaid.devotion > 50>>
 		<<set $milkmaidDevotionBonus += 2, $milkmaidTrustBonus += 2>>
 		She tries her best to be your perfect farmwife.
@@ -258,7 +258,7 @@
 		</div>
 		<</if>>
 		/* 000-250-006 */
-		''__@@.pink;<<SlaveFullName $slaves[_FLs]>>@@__'' is serving as your Milkmaid.
+		''__@@.pink;<<= SlaveFullName($slaves[_FLs])>>@@__'' is serving as your Milkmaid.
 		<br>&nbsp;&nbsp;&nbsp;
 		<<= saChoosesOwnClothes($slaves[$i])>>
 		<<include "SA rules">>
@@ -358,7 +358,7 @@
 		</div>
 		<</if>>
 		/* 000-250-006 */
-		''__@@.pink;<<SlaveFullName $slaves[$i]>>@@__''
+		''__@@.pink;<<= SlaveFullName($slaves[$i])>>@@__''
 		<<if $slaves[$i].choosesOwnAssignment == 2>>
 			<<include "SA chooses own job">>
 		<<else>>
@@ -1031,7 +1031,7 @@ $dairyNameCaps produced <<print _milkWeek+_outputMilk>> liters of milk<<if _cumW
 	<<for _dI = 0; _dI < _DL; _dI++>>
 		<<set $i = $slaveIndices[$DairyiIDs[_dI]]>>
 		<<if ($slaves[$i].ID == $bioreactorPerfectedID)>>
-			<br><br>&nbsp;&nbsp;&nbsp;&nbsp;<<SlaveFullName $slaves[$i]>>'s breasts<<if $slaves[$i].balls > 0>>, balls<</if>><<if $slaves[$i].ovaries == 1>>, belly<</if>>, body, and mind have been completely adapted to synthesize useful products. She has been reclassified as part of the machine she's now permanently attached to. This combination is projected to produce approximately
+			<br><br>&nbsp;&nbsp;&nbsp;&nbsp;<<= SlaveFullName($slaves[$i])>>'s breasts<<if $slaves[$i].balls > 0>>, balls<</if>><<if $slaves[$i].ovaries == 1>>, belly<</if>>, body, and mind have been completely adapted to synthesize useful products. She has been reclassified as part of the machine she's now permanently attached to. This combination is projected to produce approximately
 			<<if $slaves[$i].balls > 0>><<print 1000*Math.trunc((3*52*(45-$slaves[$i].physicalAge))/1000)>> liters of cum,<</if>>
 			<<if $slaves[$i].ovaries == 1>><<print 100*Math.trunc((52*(45-$slaves[$i].physicalAge))/100)>> liters of vaginal secretions, <<if $dairyPregSetting == 3>><<print 13*(45-$slaves[$i].physicalAge)>><<else>><<print 5*(45-$slaves[$i].physicalAge)>><</if>> slaves,<</if>>
 			and <<print 1000*Math.trunc((300*52*(45-$slaves[$i].physicalAge))/1000)>> liters of milk over a <<print 45-$slaves[$i].physicalAge>> year period before its biological components must be replaced.

src/uncategorized/djSelect.tw

@@ -3,7 +3,7 @@
 <<set $nextButton = "Back", $nextLink = "Club", $showEncyclopedia = 1>><<set $encyclopedia = "DJ">>
 <<showallAssignmentFilter>>
 <<if ($DJ != 0)>>
-	''__@@.pink;<<SlaveFullName $DJ>>@@__'' is serving as your DJ.<br><br>She will headline entertainment in $clubName.
+	''__@@.pink;<<= SlaveFullName($DJ)>>@@__'' is serving as your DJ.<br><br>She will headline entertainment in $clubName.
 <<else>>
 	You have not selected a DJ.
 <</if>>