Explorar el Código

<<=$npcs.get($sex.npcId,'firstname')>> -> <<npc $sex.npcId>><</npc>>

Stephan Fuchs hace 8 meses
padre
commit
551b2a057e
Se han modificado 51 ficheros con 5730 adiciones y 5724 borrados
  1. 115 115
      sugarcube/src/activities/bootycall/booty_call_after.tw
  2. 101 101
      sugarcube/src/activities/bootycall/booty_call_condoms.tw
  3. 280 280
      sugarcube/src/activities/bootycall/booty_call_cowgirl.tw
  4. 177 177
      sugarcube/src/activities/bootycall/booty_call_cum.tw
  5. 272 272
      sugarcube/src/activities/bootycall/booty_call_doggy.tw
  6. 93 93
      sugarcube/src/activities/bootycall/booty_call_favorite_part.tw
  7. 67 67
      sugarcube/src/activities/bootycall/booty_call_leave.tw
  8. 223 223
      sugarcube/src/activities/bootycall/booty_call_miss.tw
  9. 111 111
      sugarcube/src/activities/bootycall/booty_call_morning.tw
  10. 76 76
      sugarcube/src/activities/bootycall/booty_call_pillow_talk.tw
  11. 90 90
      sugarcube/src/activities/bootycall/booty_call_pillow_talk2.tw
  12. 166 166
      sugarcube/src/activities/bootycall/booty_call_reactions.tw
  13. 86 86
      sugarcube/src/activities/bootycall/booty_call_sex.tw
  14. 142 142
      sugarcube/src/activities/bootycall/booty_call_shower.tw
  15. 129 129
      sugarcube/src/activities/bootycall/booty_call_start.tw
  16. 54 54
      sugarcube/src/activities/bootycall/booty_call_talk.tw
  17. 116 116
      sugarcube/src/activities/bootycall/booty_call_virgin.tw
  18. 29 29
      sugarcube/src/activities/bootycall/booty_call_work_talk1.tw
  19. 102 102
      sugarcube/src/activities/dating/dateM.tw
  20. 7 1
      sugarcube/src/activities/sex/sex.tw
  21. 121 121
      sugarcube/src/autogenerated/unsorted/hookup.tw
  22. 115 115
      sugarcube/src/autogenerated/unsorted/hookup_after.tw
  23. 78 78
      sugarcube/src/autogenerated/unsorted/hookup_morning.tw
  24. 3 3
      sugarcube/src/autogenerated/unsorted/hookup_rape.tw
  25. 140 140
      sugarcube/src/autogenerated/unsorted/hookup_sex.tw
  26. 66 66
      sugarcube/src/autogenerated/unsorted/hookup_talk.tw
  27. 76 76
      sugarcube/src/autogenerated/unsorted/hookup_virgin.tw
  28. 125 125
      sugarcube/src/autogenerated/unsorted/sex_ev_after.tw
  29. 116 116
      sugarcube/src/autogenerated/unsorted/sex_ev_condoms.tw
  30. 262 262
      sugarcube/src/autogenerated/unsorted/sex_ev_cowgirl.tw
  31. 179 179
      sugarcube/src/autogenerated/unsorted/sex_ev_cum.tw
  32. 247 247
      sugarcube/src/autogenerated/unsorted/sex_ev_doggy.tw
  33. 97 97
      sugarcube/src/autogenerated/unsorted/sex_ev_favorite_part.tw
  34. 123 123
      sugarcube/src/autogenerated/unsorted/sex_ev_foreplay.tw
  35. 17 17
      sugarcube/src/autogenerated/unsorted/sex_ev_foreplay_desc.tw
  36. 19 19
      sugarcube/src/autogenerated/unsorted/sex_ev_hookup_leave.tw
  37. 94 94
      sugarcube/src/autogenerated/unsorted/sex_ev_leave.tw
  38. 253 253
      sugarcube/src/autogenerated/unsorted/sex_ev_miss.tw
  39. 125 125
      sugarcube/src/autogenerated/unsorted/sex_ev_morning.tw
  40. 129 129
      sugarcube/src/autogenerated/unsorted/sex_ev_pillow_talk.tw
  41. 95 95
      sugarcube/src/autogenerated/unsorted/sex_ev_pillow_talk2.tw
  42. 168 168
      sugarcube/src/autogenerated/unsorted/sex_ev_reactions.tw
  43. 106 106
      sugarcube/src/autogenerated/unsorted/sex_ev_sex.tw
  44. 140 140
      sugarcube/src/autogenerated/unsorted/sex_ev_shower.tw
  45. 21 21
      sugarcube/src/autogenerated/unsorted/sex_ev_start.tw
  46. 80 80
      sugarcube/src/autogenerated/unsorted/sex_ev_talk.tw
  47. 8 8
      sugarcube/src/autogenerated/unsorted/sex_ev_talk2.tw
  48. 135 135
      sugarcube/src/autogenerated/unsorted/sex_ev_virgin.tw
  49. 29 29
      sugarcube/src/autogenerated/unsorted/sex_ev_work_talk1.tw
  50. 14 14
      sugarcube/src/locations/pavlov/disco/pav_disco.tw
  51. 113 113
      sugarcube/src/locations/pavlov/disco/pav_disco_sex.tw

+ 115 - 115
sugarcube/src/activities/bootycall/booty_call_after.tw

@@ -4,7 +4,7 @@
 <<if $location_var[$here][0] == 'quit'>>
 	<<actCLA 'Leave in anger'>>
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-		<p>You know what, <<=$npcs.get($sex.npcId,'firstname')>>? <i>Fuck you!</i>" You leap off the bed in a huff, quickly grabbing your things and throwing your clothes on. <<=$npcs.get($sex.npcId,'firstname')>> glares daggers at you the whole time but you don't care and the moment you have all your clothes on, you stalk out the door, giving him the finger as you slam it behind you.</p>
+		<p>You know what, <<npc $sex.npcId>><</npc>>? <i>Fuck you!</i>" You leap off the bed in a huff, quickly grabbing your things and throwing your clothes on. <<npc $sex.npcId>><</npc>> glares daggers at you the whole time but you don't care and the moment you have all your clothes on, you stalk out the door, giving him the finger as you slam it behind you.</p>
 		<!-- !! if npc_abusive[$sex.npcId] > 0 and rand(1,10) > number:-->
 		<!-- !! get raped-->
 		<!-- !! else-->
@@ -44,13 +44,13 @@
 			<<elseif getvar("$booty_call['keep_going_continue']") > 0 and $npcs.get($sex.npcId,'caretaker') == 1>>
 				<<gs 'booty_call_after' 'finish'>>
 			<<elseif getvar("$booty_call['keep_going_continue']") > 0>>
-				<p>"Just a couple more times?" <<=$npcs.get($sex.npcId,'firstname')>> begs. "I still want to get off a few more times with you."</p>
+				<p>"Just a couple more times?" <<npc $sex.npcId>><</npc>> begs. "I still want to get off a few more times with you."</p>
 				<<gs 'booty_call_after' 'stop_here_options'>>
 			<<elseif $npcs.get($sex.npcId,'abusive') == 1 or $npcs.get($sex.npcId,'selfish') == 1 or (npc_caretaker[$sex.npcId] != 1 and $rand(1,3))>>
-				<p>"You're done already?" <<=$npcs.get($sex.npcId,'firstname')>> complains. "I still want to get off a few more times with you."</p>
+				<p>"You're done already?" <<npc $sex.npcId>><</npc>> complains. "I still want to get off a few more times with you."</p>
 				<<gs 'booty_call_after' 'stop_here_options'>>
 			<<elseif $npcs.get($sex.npcId,'caretaker') == 1>>
-				<p>"I was actually hoping to go a few more times," <<=$npcs.get($sex.npcId,'firstname')>> says a bit wistfully. "But if you want to stop, that's all right."</p>
+				<p>"I was actually hoping to go a few more times," <<npc $sex.npcId>><</npc>> says a bit wistfully. "But if you want to stop, that's all right."</p>
 				<<gs 'booty_call_after' 'stop_here_options'>>
 			<<elseif $npcs.get($sex.npcId,'caretaker') == 1>>
 				<<gs 'booty_call_after' 'stop_here_options'>>
@@ -63,9 +63,9 @@
 <<if $location_var[$here][0] == 'stop_here_options'>>
 	<<actCLA 'I can`t keep going'>>
 		<!-- !!		if booty_call['fuck_count'] > 0:-->
-		<p>"I'm sorry <<=$npcs.get($sex.npcId,'firstname')>>," you say, rubbing his arm, genuinely apologetic. "But I just can't keep up with your sex drive. I'm all tapped out. Maybe next time?"</p>
+		<p>"I'm sorry <<npc $sex.npcId>><</npc>>," you say, rubbing his arm, genuinely apologetic. "But I just can't keep up with your sex drive. I'm all tapped out. Maybe next time?"</p>
 		<<if $npcs.get($sex.npcId,'caretaker') == 1>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> smiles wistfully at you.</p>
+			<p><<npc $sex.npcId>><</npc>> smiles wistfully at you.</p>
 			"I guess it's okay then..."
 			<<gs 'booty_call_after' 'after_sex1'>>
 		<<else>>
@@ -88,7 +88,7 @@
 					<<gs 'booty_call_start' 'bj_ask2'>>
 				<</if>>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> seems really disappointed, almost upset.</p>
+				<p><<npc $sex.npcId>><</npc>> seems really disappointed, almost upset.</p>
 				<<setinit $booty_call['blue_ball'] = 1>>
 				<<gs 'booty_call_after' 'after_sex1'>>
 			<</if>>
@@ -98,9 +98,9 @@
 	<<actCLA 'I don`t have time'>>
 		<<setinit $booty_call['no_time'] += 1>>
 		<<if getvar("$booty_call['keep_going_continue']") >= 1>>
-			<p>"Seriously <<=$npcs.get($sex.npcId,'firstname')>>," you say. "I can't. You're gonna make me late."</p>
+			<p>"Seriously <<npc $sex.npcId>><</npc>>," you say. "I can't. You're gonna make me late."</p>
 		<<else>>
-			<p>"I wish I could, but I don't have time <<=$npcs.get($sex.npcId,'firstname')>>," you shake your head. "I really need to get going soon."</p>
+			<p>"I wish I could, but I don't have time <<npc $sex.npcId>><</npc>>," you shake your head. "I really need to get going soon."</p>
 		<</if>>
 		<<if $npcs.get($sex.npcId,'caretaker') == 1>>
 			"Well, I don't want to make you late," he says softly.
@@ -108,7 +108,7 @@
 			<<if $booty_call['cum_count'] < $npcs.get($sex.npcId,'sexdrive') - 5>>
 				<p>"Come on, please? Just a couple more times?"</p>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> seems really disappointed, almost upset.</p>
+				<p><<npc $sex.npcId>><</npc>> seems really disappointed, almost upset.</p>
 			<</if>>
 		<</if>>
 		<<gs 'booty_call_after' 'after_sex1'>>
@@ -120,12 +120,12 @@
 			<<setinit $booty_call['blue_ball'] = 1>>
 			<<if getvar("$booty_call['keep_going_continue']") >= 1>>
 				<<if $time.hour < 3>>
-					<p>"Seriously <<=$npcs.get($sex.npcId,'firstname')>>," you say. "I can't. My mom is already going to kill me for staying out past curfew."</p>
+					<p>"Seriously <<npc $sex.npcId>><</npc>>," you say. "I can't. My mom is already going to kill me for staying out past curfew."</p>
 				<<else>>
-					<p>"Seriously <<=$npcs.get($sex.npcId,'firstname')>>," you say. "I can't. I need to get home soon or my mom will kill me."</p>
+					<p>"Seriously <<npc $sex.npcId>><</npc>>," you say. "I can't. I need to get home soon or my mom will kill me."</p>
 				<</if>>
 			<<else>>
-				<p>"I wish I could, but I need to get home <<=$npcs.get($sex.npcId,'firstname')>>," you shake your head. "My mom will kill me if I'm not back before midnight."</p>
+				<p>"I wish I could, but I need to get home <<npc $sex.npcId>><</npc>>," you shake your head. "My mom will kill me if I'm not back before midnight."</p>
 			<</if>>
 			<<if $npcs.get($sex.npcId,'caretaker') == 1>>
 				"Well, I guess there''s always next time," he says softly.
@@ -137,7 +137,7 @@
 					<<gs 'booty_call_after' 'well_continue'>>
 				<<else>>
 					<<setinit $booty_call['blue_ball'] = 1>>
-					<p>"Your mom's a bitch, you know that?" <<=$npcs.get($sex.npcId,'firstname')>> grumbles, pulling away.</p>
+					<p>"Your mom's a bitch, you know that?" <<npc $sex.npcId>><</npc>> grumbles, pulling away.</p>
 					<<actCLA 'Tell me about it'>>
 						"Tell me about it," you roll your eyes. "At least you don't have to live with her."
 						<<gs 'booty_call_after' 'after_sex1'>>
@@ -158,7 +158,7 @@
 			<<setinit $booty_call['blue_ball'] = 1>>
 			"My pussy is so sore," you say, rubbing his arm, feeling genuinely apologetic. "You're gonna fuck me to death if we keep going."
 			<<if $npcs.get($sex.npcId,'caretaker') == 1>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> smiles apologetically at you.</p>
+				<p><<npc $sex.npcId>><</npc>> smiles apologetically at you.</p>
 				"Oh. Sorry about that..."
 				<<gs 'booty_call_after' 'after_sex1'>>
 			<<elseif $npcs.get($sex.npcId,'selfish') == 1 and $booty_call['cum_count'] < $npcs.get($sex.npcId,'sexdrive') - 5>>
@@ -166,7 +166,7 @@
 				<<gs 'booty_call_after' 'after_sex1'>>
 				<<gs 'booty_call_after' 'well_continue'>>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> seems really disappointed, almost upset.</p>
+				<p><<npc $sex.npcId>><</npc>> seems really disappointed, almost upset.</p>
 				<<gs 'booty_call_after' 'after_sex1'>>
 			<</if>>
 		<</actCLA>>
@@ -220,7 +220,7 @@
 				"I need to tap out," you pant breathlessly, wincing at the pain of the large cock still filling you up. "You're just too big for me... I can't keep going..."
 			<</if>>
 			<<if $npcs.get($sex.npcId,'selfish') == 1 or $npcs.get($sex.npcId,'abusive') == 1>>
-				<p>"Come on, don't be like that," <<=$npcs.get($sex.npcId,'firstname')>> moans. "You just need to get used to it. Don't pussy out now."</p>
+				<p>"Come on, don't be like that," <<npc $sex.npcId>><</npc>> moans. "You just need to get used to it. Don't pussy out now."</p>
 				<<actCLA 'Force yourself to keep going'>>
 					<<setinit $booty_call['tap_out'] = 2>>
 					You grimace, rubbing your thighs together over your sore pussy. You can't believe you're about to do this.
@@ -239,12 +239,12 @@
 				<<actCLA 'I can`t'>>
 					<<run $npcs.set($sex.npcId,'dick_too_big',1)>>
 					"I just can't," you shake your head, legs tightening over your sore lady bits. "My pussy hurts so much, I can't handle your cock inside me again."
-					<p>"Ugh," <<=$npcs.get($sex.npcId,'firstname')>> says rolling his eyes. "Way to be a little bitch about it. Never going to learn to enjoy my big cock unless you practice."</p>
+					<p>"Ugh," <<npc $sex.npcId>><</npc>> says rolling his eyes. "Way to be a little bitch about it. Never going to learn to enjoy my big cock unless you practice."</p>
 					<<gs 'booty_call_after' 'after_sex1'>>
 				<</actCLA>>
 			<<elseif $npcs.get($sex.npcId,'caretaker') == 1>>
 				<<run $npcs.set($sex.npcId,'dick_too_big',1)>>
-				<p>"Sorry," <<=$npcs.get($sex.npcId,'firstname')>> says, looking truly apologetic. "I know it's not easy for girls to handle. We can try again another time."</p>
+				<p>"Sorry," <<npc $sex.npcId>><</npc>> says, looking truly apologetic. "I know it's not easy for girls to handle. We can try again another time."</p>
 				<<actCLA 'Thanks'>>
 					"Thanks," you say, smiling gratefully at him. "Yeah... maybe another time..."
 					<<gs 'booty_call_after' 'after_sex1'>>
@@ -256,7 +256,7 @@
 				<</actCLA>>
 			<<else>>
 				<<run $npcs.set($sex.npcId,'dick_too_big',1)>>
-				<p>"Damn, my dick's too big for you?" <<=$npcs.get($sex.npcId,'firstname')>> asks, smiling smugly when you return an exhausted nod. "Just one of those big dick problems I guess. Okay we'll try again later."</p>
+				<p>"Damn, my dick's too big for you?" <<npc $sex.npcId>><</npc>> asks, smiling smugly when you return an exhausted nod. "Just one of those big dick problems I guess. Okay we'll try again later."</p>
 				He laughs aloud, not seeming to care much that your pussy is sore beyond belief.
 				<<gs 'booty_call_after' 'after_sex1'>>
 			<</if>>
@@ -266,17 +266,17 @@
 <<if $location_var[$here][0] == 'fucked_out'>>
 	<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 	<<if getvar("$booty_call['fuck_again']") == 1>>
-		<p>"Wanna keep going?" you eagerly ask <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+		<p>"Wanna keep going?" you eagerly ask <<npc $sex.npcId>><</npc>>.</p>
 	<<elseif getvar("$booty_call['cock_inserted']") == 1>>
-		<p>"Wanna keep going?" you eagerly ask, flexing your pussy around <<=$npcs.get($sex.npcId,'firstname')>>'s cock.</p>
+		<p>"Wanna keep going?" you eagerly ask, flexing your pussy around <<npc $sex.npcId>><</npc>>'s cock.</p>
 	<<else>>
-		<p>"Wanna keep going?" you eagerly ask <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+		<p>"Wanna keep going?" you eagerly ask <<npc $sex.npcId>><</npc>>.</p>
 	<</if>>
 	"I don't think I can..." he groans.
 	<<if getvar("$booty_call['cock_inserted']") == 0>>
-		<p>You look down and see <<=$npcs.get($sex.npcId,'firstname')>>'s cock already going limp, rapidly deflating right before your eyes.</p>
+		<p>You look down and see <<npc $sex.npcId>><</npc>>'s cock already going limp, rapidly deflating right before your eyes.</p>
 	<<else>>
-		<p>You realize with a start that <<=$npcs.get($sex.npcId,'firstname')>> is getting <i>softer</i>, not harder, inside you.</p>
+		<p>You realize with a start that <<npc $sex.npcId>><</npc>> is getting <i>softer</i>, not harder, inside you.</p>
 	<</if>>
 	"I think I might be all fucked out for the day..."
 	<<actCLA 'Ugh'>>
@@ -345,7 +345,7 @@
 			"I guess that's a sign we should stop..."
 		<</if>>
 		<<if $booty_call['cum_count'] < npc_sexdrive[$sex.npcId] - rand(1,3) and $booty_call['condoms_used'] < $booty_call['condom_count']>>
-			<p>"I have a few," <<=$npcs.get($sex.npcId,'firstname')>> says, reaching for another one."</p>
+			<p>"I have a few," <<npc $sex.npcId>><</npc>> says, reaching for another one."</p>
 			<<gs 'booty_call_condoms' 'npc_condom_use_stats'>>
 			<<gs 'booty_call_sex' 'reset'>>
 			<<actCLA 'Let him lead'>>
@@ -355,13 +355,13 @@
 				 <<gs 'booty_call_sex' 'position_change'>>
 			<</actCLA>>
 		<<elseif $booty_call['cum_count'] >= $npcs.get($sex.npcId,'sexdrive')>>
-			<p>"I think I'm all fucked out anyways," <<=$npcs.get($sex.npcId,'firstname')>> sighs limply.</p>
+			<p>"I think I'm all fucked out anyways," <<npc $sex.npcId>><</npc>> sighs limply.</p>
 			<<gs 'booty_call_after' 'after_sex1'>>
 		<<elseif getvar("$booty_call['fuck_count']") == 0 and $booty_call['cum_count'] < npc_sexdrive[$sex.npcId] - rand(1,3)>>
-			<p>"Well this was fucking bullshit," <<=$npcs.get($sex.npcId,'firstname')>> grumbles.</p>
+			<p>"Well this was fucking bullshit," <<npc $sex.npcId>><</npc>> grumbles.</p>
 			<<gs 'booty_call_after' 'after_sex1'>>
 		<<else>>
-			<p>"Yeah, I think so too," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+			<p>"Yeah, I think so too," <<npc $sex.npcId>><</npc>> says.</p>
 			<<gs 'booty_call_after' 'after_sex1'>>
 		<</if>>
 	<</actCLA>>
@@ -379,13 +379,13 @@
 				<<image "shared/sex/cum/facial/facial36.jpg">>
 				<<if getvar("$booty_call['wipes']") == 2>>
 					<p>"Hey, got anything I can use to clean up?" you trying not to smile under the spunk covering your face.</p>
-					<p>"Oh yeah, right here." <<=$npcs.get($sex.npcId,'firstname')>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.</p>
+					<p>"Oh yeah, right here." <<npc $sex.npcId>><</npc>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.</p>
 				<<else>>
 					You reach up and poke at the sperm coating your face. Ew. You really need to clean that up before you do anything else. Reaching down to your purse, you pull some wipes out of your purse.
 				<</if>>
 				<<if $pc.cumAtLocation(16) > 0>>
 					<!-- !! hair-->
-					<p>You carefully wipe the cum from your face, making sure to get every last drop, including getting the tangled web that <<=$npcs.get($sex.npcId,'firstname')>> managed to get in your hair. About a minute later, you can still feel a faintly sticky layer over the top of your skin, but at least nobody is going to give you funny looks walking down the street.</p>
+					<p>You carefully wipe the cum from your face, making sure to get every last drop, including getting the tangled web that <<npc $sex.npcId>><</npc>> managed to get in your hair. About a minute later, you can still feel a faintly sticky layer over the top of your skin, but at least nobody is going to give you funny looks walking down the street.</p>
 				<<else>>
 					You carefully wipe the cum from your face, making sure to get every last drop. About a minute later, you can still feel a faintly sticky layer over the top of your skin, but at least nobody is going to give you funny looks walking down the street.
 				<</if>>
@@ -394,7 +394,7 @@
 				<<image "shared/sex/cum/stomach/bellycum3.jpg">>
 				<<if getvar("$booty_call['wipes']") == 2>>
 					<p>"Hey, got anything I can use to clean up?" you ask, looking at your belly, cum still spattered over it.</p>
-					<p>"Oh yeah, right here." <<=$npcs.get($sex.npcId,'firstname')>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.</p>
+					<p>"Oh yeah, right here." <<npc $sex.npcId>><</npc>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.</p>
 				<<else>>
 					You really need to clean yourself after up after that. Reaching down to your purse, you pull some wipes out of your purse.
 				<</if>>
@@ -403,7 +403,7 @@
 				<<image "shared/sex/cum/back1.jpg">>
 				<<if getvar("$booty_call['wipes']") == 2>>
 					<p>"Hey, got anything I can use to clean up?" you ask, looking over your shoulder and wiggling your ass to emphasize the cum resting on it.</p>
-					<p>"Oh yeah, right here." <<=$npcs.get($sex.npcId,'firstname')>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work awkwardly trying to wipe your ass and up your back.</p>
+					<p>"Oh yeah, right here." <<npc $sex.npcId>><</npc>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work awkwardly trying to wipe your ass and up your back.</p>
 				<<else>>
 					You really need to clean yourself after up after that. Reaching down to your purse, you pull some wipes out of your purse, awkwardly wiping your ass and back with it.
 				<</if>>
@@ -416,7 +416,7 @@
 						<p><i>Why did I get out my wipes?</i> you think to yourself. You frown at the packet, befuddled as to what you wanted to do with the,.</p>
 						<i>Meh. If it's important, it will come back to me later,</i> you think to yourself as you put it back into your purse, oblivious to the liquid dribbling down the inside of your thigh.
 					<<elseif getvar("$booty_call['wipes']") == 2>>
-						<p>"Hey, do you-" you start and then suddenly lose track of what you were trying to say. You frown to yourself as <<=$npcs.get($sex.npcId,'firstname')>> looks at you quizically.</p>
+						<p>"Hey, do you-" you start and then suddenly lose track of what you were trying to say. You frown to yourself as <<npc $sex.npcId>><</npc>> looks at you quizically.</p>
 						<p>"Did you need something?"</p>
 						"I uhh..." Your frown deepens. "I wanted to ask you something... but I forgot what it was... I guess it doesn''t really matter..."
 						<i>Meh. If it's important, it will come back to me later,</i> you think to yourself, oblivious to the liquid dribbling down the inside of your thigh.
@@ -425,7 +425,7 @@
 					<<if getvar("$booty_call['wipes']") == 2>>
 						<<video "shared/sex/cum/vagcreampie/after1.mp4">>
 						<p>"Hey, got anything I can use to clean up?" you say, holding your fingers over your pussy, trying to keep the cum from spilling out any further.</p>
-						<p>"Oh yeah, right here." <<=$npcs.get($sex.npcId,'firstname')>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.</p>
+						<p>"Oh yeah, right here." <<npc $sex.npcId>><</npc>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.</p>
 					<<else>>
 						<<image "shared/sex/cum/cum111.jpg">>
 						You really need to clean yourself after up after that. Reaching down to your purse, you pull some wipes out of your purse before reaching between your legs to wipe yourself up.
@@ -499,15 +499,15 @@
 	<<elseif getvar("$booty_call['force_harden']") == 2>>
 		<<setinit $booty_call['force_harden'] = 3>>
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-		<p>"I really can't... keep going... <<=$npcs.get($sex.npcId,'firstname')>> huffs exhaustedly.</p>
+		<p>"I really can't... keep going... <<npc $sex.npcId>><</npc>> huffs exhaustedly.</p>
 		<<gs 'booty_call_after' 'after_sex1'>>
 	<<elseif $booty_call['cum_count'] >= $npcs.get($sex.npcId,'sexdrive') + $booty_call['extra_cum']>>
 		<<setinit $booty_call['sex_over'] = 1>>
-		<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> pants. "I'm totally tapped out."</p>
+		<p>"Yeah," <<npc $sex.npcId>><</npc>> pants. "I'm totally tapped out."</p>
 		<<gs 'booty_call_after' 'after_sex1'>>
 	<<elseif getvar("$booty_call['cum_count']") == 0>>
 		"Sorry," you say only a little apologetically. "I really can't keep going. I'm finished here."
-		<p>"This is bullshit..." <<=$npcs.get($sex.npcId,'firstname')>> grumbles.</p>
+		<p>"This is bullshit..." <<npc $sex.npcId>><</npc>> grumbles.</p>
 		<<gs 'booty_call_after' 'after_sex1'>>
 	<<else>>
 		<<setinit $booty_call['sex_over'] = 1>>
@@ -517,12 +517,12 @@
 <</if>>
 <<if $location_var[$here][0] == 'no_cum_end'>>
 	<<if getvar("$booty_call['fuck_count']") == 0>>
-		<p>"Really?" <<=$npcs.get($sex.npcId,'firstname')>> asks, sitting up. "But we didn't fuck. You didn't even get to come."</p>
+		<p>"Really?" <<npc $sex.npcId>><</npc>> asks, sitting up. "But we didn't fuck. You didn't even get to come."</p>
 		<<if getvar("$know_virgin["+$sex.npcId+"]") == 1 and $pc.thinksIsVirgin and getvar("$booty_call['fuck_count']") == 0>>
 			<<actCLA 'You know I`m saving my virginity'>>
-				<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+				<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-				<p>"Come on <<=$npcs.get($sex.npcId,'firstname')>>," you sigh. "You know I'm saving myself for marriage."</p>
+				<p>"Come on <<npc $sex.npcId>><</npc>>," you sigh. "You know I'm saving myself for marriage."</p>
 				"And you still have a fuckbuddy."
 				"Shut up," you roll your eyes.
 				<<gs 'booty_call_after' 'after_sex1'>>
@@ -530,7 +530,7 @@
 		<<elseif $pc.thinksIsVirgin and getvar("$booty_call['fuck_count']") == 0>>
 			<<actCLA 'I`m saving my virginity'>>
 				<<setinit $know_virgin[$sex.npcId] = 1>>
-				<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+				<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				"Sorry," you smile apologetically. "I'm saving myself for marriage."
 				<p>"Why?" he asks, confusedly.</p>
@@ -559,7 +559,7 @@
 			<<gs 'booty_call_after' 'after_sex1'>>
 		<</actCLA>>
 	<<else>>
-		<p>"Really?" <<=$npcs.get($sex.npcId,'firstname')>> asks, sitting up. "But you didn't get to come."</p>
+		<p>"Really?" <<npc $sex.npcId>><</npc>> asks, sitting up. "But you didn't get to come."</p>
 		<<actCLA 'It`s okay'>>
 			"That's sweet of you," you say, smiling. "But don't worry about that. I'm okay without it today."
 			<p>"You're sure?" he asks.</p>
@@ -584,7 +584,7 @@
 	<<actCLA 'End here (bad end)'>>
 		<<image "shared/sex/after/annoyed1.jpg">>
 		"Let''s call it here," you say, letting your negative feelings get to you.
-		<p>"What, done already?" <<=$npcs.get($sex.npcId,'firstname')>> says, sitting up.</p>
+		<p>"What, done already?" <<npc $sex.npcId>><</npc>> says, sitting up.</p>
 		<<actCLA 'Don`t feel like it anymore'>>
 			"I don't feel like doing anything else," you mumble, feeling deflated and dejected, sinking further into the bed. "I'm just... not in the mood anymore."
 			<<gs 'booty_call_after' 'after_sex1'>>
@@ -605,44 +605,44 @@
 	<<if getvar("$booty_call['cum_together']") > 0>>
 		<<if $booty_call['position'] == 'miss'>>
 			<<image "shared/sex/vag/miss/2.jpg">>
-			<p>Your simultaneous orgasm was too much to handle and your vision begins to blur. At the back of your mind, you realize that your body is succumbing to exhaustion. The last thing you're aware of is <<=$npcs.get($sex.npcId,'firstname')>>'s cock stuffed inside you, his cum filling your pussy to the brim, and then...</p>
+			<p>Your simultaneous orgasm was too much to handle and your vision begins to blur. At the back of your mind, you realize that your body is succumbing to exhaustion. The last thing you're aware of is <<npc $sex.npcId>><</npc>>'s cock stuffed inside you, his cum filling your pussy to the brim, and then...</p>
 		<<elseif $booty_call['position'] == 'doggy'>>
 			<<image "shared/sex/cum/vagcreampie/doggy1.jpg">>
-			<p>Your simultaneous orgasm was too much to handle and your knees give out underneath you, collapsing onto the bed in exhaustion as your vision begins to blur and fade. The last thing you're aware of is <<=$npcs.get($sex.npcId,'firstname')>>'s cock slipping from your pussy, the tickling sensation of his cum leaking from your snatch, and then...</p>
+			<p>Your simultaneous orgasm was too much to handle and your knees give out underneath you, collapsing onto the bed in exhaustion as your vision begins to blur and fade. The last thing you're aware of is <<npc $sex.npcId>><</npc>>'s cock slipping from your pussy, the tickling sensation of his cum leaking from your snatch, and then...</p>
 		<<elseif $booty_call['position'] == 'cowgirl'>>
 			<<image "shared/sex/vag/cowgirl/1.jpg">>
-			<p>Your simultaneous orgasm was too much to handle and you collapse, no strength left to stay upright and your vision begins to blur. At the back of your mind, you realize that your body is succumbing to exhaustion. The last thing you're aware of is your breasts pressed up against <<=$npcs.get($sex.npcId,'firstname')>>'s chest, his cock stuffed inside you and cum filling your pussy to the brim, and then...</p>
+			<p>Your simultaneous orgasm was too much to handle and you collapse, no strength left to stay upright and your vision begins to blur. At the back of your mind, you realize that your body is succumbing to exhaustion. The last thing you're aware of is your breasts pressed up against <<npc $sex.npcId>><</npc>>'s chest, his cock stuffed inside you and cum filling your pussy to the brim, and then...</p>
 		<</if>>
 	<<elseif $booty_call['last_cum'] == 'creampie'>>
 		<<if $booty_call['position'] == 'miss'>>
 			<<image "shared/sex/vag/miss/2.jpg">>
-			<p>Exhaustion hits you in a sudden wave and your vision begins to blur. The last thing you're aware of is <<=$npcs.get($sex.npcId,'firstname')>> inside you, his cock and cum filling your pussy to the brim, and then...</p>
+			<p>Exhaustion hits you in a sudden wave and your vision begins to blur. The last thing you're aware of is <<npc $sex.npcId>><</npc>> inside you, his cock and cum filling your pussy to the brim, and then...</p>
 		<<elseif $booty_call['position'] == 'doggy'>>
 			<<image "shared/sex/cum/vagcreampie/doggy1.jpg">>
-			<p>Exhaustion hits you in a sudden wave and your knees give out underneath you, collapsing onto the bed in exhaustion as your vision begins to blur and fade. The last thing you're aware of is <<=$npcs.get($sex.npcId,'firstname')>>'s cock slipping from your pussy, the tickling sensation of his cum leaking from your snatch, and then...</p>
+			<p>Exhaustion hits you in a sudden wave and your knees give out underneath you, collapsing onto the bed in exhaustion as your vision begins to blur and fade. The last thing you're aware of is <<npc $sex.npcId>><</npc>>'s cock slipping from your pussy, the tickling sensation of his cum leaking from your snatch, and then...</p>
 		<<elseif $booty_call['position'] == 'cowgirl'>>
 			<<image "shared/sex/vag/cowgirl/1.jpg">>
-			<p>Exhaustion hits you in a sudden wave and you collapse, no strength left to stay upright and your vision begins to blur. The last thing you're aware of is your breasts pressed up against <<=$npcs.get($sex.npcId,'firstname')>>'s chest, his cock and cum filling your pussy to the brim, and then...</p>
+			<p>Exhaustion hits you in a sudden wave and you collapse, no strength left to stay upright and your vision begins to blur. The last thing you're aware of is your breasts pressed up against <<npc $sex.npcId>><</npc>>'s chest, his cock and cum filling your pussy to the brim, and then...</p>
 		<</if>>
 	<<elseif $booty_call['last_cum'] == 'facial'>>
 		<<image "shared/sex/cum/facial/facial35.jpg">>
-		<p>You collapse to the bed, <<=$npcs.get($sex.npcId,'firstname')>>'s cum still hot on your face. Your vision blurs and you struggle to keep your eyes open. The last thing you remember is a trickle of liquid running down your cheek, and then...</p>
+		<p>You collapse to the bed, <<npc $sex.npcId>><</npc>>'s cum still hot on your face. Your vision blurs and you struggle to keep your eyes open. The last thing you remember is a trickle of liquid running down your cheek, and then...</p>
 	<<elseif $booty_call['last_cum'] == 'swallow'>>
 		<<image "shared/sex/after/sleep4.jpg">>
-		<p>You collapse to the bed as soon as you gulp, no strength left for you to stay upright. Your vision blurs and you struggle to keep your eyes open. The last thing you remember is the salty taste of <<=$npcs.get($sex.npcId,'firstname')>>'s cum on your lips, and then...</p>
+		<p>You collapse to the bed as soon as you gulp, no strength left for you to stay upright. Your vision blurs and you struggle to keep your eyes open. The last thing you remember is the salty taste of <<npc $sex.npcId>><</npc>>'s cum on your lips, and then...</p>
 	<<elseif $booty_call['last_cum'] == 'spit'>>
 		<<image "locations/pavlovsk/resident/rekshome/party/party_girls_party_gost_22.jpg">>
-		<p>You collapse to the bed, <<=$npcs.get($sex.npcId,'firstname')>>'s cum still dribbling down your chin. Your vision blurs and you struggle to keep your eyes open. The last thing you remember is a trickle of liquid running down your cheek, and then...</p>
+		<p>You collapse to the bed, <<npc $sex.npcId>><</npc>>'s cum still dribbling down your chin. Your vision blurs and you struggle to keep your eyes open. The last thing you remember is a trickle of liquid running down your cheek, and then...</p>
 	<<elseif $booty_call['last_cum'] == 'face_mouth'>>
 		<<image "shared/sex/cum/facial/sleep4.jpg">>
-		<p>You collapse to the bed, <<=$npcs.get($sex.npcId,'firstname')>>'s cum hot on your face, still running down your chin. Your vision blurs and you struggle to keep your eyes open. The last thing you remember is a trickle of liquid dribbling from your lips, and then...</p>
+		<p>You collapse to the bed, <<npc $sex.npcId>><</npc>>'s cum hot on your face, still running down your chin. Your vision blurs and you struggle to keep your eyes open. The last thing you remember is a trickle of liquid dribbling from your lips, and then...</p>
 	<<elseif $booty_call['last_cum'] == 'tits'>>
 		<<if $pc.pubesLength < 3>>
 			<<image "shared/sex/after/sleep1.jpg">>
 		<<else>>
 			<<image "shared/sex/after/sleep2.jpg">>
 		<</if>>
-		<p>You collapse to the bed, <<=$npcs.get($sex.npcId,'firstname')>>'s cum hot on your chest. Your vision blurs and you struggle to keep your eyes open, to keep conscious. The last thing you remember is a trickle of liquid running down between your breasts, and then...</p>
+		<p>You collapse to the bed, <<npc $sex.npcId>><</npc>>'s cum hot on your chest. Your vision blurs and you struggle to keep your eyes open, to keep conscious. The last thing you remember is a trickle of liquid running down between your breasts, and then...</p>
 	<<elseif $booty_call['last_cum'] == 'pullout'>>
 		<<if $booty_call['position'] == 'miss'>>
 			<<image "shared/sex/cum/stomach/sleep1.jpg">>
@@ -669,7 +669,7 @@
 	<p>"Hey! Wake up!"</p>
 	You sit up in a rush, confused.
 	"Wha... Whe..."
-	<p>"You passed out suddenly," <<=$npcs.get($sex.npcId,'firstname')>> says, looking annoyed. "You need to get dressed and get out. My girlfriend is going to be here any minute."</p>
+	<p>"You passed out suddenly," <<npc $sex.npcId>><</npc>> says, looking annoyed. "You need to get dressed and get out. My girlfriend is going to be here any minute."</p>
 	<<setinit $pc_know_npc_has_girlfriend[$sex.npcId] = 1>>
 	<<gs 'booty_call_after' 'black_out_wake_options'>>
 <</if>>
@@ -680,7 +680,7 @@
 	<<actCLA 'Shower?'>>
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		<p>"Ugh..." you moan, holding your hand to your head. "Can I borrow your shower first? I'm kind of-"</p>
-		<p>"No, no time," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head. "If you wanted that, then you shouldn't have fallen asleep on me."</p>
+		<p>"No, no time," <<npc $sex.npcId>><</npc>> says, shaking his head. "If you wanted that, then you shouldn't have fallen asleep on me."</p>
 		<<actCLA 'Get out of bed'>>
 			<<gt 'booty_call_after' 'black_out_wake2'>>
 		<</actCLA>>
@@ -694,11 +694,11 @@
 			<<actCLA 'Get dressed'>>
 				<<video "pc/activities/misc/dress_1.mp4">>
 				<<if getvar("$cumloc") > 0>>
-					<p>Sleepily, you pull your clothing on, frowning as you feel cum smear across the inside. <<=$npcs.get($sex.npcId,'firstname')>> stands beside you impatiently, constantly checking the time and the door.</p>
+					<p>Sleepily, you pull your clothing on, frowning as you feel cum smear across the inside. <<npc $sex.npcId>><</npc>> stands beside you impatiently, constantly checking the time and the door.</p>
 				<<else>>
-					<p>Sleepily, you pull your clothing on slowly. <<=$npcs.get($sex.npcId,'firstname')>> stands beside you impatiently, constantly checking the time and the door.</p>
+					<p>Sleepily, you pull your clothing on slowly. <<npc $sex.npcId>><</npc>> stands beside you impatiently, constantly checking the time and the door.</p>
 				<</if>>
-				<p>Once you've picked up the last of your things, <<=$npcs.get($sex.npcId,'firstname')>> hurries you to the door, practically pushing you out.</p>
+				<p>Once you've picked up the last of your things, <<npc $sex.npcId>><</npc>> hurries you to the door, practically pushing you out.</p>
 				<<actCLA 'Continue'>>
 					<<gt 'booty_call_after' 'black_out_end'>>
 				<</actCLA>>
@@ -721,11 +721,11 @@
 	<<actCLA 'Get dressed'>>
 		<<video "pc/activities/misc/dress_1.mp4">>
 		<<if getvar("$cumloc") > 0>>
-			<p>Sleepily, you pull your clothing on, frowning as you feel cum smear across the inside. <<=$npcs.get($sex.npcId,'firstname')>> is throwing your things at you, constantly checking the time and the door.</p>
+			<p>Sleepily, you pull your clothing on, frowning as you feel cum smear across the inside. <<npc $sex.npcId>><</npc>> is throwing your things at you, constantly checking the time and the door.</p>
 		<<else>>
-			<p>Sleepily, you pull your clothing on slowly. <<=$npcs.get($sex.npcId,'firstname')>> is throwing your things at you, constantly checking the time and the door.</p>
+			<p>Sleepily, you pull your clothing on slowly. <<npc $sex.npcId>><</npc>> is throwing your things at you, constantly checking the time and the door.</p>
 		<</if>>
-		<p>Once you've picked up the last of your things, <<=$npcs.get($sex.npcId,'firstname')>> hurries you to the door, practically pushing you out.</p>
+		<p>Once you've picked up the last of your things, <<npc $sex.npcId>><</npc>> hurries you to the door, practically pushing you out.</p>
 		<<actCLA 'Continue'>>
 			<<gt 'booty_call_after' 'black_out_end'>>
 		<</actCLA>>
@@ -733,7 +733,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'black_out_end'>>
 	<<=$npcs.get($sex.npcId,'apt_hall')>>
-	<p>"I'll text you next time I want to hook up," <<=$npcs.get($sex.npcId,'firstname')>> says, and slams the door behind you.</p>
+	<p>"I'll text you next time I want to hook up," <<npc $sex.npcId>><</npc>> says, and slams the door behind you.</p>
 	<<actCLA 'Leave'>>
 		<<gt 'booty_call_leave' 'exit'>>
 	<</actCLA>>
@@ -762,11 +762,11 @@
 					<p>"Got anything for this?" you ask, smiling wryly as you point to the sticky strands of cum covering your body.</p>
 				<</if>>
 				<<if getvar("$booty_call['sex_over']") > 0>>
-					<p>"Yeah, got some wipes right here." <<=$npcs.get($sex.npcId,'firstname')>> reaches for his nightstand, pulling a bag of wipes out of the drawer. He pulls one out and starts wiping himself down, tossing you the bag.</p>
+					<p>"Yeah, got some wipes right here." <<npc $sex.npcId>><</npc>> reaches for his nightstand, pulling a bag of wipes out of the drawer. He pulls one out and starts wiping himself down, tossing you the bag.</p>
 				<<else>>
-					<p>"Yeah, got some wipes right here." <<=$npcs.get($sex.npcId,'firstname')>> reaches for his nightstand, pulling a bag of wipes out of the drawer and tossing it over.</p>
+					<p>"Yeah, got some wipes right here." <<npc $sex.npcId>><</npc>> reaches for his nightstand, pulling a bag of wipes out of the drawer and tossing it over.</p>
 				<</if>>
-				<p>You pull out a handful and clean yourself off as well. Following <<=$npcs.get($sex.npcId,'firstname')>>'s lead, you finish by tossing the used wipe into a small trashcan in the corner of the room.</p>
+				<p>You pull out a handful and clean yourself off as well. Following <<npc $sex.npcId>><</npc>>'s lead, you finish by tossing the used wipe into a small trashcan in the corner of the room.</p>
 				<<if getvar("$booty_call['sex_over']") == 1>>
 					<<gs 'booty_call_after' 'after_sex1'>>
 				<<else>>
@@ -777,10 +777,10 @@
 				<<actCLA 'Use your wipes'>>
 					<<gs 'cum_cleanup' 'cleanloc'>>
 					<<setinit $booty_call['cock_inserted'] = 0>>
-					<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+					<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					Leaning down off the bed, you dig into your bag with a clean hand and grab some wipes out of it, cleaning yourself off.
-					<p>Feeling nice, you also take a moment to clean <<=$npcs.get($sex.npcId,'firstname')>>'s cock for him at the same time. Once you're both all wiped down off, you toss it into the wastebasket by his bed.</p>
+					<p>Feeling nice, you also take a moment to clean <<npc $sex.npcId>><</npc>>'s cock for him at the same time. Once you're both all wiped down off, you toss it into the wastebasket by his bed.</p>
 					<<if getvar("$booty_call['sex_over']") == 1>>
 						<<gs 'booty_call_after' 'after_sex1'>>
 					<<else>>
@@ -794,11 +794,11 @@
 					<<gs 'cum_cleanup' 'cleanloc'>>
 					<<run $pc.sexStatInc('swallow','aware',1)>>
 					<<image "shared/sex/cum/lick_fingers.jpg">>
-					<p>Briefly making eye contact with <<=$npcs.get($sex.npcId,'firstname')>>, you use your fingers to gather up all the loose cum on you and stick out your tongue, running it up your hand, licking every drop from it and into your mouth. You give your hand a thorough tongue bath, sucking your fingers clean at the end. Once finished, you smack your lips, smiling at <<=$npcs.get($sex.npcId,'firstname')>> who stared at you the whole time.</p>
+					<p>Briefly making eye contact with <<npc $sex.npcId>><</npc>>, you use your fingers to gather up all the loose cum on you and stick out your tongue, running it up your hand, licking every drop from it and into your mouth. You give your hand a thorough tongue bath, sucking your fingers clean at the end. Once finished, you smack your lips, smiling at <<npc $sex.npcId>><</npc>> who stared at you the whole time.</p>
 					<<if getvar("$booty_call['he_cleaned']") == 0>>
 						<p>"Any chance I could get one of those?" he gestures towards his cock.</p>
 						<<actCLA 'You`re on your own'>>
-							<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+							<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 							<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 							"Sorry soldier, but you're on your own," you giggle.
 							"<i>Of course I am...</i>" He sighs but reaches for his nightstand, pulling a pack of wipes from it and gets to work cleaning himself up. Once he's done, he tosses the used wipe into a trash can in the corner of his room.
@@ -841,9 +841,9 @@
 			<<setinit $booty_call['react'] = 1>>
 			<<image "shared/sex/cum/facial/facial24.jpg">>
 			<<if $booty_call['position'] == 'miss' or $booty_call['position'] == 'doggy' or $booty_call['position'] == 'cowgirl'>>
-				<p>You lean forward, wrapping your lips around <<=$npcs.get($sex.npcId,'firstname')>>'s cock and running them up and down to clean him off. You can faintly taste yourself, as well as the remnants of cum that was still inside it, drawn out your mouth. Looking up at <<=$npcs.get($sex.npcId,'firstname')>>, you are greeted with the sight of him staring down at you.</p>
+				<p>You lean forward, wrapping your lips around <<npc $sex.npcId>><</npc>>'s cock and running them up and down to clean him off. You can faintly taste yourself, as well as the remnants of cum that was still inside it, drawn out your mouth. Looking up at <<npc $sex.npcId>><</npc>>, you are greeted with the sight of him staring down at you.</p>
 			<<else>>
-				<p>Opening your mouth, you lean forward, wrapping your lips around <<=$npcs.get($sex.npcId,'firstname')>>'s cock and running them up and down to clean him off. You can taste the remnants of cum that was still inside it, drawn out by your mouth. Looking up at <<=$npcs.get($sex.npcId,'firstname')>>, you are greeted with the sight of him staring down at you.</p>
+				<p>Opening your mouth, you lean forward, wrapping your lips around <<npc $sex.npcId>><</npc>>'s cock and running them up and down to clean him off. You can taste the remnants of cum that was still inside it, drawn out by your mouth. Looking up at <<npc $sex.npcId>><</npc>>, you are greeted with the sight of him staring down at you.</p>
 			<</if>>
 			<<gs 'booty_call_sex' 'sex_end'>>
 		<</actCLA>>
@@ -868,7 +868,7 @@
 		<<actCLA 'Finish'>>
 			<<if $pc.cumAtLocation(0) > 0>>
 				<<image "shared/sex/cum/vagcreampie/miss1.jpg">>
-				<p>You lay back, settling down on the other side of the bed. Your body relaxes and you feel <<=$npcs.get($sex.npcId,'firstname')>>'s cum seep from your pussy, trickling down the crack of your ass into the bedsheets.</p>
+				<p>You lay back, settling down on the other side of the bed. Your body relaxes and you feel <<npc $sex.npcId>><</npc>>'s cum seep from your pussy, trickling down the crack of your ass into the bedsheets.</p>
 			<<else>>
 				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			<</if>>
@@ -876,7 +876,7 @@
 				<<gs 'booty_call_pillow_talk' 'high_five1'>>
 			<<else>>
 				<<if $npcs.get($sex.npcId,'smoker') > 0>>
-					<p>The two of you pull apart and <<=$npcs.get($sex.npcId,'firstname')>> reaches over to his nightstand and pulls out a pack of cigarettes.</p>
+					<p>The two of you pull apart and <<npc $sex.npcId>><</npc>> reaches over to his nightstand and pulls out a pack of cigarettes.</p>
 				<<else>>
 					The two of you quietly bask in the afterglow of your fuck together.
 				<</if>>
@@ -891,29 +891,29 @@
 		<<if $booty_call['position'] == 'miss'>>
 			<<video "shared/sex/after/miss_after1.mp4">>
 			$booty_call['end_comment']
-			<p><<=$npcs.get($sex.npcId,'firstname')>> climbs off of you, removing his cock from your pussy in the process, and flops down on the other side of the bed. His cum seeps from your pussy, trickling down the crack of your ass into the bedsheets.</p>
+			<p><<npc $sex.npcId>><</npc>> climbs off of you, removing his cock from your pussy in the process, and flops down on the other side of the bed. His cum seeps from your pussy, trickling down the crack of your ass into the bedsheets.</p>
 		<<elseif $booty_call['position'] == 'doggy'>>
 			<<video "shared/sex/after/doggy_after1.mp4">>
 			$booty_call['end_comment']
-			<p><<=$npcs.get($sex.npcId,'firstname')>> pulls out from behind you and you roll over together onto your backs. His cum seeps from your pussy, slowly oozing down your thighs.</p>
+			<p><<npc $sex.npcId>><</npc>> pulls out from behind you and you roll over together onto your backs. His cum seeps from your pussy, slowly oozing down your thighs.</p>
 		<<elseif $booty_call['position'] == 'cowgirl'>>
 			<<video "shared/sex/after/cowgirl_after1.mp4">>
 			$booty_call['end_comment']
-			<p>You climb off of <<=$npcs.get($sex.npcId,'firstname')>> and flop down next to him. As soon as his cock vacates your pussy, cum begins to drip from it, trickling down the crack of your ass into the bedsheets.</p>
+			<p>You climb off of <<npc $sex.npcId>><</npc>> and flop down next to him. As soon as his cock vacates your pussy, cum begins to drip from it, trickling down the crack of your ass into the bedsheets.</p>
 		<</if>>
 	<<else>>
 		<<if $booty_call['position'] == 'miss'>>
 			<<video "shared/sex/after/miss_after1.mp4">>
 			$booty_call['end_comment']
-			<p><<=$npcs.get($sex.npcId,'firstname')>> removes his cock from your pussy, climbing out from between your legs, flopping onto the other side of the bed.</p>
+			<p><<npc $sex.npcId>><</npc>> removes his cock from your pussy, climbing out from between your legs, flopping onto the other side of the bed.</p>
 		<<elseif $booty_call['position'] == 'doggy'>>
 			<<video "shared/sex/after/doggy_after1.mp4">>
 			$booty_call['end_comment']
-			<p><<=$npcs.get($sex.npcId,'firstname')>> pulls out from behind you and you roll over together onto your backs.</p>
+			<p><<npc $sex.npcId>><</npc>> pulls out from behind you and you roll over together onto your backs.</p>
 		<<elseif $booty_call['position'] == 'cowgirl'>>
 			<<video "shared/sex/after/cowgirl_after1.mp4">>
 			$booty_call['end_comment']
-			<p>You climb off of <<=$npcs.get($sex.npcId,'firstname')>>, letting his cock slip from your pussy, and flop down beside him.</p>
+			<p>You climb off of <<npc $sex.npcId>><</npc>>, letting his cock slip from your pussy, and flop down beside him.</p>
 		<</if>>
 	<</if>>
 <</if>>
@@ -930,7 +930,7 @@
 	<<elseif getvar("$booty_call['sleep_fuck']") > 0>>
 		<<actCLA 'Go back to sleep'>>
 			<<image "shared/sex/after/cuddle2.jpg">>
-			<p>Your midnight fuck over, you and <<=$npcs.get($sex.npcId,'firstname')>> cuddle up together and fall asleep again.</p>
+			<p>Your midnight fuck over, you and <<npc $sex.npcId>><</npc>> cuddle up together and fall asleep again.</p>
 			<<actCLA 'Sleep'>>
 				<<gt 'booty_call_after' 'sleep_function'>>
 			<</actCLA>>
@@ -945,13 +945,13 @@
 			<<if getvar("$booty_call['get_up']") == 1>>
 				<<setinit $booty_call['get_up'] = 0>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
-				<p>You climb back into bed with <<=$npcs.get($sex.npcId,'firstname')>>, snuggling up with him to relax.</p>
+				<p>You climb back into bed with <<npc $sex.npcId>><</npc>>, snuggling up with him to relax.</p>
 			<<elseif $npcs.get($sex.npcId,'smoker') < 1 or getvar("$booty_call['boy_smoked']") == 1>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
-				<p>You and <<=$npcs.get($sex.npcId,'firstname')>> both lay back, quietly relaxing together in the still bliss of your love-making.</p>
+				<p>You and <<npc $sex.npcId>><</npc>> both lay back, quietly relaxing together in the still bliss of your love-making.</p>
 			<<else>>
 				<<image "shared/sex/after/bed_smoke2.jpg">>
-				<p>You lay back, quietly relaxing beside <<=$npcs.get($sex.npcId,'firstname')>> in the still bliss of your love-making as he puffs away on his cigarette.</p>
+				<p>You lay back, quietly relaxing beside <<npc $sex.npcId>><</npc>> in the still bliss of your love-making as he puffs away on his cigarette.</p>
 				<<setinit $booty_call['boy_smoked'] = 1>>
 			<</if>>
 			<<gs 'booty_call_after' 'relax_together'>>
@@ -1085,7 +1085,7 @@
 			<<set $time.minutes += 15>>
 			<<actCLA 'Wait it out'>>
 				<<image "shared/home/bathroom/toilet_naked.jpg">>
-				<p>You sit on the toilet humming to yourself while you wait for <<=$npcs.get($sex.npcId,'firstname')>>'s cum to drain from your pussy. It takes a long time with minutes passing between sudden gushes of semen pouring out of your snatch.</p>
+				<p>You sit on the toilet humming to yourself while you wait for <<npc $sex.npcId>><</npc>>'s cum to drain from your pussy. It takes a long time with minutes passing between sudden gushes of semen pouring out of your snatch.</p>
 				After about fifteen minutes, you figure you're safe and grab some toilet paper to wipe the last strands from your labia.
 				<<actCLA 'Continue'>>
 					<<gs 'booty_call_after' 'boy_bathroom'>>
@@ -1096,7 +1096,7 @@
 					<<gs 'drugs' 'smoke'>>
 					<<image "shared/home/bathroom/toilet_naked_smoke.jpg">>
 					You know this is going to take a long time so you take your smokes and a lighter into the bathroom with you.
-					<p>Plopping down on the toilet, you light up while waiting for <<=$npcs.get($sex.npcId,'firstname')>>'s cum to drain from your pussy. Minutes pass between sudden gushes of semen pouring out of your snatch and you pass the time puffing smoke and flicking ashes.</p>
+					<p>Plopping down on the toilet, you light up while waiting for <<npc $sex.npcId>><</npc>>'s cum to drain from your pussy. Minutes pass between sudden gushes of semen pouring out of your snatch and you pass the time puffing smoke and flicking ashes.</p>
 					<p>After about fifteen minutes, you figure you're safe and grab some toilet paper to wipe the last strands from your labia before making your long-drained cigarette is fully extinguished and tossing it in the trash.</p>
 					<<actCLA 'Continue'>>
 						<<gs 'booty_call_after' 'boy_bathroom'>>
@@ -1134,18 +1134,18 @@
 			<<video "shared/sex/blowjob/play1.mp4">>
 			<<if getvar("$booty_call['no_condom']") == 1>>
 				<<if $booty_call['last_cum'] == 'creampie'>>
-					<p>Feeling nice, you slither down between <<=$npcs.get($sex.npcId,'firstname')>>'s legs and take his cock in your mouth, running your lips across it and giving it a thorough tongue bath, cleaning it of cum and your own juices.</p>
+					<p>Feeling nice, you slither down between <<npc $sex.npcId>><</npc>>'s legs and take his cock in your mouth, running your lips across it and giving it a thorough tongue bath, cleaning it of cum and your own juices.</p>
 				<<else>>
-					<p>Feeling nice, you slither down between <<=$npcs.get($sex.npcId,'firstname')>>'s legs and take his cock in your mouth, running your lips across it and giving it a thorough tongue bath, cleaning the cum from its tip and your own juices from its shaft.</p>
+					<p>Feeling nice, you slither down between <<npc $sex.npcId>><</npc>>'s legs and take his cock in your mouth, running your lips across it and giving it a thorough tongue bath, cleaning the cum from its tip and your own juices from its shaft.</p>
 				<</if>>
 			<<elseif getvar("$booty_call['condoms_used']") > 0>>
 				<<if getvar("$booty_call['cum_condom']") > 0>>
-					<p>Feeling nice, you slither down between <<=$npcs.get($sex.npcId,'firstname')>>'s legs and take his cock in your mouth, running your lips across it and giving it a thorough tongue bath, cleaning it of the cum that filled the inside of the condom.</p>
+					<p>Feeling nice, you slither down between <<npc $sex.npcId>><</npc>>'s legs and take his cock in your mouth, running your lips across it and giving it a thorough tongue bath, cleaning it of the cum that filled the inside of the condom.</p>
 				<<else>>
-					<p>Feeling nice, you slither down between <<=$npcs.get($sex.npcId,'firstname')>>'s legs and take his cock in your mouth, running your lips across it and giving it a thorough tongue bath, cleaning the cum from the tip and the condom lube from its shaft.</p>
+					<p>Feeling nice, you slither down between <<npc $sex.npcId>><</npc>>'s legs and take his cock in your mouth, running your lips across it and giving it a thorough tongue bath, cleaning the cum from the tip and the condom lube from its shaft.</p>
 				<</if>>
 			<</if>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> smiles at you appreciatively.</p>
+			<p><<npc $sex.npcId>><</npc>> smiles at you appreciatively.</p>
 			<<gs 'booty_call_after' 'after_sex2'>>
 		<</actCLA>>
 	<</if>>
@@ -1158,16 +1158,16 @@
 		<<image "shared/sex/after/kiss1.jpg">>
 		<<if $npcs.get($sex.npcId,'rel') < 50>>
 			<<arouse 'kiss' -2 >>
-			<p>You lean over to kiss <<=$npcs.get($sex.npcId,'firstname')>>, gently pressing your lips against his.</p>
-			<p>"What was that for?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+			<p>You lean over to kiss <<npc $sex.npcId>><</npc>>, gently pressing your lips against his.</p>
+			<p>"What was that for?" <<npc $sex.npcId>><</npc>> asks.</p>
 			<<actCLA 'Just felt like it'>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
-				<p>"I just felt like it," you shrug, giving <<=$npcs.get($sex.npcId,'firstname')>> a pleasant smile.</p>
+				<p>"I just felt like it," you shrug, giving <<npc $sex.npcId>><</npc>> a pleasant smile.</p>
 				<<gs 'booty_call_after' 'relax_together'>>
 			<</actCLA>>
 			<<actCLA 'Cause I like you'>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
-				<p>"Cause I like you," you say, giving <<=$npcs.get($sex.npcId,'firstname')>> a pleasant smile.</p>
+				<p>"Cause I like you," you say, giving <<npc $sex.npcId>><</npc>> a pleasant smile.</p>
 				<<gs 'booty_call_after' 'relax_together'>>
 			<</actCLA>>
 			<<if getvar("$booty_call['orgasm_count']") > 0>>
@@ -1180,14 +1180,14 @@
 		<<else>>
 			<<arouse 'kiss' -10 `['no_orgasm_msg']`>>
 			<<arouse 'kiss' `rand(2,3)` >>
-			<p>You lean over to kiss <<=$npcs.get($sex.npcId,'firstname')>>, gently pressing your lips against his. Instantly, it sparks something within you and the kiss takes on a passion of its own and you find yourself drinking him in; his taste, his scent, his tongue, feverishly pressing your faces together as if you might die at any second.</p>
+			<p>You lean over to kiss <<npc $sex.npcId>><</npc>>, gently pressing your lips against his. Instantly, it sparks something within you and the kiss takes on a passion of its own and you find yourself drinking him in; his taste, his scent, his tongue, feverishly pressing your faces together as if you might die at any second.</p>
 			It's several minutes before you finally break apart, panting breathlessly as you stare into each others eyes.
 			<<gs 'booty_call_after' 'relax_together'>>
 		<</if>>
 		<<set $orgasm_or = ''>>
 	<<else>>
 		<<image "shared/sex/after/pillow_talk1.jpg">>
-		<p>You lean over to kiss <<=$npcs.get($sex.npcId,'firstname')>> before his eyes widen and he shies away. It puzzles you for a moment before he draws a finger around his face in a circle.</p>
+		<p>You lean over to kiss <<npc $sex.npcId>><</npc>> before his eyes widen and he shies away. It puzzles you for a moment before he draws a finger around his face in a circle.</p>
 		"You've still got..." You blink before remembering. The cum. Right. He probably doesn''t want to kiss you with his own load blown all over your face.
 		<<gs 'booty_call_after' 'relax_together'>>
 	<</if>>
@@ -1199,9 +1199,9 @@
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			<<if $pc.cumAtLocation(0) > 0>>
 				<<if getvar("$LudaQW['free_condoms']") == 1 and $pc.sexStat('morning_after_pill') == 0>>
-					<p>With <<=$npcs.get($sex.npcId,'firstname')>>'s cum still leaking from your pussy, you reach down to your purse and pull out the morning after pill Luda gave you.</p>
+					<p>With <<npc $sex.npcId>><</npc>>'s cum still leaking from your pussy, you reach down to your purse and pull out the morning after pill Luda gave you.</p>
 				<<else>>
-					<p>With <<=$npcs.get($sex.npcId,'firstname')>>'s cum still leaking from your pussy, you reach down to your purse and pull out the morning after pill you keep inside.</p>
+					<p>With <<npc $sex.npcId>><</npc>>'s cum still leaking from your pussy, you reach down to your purse and pull out the morning after pill you keep inside.</p>
 				<</if>>
 			<<else>>
 				<<if getvar("$LudaQW['free_condoms']") == 1 and $pc.sexStat('morning_after_pill') == 0>>
@@ -1216,7 +1216,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'plan_b2'>>
 	<<actCLA 'Take it shyly'>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> watches you pop the pill out of it's packaging and you can't help but blush beneath his gaze.</p>
+		<p><<npc $sex.npcId>><</npc>> watches you pop the pill out of it's packaging and you can't help but blush beneath his gaze.</p>
 		<<if getvar("$LudaQW['free_condoms']") == 1 and $pc.sexStat('morning_after_pill') == 0>>
 			"My aunt gave me this for emergencies," you say shyly, blush intensifying as you put it in your mouth and force it down with a dry swallow.
 		<<else>>
@@ -1226,7 +1226,7 @@
 		<<gs 'booty_call_after' 'after_sex2'>>
 	<</actCLA>>
 	<<actCLA 'Take it sexily'>>
-		<p>As <<=$npcs.get($sex.npcId,'firstname')>> watches you pull the pill from its packaging, you stick out your tongue at him, popping the pill onto it and swallowing with a wide grin.</p>
+		<p>As <<npc $sex.npcId>><</npc>> watches you pull the pill from its packaging, you stick out your tongue at him, popping the pill onto it and swallowing with a wide grin.</p>
 		<<if getvar("$booty_call['accidental_creampie_convo']") == 1>>
 			"There," you smirk. "Problem solved."
 		<<elseif $booty_call['last_cum'] == 'swallow'>>
@@ -1272,7 +1272,7 @@
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		<</if>>
 		<<if $pc.cumAtLocation(0) > 0>>
-			<p>With <<=$npcs.get($sex.npcId,'firstname')>>'s cum still leaking from your pussy, you reach down to your purse and pull out your birth control.</p>
+			<p>With <<npc $sex.npcId>><</npc>>'s cum still leaking from your pussy, you reach down to your purse and pull out your birth control.</p>
 			<<if getvar("$booty_call['risky_creampie']") == 1>>
 				"Hopefully we won''t have to worry about this stuff soon," you smile, shyly placing the pill between your lips and swallowing.
 			<<else>>
@@ -1302,7 +1302,7 @@
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		<</if>>
 		<<if $pc.cumAtLocation(0) > 0>>
-			<p>With <<=$npcs.get($sex.npcId,'firstname')>>'s cum still leaking from your pussy, you reach down to your purse and pull out your birth control.</p>
+			<p>With <<npc $sex.npcId>><</npc>>'s cum still leaking from your pussy, you reach down to your purse and pull out your birth control.</p>
 			<<if getvar("$booty_call['risky_creampie']") == 1>>
 				"You better hope this stuff kicks in soon," you say, placing the pill between your lips and swallowing with a grin.
 			<<elseif getvar("$birth_control['think_safe']") == 1>>
@@ -1359,9 +1359,9 @@
 	<<run $npcs.set($sex.npcId,'know_pc_smoker',1)>>
 	<<image "shared/sex/after/bed_smoke0.jpg">>
 	<<if $npcs.get($sex.npcId,'smoker') > 0 and getvar("$booty_call['boy_smoked']") != 1>>
-		<p>Seeing <<=$npcs.get($sex.npcId,'firstname')>> inspires you to reach for your own cigarettes and light up too.</p>
+		<p>Seeing <<npc $sex.npcId>><</npc>> inspires you to reach for your own cigarettes and light up too.</p>
 	<<elseif getvar("$booty_call['annoyed']") > 0>>
-		<p>Feeling very irritated at <<=$npcs.get($sex.npcId,'firstname')>>, you grab a cigarette and light up.</p>
+		<p>Feeling very irritated at <<npc $sex.npcId>><</npc>>, you grab a cigarette and light up.</p>
 	<<elseif getvar("$booty_call['cigarette']") == 1>>
 		Still unsatisfied, you pull another cigarette from the box and flick your lighter,
 	<<else>>
@@ -1379,12 +1379,12 @@
 			<<if getvar("$booty_call['annoyed']") > 0>>
 				The two of you puff away in silence, smoking up your irritation and refusing to speak to one another.
 			<<else>>
-				<p>Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it's like all your stress goes with it and you sigh happily, relaxing into the bed. <<=$npcs.get($sex.npcId,'firstname')>> does the same beside you.</p>
+				<p>Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it's like all your stress goes with it and you sigh happily, relaxing into the bed. <<npc $sex.npcId>><</npc>> does the same beside you.</p>
 			<</if>>
 		<<else>>
 			<<image "shared/sex/after/bed_smoke1.jpg">>
 			<<if getvar("$booty_call['annoyed']") > 0>>
-				<p>You focus entirely on the cigarette in your mouth, making a point of ignoring <<=$npcs.get($sex.npcId,'firstname')>> for as long as it burns between your lips.</p>
+				<p>You focus entirely on the cigarette in your mouth, making a point of ignoring <<npc $sex.npcId>><</npc>> for as long as it burns between your lips.</p>
 			<<elseif getvar("$booty_call['cigarette']") == 1>>
 				Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. The smoke trails hazily around the room as you enjoy another cigarette.
 			<<else>>
@@ -1400,7 +1400,7 @@
 	<<if $npcs.get($sex.npcId,'smoker') > 0>>
 		<<image "shared/sex/after/bed_smoke0.jpg">>
 		<p>"Can I get one of those?" you ask.</p>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> hands over his pack to you and you accept one gratefully, lighting it and inhaling deeply.</p>
+		<p><<npc $sex.npcId>><</npc>> hands over his pack to you and you accept one gratefully, lighting it and inhaling deeply.</p>
 		<<actCLA 'Smoke'>>
 			<<gs 'drugs' 'smoke'>>
 			<<if getvar("$booty_call['phone']") == 2>>
@@ -1409,7 +1409,7 @@
 			<</if>>
 			<<if $npcs.get($sex.npcId,'smoker') > 0>>
 				<<image "shared/sex/after/bed_smoke3.jpg">>
-				<p>Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it's like all your stress goes with it and you sigh happily, relaxing into the bed. <<=$npcs.get($sex.npcId,'firstname')>> does the same beside you.</p>
+				<p>Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it's like all your stress goes with it and you sigh happily, relaxing into the bed. <<npc $sex.npcId>><</npc>> does the same beside you.</p>
 			<<else>>
 				<<image "shared/sex/after/bed_smoke1.jpg">>
 				Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it's like all your stress goes with it and you sigh happily, relaxing into the bed.
@@ -1418,7 +1418,7 @@
 		<</actCLA>>
 	<<else>>
 		<<image "shared/sex/after/annoyed1.jpg">>
-		<p>"Got any smokes?" you ask but <<=$npcs.get($sex.npcId,'firstname')>> just shakes his head.</p>
+		<p>"Got any smokes?" you ask but <<npc $sex.npcId>><</npc>> just shakes his head.</p>
 		"I don't smoke. It's bad for you y''know."
 		"Damn," you sigh unhappily. "A cigarette is just what I need right now..."
 		<<gs 'booty_call_after' 'relax_together'>>
@@ -1497,7 +1497,7 @@
 			<<gs 'booty_call_after' 'after_sex2'>>
 		<<else>>
 			"Sure, my girlfriend isn''t gonna be around for a while. You can crash here."
-			<p>"Thanks," you yawn, snuggling into <<=$npcs.get($sex.npcId,'firstname')>>. "Appreciate it."</p>
+			<p>"Thanks," you yawn, snuggling into <<npc $sex.npcId>><</npc>>. "Appreciate it."</p>
 			<<actCLA 'Cuddle up'>>
 				<<image "shared/sex/after/cuddle1.jpg">>
 				He wraps his arms around you in return and you close your eyes, allowing yourself to drift off into sleep.
@@ -1521,7 +1521,7 @@
 			<<gs 'booty_call_after' 'after_sex2'>>
 		<<else>>
 			"Sure, I'm not doing anything tomorrow. You can crash here."
-			<p>"Thanks," you yawn, snuggling into <<=$npcs.get($sex.npcId,'firstname')>>. "Appreciate it."</p>
+			<p>"Thanks," you yawn, snuggling into <<npc $sex.npcId>><</npc>>. "Appreciate it."</p>
 			<<actCLA 'Cuddle up'>>
 				<<image "shared/sex/after/cuddle1.jpg">>
 				He wraps his arms around you in return and you close your eyes, allowing yourself to drift off into sleep.
@@ -1532,7 +1532,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'bed'>>
 	<<set $time.minutes += rand(1,2)>>
-	<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+	<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 	<<if $pc.pubesLength < 4>>
 		<<image "shared/sex/after/sleep1.jpg">>
 	<<else>>
@@ -1555,7 +1555,7 @@
 		<<elseif getvar("$cum_loc['vagina']") > 0>>
 			<!-- !! vagina-->
 			<<image "shared/sex/cum/vagcreampie/after2.jpg">>
-			<!-- !!				'Tired, you curl up onto your side to face <<<<=$npcs.get($sex.npcId,'firstname')>>>>, passively aware that his cum is still leaking from your pussy, slowly dribbling down the curve of your thigh.'-->
+			<!-- !!				'Tired, you curl up onto your side to face <<<<npc $sex.npcId>><</npc>>>>, passively aware that his cum is still leaking from your pussy, slowly dribbling down the curve of your thigh.'-->
 		<<else>>
 			<<image "shared/home/bedroom/son.jpg">>
 		<</if>>

+ 101 - 101
sugarcube/src/activities/bootycall/booty_call_condoms.tw

@@ -34,7 +34,7 @@
 	<<if getvar("$booty_call['no_condom']") != 1>>
 		<<if $npcs.get($sex.npcId,'bareback') == 1 and getvar("$booty_call['no_condom']") != 1 and getvar("$booty_call['condom']") != 1>>
 			<!-- !!		if npc_know_bc[$sex.npcId] = 1 and npc_condom_conscious[$sex.npcId] ! 2: booty_call['no_condom'] = 1-->
-			<p>You agreed to stop using condoms with <<=$npcs.get($sex.npcId,'firstname')>> and he makes no move to get one.</p>
+			<p>You agreed to stop using condoms with <<npc $sex.npcId>><</npc>> and he makes no move to get one.</p>
 			<<gs 'booty_call_sex' 'position_choose'>>
 			<<gs 'booty_call_condoms' 'dont_cum_in_me'>>
 			<<gs 'booty_call_condoms' 'pc_safe_day'>>
@@ -43,7 +43,7 @@
 			<<gs 'booty_call_condoms' 'no_more_free_creampies1'>>
 			<<gs 'booty_call_condoms' 'already_creampie1'>>
 		<<elseif $npcs.get($sex.npcId,'bareback') == 2 and getvar("$booty_call['no_condom']") != 1 and getvar("$booty_call['condom']") != 1>>
-			<p>"Is it safe?" <<=$npcs.get($sex.npcId,'firstname')>> asks. "Can we go bareback?"</p>
+			<p>"Is it safe?" <<npc $sex.npcId>><</npc>> asks. "Can we go bareback?"</p>
 			<<gs 'booty_call_condoms' 'bareback_check'>>
 		<<elseif getvar("$booty_call['condom']") == 0>>
 			<<if $npcs.get($sex.npcId,'condom_conscious') > 0>>
@@ -53,7 +53,7 @@
 					<<gs 'booty_call_condoms' 'npc_condom_use'>>
 				<</actCLA>>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> makes no indication that he's going to put on a condom.</p>
+				<p><<npc $sex.npcId>><</npc>> makes no indication that he's going to put on a condom.</p>
 				<<gs 'booty_call_condoms' 'pc_condom_ask'>>
 				<<gs 'booty_call_condoms' 'pc_condoms'>>
 				<<gs 'booty_call_condoms' 'dont_cum_in_me'>>
@@ -114,7 +114,7 @@
 		<<setinit $booty_call['pc_out_of_condoms'] = 1>>
 		<<if getvar("$booty_call['out_of_condoms']") == 1>>
 			<p>"I think that was my last condom..." you say. "I guess that means we're both out...?"</p>
-			<p>"I guess so," <<=$npcs.get($sex.npcId,'firstname')>> shrugs.</p>
+			<p>"I guess so," <<npc $sex.npcId>><</npc>> shrugs.</p>
 			<<gs 'booty_call_after' 'no_condom_end'>>
 			<<gs 'booty_call_condoms' 'no_sex_only'>>
 		<<else>>
@@ -123,12 +123,12 @@
 			<<actCLA 'Do you have any?'>>
 				$npc_apt_bedroom
 				<<if getvar("$booty_call['cock_inserted']") == 1>>
-					<p>"But I'm not ready to stop," you grin, flexing your pussy around <<=$npcs.get($sex.npcId,'firstname')>>'s cock inside you. "Have you got any?"</p>
+					<p>"But I'm not ready to stop," you grin, flexing your pussy around <<npc $sex.npcId>><</npc>>'s cock inside you. "Have you got any?"</p>
 				<<else>>
 					<p>"But I'm not ready to stop," you say. "Have you got any?"</p>
 				<</if>>
 				<<if getvar("$npc_condom_conscious") == 1>>
-					<p>"I always have condoms," <<=$npcs.get($sex.npcId,'firstname')>> says. "You don't have to keep buying them if you don't want to, you know. I order in bulk."</p>
+					<p>"I always have condoms," <<npc $sex.npcId>><</npc>> says. "You don't have to keep buying them if you don't want to, you know. I order in bulk."</p>
 					<<gs 'booty_call_sex' 'reset'>>
 					<<actCLA 'If you`re offering'>>
 						"Well, if you're offering..." you smirk.
@@ -157,16 +157,16 @@
 						<</actCLA>>
 					<</if>>
 				<<elseif getvar("$booty_call['condom_count']") > 0 and $booty_call['condoms_used'] < $booty_call['condom_count']>>
-					<p>"Yeah, I have some," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+					<p>"Yeah, I have some," <<npc $sex.npcId>><</npc>> says.</p>
 					<<gs 'booty_call_sex' 'reset'>>
 					<<actCLA 'Continue'>>
 						<<gs 'booty_call_condoms' 'npc_condom_use'>>
 					<</actCLA>>
 				<<else>>
 					<<if $npcs.get($sex.npcId,'no_condoms_know') == 1>>
-						<p>"Come on," <<=$npcs.get($sex.npcId,'firstname')>> says, rolling his eyes. "You know I hate using condoms. Lucky you can even talk me into using yours."</p>
+						<p>"Come on," <<npc $sex.npcId>><</npc>> says, rolling his eyes. "You know I hate using condoms. Lucky you can even talk me into using yours."</p>
 					<<else>>
-						<p><<=$npcs.get($sex.npcId,'firstname')>> shakes his head.</p>
+						<p><<npc $sex.npcId>><</npc>> shakes his head.</p>
 						"I don't."
 					<</if>>
 					<<gs 'booty_call_after' 'no_condom_end'>>
@@ -180,7 +180,7 @@
 <<if $location_var[$here][0] == 'pc_condom_ask'>>
 	<<actCLA 'Don`t say anything'>>
 		<<setinit $booty_call['no_condom'] = 1>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> takes your silence as consent and begins manuevering into position.</p>
+		<p><<npc $sex.npcId>><</npc>> takes your silence as consent and begins manuevering into position.</p>
 		<<gs 'booty_call_sex' 'position_choose'>>
 	<</actCLA>>
 	<<actCLA 'Ask him to put on a condom'>>
@@ -217,13 +217,13 @@
 		<<setinit $booty_call['must_fuck'] = 1>>
 		<p>"I guess we could skip it..." you smile shyly. "Just this once?"</p>
 		<<if getvar("$booty_call['danger_day']") == 1 and getvar("$npc_childfree") == 1>>
-			<p>"Seems like a bad idea," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head. "You said it's dangerous for you today. I don't want to take the risk."</p>
+			<p>"Seems like a bad idea," <<npc $sex.npcId>><</npc>> says, shaking his head. "You said it's dangerous for you today. I don't want to take the risk."</p>
 			<<actCLA 'Disappointed'>>
-				<p>You sigh deeply as <<=$npcs.get($sex.npcId,'firstname')>> already starts to pull away from you.</p>
+				<p>You sigh deeply as <<npc $sex.npcId>><</npc>> already starts to pull away from you.</p>
 				<<gs 'booty_call_after' 'after_sex1'>>
 			<</actCLA>>
 			<<actCLA 'You`re probably right'>>
-				<p>"Yeah... You're probably right," you say ruefully as <<=$npcs.get($sex.npcId,'firstname')>> already starts to pull away from you.</p>
+				<p>"Yeah... You're probably right," you say ruefully as <<npc $sex.npcId>><</npc>> already starts to pull away from you.</p>
 				<<gs 'booty_call_after' 'after_sex1'>>
 			<</actCLA>>
 			<<gs 'booty_call_condoms' 'no_sex_only'>>
@@ -243,11 +243,11 @@
 	<<setinit $booty_call['must_fuck'] = 1>>
 	<<setinit $booty_call['cock_inserted'] = 0>>
 	<<if getvar("$booty_call['fuck_count']") > 1 and $booty_call['last_cum'] == 'condom'>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> swaps out his used condom for a new one.</p>
+		<p><<npc $sex.npcId>><</npc>> swaps out his used condom for a new one.</p>
 	<<elseif getvar("$booty_call['fuck_count']") > 1>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> reaches for a new condom.</p>
+		<p><<npc $sex.npcId>><</npc>> reaches for a new condom.</p>
 	<<else>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> reaches for a condom from his nightstand.</p>
+		<p><<npc $sex.npcId>><</npc>> reaches for a condom from his nightstand.</p>
 	<</if>>
 	<!-- !!	gs 'booty_call_sex', 'position_choose'-->
 	<<gs 'booty_call_condoms' 'npc_condom_put_on'>>
@@ -275,14 +275,14 @@
 		<<gs 'booty_call_condoms' 'npc_condom_use_stats'>>
 		<<arouse 'foreplay_give' -2 >>
 		<<image "shared/sex/misc/condom_put.jpg">>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> tears open the packaging when you swiftly reach over and pluck the condom out of the wrapper.</p>
+		<p><<npc $sex.npcId>><</npc>> tears open the packaging when you swiftly reach over and pluck the condom out of the wrapper.</p>
 		"Here, let me," you say with a sexy smile. You gently roll the rubber sleeve down his shaft, squeezing just hard enough to make him twitch under your touch.
 		<<gs 'booty_call_sex' 'position_choose'>>
 	<</actCLA>>
 	<<actCLA 'Put it on with your mouth'>>
 		<<gs 'booty_call_condoms' 'npc_condom_use_stats'>>
 		<<video "shared/sex/misc/condom_mouth.mp4">>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> tears open the packaging when you swiftly reach over and pluck the condom out of the wrapper.</p>
+		<p><<npc $sex.npcId>><</npc>> tears open the packaging when you swiftly reach over and pluck the condom out of the wrapper.</p>
 		"Here, let me," you say with a sexy smile. Placing it on the tip of his cock, you lean over and put your lips over both. Then, using both hands, you roll the sleeve down his shaft, following with your head, lips pressed tight against the rubber. Even through the rubber, you can feel the heat of his member against your tongue.
 		You bob your head up and down a few times for good measure before coming up and flashing a grin.
 		<<gs 'booty_call_sex' 'position_choose'>>
@@ -290,9 +290,9 @@
 <</if>>
 <<if $location_var[$here][0] == 'condom_conscious_npc'>>
 	<<if getvar("$booty_call['fuck_count']") <= 1>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> immediately reaches for a condom.</p>
+		<p><<npc $sex.npcId>><</npc>> immediately reaches for a condom.</p>
 	<<elseif getvar("$booty_call['fuck_count']") > 1>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> reaches for another condom.</p>
+		<p><<npc $sex.npcId>><</npc>> reaches for another condom.</p>
 	<</if>>
 	<<actCLA 'Continue'>>
 		<<gs 'booty_call_condoms' 'npc_condom_use'>>
@@ -304,9 +304,9 @@
 <<if $location_var[$here][0] == 'npc_out_of_condoms'>>
 	<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 	<<if getvar("$booty_call['fuck_count']") > 5>>
-		<p>"I think that was my last condom," <<=$npcs.get($sex.npcId,'firstname')>> pants.</p>
+		<p>"I think that was my last condom," <<npc $sex.npcId>><</npc>> pants.</p>
 	<<else>>
-		<p>"I think that was my last condom," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+		<p>"I think that was my last condom," <<npc $sex.npcId>><</npc>> says.</p>
 	<</if>>
 	<<gs 'booty_call_after' 'no_condom_end'>>
 	<<gs 'booty_call_condoms' 'pc_skip_the_condom'>>
@@ -336,7 +336,7 @@
 <<if $location_var[$here][0] == 'npc_doesnt_use_condoms'>>
 	<!-- !! boy says he doesn''t use condoms-->
 	<<if $npcs.get($sex.npcId,'no_condoms_know') == 1>>
-		<p>"You know I don't use that shit," <<=$npcs.get($sex.npcId,'firstname')>> frowns. "It's bareback or nothing."</p>
+		<p>"You know I don't use that shit," <<npc $sex.npcId>><</npc>> frowns. "It's bareback or nothing."</p>
 	<<else>>
 	<</if>>
 <</if>>
@@ -365,7 +365,7 @@
 		<<run $npcs.inc($sex.npcId,'rel',1)>>
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		You hesitate for a moment before relenting.
-		<p>"I guess it's okay... I trust you," you smile as <<=$npcs.get($sex.npcId,'firstname')>> eagerly forgoes the condom.</p>
+		<p>"I guess it's okay... I trust you," you smile as <<npc $sex.npcId>><</npc>> eagerly forgoes the condom.</p>
 		<<gs 'booty_call_sex' 'position_choose'>>
 	<</actCLA>>
 	<<actCLA 'I guess I trust you'>>
@@ -374,7 +374,7 @@
 		<<run $npcs.inc($sex.npcId,'rel',1)>>
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		You hesitate for a moment before relenting.
-		<p>"If you promise..." you say reluctantly as <<=$npcs.get($sex.npcId,'firstname')>> eagerly forgoes the condom.</p>
+		<p>"If you promise..." you say reluctantly as <<npc $sex.npcId>><</npc>> eagerly forgoes the condom.</p>
 		<<gs 'booty_call_sex' 'position_choose'>>
 	<</actCLA>>
 	<<gs 'booty_call_condoms' 'pc_skip_the_condom'>>
@@ -384,15 +384,15 @@
 	<<actCLA 'We don`t need a condom (feel better)'>>
 		"Come on," you say, grabbing his arm. "Let''s skip the condom. It'll feel better without one."
 		<<if $npcs.get($sex.npcId,'condom_conscious') == 2 or ($npcs.get($sex.npcId,'condom_conscious') == 1 and $npcs.get($sex.npcId,'childfree') == 1)>>
-			<p>"Don't want to risk it," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head and opens the condom anyways, rolling it onto his cock.</p>
+			<p>"Don't want to risk it," <<npc $sex.npcId>><</npc>> says, shaking his head and opens the condom anyways, rolling it onto his cock.</p>
 		<<else>>
 			<<if rand(npc_willpwr[$sex.npcId],100) < $pc.skillLevel("persuasion") + $npcs.get($sex.npcId,'rel')>>
 				<<setinit $booty_call['no_condom'] = 1>>
 				<<setinit $booty_call['condom'] = 0>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> stops, looking back at you for a moment before smiling.</p>
+				<p><<npc $sex.npcId>><</npc>> stops, looking back at you for a moment before smiling.</p>
 				"Okay," he says and leaves the rubber where it is.
 			<<else>>
-				<p>"Don't want to risk it," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head and opens the condom anyways, rolling it onto his cock.</p>
+				<p>"Don't want to risk it," <<npc $sex.npcId>><</npc>> says, shaking his head and opens the condom anyways, rolling it onto his cock.</p>
 			<</if>>
 		<</if>>
 		<<gs 'booty_call_sex' 'position_choose'>>
@@ -406,12 +406,12 @@
 				"Hey," you smile, grabbing his arm. "We don't need condoms. I'm on the shot."
 				<<if $npcs.get($sex.npcId,'condom_conscious') == 2>>
 					<<setinit $booty_call['npc_condom_insist'] = 1>>
-					<p>"I want to use one anyways," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head and reaches back for the condom. "Better to be safe."</p>
+					<p>"I want to use one anyways," <<npc $sex.npcId>><</npc>> says, shaking his head and reaches back for the condom. "Better to be safe."</p>
 					Your jaw drops.
 					<i>A free pass to go bareback and he doesn''t take it? What''s with this guy?</i>
 				<<else>>
 					<<setinit $booty_call['no_condom'] = 1>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> stops reaching and turns to meet your gaze, eyes filled with desire, and your smile widens into a full blown grin.</p>
+					<p><<npc $sex.npcId>><</npc>> stops reaching and turns to meet your gaze, eyes filled with desire, and your smile widens into a full blown grin.</p>
 				<</if>>
 				<<gs 'booty_call_sex' 'position_choose'>>
 			<</actCLA>>
@@ -423,12 +423,12 @@
 				"Hey," you smile, grabbing his arm. "We don't need condoms. I'm on the pill."
 				<<if $npcs.get($sex.npcId,'condom_conscious') == 2>>
 					<<setinit $booty_call['npc_condom_insist'] = 1>>
-					<p>"I want to use one anyways," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head and reaches back for the condom. "Better to be safe."</p>
+					<p>"I want to use one anyways," <<npc $sex.npcId>><</npc>> says, shaking his head and reaches back for the condom. "Better to be safe."</p>
 					Your jaw drops.
 					<i>A free pass to go bareback and he doesn''t take it? What''s with this guy?</i>
 				<<else>>
 					<<setinit $booty_call['no_condom'] = 1>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> stops reaching and turns to meet your gaze, eyes filled with desire, and your smile widens into a full blown grin.</p>
+					<p><<npc $sex.npcId>><</npc>> stops reaching and turns to meet your gaze, eyes filled with desire, and your smile widens into a full blown grin.</p>
 				<</if>>
 				<<gs 'booty_call_sex' 'position_choose'>>
 			<</actCLA>>
@@ -440,12 +440,12 @@
 			<<run $npcs.set($sex.npcId,'know_not_bc',0)>>
 			"Hey," you smile, grabbing his arm. "We don't need condoms. I'm on birth control."
 			<<if $npcs.get($sex.npcId,'condom_conscious') == 2>>
-				<p>"I want to use one anyways," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head and reaches back for the condom. "Better to be safe."</p>
+				<p>"I want to use one anyways," <<npc $sex.npcId>><</npc>> says, shaking his head and reaches back for the condom. "Better to be safe."</p>
 				Your jaw drops.
 				<i>Son of a bitch! Why is this guy so fucking careful?!</i>
 			<<else>>
 				<<setinit $booty_call['no_condom'] = 1>>
-				<p>Upon hearing your barefaced lie, <<=$npcs.get($sex.npcId,'firstname')>> stops reaching and turns to meet your gaze, eyes filled with desire. Your smile widens into a full blown grin.</p>
+				<p>Upon hearing your barefaced lie, <<npc $sex.npcId>><</npc>> stops reaching and turns to meet your gaze, eyes filled with desire. Your smile widens into a full blown grin.</p>
 			<</if>>
 			<<gs 'booty_call_sex' 'position_choose'>>
 		<</actCLA>>
@@ -488,7 +488,7 @@
 				<p>"I'm trying to but you won't let me!"</p>
 				<!-- !!if booty_call['rape_chance'] > 0:-->
 				<!-- !!put in chance he rapes you-->
-				<p><<=$npcs.get($sex.npcId,'firstname')>> continues to complain at you while you grab all of your belongings and rush your way out the door, slamming it behind you.</p>
+				<p><<npc $sex.npcId>><</npc>> continues to complain at you while you grab all of your belongings and rush your way out the door, slamming it behind you.</p>
 				<p>Just because he's your fuckbuddy doesn't mean he can take advantage of you!</p>
 				<<actCLA 'Leave'>>
 					<<gt 'booty_call_leave' 'exit'>>
@@ -532,7 +532,7 @@
 				<p>"I'm trying to but you won't let me!"</p>
 				<!-- !!if booty_call['rape_chance'] > 0:-->
 				<!-- !!put in chance he rapes you-->
-				<p><<=$npcs.get($sex.npcId,'firstname')>> continues to complain at you while you grab all of your belongings and rush your way out the door, slamming it behind you.</p>
+				<p><<npc $sex.npcId>><</npc>> continues to complain at you while you grab all of your belongings and rush your way out the door, slamming it behind you.</p>
 				The nerve of some people.
 				<<actCLA 'Leave'>>
 					<<gt 'booty_call_leave' 'exit'>>
@@ -562,7 +562,7 @@
 			<<setinit $booty_call['must_fuck'] = 1>>
 			<<image "shared/sex/misc/condom_put.jpg">>
 			"I've got some right here," you say, pulling a rubber from your bag and tearing it open.
-			<p>You smile at <<=$npcs.get($sex.npcId,'firstname')>> as you roll it onto his cock for him.</p>
+			<p>You smile at <<npc $sex.npcId>><</npc>> as you roll it onto his cock for him.</p>
 			<<gs 'booty_call_sex' 'position_choose'>>
 		<</actCLA>>
 	<<else>>
@@ -606,7 +606,7 @@
 				<<actCLA 'We could make out'>>
 					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					<p>"We could do other stuff?" you suggest. "We could just make out?"</p>
-					<p>"Okay," <<=$npcs.get($sex.npcId,'firstname')>> nods and you happily move to kiss him.</p>
+					<p>"Okay," <<npc $sex.npcId>><</npc>> nods and you happily move to kiss him.</p>
 					<<gs 'booty_call_start' 'makeout_dom1'>>
 				<</actCLA>>
 			<</if>>
@@ -614,9 +614,9 @@
 				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				<p>"We could do other stuff?" you suggest. "I could just blow you?"</p>
 				<<if $npcs.get($npclastgenerated,'fav_pos') == 'blowjob'>>
-					<p>"I would love that," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+					<p>"I would love that," <<npc $sex.npcId>><</npc>> grins.</p>
 				<<else>>
-					<p>"I could get behind that..." <<=$npcs.get($sex.npcId,'firstname')>> smiles.</p>
+					<p>"I could get behind that..." <<npc $sex.npcId>><</npc>> smiles.</p>
 				<</if>>
 				<<actCLA 'Blow him'>>
 					<<gt 'booty_call_start' 'bj_dom2'>>
@@ -627,7 +627,7 @@
 					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					<p>"We could do other stuff?" you suggest. "I wouldn't mind if you ate my pussy for a little while..."</p>
 					<<if $npcs.get($sex.npcId,'pussyeater') == 1>>
-						<p>"I think I'd like that too," <<=$npcs.get($sex.npcId,'firstname')>> says with a dangerous glint in his eye.</p>
+						<p>"I think I'd like that too," <<npc $sex.npcId>><</npc>> says with a dangerous glint in his eye.</p>
 						<<actCLA 'Get eaten out'>>
 							<<gs 'booty_call_start' 'pussy_lick'>>
 						<</actCLA>>
@@ -748,7 +748,7 @@
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			"Hey," you smile. "We don't need to use condoms anymore. I'm on birth control."
 			<<if $npcs.get($sex.npcId,'condom_conscious') == 2>>
-				<p>"I want to use one anyways," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head and reaches back for the condom. "Better to be safe."</p>
+				<p>"I want to use one anyways," <<npc $sex.npcId>><</npc>> says, shaking his head and reaches back for the condom. "Better to be safe."</p>
 				Your jaw drops.
 				<i>Son of a bitch! Why is this guy so fucking careful?!</i>
 				<<actCLA 'Continue'>>
@@ -757,7 +757,7 @@
 			<<else>>
 				<<setinit $booty_call['no_condom'] = 1>>
 				<<run $npcs.set($sex.npcId,'bareback',1)>>
-				<p>Upon hearing your barefaced lie, <<=$npcs.get($sex.npcId,'firstname')>> stares back into your eyes filled with desire and your smile widens into a full blown grin.</p>
+				<p>Upon hearing your barefaced lie, <<npc $sex.npcId>><</npc>> stares back into your eyes filled with desire and your smile widens into a full blown grin.</p>
 			<</if>>
 			<<gs 'booty_call_sex' 'position_choose'>>
 		<</actCLA>>
@@ -784,7 +784,7 @@
 		<<actCLA 'Need condoms again'>>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			"Hey, we need to start using condoms again," you say.
-			<p>"What for?" <<=$npcs.get($sex.npcId,'firstname')>> asks, confused.</p>
+			<p>"What for?" <<npc $sex.npcId>><</npc>> asks, confused.</p>
 			"I'm not on birth control anymore."
 			<p>"Huh? How come?"</p>
 			<<gs 'booty_call_condoms' 'reenable_condoms1_stop_bc'>>
@@ -804,7 +804,7 @@
 		<<actCLA 'Can we use condoms again?'>>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			<p>"Hey, can we start using condoms again?" you say.</p>
-			<p>"What for?" <<=$npcs.get($sex.npcId,'firstname')>> asks, confused.</p>
+			<p>"What for?" <<npc $sex.npcId>><</npc>> asks, confused.</p>
 			<<actCLA 'Safety'>>
 				<p>"I just want to be more safe," you explain. "It would be a weight off my mind. I can't afford to get pregnant now. So can we just switch back to using condoms?"</p>
 				<<gs 'booty_call_condoms' 'reenable_condoms2'>>
@@ -818,7 +818,7 @@
 			<</if>>
 			<<if $npcs.get($sex.npcId,'risky_creampie_count') > 0 and getvar("$birth_control['think_safe']") == 0>>
 				<<actCLA 'Too many close calls'>>
-					<p>"We've had too many close calls," you say, recalling all the times <<=$npcs.get($sex.npcId,'firstname')>>'s come inside you on dangerous days. "I've been too reckless. I can't afford to get pregnant now. So can we just switch back to using condoms?"</p>
+					<p>"We've had too many close calls," you say, recalling all the times <<npc $sex.npcId>><</npc>>'s come inside you on dangerous days. "I've been too reckless. I can't afford to get pregnant now. So can we just switch back to using condoms?"</p>
 					<<gs 'booty_call_condoms' 'reenable_condoms2'>>
 				<</actCLA>>
 			<</if>>
@@ -859,11 +859,11 @@
 					<<actCLA 'Uh oh'>>
 						"Uhh..."
 						You gulp as you realize you didn''t think to bring any condoms yourself.
-						<p>"Come on," <<=$npcs.get($sex.npcId,'firstname')>> says with a flat stare. "You're going to insist all that and then not have any condoms to use? So what are we going to do now?"</p>
+						<p>"Come on," <<npc $sex.npcId>><</npc>> says with a flat stare. "You're going to insist all that and then not have any condoms to use? So what are we going to do now?"</p>
 						<<actCLA 'No sex'>>
 							<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 							"I guess that means we're not going to have sex today..."
-							<p>"Well this was fucking bullshit," <<=$npcs.get($sex.npcId,'firstname')>> grumbles.</p>
+							<p>"Well this was fucking bullshit," <<npc $sex.npcId>><</npc>> grumbles.</p>
 							<<gs 'booty_call_after' 'after_sex1'>>
 						<</actCLA>>
 						<<gs 'booty_call_condoms' 'no_sex_only'>>
@@ -890,7 +890,7 @@
 				<!-- !!				end-->
 				You chew your lip, mulling it over.
 				"Well... I guess that would be a good compromise..."  you smile. "Just as long as I tell you when it's safe..."
-				<p>"So?" <<=$npcs.get($sex.npcId,'firstname')>> says, looking expectantly. "Is it safe today?"</p>
+				<p>"So?" <<npc $sex.npcId>><</npc>> says, looking expectantly. "Is it safe today?"</p>
 				<<if getvar("$mesec") > 0>>
 					<<actCLA 'I`m on my period'>>
 						<<setinit $booty_call['safe_day'] = 1>>
@@ -902,7 +902,7 @@
 					<<actCLA 'It`s a safe day'>>
 						<<setinit $booty_call['safe_day'] = 1>>
 						"Yeah."
-						<p>Your eyes meet for just a moment before <<=$npcs.get($sex.npcId,'firstname')>> begins clambering into position to fuck you bareback.</p>
+						<p>Your eyes meet for just a moment before <<npc $sex.npcId>><</npc>> begins clambering into position to fuck you bareback.</p>
 						<<gs 'booty_call_sex' 'position_choose'>>
 					<</actCLA>>
 				<<elseif $pc.sexStat('probably_safe_day') == 1>>
@@ -931,7 +931,7 @@
 			<<elseif $pc.sexStat('safe_day') == 1>>
 				<<setinit $booty_call['safe_day'] = 1>>
 				"Yeah."
-				<p>Your eyes meet for just a moment before <<=$npcs.get($sex.npcId,'firstname')>> begins clambering into position to fuck you bareback.</p>
+				<p>Your eyes meet for just a moment before <<npc $sex.npcId>><</npc>> begins clambering into position to fuck you bareback.</p>
 			<<elseif $pc.sexStat('probably_safe_day') == 1>>
 				<<setinit $booty_call['probably_safe_day'] = 1>>
 				"Probably," you admit, your smile twisting into a smirk. His smile breaks into a grin and pulls you over, preparing to fuck you bareback.
@@ -945,11 +945,11 @@
 	<<else>>
 		<<gs 'booty_call_condoms' 'reenable_condoms_code'>>
 		<<run $npcs.inc($sex.npcId,'rel',5)>>
-		<p>"That's fair," <<=$npcs.get($sex.npcId,'firstname')>> nods. "So do you want to use mine or yours today?"</p>
+		<p>"That's fair," <<npc $sex.npcId>><</npc>> nods. "So do you want to use mine or yours today?"</p>
 		<<actCLA 'Yours'>>
 			<<if $inventory.get("condom") == 0>>
 				"Yours," you say. "I don't have any on me today."
-				<p><<=$npcs.get($sex.npcId,'firstname')>> nods again and reaches for a condom from his nightstand while you wait, happy that this didn't have to be a big deal.</p>
+				<p><<npc $sex.npcId>><</npc>> nods again and reaches for a condom from his nightstand while you wait, happy that this didn't have to be a big deal.</p>
 			<<else>>
 				<p>"Do you mind if we use yours today?"</p>
 				"Not at all," he says, reaching for a condom from his nightstand and you feel happy that this didn''t turn into a big deal.
@@ -1032,7 +1032,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'npc_preg_react'>>
 	<<if $npcs.get($sex.npcId,'creampie_count') > 0>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>>'s eyes go wide.</p>
+		<p><<npc $sex.npcId>><</npc>>'s eyes go wide.</p>
 		<<if $npcs.get($sex.npcId,'childfree') > 0>>
 			<p>"It's... it's not mine, is it?"</p>
 			<<if getvar("$npc_is_father") == 1>>
@@ -1051,7 +1051,7 @@
 	<<if $npcs.get($sex.npcId,'condom_conscious') == 2 or (npc_condom_conscious[$sex.npcId] == 1 and rand(npc_willpwr[$sex.npcId],100) - npc_rel[$sex.npcId]) > $pc.skillLevel("persuasion")>>
 		<<setinit $booty_call['condom'] = 1>>
 		<<setinit $booty_call['npc_condom_insist'] = 1>>
-		<p>"I want to use one anyways," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head and reaching back for the condom. "Better to be safe."</p>
+		<p>"I want to use one anyways," <<npc $sex.npcId>><</npc>> says, shaking his head and reaching back for the condom. "Better to be safe."</p>
 		Your jaw drops.
 		<i>A free pass to go bareback forever and he doesn''t take it? What''s with this guy?</i>
 		<<actCLA 'Continue'>>
@@ -1061,10 +1061,10 @@
 		<<setinit $booty_call['no_condom'] = 1>>
 		<<run $npcs.set($sex.npcId,'bareback',$booty_call['temp_bareback'])>>
 		<<if $npcs.get($sex.npcId,'bareback') == 1>>
-			<p>"This is going to feel so good," <<=$npcs.get($sex.npcId,'firstname')>> says and your smile widens into a full blown grin.</p>
+			<p>"This is going to feel so good," <<npc $sex.npcId>><</npc>> says and your smile widens into a full blown grin.</p>
 			<<gs 'booty_call_sex' 'position_choose'>>
 		<<else>>
-			<p>"So is today safe?" <<=$npcs.get($sex.npcId,'firstname')>> asks with a smile.</p>
+			<p>"So is today safe?" <<npc $sex.npcId>><</npc>> asks with a smile.</p>
 			<<gs 'booty_call_condoms' 'bareback_check'>>
 		<</if>>
 	<</if>>
@@ -1073,7 +1073,7 @@
 	<<if $npcs.get($sex.npcId,'condom_conscious') == 2 or (npc_condom_conscious[$sex.npcId] == 1 and rand(npc_willpwr[$sex.npcId],100) - npc_rel[$sex.npcId]) > $pc.skillLevel("persuasion")>>
 		<<setinit $booty_call['condom'] = 1>>
 		<<setinit $booty_call['npc_condom_insist'] = 1>>
-		<p>"I want to use one anyways," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head and reaching back for the condom. "Better to be safe."</p>
+		<p>"I want to use one anyways," <<npc $sex.npcId>><</npc>> says, shaking his head and reaching back for the condom. "Better to be safe."</p>
 		Your jaw drops.
 		<i>A free pass to go bareback and he doesn''t take it? What''s with this guy?</i>
 		<<actCLA 'Continue'>>
@@ -1081,12 +1081,12 @@
 		<</actCLA>>
 	<<else>>
 		<<setinit $booty_call['no_condom'] = 1>>
-		<p>"This is going to feel so good," <<=$npcs.get($sex.npcId,'firstname')>> says and your smile widens into a full blown grin.</p>
+		<p>"This is going to feel so good," <<npc $sex.npcId>><</npc>> says and your smile widens into a full blown grin.</p>
 	<</if>>
 	<<gs 'booty_call_sex' 'position_choose'>>
 <</if>>
 <<if $location_var[$here][0] == 'npc_hesitate_childfree'>>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> pauses.</p>
+	<p><<npc $sex.npcId>><</npc>> pauses.</p>
 	<p>"What do you mean 'should' be?" he asks.</p>
 <</if>>
 <<if $location_var[$here][0] == 'bareback_check'>>
@@ -1139,13 +1139,13 @@
 				<<actCLA 'Put it on him'>>
 					<<gs 'booty_call_condoms' 'pc_condom_use_stats'>>
 					<<image "shared/sex/misc/condom_put.jpg">>
-					<p>With sensually slow movements you crawl over to <<=$npcs.get($sex.npcId,'firstname')>> and tear open the packaging, gently rolling the condom down his erect manhood and jerking it a few times as much as for pleasure as for making sure the rubber's snug.</p>
+					<p>With sensually slow movements you crawl over to <<npc $sex.npcId>><</npc>> and tear open the packaging, gently rolling the condom down his erect manhood and jerking it a few times as much as for pleasure as for making sure the rubber's snug.</p>
 					<<gs 'booty_call_sex' 'position_choose'>>
 				<</actCLA>>
 				<<actCLA 'Use your mouth'>>
 					<<video "shared/sex/misc/condom_mouth.mp4">>
 					<<gs 'booty_call_condoms' 'pc_condom_use_stats'>>
-					<p>With sensually slow movements you crawl over to <<=$npcs.get($sex.npcId,'firstname')>> and tear open the packaging, placing the condom on the tip of his penis and kissing it through the rubber. Then, using your fingers, you unroll it smoothly over the length of his cock, your lips following all the way down. You bob your head up and down a few more times to make sure it's all the way on before pulling back.</p>
+					<p>With sensually slow movements you crawl over to <<npc $sex.npcId>><</npc>> and tear open the packaging, placing the condom on the tip of his penis and kissing it through the rubber. Then, using your fingers, you unroll it smoothly over the length of his cock, your lips following all the way down. You bob your head up and down a few more times to make sure it's all the way on before pulling back.</p>
 					<<gs 'booty_call_sex' 'position_choose'>>
 				<</actCLA>>
 			<</actCLA>>
@@ -1159,25 +1159,25 @@
 			<<setinit $booty_call['no_creampies_today'] = 1>>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			<<if getvar("$ovulate") > 0>>
-				<p>"I'm ovulating right now," you warn <<=$npcs.get($sex.npcId,'firstname')>>. </p>
+				<p>"I'm ovulating right now," you warn <<npc $sex.npcId>><</npc>>. </p>
 			<<else>>
-				<p>"I'm ovulating soon," you warn <<=$npcs.get($sex.npcId,'firstname')>>. </p>
+				<p>"I'm ovulating soon," you warn <<npc $sex.npcId>><</npc>>. </p>
 			<</if>>
 			<<actCLA 'You can`t come inside me'>>
 				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				<<if getvar("$ovulate") > 0>>
-					<p>"I'm ovulating right now," you warn <<=$npcs.get($sex.npcId,'firstname')>>. "You can't come inside me, I'll get pregnant."</p>
+					<p>"I'm ovulating right now," you warn <<npc $sex.npcId>><</npc>>. "You can't come inside me, I'll get pregnant."</p>
 				<<else>>
-					<p>"I'm ovulating soon," you warn <<=$npcs.get($sex.npcId,'firstname')>>. "If you come inside me now, I'll could pregnant."</p>
+					<p>"I'm ovulating soon," you warn <<npc $sex.npcId>><</npc>>. "If you come inside me now, I'll could pregnant."</p>
 				<</if>>
 				<<gs 'booty_call_condoms' 'pc_dangerous_day2'>>
 			<</actCLA>>
 			<<actCLA 'Don`t forget to pull out'>>
 				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				<<if getvar("$ovulate") > 0>>
-					<p>"I'm ovulating right now," you warn <<=$npcs.get($sex.npcId,'firstname')>>. "Don't forget to pull out."</p>
+					<p>"I'm ovulating right now," you warn <<npc $sex.npcId>><</npc>>. "Don't forget to pull out."</p>
 				<<else>>
-					<p>"I'm ovulating soon," you warn <<=$npcs.get($sex.npcId,'firstname')>>. "Don't forget to pull out."</p>
+					<p>"I'm ovulating soon," you warn <<npc $sex.npcId>><</npc>>. "Don't forget to pull out."</p>
 				<</if>>
 				<<gs 'booty_call_condoms' 'pc_dangerous_day2'>>
 			<</actCLA>>
@@ -1185,12 +1185,12 @@
 				<<setinit $booty_call['pc_wants_condoms'] = 1>>
 				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				<<if getvar("$ovulate") > 0>>
-					<p>"I'm ovulating right now," you warn <<=$npcs.get($sex.npcId,'firstname')>>. "We need to use a condom."</p>
+					<p>"I'm ovulating right now," you warn <<npc $sex.npcId>><</npc>>. "We need to use a condom."</p>
 				<<else>>
-					<p>"I'm ovulating soon," you warn <<=$npcs.get($sex.npcId,'firstname')>>. "If you come inside me now, I'll get pregnant. We need to use a condom."</p>
+					<p>"I'm ovulating soon," you warn <<npc $sex.npcId>><</npc>>. "If you come inside me now, I'll get pregnant. We need to use a condom."</p>
 				<</if>>
 				<<if $npcs.get($sex.npcId,'condom_conscious') == 1>>
-					<p>"<<=$npcs.get($sex.npcId,'firstname')>> nods and immediately reaches for one from his stash.</p>
+					<p>"<<npc $sex.npcId>><</npc>> nods and immediately reaches for one from his stash.</p>
 					<<gs 'booty_call_condoms' 'npc_condom_put_on'>>
 				<<elseif $npcs.get($sex.npcId,'no_condoms') == 1 and $npcs.get($sex.npcId,'childfree') == 1>>
 					"Ugh fine..." he sighs. "But I don't have any. We need to use yours."
@@ -1211,7 +1211,7 @@
 					<p>"Come on, do we really have to? I promise I won't come inside."</p>
 					<<gs 'booty_call_condoms' 'npc_promise_wont_creampie'>>
 				<<else>>
-					<p>"Okay," <<=$npcs.get($sex.npcId,'firstname')>> nods.</p>
+					<p>"Okay," <<npc $sex.npcId>><</npc>> nods.</p>
 					<<actCLA 'Ask to use his'>>
 						<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 						<<if $inventory.get("condom") > 0>>
@@ -1288,7 +1288,7 @@
 			<<actCLA 'You can come inside me'>>
 				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				<<if getvar("$mesec") > 0>>
-					<p>"You can come inside me today," you smile at <<=$npcs.get($sex.npcId,'firstname')>>. "I don't think I can get pregnant on my period."</p>
+					<p>"You can come inside me today," you smile at <<npc $sex.npcId>><</npc>>. "I don't think I can get pregnant on my period."</p>
 				<<else>>
 					<<if $pc.sexStat('safe_day') == 1>>
 						<<setinit $booty_call['safe_day'] = 1>>
@@ -1298,7 +1298,7 @@
 						<<setinit $booty_call['probably_safe_day'] = 1>>
 
 					<</if>>
-					<p>"$booty_call['safe_day_desc1']," you smile at <<=$npcs.get($sex.npcId,'firstname')>>. "$booty_call['safe_day_creampie_desc']."</p>
+					<p>"$booty_call['safe_day_desc1']," you smile at <<npc $sex.npcId>><</npc>>. "$booty_call['safe_day_creampie_desc']."</p>
 				<</if>>
 				<!-- !!				if stat['probably_safe_day'] = 1 and npc_childfree[$sex.npcId] = 1:-->
 				<!-- !!					gs 'booty_call_condoms', 'npc_hesitate_childfree'-->
@@ -1314,10 +1314,10 @@
 				<<setinit $booty_call['safe_day'] = 1>>
 				<<setinit $booty_call['no_condom'] = 1>>
 				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-				<p>"$booty_call['safe_day_desc1']," you smile at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+				<p>"$booty_call['safe_day_desc1']," you smile at <<npc $sex.npcId>><</npc>>.</p>
 				<<actCLA 'You can come inside me'>>
 					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-					<p>"$booty_call['safe_day_desc1']," you smile at <<=$npcs.get($sex.npcId,'firstname')>>. "$booty_call['safe_day_creampie_desc']."</p>
+					<p>"$booty_call['safe_day_desc1']," you smile at <<npc $sex.npcId>><</npc>>. "$booty_call['safe_day_creampie_desc']."</p>
 					<!-- !!				if stat['probably_safe_day'] = 1 and npc_childfree[$sex.npcId] = 1:-->
 					<!-- !!					gs 'booty_call_condoms', 'npc_hesitate_childfree'-->
 					<<if $npcs.get($sex.npcId,'cum_pref') == 'creampie'>>
@@ -1330,7 +1330,7 @@
 				<<if $npcs.get($sex.npcId,'bareback') != 1>>
 					<<actCLA 'We can skip the condom'>>
 						<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-						<p>"$booty_call['safe_day_desc1']," you smile at <<=$npcs.get($sex.npcId,'firstname')>>. "$booty_call['safe_day_no_condom_desc']."</p>
+						<p>"$booty_call['safe_day_desc1']," you smile at <<npc $sex.npcId>><</npc>>. "$booty_call['safe_day_no_condom_desc']."</p>
 						<<if $npcs.get($sex.npcId,'cum_pref') == 'creampie'>>
 							"I'm going to pump you full of so many creampies," he whispers.
 							<<actCLA 'I didn`t say that (annoyed)'>>
@@ -1343,7 +1343,7 @@
 								<<gs 'booty_call_sex' 'position_choose'>>
 							<</actCLA>>
 						<<elseif $npcs.get($sex.npcId,'no_condoms') == 1>>
-							<p>"Finally," <<=$npcs.get($sex.npcId,'firstname')>> says. "I'm sick of using that rubber shit."</p>
+							<p>"Finally," <<npc $sex.npcId>><</npc>> says. "I'm sick of using that rubber shit."</p>
 							<<gs 'booty_call_sex' 'position_choose'>>
 						<<else>>
 							"Good to know," he smiles back.
@@ -1354,7 +1354,7 @@
 				<<if getvar("$booty_call['virgin']") == 1>>
 					<<actCLA 'I don`t want my first time with a condom'>>
 						<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-						<p>"$booty_call['safe_day_desc1']," you smile at <<=$npcs.get($sex.npcId,'firstname')>>. "Besides, I don't want my first time to be with a condom."</p>
+						<p>"$booty_call['safe_day_desc1']," you smile at <<npc $sex.npcId>><</npc>>. "Besides, I don't want my first time to be with a condom."</p>
 						<<if $npcs.get($sex.npcId,'no_condoms') == 1>>
 							<<run $npcs.set($sex.npcId,'no_condoms_know',1)>>
 							"I never use condoms anyways," he grins.
@@ -1376,7 +1376,7 @@
 				<<setinit $booty_call['no_condom'] = 1>>
 				"Somebody came inside me earlier," you say. "So let''s skip the rubber. Seems a little too late for condoms."
 				<<if $npcs.get($sex.npcId,'cum_pref') == 'creampie'>>
-					<p>"Does that mean I can come inside you too?" <<=$npcs.get($sex.npcId,'firstname')>> asks eagerly.</p>
+					<p>"Does that mean I can come inside you too?" <<npc $sex.npcId>><</npc>> asks eagerly.</p>
 					<<actCLA 'No'>>
 						"No it does not," you reply, twisting your mouth in a wry smirk. "I feel like we don't need to be extra careful, I didn''t say I want to be extra risky."
 						<<gs 'booty_call_sex' 'position_choose'>>
@@ -1387,13 +1387,13 @@
 						<<gs 'booty_call_sex' 'position_choose'>>
 					<</actCLA>>
 				<<else>>
-					<p>"You really get around don't you?" <<=$npcs.get($sex.npcId,'firstname')>> says amusedly.</p>
+					<p>"You really get around don't you?" <<npc $sex.npcId>><</npc>> says amusedly.</p>
 					<<actCLA 'Blush'>>
-						<p>Your cheeks flush with heat as <<=$npcs.get($sex.npcId,'firstname')>> pulls you towards him.</p>
+						<p>Your cheeks flush with heat as <<npc $sex.npcId>><</npc>> pulls you towards him.</p>
 						<<gs 'booty_call_sex' 'position_choose'>>
 					<</actCLA>>
 					<<actCLA 'Giggle'>>
-						<p>"Shut up," you giggle back as <<=$npcs.get($sex.npcId,'firstname')>> pulls you towards him.</p>
+						<p>"Shut up," you giggle back as <<npc $sex.npcId>><</npc>> pulls you towards him.</p>
 						<<gs 'booty_call_sex' 'position_choose'>>
 					<</actCLA>>
 				<</if>>
@@ -1404,7 +1404,7 @@
 				<<setinit $booty_call['no_condom'] = 1>>
 				<<setinit $booty_call['creampie_allowance'] = 1>>
 				"Somebody already came inside me today," you say. "If I have to get a pill anyways, I might as well make the most of it."
-				<p>You pull <<=$npcs.get($sex.npcId,'firstname')>> close to whisper in his ear.</p>
+				<p>You pull <<npc $sex.npcId>><</npc>> close to whisper in his ear.</p>
 				<i>"Come inside me as much as you want."</i>
 				<<gs 'booty_call_sex' 'position_choose'>>
 			<</actCLA>>
@@ -1423,7 +1423,7 @@
 			<<setinit $booty_call['no_condom'] = 1>>
 			<<setinit $booty_call['creampie_allowance'] = 1>>
 			"Well," you say with a wry smirk. "Seeing as someone else already came inside me today, it feels a little silly to worry about condoms. In fact..."
-			<p>You pull <<=$npcs.get($sex.npcId,'firstname')>> close to whisper in his ear.</p>
+			<p>You pull <<npc $sex.npcId>><</npc>> close to whisper in his ear.</p>
 			<i>"Come inside me as much as you want."</i>
 			<<gs 'booty_call_sex' 'position_choose'>>
 		<</actCLA>>
@@ -1514,7 +1514,7 @@
 		<<gs 'booty_call_condoms' 'no_more_free_creampies5'>>
 	<<else>>
 		<<run $npcs.set($sex.npcId,'free_creampies',$booty_call['temp_disable_creampies'])>>
-		<p>"Okay," <<=$npcs.get($sex.npcId,'firstname')>> nods. "That's fair."</p>
+		<p>"Okay," <<npc $sex.npcId>><</npc>> nods. "That's fair."</p>
 		"Thanks for making this easy," you smile.
 		<<gs 'booty_call_sex' 'position_choose'>>
 	<</if>>
@@ -1524,7 +1524,7 @@
 		<<run $npcs.set($sex.npcId,'free_creampies',$booty_call['temp_disable_creampies'])>>
 		<<set $npc_rel -= 10>>
 		"This isn''t up for debate," you insist. "You need to promise me that you're not going to come inside me or we can't fuck anymore."
-		<p>"Fine, fine," <<=$npcs.get($sex.npcId,'firstname')>> grumbles.</p>
+		<p>"Fine, fine," <<npc $sex.npcId>><</npc>> grumbles.</p>
 		"<i>Thank you</i>," you sigh frustratedly.
 		<<gs 'booty_call_sex' 'position_choose'>>
 	<</actCLA>>
@@ -1539,7 +1539,7 @@
 		<<elseif $pc.sexStat('safe_day') == 1>>
 			<<setinit $booty_call['safe_day'] = 1>>
 			"Yeah."
-			<p>Your eyes meet for just a moment before <<=$npcs.get($sex.npcId,'firstname')>> begins clambering into position to fuck you.</p>
+			<p>Your eyes meet for just a moment before <<npc $sex.npcId>><</npc>> begins clambering into position to fuck you.</p>
 			"Pump me full of cum," you giggle.
 		<<elseif $pc.sexStat('probably_safe_day') == 1>>
 			<<setinit $booty_call['probably_safe_day'] = 1>>
@@ -1560,7 +1560,7 @@
 		<<gs 'booty_call_condoms' 'npc_condom_use_stats'>>
 		<<video "shared/sex/misc/wait.mp4">>
 		He tears open the packaging and begins rolling the rubber sleeve onto his cock. You watch him, anxious with anticipation, thinking about what''s about to happen next.
-		<p>With the condom securely wrapped around his manhood, he lines his cock up with your pussy and moments later, <<=$npcs.get($sex.npcId,'firstname')>> takes your virginity.</p>
+		<p>With the condom securely wrapped around his manhood, he lines his cock up with your pussy and moments later, <<npc $sex.npcId>><</npc>> takes your virginity.</p>
 		<<if $npcs.get($sex.npcId,'sex_speed') == 3 and ($npcs.get($sex.npcId,'selfish') == 1 or $npcs.get($sex.npcId,'abusive') == 1)>>
 			<<actCLA 'Continue'>>
 				<<gt 'booty_call_virgin' 'miss_virg_hard1'>>
@@ -1583,7 +1583,7 @@
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		<p>"Can you use a condom?" you whisper. "Please?"</p>
 		<<if $npcs.get($sex.npcId,'condom_conscious') == 1>>
-			<p>"Of course," <<=$npcs.get($sex.npcId,'firstname')>> says, already tearing open a package. "I'm not an idiot you know."</p>
+			<p>"Of course," <<npc $sex.npcId>><</npc>> says, already tearing open a package. "I'm not an idiot you know."</p>
 			<<gs 'booty_call_virgin' 'start_with_condom'>>
 		<<else>>
 			<<if $npcs.get($sex.npcId,'no_condoms') == 1>>
@@ -1596,7 +1596,7 @@
 				<<gs 'booty_call_condoms' 'virgin_condom_ask2'>>
 			<<else>>
 				<<if rand(1,2) == 2>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> nods and gets one out, tearing open the package and pulling out the little rubber sleeve.</p>
+					<p><<npc $sex.npcId>><</npc>> nods and gets one out, tearing open the package and pulling out the little rubber sleeve.</p>
 					<<gs 'booty_call_virgin' 'start_with_condom'>>
 				<<else>>
 					<p>"Come on," he says. "You really want to use a condom for your first time?"</p>
@@ -1634,7 +1634,7 @@
 			<<elseif getvar("$booty_call['condom_count']") <= 0>>
 				<p>"Woah!" you exclaim, snapping your legs closed and pulling back from him. "If you don't have a condom, then we can't do this."</p>
 			<</if>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> takes a deep breath and pulls back.</p>
+			<p><<npc $sex.npcId>><</npc>> takes a deep breath and pulls back.</p>
 			<p>"Sorry," he smiles shyly at you. "I was thinking with my dick instead of my head. You're right, we shouldn't do this without protection. What should we do instead?"</p>
 			<<gs 'booty_call_start' 'foreplay_choose'>>
 			<<actCLA 'Change your mind'>>
@@ -1680,14 +1680,14 @@
 			<<else>>
 				<p>"I don't know that!" you spit back. "Where's the proof? You have a negative test on you? I'm not about to risk it just because you tell me to 'trust you.'"</p>
 				"Fine, fine," he grumbles, rolling his eyes. You fume for a little bit, feeling like he's totally ruined the moment while he rolls the rubber onto his cock. A little bit later, he's back in position between your legs.
-				<p>A moment after that, <<=$npcs.get($sex.npcId,'firstname')>> takes your virginity.</p>
+				<p>A moment after that, <<npc $sex.npcId>><</npc>> takes your virginity.</p>
 				<<setinit $booty_call['condom'] = 1>>
 				<<gs 'booty_call_virgin' 'miss_virg_start'>>
 			<</if>>
 		<</actCLA>>
 		<<actCLA 'Trust him'>>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-			<p>"If you say so..." you say hesitantly. He just smiles back in response. You can't help but fume just a little bit, feeling like he's ruined the mood somewhat. But you don't have much time to think about that as moments later, <<=$npcs.get($sex.npcId,'firstname')>> takes your virginity.</p>
+			<p>"If you say so..." you say hesitantly. He just smiles back in response. You can't help but fume just a little bit, feeling like he's ruined the mood somewhat. But you don't have much time to think about that as moments later, <<npc $sex.npcId>><</npc>> takes your virginity.</p>
 			<<gs 'booty_call_virgin' 'miss_virg_start'>>
 		<</actCLA>>
 	<</actCLA>>
@@ -1733,14 +1733,14 @@
 			While he rolls it on, you make sounds of annoyance, glaring at him.
 			"Really making my first time special," you grumble to yourself.
 			With the condom securely in place, he gets back in position between your legs.
-			<p>A moment after that, <<=$npcs.get($sex.npcId,'firstname')>> takes your virginity.</p>
+			<p>A moment after that, <<npc $sex.npcId>><</npc>> takes your virginity.</p>
 			<<setinit $booty_call['condom'] = 1>>
 			<<gs 'booty_call_virgin' 'miss_virg_start'>>
 		<</actCLA>>
 		<<gs 'booty_call_leave' 'no_condom_breakoff'>>
 	<<else>>
 		"Well I don't have any either," you growl back.
-		<p>"Look who wants to fuck with a condom but doesn't have any now," <<=$npcs.get($sex.npcId,'firstname')>> rolls his eyes.</p>
+		<p>"Look who wants to fuck with a condom but doesn't have any now," <<npc $sex.npcId>><</npc>> rolls his eyes.</p>
 		<<actCLA 'Embarrassed'>>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			You blush fiercely, turning away.
@@ -1768,7 +1768,7 @@
 		<<actCLA 'Have a morning after pill'>>
 			<<setinit $booty_call['plan_b'] = 1>>
 			"Besides," you look pointedly at your bag. "I have a morning after pill."
-			<p><<=$npcs.get($sex.npcId,'firstname')>> raises an eyebrow back at you.</p>
+			<p><<npc $sex.npcId>><</npc>> raises an eyebrow back at you.</p>
 			<<if $time.hour >= 18>>
 				<p>"Were you expecting to lose your virginity tonight?"</p>
 			<<else>>
@@ -1867,9 +1867,9 @@
 	<</if>>
 	<<if getvar("$booty_call['condom_count']") == 0 or getvar("$booty_call['no_condom']") == 1>>
 		<<if $npcs.get($sex.npcId,'cum_pref') == 'creampie' and getvar("$booty_call['virgin_creampie_request']") == 1>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> gulps, apparently stunned with arousal at the thought of coming inside you. It takes several seconds before he nods slowly.</p>
+			<p><<npc $sex.npcId>><</npc>> gulps, apparently stunned with arousal at the thought of coming inside you. It takes several seconds before he nods slowly.</p>
 		<<else>>
-			<p>"Okay," <<=$npcs.get($sex.npcId,'firstname')>> nods.</p>
+			<p>"Okay," <<npc $sex.npcId>><</npc>> nods.</p>
 		<</if>>
 		<<gs 'booty_call_virgin' 'start_without_condom'>>
 	<<elseif rand(npc_willpwr[$sex.npcId],100) + $booty_call['condom_bonus'] < $pc.skillLevel("persuasion") + $npcs.get($sex.npcId,'rel') and $npcs.get($sex.npcId,'condom_conscious') != 2>>
@@ -1879,11 +1879,11 @@
 			<<setinit $booty_call['creampie_allowance'] = 1>>
 
 		<</if>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> stops, looking back at you for a moment before smiling.</p>
+		<p><<npc $sex.npcId>><</npc>> stops, looking back at you for a moment before smiling.</p>
 		"Okay," he says and puts the rubber back on the nightstand.
 		<<gs 'booty_call_virgin' 'start_without_condom'>>
 	<<else>>
-		<p>"We shouldn't risk it," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head and opening the condom anyways. "Especially not for your first time."</p>
+		<p>"We shouldn't risk it," <<npc $sex.npcId>><</npc>> says, shaking his head and opening the condom anyways. "Especially not for your first time."</p>
 		<<actCLA 'Wait for him'>>
 			<<setinit $booty_call['condom'] = 1>>
 			<<gs 'booty_call_condoms' 'npc_condom_use_stats'>>

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 280 - 280
sugarcube/src/activities/bootycall/booty_call_cowgirl.tw


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 177 - 177
sugarcube/src/activities/bootycall/booty_call_cum.tw


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 272 - 272
sugarcube/src/activities/bootycall/booty_call_doggy.tw


+ 93 - 93
sugarcube/src/activities/bootycall/booty_call_favorite_part.tw

@@ -71,7 +71,7 @@
 		<<gs 'booty_call_pillow_talk' 'topics'>>
 	<</actCLA>>
 	<<if getvar("$booty_call['surprise_creampie_count']") >= 3>>
-		<p>"Your pussy is amazing," <<=$npcs.get($sex.npcId,'firstname')>> says. "It's like you were sucking me in, I couldn't stop coming inside you."</p>
+		<p>"Your pussy is amazing," <<npc $sex.npcId>><</npc>> says. "It's like you were sucking me in, I couldn't stop coming inside you."</p>
 		<<if $npcs.get($sex.npcId,'free_creampies') < 1>>
 			<<actCLA 'Ask next time (tease)'>>
 				"It would be nice if you would ask before you do," you smile teasingly. "I'm not just a cum receptacle you know."
@@ -86,12 +86,12 @@
 		<</if>>
 	<<else>>
 		<<if $npcs.get($sex.npcId,'rel') < 100>>
-			<p>"It felt so good to come inside you," <<=$npcs.get($sex.npcId,'firstname')>> says. "Other guys are into facials and watching girls swallow, which is fine I guess, but there's nothing like filling a pussy up with cum. What about you?"</p>
+			<p>"It felt so good to come inside you," <<npc $sex.npcId>><</npc>> says. "Other guys are into facials and watching girls swallow, which is fine I guess, but there's nothing like filling a pussy up with cum. What about you?"</p>
 		<<else>>
 			<<if getvar("$booty_call['simultaneous_orgasm_count']") > 0>>
-				<p>"I love coming inside you," <<=$npcs.get($sex.npcId,'firstname')>> says smiling warmly at you. "Especially when you come too. It drives me crazy feeling you orgasm on my cock. What about you?"</p>
+				<p>"I love coming inside you," <<npc $sex.npcId>><</npc>> says smiling warmly at you. "Especially when you come too. It drives me crazy feeling you orgasm on my cock. What about you?"</p>
 			<<else>>
-				<p>"I love coming inside you," <<=$npcs.get($sex.npcId,'firstname')>> says smiling warmly at you. "I want to fill your pussy with cum and never stop. What about you?"</p>
+				<p>"I love coming inside you," <<npc $sex.npcId>><</npc>> says smiling warmly at you. "I want to fill your pussy with cum and never stop. What about you?"</p>
 			<</if>>
 		<</if>>
 		<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
@@ -100,7 +100,7 @@
 <<if $location_var[$here][0] == 'cum_mouth_favorite'>>
 	<<if getvar("$booty_call['swallow_count']") > 0>>
 		<<setinit $booty_call['boy_favorite'] = 'swallowing'>>
-		<p>"It was so hot watching you swallow," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+		<p>"It was so hot watching you swallow," <<npc $sex.npcId>><</npc>> says.</p>
 		<<actCLA 'I aim to please'>>
 			"Glad you thought so," you smile pleasantly. "I aim to please."
 			<p>"So what about you? What did you like?"</p>
@@ -119,7 +119,7 @@
 				"You could stand to eat some more fruit if you want me to keep doing it," you say, wrinkling your nose. "Your cum tastes <i>horrible</i>. It's like drinking expired caviar."
 				You stick your tongue out, half gagging at the lingering flavour.
 				<<if $npcs.get($sex.npcId,'argumentative') == 1 or $npcs.get($sex.npcId,'insecure') == 1>>
-					<p>"Come on, it can't be that bad," <<=$npcs.get($sex.npcId,'firstname')>> scowls at you.</p>
+					<p>"Come on, it can't be that bad," <<npc $sex.npcId>><</npc>> scowls at you.</p>
 					<<actCLA 'Insist'>>
 						<<run $npcs.dec($sex.npcId,'rel',1)>>
 						<p>"Yes, it can be and it is," you say, making a face at him. "I <i>wish</i> was making this up. Yuck!"</p>
@@ -135,12 +135,12 @@
 					<<actCLA 'Get sarcastic'>>
 						<<run $npcs.dec($sex.npcId,'rel',1)>>
 						<<video "shared/sex/after/pillow_talk_eyeroll.mp4">>
-						<p>"<i>It can't be that bad,</i>" you repeat, mocking <<=$npcs.get($sex.npcId,'firstname')>> with a squeaky high voice. "I'd like to see you get down there and blow yourself to completion. Then we'll see."</p>
+						<p>"<i>It can't be that bad,</i>" you repeat, mocking <<npc $sex.npcId>><</npc>> with a squeaky high voice. "I'd like to see you get down there and blow yourself to completion. Then we'll see."</p>
 						<<gs 'booty_call_pillow_talk' 'angry_end2'>>
 					<</actCLA>>
 				<<else>>
 					<<if getvar("$booty_call['swallow_count']") > 1>>
-						<p>"If it's so bad, why did you keep doing it?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+						<p>"If it's so bad, why did you keep doing it?" <<npc $sex.npcId>><</npc>> asks.</p>
 						<<actCLA 'For you (affectionate)'>>
 							<<image "shared/sex/after/pillow_talk2.jpg">>
 							"Cause I like you too much to say no," you say, smirking wryly at him.
@@ -158,19 +158,19 @@
 						<<actCLA 'Acquiring taste'>>
 							<<image "shared/sex/after/pillow_talk2.jpg">>
 							"I figure if I do it enough times maybe I'll get used to it," you say, eyeballing him with a grim expression. "Starting to have my doubts though."
-							<p><<=$npcs.get($sex.npcId,'firstname')>> laughs.</p>
+							<p><<npc $sex.npcId>><</npc>> laughs.</p>
 							<p>"Well I appreciate the effort. What about you? Was there something I did to make you feel good?"</p>
 							<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 						<</actCLA>>
 						<<actCLA 'Spitting is quitting'>>
 							<<image "shared/sex/after/pillow_talk2.jpg">>
 							"Cause spitting is quitting," you say, eyeballing him. "If I start something, I'm gonna finish it."
-							<p><<=$npcs.get($sex.npcId,'firstname')>> laughs.</p>
+							<p><<npc $sex.npcId>><</npc>> laughs.</p>
 							<p>"You certainly do. What about you then? Was there something I did to make you feel good?"</p>
 							<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 						<</actCLA>>
 					<<else>>
-						<p>"Sorry I guess," <<=$npcs.get($sex.npcId,'firstname')>> says, looking a little embarrassed. "Was there something you did enjoy?"</p>
+						<p>"Sorry I guess," <<npc $sex.npcId>><</npc>> says, looking a little embarrassed. "Was there something you did enjoy?"</p>
 						<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 					<</if>>
 				<</if>>
@@ -184,7 +184,7 @@
 				<<else>>
 					"Your cum is delicious," you grin. "I don't usually like cum all that much, but yours is really nice. It's almost sweet."
 				<</if>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> looks pretty pleased with himself at that.</p>
+				<p><<npc $sex.npcId>><</npc>> looks pretty pleased with himself at that.</p>
 				<p>"What else did you like?"</p>
 				<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 			<</actCLA>>
@@ -192,14 +192,14 @@
 		<<if $pc.trait('cumeater') > 0>>
 			<<actCLA 'I love cum'>>
 				"I love cum," you grin. "If it's in my mouth, I can't help but swallow."
-				<p><<=$npcs.get($sex.npcId,'firstname')>> can't seem to help but grin back at you.</p>
+				<p><<npc $sex.npcId>><</npc>> can't seem to help but grin back at you.</p>
 				<p>"What else did you like?"</p>
 				<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 			<</actCLA>>
 		<</if>>
 	<<else>>
 		<<setinit $booty_call['boy_favorite'] = 'cum_in_mouth'>>
-		<p>"Coming in your mouth felt great," <<=$npcs.get($sex.npcId,'firstname')>> says. "I wish you'd swallow though."</p>
+		<p>"Coming in your mouth felt great," <<npc $sex.npcId>><</npc>> says. "I wish you'd swallow though."</p>
 		<<actCLA 'I don`t like it'>>
 			"I don't like it," you say, wrinkling your nose. "It's just <i>weird</i> swallowing cum."
 			<p>"Then what <i>do</i> you like?"</p>
@@ -216,22 +216,22 @@
 			<<actCLA 'No (tease)'>>
 				"No," you smirk teasingly. "Now that I know it's what you want, maybe I'll keep spitting just to fuck with you."
 				<<if $npcs.get($sex.npcId,'argumentative') == 1>>
-					<p>"Way to be a bitch about it," <<=$npcs.get($sex.npcId,'firstname')>> scowls, grumbling to himself.</p>
+					<p>"Way to be a bitch about it," <<npc $sex.npcId>><</npc>> scowls, grumbling to himself.</p>
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<<else>>
-					<p>"Okay, I see how it is," <<=$npcs.get($sex.npcId,'firstname')>> chuckles. "So what do <i>you</i> like then? So I know what to avoid in the future?"</p>
+					<p>"Okay, I see how it is," <<npc $sex.npcId>><</npc>> chuckles. "So what do <i>you</i> like then? So I know what to avoid in the future?"</p>
 					<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 				<</if>>
 			<</actCLA>>
 			<<actCLA 'Maybe'>>
 				"Maybe," you smirk teasingly.
-				<p>"Okay, I see how it is," <<=$npcs.get($sex.npcId,'firstname')>> chuckles. "So what did <i>you</i> enjoy then? So I know what to do to make you like me?"</p>
+				<p>"Okay, I see how it is," <<npc $sex.npcId>><</npc>> chuckles. "So what did <i>you</i> enjoy then? So I know what to do to make you like me?"</p>
 				<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 			<</actCLA>>
 			<<actCLA 'Yes'>>
 				"Yes," you smirk, a mischievous twinkle in your eye. "Every drop."
 				<!-- !! insert invite for date if relationship high enough-->
-				<p>"Well in that case," <<=$npcs.get($sex.npcId,'firstname')>> smiles back. "What do I do to make you like me?"</p>
+				<p>"Well in that case," <<npc $sex.npcId>><</npc>> smiles back. "What do I do to make you like me?"</p>
 				<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 			<</actCLA>>
 		<</actCLA>>
@@ -241,19 +241,19 @@
 			<<actCLA 'No (tease)'>>
 				"No," you smirk teasingly. "Not now that I know how much you''d love it. If we started dating, maybe I''d spit just to drive you crazy."
 				<<if $npcs.get($sex.npcId,'argumentative') == 1>>
-					<p>"Way to be a bitch about it," <<=$npcs.get($sex.npcId,'firstname')>> scowls, grumbling to himself.</p>
+					<p>"Way to be a bitch about it," <<npc $sex.npcId>><</npc>> scowls, grumbling to himself.</p>
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<<else>>
-					<p>"Okay, I see how it is," <<=$npcs.get($sex.npcId,'firstname')>> chuckles. "So what do <i>you</i> like then? So I know how to drive <i>you</i> crazy."</p>
+					<p>"Okay, I see how it is," <<npc $sex.npcId>><</npc>> chuckles. "So what do <i>you</i> like then? So I know how to drive <i>you</i> crazy."</p>
 					<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 				<</if>>
 			<</actCLA>>
 			<<actCLA 'Maybe'>>
 				"Maybe," you smirk teasingly.
 				<<if $npcs.get($sex.npcId,'know_cheat') == 1>>
-					<p>"Okay, I see how it is," <<=$npcs.get($sex.npcId,'firstname')>> chuckles. "So what did <i>you</i> enjoy then? So I know how to steal you from your boyfriend."</p>
+					<p>"Okay, I see how it is," <<npc $sex.npcId>><</npc>> chuckles. "So what did <i>you</i> enjoy then? So I know how to steal you from your boyfriend."</p>
 				<<else>>
-					<p>"Okay, I see how it is," <<=$npcs.get($sex.npcId,'firstname')>> chuckles. "So what did <i>you</i> enjoy then? So I know what to do to make you my girlfriend."</p>
+					<p>"Okay, I see how it is," <<npc $sex.npcId>><</npc>> chuckles. "So what did <i>you</i> enjoy then? So I know what to do to make you my girlfriend."</p>
 				<</if>>
 				<!-- !! insert option for "are you being serious?"-->
 				<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
@@ -262,9 +262,9 @@
 				"Yes," you smirk, a mischievous twinkle in your eye. "Every drop."
 				<!-- !! insert invite to start dating-->
 				<<if $npcs.get($sex.npcId,'know_cheat') == 1>>
-					<p>"Well in that case," <<=$npcs.get($sex.npcId,'firstname')>> smiles back. "What do I do to make you break up with your boyfriend for me?"</p>
+					<p>"Well in that case," <<npc $sex.npcId>><</npc>> smiles back. "What do I do to make you break up with your boyfriend for me?"</p>
 				<<else>>
-					<p>"Well in that case," <<=$npcs.get($sex.npcId,'firstname')>> smiles back. "So what did <i>you</i> enjoy then? So I know what to do to make you my girlfriend."</p>
+					<p>"Well in that case," <<npc $sex.npcId>><</npc>> smiles back. "So what did <i>you</i> enjoy then? So I know what to do to make you my girlfriend."</p>
 				<</if>>
 				<!-- !! insert option for "are you being serious?"-->
 				<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
@@ -275,11 +275,11 @@
 <<if $location_var[$here][0] == 'facial_favorite'>>
 	<<setinit $booty_call['boy_favorite'] = 'facial'>>
 	<<if getvar("$booty_call['pc_facial_jerk']") == 1>>
-		<p>"I love seeing your face covered in cum," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Especially when you finished me yourself. That was fucking hot."</p>
+		<p>"I love seeing your face covered in cum," <<npc $sex.npcId>><</npc>> grins. "Especially when you finished me yourself. That was fucking hot."</p>
 	<<elseif getvar("$booty_call['facial_swallow']") > 0>>
-		<p>"I love seeing your face covered in cum," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Plus it was a bonus watching you swallow after. That was hot."</p>
+		<p>"I love seeing your face covered in cum," <<npc $sex.npcId>><</npc>> grins. "Plus it was a bonus watching you swallow after. That was hot."</p>
 	<<else>>
-		<p>"I love blowing my load all over your face," <<=$npcs.get($sex.npcId,'firstname')>> grins. "It's fucking hot."</p>
+		<p>"I love blowing my load all over your face," <<npc $sex.npcId>><</npc>> grins. "It's fucking hot."</p>
 	<</if>>
 	<<actCLA 'Glad you enjoyed it'>>
 		<<if getvar("$cum_loc['face']") > 0>>
@@ -326,18 +326,18 @@
 			<p>"If it's so gross, why do you let me do it?"</p>
 			<<actCLA 'Sex is a two way street'>>
 				<p>"Cause it goes both ways," you shrug. "If I don't let you do stuff to me that you enjoy then how can I ask the same of you?"</p>
-				<p>"Well, what do you enjoy then?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+				<p>"Well, what do you enjoy then?" <<npc $sex.npcId>><</npc>> asks.</p>
 				<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 			<</actCLA>>
 			<<actCLA 'Cause you like it'>>
 				<<actCLA '(Affectionate)'>>
 					"Cause I know you like it," you smirk. "And I like turning you on."
-					<p>"Well, what can I do to turn you on then?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+					<p>"Well, what can I do to turn you on then?" <<npc $sex.npcId>><</npc>> asks.</p>
 					<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 				<</actCLA>>
 				<<actCLA '(Sarcastic)'>>
 					"Cause I know you're a pervert," you say eyeballing him. "And pervs like seeing girls get facials."
-					<p>"We sure do," <<=$npcs.get($sex.npcId,'firstname')>> chuckles. "But what about you? What do you like?"</p>
+					<p>"We sure do," <<npc $sex.npcId>><</npc>> chuckles. "But what about you? What do you like?"</p>
 					<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 				<</actCLA>>
 			<</actCLA>>
@@ -350,13 +350,13 @@
 			<<actCLA 'I don`t get a say (subservient)'>>
 				<p>"Cause it's not up to me," you shrug. "Sex is about making the guy feel good. I'm the girl you're fucking. If you want to come on my face, who am I to stop you?"</p>
 				<<if $npcs.get($sex.npcId,'caretaker') == 1>>
-					<p>"Well I don't want you to feel like you always have to be serving me," <<=$npcs.get($sex.npcId,'firstname')>> smiles back. "What can I do to make you feel good?"</p>
+					<p>"Well I don't want you to feel like you always have to be serving me," <<npc $sex.npcId>><</npc>> smiles back. "What can I do to make you feel good?"</p>
 					<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 				<<elseif $npcs.get($sex.npcId,'abusive') == 1>>
-					<p>"Glad you know your place," <<=$npcs.get($sex.npcId,'firstname')>> says smugly.</p>
+					<p>"Glad you know your place," <<npc $sex.npcId>><</npc>> says smugly.</p>
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<<else>>
-					<p>"That's nice of you," <<=$npcs.get($sex.npcId,'firstname')>> smiles back.</p>
+					<p>"That's nice of you," <<npc $sex.npcId>><</npc>> smiles back.</p>
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<</if>>
 			<</actCLA>>
@@ -366,9 +366,9 @@
 <<if $location_var[$here][0] == 'tit_cum_favorite'>>
 	<<setinit $booty_call['boy_favorite'] = 'tit_cum'>>
 	<<if getvar("$booty_call['pc_titcum_jerk']") == 1>>
-		<p>"I love coming all over your tits," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Especially when you finished me yourself. That was fucking hot."</p>
+		<p>"I love coming all over your tits," <<npc $sex.npcId>><</npc>> grins. "Especially when you finished me yourself. That was fucking hot."</p>
 	<<else>>
-		<p>"I love coming all over your tits," <<=$npcs.get($sex.npcId,'firstname')>> grins. "You look so sexy like that."</p>
+		<p>"I love coming all over your tits," <<npc $sex.npcId>><</npc>> grins. "You look so sexy like that."</p>
 	<</if>>
 	<<actCLA 'Glad you enjoyed it'>>
 		<<if getvar("$cum_loc['tits']") > 0>>
@@ -415,18 +415,18 @@
 			<p>"If it's so gross, why do you let me do it?"</p>
 			<<actCLA 'Sex is a two way street'>>
 				<p>"Cause it goes both ways," you shrug. "If I don't let you do stuff to me that you enjoy then how can I ask the same of you?"</p>
-				<p>"Well, what do you enjoy then?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+				<p>"Well, what do you enjoy then?" <<npc $sex.npcId>><</npc>> asks.</p>
 				<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 			<</actCLA>>
 			<<actCLA 'Cause you like it'>>
 				<<actCLA '(Affectionate)'>>
 					"Cause I know you like it," you smirk. "And I like turning you on."
-					<p>"Well, what can I do to turn you on then?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+					<p>"Well, what can I do to turn you on then?" <<npc $sex.npcId>><</npc>> asks.</p>
 					<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 				<</actCLA>>
 				<<actCLA '(Sarcastic)'>>
 					"Cause I know you're a pervert," you say eyeballing him. "And pervs like seeing girls get slimed."
-					<p>"We sure do," <<=$npcs.get($sex.npcId,'firstname')>> chuckles. "But what about you? What do you like?"</p>
+					<p>"We sure do," <<npc $sex.npcId>><</npc>> chuckles. "But what about you? What do you like?"</p>
 					<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 				<</actCLA>>
 			<</actCLA>>
@@ -439,13 +439,13 @@
 			<<actCLA 'I don`t get a say (subservient)'>>
 				<p>"Cause it's not up to me," you shrug. "Sex is about making the guy feel good. I'm the girl you're fucking. If you want to come on my tits, who am I to stop you?"</p>
 				<<if $npcs.get($sex.npcId,'caretaker') == 1>>
-					<p>"Well I don't want you to feel like you always have to be serving me," <<=$npcs.get($sex.npcId,'firstname')>> smiles back. "What can I do to make you feel good?"</p>
+					<p>"Well I don't want you to feel like you always have to be serving me," <<npc $sex.npcId>><</npc>> smiles back. "What can I do to make you feel good?"</p>
 					<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 				<<elseif $npcs.get($sex.npcId,'abusive') == 1>>
-					<p>"Glad you know your place," <<=$npcs.get($sex.npcId,'firstname')>> says smugly.</p>
+					<p>"Glad you know your place," <<npc $sex.npcId>><</npc>> says smugly.</p>
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<<else>>
-					<p>"That's nice of you," <<=$npcs.get($sex.npcId,'firstname')>> smiles back.</p>
+					<p>"That's nice of you," <<npc $sex.npcId>><</npc>> smiles back.</p>
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<</if>>
 			<</actCLA>>
@@ -454,7 +454,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'pussyeat_favorite'>>
 	<<setinit $booty_call['boy_favorite'] = 'pussyeating'>>
-	<p>"I love the way you taste," <<=$npcs.get($sex.npcId,'firstname')>> smiles.</p>
+	<p>"I love the way you taste," <<npc $sex.npcId>><</npc>> smiles.</p>
 	<<actCLA 'What do I taste like?'>>
 		<p>"Yeah?" you smirk back. "What do I taste like?"</p>
 		<p>"Hmm... A little salty. Maybe a little sweet too. Not exactly sure how to describe it other than to say you taste delicious. Did you enjoy it too?"</p>
@@ -463,14 +463,14 @@
 	<<actCLA 'What do you like about eating pussy?'>>
 		<p>"Why do you like eating pussy so much?" you giggle. "You're not gonna come from it."</p>
 		<<if rand(0,1) == 1>>
-			<p>"I just like giving more than I like receiving," <<=$npcs.get($sex.npcId,'firstname')>> shrugs. "It turns me on knowing that what I'm doing is making a girl feel good. I love making girls squirm just by running my tongue across their clit at the right time and I like the way they taste. What can I say? I just think it's fun. What about you? What do you like?"</p>
+			<p>"I just like giving more than I like receiving," <<npc $sex.npcId>><</npc>> shrugs. "It turns me on knowing that what I'm doing is making a girl feel good. I love making girls squirm just by running my tongue across their clit at the right time and I like the way they taste. What can I say? I just think it's fun. What about you? What do you like?"</p>
 			<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 		<<else>>
-			<p>"Well, do you like giving blowjobs?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+			<p>"Well, do you like giving blowjobs?" <<npc $sex.npcId>><</npc>> asks.</p>
 			<<actCLA 'No'>>
 				<p>"Uhh, no?" You cock your head. "It's boring and makes my neck hurt and my jaw ache."</p>
-				<p>"Oh. Well, how do I explain it then?" <<=$npcs.get($sex.npcId,'firstname')>> rubs his chin. "I just like giving more than I like receiving. It turns me on knowing that what I'm doing is making a girl feel good. I love making girls squirm just by running my tongue across their clit at the right time and I like the way they taste."</p>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> shrugs.</p>
+				<p>"Oh. Well, how do I explain it then?" <<npc $sex.npcId>><</npc>> rubs his chin. "I just like giving more than I like receiving. It turns me on knowing that what I'm doing is making a girl feel good. I love making girls squirm just by running my tongue across their clit at the right time and I like the way they taste."</p>
+				<p><<npc $sex.npcId>><</npc>> shrugs.</p>
 				<p>"What can I say? I just think it's fun. What about you? What do you like?"</p>
 				<<gs 'booty_call_favorite_part' 'pc_favorite_part'>>
 			<</actCLA>>
@@ -479,19 +479,19 @@
 				<p>"What do you like about it?"</p>
 				<<actCLA 'Making you feel good'>>
 					"I like making the guy feel good," you say. "Making <i>you</i> feel good. I love how when I use my tongue just right, I can feel your entire body respond through your cock."
-					<p>"Same thing with eating pussy," <<=$npcs.get($sex.npcId,'firstname')>> smirks back. "I like giving more than receiving. It's fun to make girls squirm and I love the taste of pussy. So if you're allowed to love blowjobs, why can't I love eating pussy?"</p>
+					<p>"Same thing with eating pussy," <<npc $sex.npcId>><</npc>> smirks back. "I like giving more than receiving. It's fun to make girls squirm and I love the taste of pussy. So if you're allowed to love blowjobs, why can't I love eating pussy?"</p>
 					"Guess you've got a point," you chuckle.
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<</actCLA>>
 				<<actCLA 'The taste'>>
 					"Something about having a cock in my mouth just feels good," you say. "The sweaty rough texture, the sort of musky smell. It's like licking a warm salty popsicle."
-					<p>"Same thing with eating pussy," <<=$npcs.get($sex.npcId,'firstname')>> smirks back. "I love the taste of pussy. And it's fun to lick them, playing with their little clits and making girls squirm with just my tongue. So if you're allowed to love blowjobs, why can't I love eating pussy?"</p>
+					<p>"Same thing with eating pussy," <<npc $sex.npcId>><</npc>> smirks back. "I love the taste of pussy. And it's fun to lick them, playing with their little clits and making girls squirm with just my tongue. So if you're allowed to love blowjobs, why can't I love eating pussy?"</p>
 					"Guess you've got a point," you chuckle.
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<</actCLA>>
 				<<actCLA 'The control'>>
 					<p>"I guess because of the control?" you say. "There's something... empowering about having a cock in my mouth. Like I could just chomp down and cause tons of pain but also that I have a direct line to the pleasure a guy is feeling. <i>I</i> get to decide if he gets to feel good. <i>I</i> get to decide if he gets to come. I can edge him, I can tease him, I can swallow him whole, make him gasp. Something about that just... turns me on."</p>
-					<p>"Same thing with eating pussy," <<=$npcs.get($sex.npcId,'firstname')>> smirks back. "I like giving more than receiving. I love the taste of pussy and it's fun to lick them, playing with their little clits and making girls squirm with just my tongue. So if you're allowed to love blowjobs, why can't I love eating pussy?"</p>
+					<p>"Same thing with eating pussy," <<npc $sex.npcId>><</npc>> smirks back. "I like giving more than receiving. I love the taste of pussy and it's fun to lick them, playing with their little clits and making girls squirm with just my tongue. So if you're allowed to love blowjobs, why can't I love eating pussy?"</p>
 					"Guess you've got a point," you chuckle.
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<</actCLA>>
@@ -649,7 +649,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'npc_argue_lashout'>>
 	<<run $npcs.dec($sex.npcId,'rel',1)>>
-	<p>"Why're you being such a bitch?" <<=$npcs.get($sex.npcId,'firstname')>> scowls back. "What's the point of asking me what I liked if you're just going to piss on it?"</p>
+	<p>"Why're you being such a bitch?" <<npc $sex.npcId>><</npc>> scowls back. "What's the point of asking me what I liked if you're just going to piss on it?"</p>
 	<<actCLA 'Let it slide'>>
 		<<video "shared/sex/after/pillow_talk_eyeroll.mp4">>
 		A spike of anger jolts through you and your body stiffens for a fight by instinct. But you take a deep breath through your nose and turn your head, choosing not to pursue conflict and just let it go instead.
@@ -658,7 +658,7 @@
 	<<actCLA 'Apologize'>>
 		<<run $npcs.inc($sex.npcId,'rel',1)>>
 		<<image "shared/sex/after/pillow_talk2.jpg">>
-		<p><<=$npcs.get($sex.npcId,'firstname')>>'s response causes you to start. After a moment of shock, you shake your head.</p>
+		<p><<npc $sex.npcId>><</npc>>'s response causes you to start. After a moment of shock, you shake your head.</p>
 		"You're right," you say ruefully. "I'm sorry. I shouldn''t have said that."
 		He turns to look at you, chewing on his cheek for a few seconds.
 		"It's whatever," he mumbles back.
@@ -687,7 +687,7 @@
 		<<actCLA 'Everything together'>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
 			"All of it," you smile warmly. "I loved how everything came together."
-			<p><<=$npcs.get($sex.npcId,'firstname')>> returns the smile with more than a hint of satisfaction.</p>
+			<p><<npc $sex.npcId>><</npc>> returns the smile with more than a hint of satisfaction.</p>
 			<<gs 'booty_call_pillow_talk' 'topics'>>
 		<</actCLA>>
 	<</actCLA>>
@@ -709,9 +709,9 @@
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				"I liked sucking your cock," you grin. "I love the way I can make you groan and buck your hips just with my mouth. It makes me feel sexy."
 				<<if $npcs.get($sex.npcId,'fav_pos') == 'blowjob'>>
-					<p>"Blowjobs are my favorite," <<=$npcs.get($sex.npcId,'firstname')>> smiles back running his thumb across your lips. "But the head you give is especially great."</p>
+					<p>"Blowjobs are my favorite," <<npc $sex.npcId>><</npc>> smiles back running his thumb across your lips. "But the head you give is especially great."</p>
 				<<else>>
-					<p>"You've got magic lips," <<=$npcs.get($sex.npcId,'firstname')>> smiles back, running his thumb across your lips.</p>
+					<p>"You've got magic lips," <<npc $sex.npcId>><</npc>> smiles back, running his thumb across your lips.</p>
 				<</if>>
 				<<gs 'booty_call_favorite_part' 'pc_bj_fav2'>>
 				<<gs 'booty_call_favorite_part' 'pc_bj_fav3'>>
@@ -719,18 +719,18 @@
 			<<actCLA 'Oral fixation'>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				"I liked sucking your cock," you grin. "I think I have some kind of oral fixation. Something about having a cock in my mouth just feels <i>good</i>."
-				<p>"Oral fixation huh?" <<=$npcs.get($sex.npcId,'firstname')>> says, running his thumb across your lips.</p>
+				<p>"Oral fixation huh?" <<npc $sex.npcId>><</npc>> says, running his thumb across your lips.</p>
 				<<gs 'booty_call_favorite_part' 'pc_bj_fav3'>>
 			<</actCLA>>
 			<<actCLA 'The taste'>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				"I liked sucking your cock," you grin. "It tastes good."
 				<<if getvar("$booty_call['mouth_cum_gross']") == 1>>
-					<p>"You didn't seem to think that when I came in your mouth," <<=$npcs.get($sex.npcId,'firstname')>> smirks.</p>
+					<p>"You didn't seem to think that when I came in your mouth," <<npc $sex.npcId>><</npc>> smirks.</p>
 					"Okay, <i>that's</i> different," you protest. "I said I like the taste of your cock, not the taste of your cum."
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<<else>>
-					<p>"Explains why you're so good at it," <<=$npcs.get($sex.npcId,'firstname')>> smirks, running his thumb across your lips. "You were gobbling it up like it was your last meal."</p>
+					<p>"Explains why you're so good at it," <<npc $sex.npcId>><</npc>> smirks, running his thumb across your lips. "You were gobbling it up like it was your last meal."</p>
 					<<gs 'booty_call_favorite_part' 'pc_bj_fav2'>>
 					<<gs 'booty_call_favorite_part' 'pc_bj_fav3'>>
 				<</if>>
@@ -746,7 +746,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'pc_bj_fav3'>>
 	<<actCLA 'Suck his thumb'>>
-		<p>As his thumb trails past you let it slip into your mouth. Almost instinctively, you begin sucking on it like a tiny dick, making doe eyes at <<=$npcs.get($sex.npcId,'firstname')>> for a few seconds until you let it pop from your lips.</p>
+		<p>As his thumb trails past you let it slip into your mouth. Almost instinctively, you begin sucking on it like a tiny dick, making doe eyes at <<npc $sex.npcId>><</npc>> for a few seconds until you let it pop from your lips.</p>
 		An intense silence hangs between you as you just keep staring at each other for several more moments.
 		<<gs 'booty_call_pillow_talk' 'topics'>>
 	<</actCLA>>
@@ -756,7 +756,7 @@
 		<<actCLA 'The sex'>>
 			<<if getvar("$booty_call['virgin']") == 1>>
 				"I liked the sex," you grin, unable to contain your pleasure.
-				<p>"Not bad for your first time huh?" <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
+				<p>"Not bad for your first time huh?" <<npc $sex.npcId>><</npc>> grins back.</p>
 				<<actCLA 'Agree'>>
 					You shake your head.
 					"You made for a memorable first fuck."
@@ -771,7 +771,7 @@
 					<<actCLA 'When we did it missionary'>>
 						<<video "shared/sex/after/pillow_talk2.mp4">>
 						"I liked it when we did it in missionary," you smile.
-						<p>"Yeah?" <<=$npcs.get($sex.npcId,'firstname')>> grins back. "That's your favorite position?"</p>
+						<p>"Yeah?" <<npc $sex.npcId>><</npc>> grins back. "That's your favorite position?"</p>
 						<<actCLA 'Not usually'>>
 							"Hmmm... It's not usually my favorite," you shrug. "But something about it was nice this time."
 							<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -798,7 +798,7 @@
 					<<actCLA 'When we did it doggy'>>
 						<<video "shared/sex/after/pillow_talk2.mp4">>
 						"I liked it when you fucked me doggy," you smile.
-						<p>"Yeah?" <<=$npcs.get($sex.npcId,'firstname')>> grins back. "You like it doggy?"</p>
+						<p>"Yeah?" <<npc $sex.npcId>><</npc>> grins back. "You like it doggy?"</p>
 						<<actCLA 'Not usually'>>
 							"Hmmm... It's not <i>usually</i> my favorite," you shrug. "But it was good this time. Nice to mix things up."
 							<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -813,7 +813,7 @@
 						<</actCLA>>
 						<<actCLA 'Feels dirty'>>
 							"It feels dirty," you grin wickedly. "And I like it dirty."
-							<p>"You dirty girl," <<=$npcs.get($sex.npcId,'firstname')>> smirks back.</p>
+							<p>"You dirty girl," <<npc $sex.npcId>><</npc>> smirks back.</p>
 							<p>"Stop!" you tease. "You're gonna make me come."</p>
 							<<gs 'booty_call_pillow_talk' 'topics'>>
 						<</actCLA>>
@@ -823,7 +823,7 @@
 					<<actCLA 'When I got to ride you'>>
 						<<video "shared/sex/after/pillow_talk2.mp4">>
 						"I liked it when I got to be on top," you smile.
-						<p>"Yeah?" <<=$npcs.get($sex.npcId,'firstname')>> grins back. "You like to ride?"</p>
+						<p>"Yeah?" <<npc $sex.npcId>><</npc>> grins back. "You like to ride?"</p>
 						<<actCLA 'Not usually'>>
 							<p>"Hmmm... It's not <i>usually</i> my favorite," you shrug. "But who doesn't like a good ride now and then?"</p>
 							<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -845,7 +845,7 @@
 				<<if getvar("$booty_call['gentle_fuck']") == 1>>
 					<<actCLA 'When you were gentle'>>
 						<<image "shared/sex/after/pillow_talk1.jpg">>
-						<p>"I liked it when you were gentle, " you say, smiling warmly at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+						<p>"I liked it when you were gentle, " you say, smiling warmly at <<npc $sex.npcId>><</npc>>.</p>
 						<<gs 'booty_call_pillow_talk' 'topics'>>
 					<</actCLA>>
 				<</if>>
@@ -854,7 +854,7 @@
 						<<setinit $booty_call['rough_pillow_talk'] = 1>>
 						<<image "shared/sex/after/pillow_talk1.jpg">>
 						"I liked it when you fucked me hard," you grin.
-						<p>"You like it that way?" <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+						<p>"You like it that way?" <<npc $sex.npcId>><</npc>> grins.</p>
 						<<actCLA 'Sometimes'>>
 							"Not always," you shrug. "But any one speed is boring if you don't mix it up. A good pounding is always welcome provided the timing is right."
 							<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -870,7 +870,7 @@
 							<<setinit $booty_call['rough_pillow_talk'] = 1>>
 							<<image "shared/sex/after/pillow_talk1.jpg">>
 							"I liked it when you got rough with me," you grin.
-							<p>"You like it rough?" <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
+							<p>"You like it rough?" <<npc $sex.npcId>><</npc>> grins back.</p>
 							<<actCLA 'Sometimes'>>
 								<p>"Not always," you shrug. "But what girl doesn't like to get rough housed now and again?"</p>
 								<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -909,7 +909,7 @@
 		<<actCLA 'The sex (shy)'>>
 			<<if getvar("$booty_call['virgin']") == 1>>
 				<p>"I liked- I liked the sex," you mumble, a crimson blush spreading through your cheeks.</p>
-				<p>"Not bad for your first time huh?" <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
+				<p>"Not bad for your first time huh?" <<npc $sex.npcId>><</npc>> grins back.</p>
 				<<actCLA 'Agree'>>
 					You shake your head, smiling shyly, feeling your blush intensify.
 					<i>Oh my! How embarrassing!</i>
@@ -924,7 +924,7 @@
 					<<actCLA 'When we did it missionary'>>
 						<<image "shared/sex/after/pillow_talk1.jpg">>
 						"I liked it when... when we did it in missionary," you say, a crimson blush spreading through your cheeks.
-						<p>"Yeah?" <<=$npcs.get($sex.npcId,'firstname')>> grins back. "That's your favorite position?"</p>
+						<p>"Yeah?" <<npc $sex.npcId>><</npc>> grins back. "That's your favorite position?"</p>
 						<<actCLA 'Not usually'>>
 							"Not usually my favorite," you stammer. "But something about it was nice this time."
 							<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -947,7 +947,7 @@
 					<<actCLA 'When we did it doggy'>>
 						<<image "shared/sex/after/pillow_talk1.jpg">>
 						"I liked it when you, uhm... when you did me from behind..." you say, a crimson blush spreading through your cheeks.
-						<p>"Yeah?" <<=$npcs.get($sex.npcId,'firstname')>> grins back. "You like it doggy?"</p>
+						<p>"Yeah?" <<npc $sex.npcId>><</npc>> grins back. "You like it doggy?"</p>
 						<<actCLA 'Not usually'>>
 							"Not usually my favorite," you stammer. "But something about it was nice this time."
 							<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -962,7 +962,7 @@
 						<</actCLA>>
 						<<actCLA 'Feels dirty'>>
 							<p>"Y-yes," you admit. "I kind of like how, uhm... <i>dirty</i>... it feels..."</p>
-							<p>"You dirty girl," <<=$npcs.get($sex.npcId,'firstname')>> replies and you feel your blush intensify.</p>
+							<p>"You dirty girl," <<npc $sex.npcId>><</npc>> replies and you feel your blush intensify.</p>
 							<<gs 'booty_call_pillow_talk' 'topics'>>
 						<</actCLA>>
 					<</actCLA>>
@@ -971,7 +971,7 @@
 					<<actCLA 'When I got to ride you'>>
 						<<image "shared/sex/after/pillow_talk1.jpg">>
 						"I liked it when, uhm... when I got to be on top..." you say, a crimson blush spreading through your cheeks.
-						<p>"Yeah?" <<=$npcs.get($sex.npcId,'firstname')>> grins back. "You like to ride?"</p>
+						<p>"Yeah?" <<npc $sex.npcId>><</npc>> grins back. "You like to ride?"</p>
 						<<actCLA 'Not usually'>>
 							"Not usually my favorite," you stammer. "But something about it was nice this time."
 							<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -1002,7 +1002,7 @@
 						<<setinit $booty_call['rough_pillow_talk'] = 1>>
 						<<image "shared/sex/after/pillow_talk1.jpg">>
 						"I liked it when you, uhm... when you fucked me hard..." you say, a crimson blush spreading through your cheeks.
-						<p>"You like to get pounded?" <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+						<p>"You like to get pounded?" <<npc $sex.npcId>><</npc>> grins.</p>
 						<<actCLA 'Sometimes'>>
 							<p>"Not a-always," you stammer. "But it's nice now and again..."</p>
 							<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -1017,7 +1017,7 @@
 							<<setinit $booty_call['rough_pillow_talk'] = 1>>
 							<<image "shared/sex/after/pillow_talk1.jpg">>
 							"I liked it when you, uhm... when you got rough with me..." you say, a crimson blush spreading through your cheeks.
-							<p>"You like it rough?" <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+							<p>"You like it rough?" <<npc $sex.npcId>><</npc>> grins.</p>
 							<<actCLA 'Sometimes'>>
 								<p>"Not a-always," you stammer. "But the variety was nice..."</p>
 								<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -1078,24 +1078,24 @@
 			<<image "shared/sex/after/pillow_talk1.jpg">>
 			<<if $booty_call['boy_favorite'] == 'creampie' and $npcs.get($sex.npcId,'free_creampies') < 1 and getvar("$booty_call['surprise_creampie_count']") > 0>>
 				<<if $npcs.get($sex.npcId,'know_not_bc') == 1>>
-					<p>"I... liked it when you came inside me," you admit, quickly holding up your finger before <<=$npcs.get($sex.npcId,'firstname')>> can say anything. "But you still need to ask before you do it! You know I'm not on birth control so it's extra important!"</p>
+					<p>"I... liked it when you came inside me," you admit, quickly holding up your finger before <<npc $sex.npcId>><</npc>> can say anything. "But you still need to ask before you do it! You know I'm not on birth control so it's extra important!"</p>
 				<<elseif getvar("$birth_control['think_safe']") != 1>>
 					<<gs 'booty_call_stats' 'no_birth_control_know'>>
-					<p>"I... liked it when you came inside me," you admit, quickly holding up your finger before <<=$npcs.get($sex.npcId,'firstname')>> can say anything. "But you still need to ask before you do it! I'm not on birth control so it's dangerous."</p>
+					<p>"I... liked it when you came inside me," you admit, quickly holding up your finger before <<npc $sex.npcId>><</npc>> can say anything. "But you still need to ask before you do it! I'm not on birth control so it's dangerous."</p>
 				<<else>>
-					<p>"I... liked it when you came inside me," you admit, quickly holding up your finger before <<=$npcs.get($sex.npcId,'firstname')>> can say anything. "But you still need to ask before you do it! Just because it feels good doesn't mean you can't ask permission!"</p>
+					<p>"I... liked it when you came inside me," you admit, quickly holding up your finger before <<npc $sex.npcId>><</npc>> can say anything. "But you still need to ask before you do it! Just because it feels good doesn't mean you can't ask permission!"</p>
 				<</if>>
 			<<elseif $booty_call['boy_favorite'] == 'creampie'>>
 				<<if getvar("$cum_loc['vagina']") > 0>>
-					<p>"The same as you," you smile warmly at <<=$npcs.get($sex.npcId,'firstname')>> rubbing your wet thighs together where his cum continues to leak from your pussy. "I can <i>feel</i> everything. Your cock throbs inside me, warmth spreading through my hips, I just feel <i>full</i> when you come inside me. And it feels really really good."</p>
+					<p>"The same as you," you smile warmly at <<npc $sex.npcId>><</npc>> rubbing your wet thighs together where his cum continues to leak from your pussy. "I can <i>feel</i> everything. Your cock throbs inside me, warmth spreading through my hips, I just feel <i>full</i> when you come inside me. And it feels really really good."</p>
 				<<else>>
-					<p>"The same as you," you smile warmly at <<=$npcs.get($sex.npcId,'firstname')>> rubbing your wet thighs together where his cum was leaking from your snatch just minutes ago. "I can <i>feel</i> everything. Your cock throbs inside me, warmth spreading through my hips, I just feel <i>full</i> when you come inside me. And it feels really really good."</p>
+					<p>"The same as you," you smile warmly at <<npc $sex.npcId>><</npc>> rubbing your wet thighs together where his cum was leaking from your snatch just minutes ago. "I can <i>feel</i> everything. Your cock throbs inside me, warmth spreading through my hips, I just feel <i>full</i> when you come inside me. And it feels really really good."</p>
 				<</if>>
 			<<else>>
 				<<if getvar("$cum_loc['vagina']") > 0>>
-					<p>"I liked it when you came inside me," you smile warmly at <<=$npcs.get($sex.npcId,'firstname')>> rubbing your wet thighs together where his cum continues to leak from your pussy. "I can <i>feel</i> everything. Your cock throbs inside me, warmth spreading through my hips, I just feel <i>full</i> when you come inside me. And it feels really really good."</p>
+					<p>"I liked it when you came inside me," you smile warmly at <<npc $sex.npcId>><</npc>> rubbing your wet thighs together where his cum continues to leak from your pussy. "I can <i>feel</i> everything. Your cock throbs inside me, warmth spreading through my hips, I just feel <i>full</i> when you come inside me. And it feels really really good."</p>
 				<<else>>
-					<p>"I liked it when you came inside me," you smile warmly at <<=$npcs.get($sex.npcId,'firstname')>> rubbing your wet thighs together where his cum was leaking from your snatch just minutes ago. "I can <i>feel</i> everything. Your cock throbs inside me, warmth spreading through my hips, I just feel <i>full</i> when you come inside me. And it feels really really good."</p>
+					<p>"I liked it when you came inside me," you smile warmly at <<npc $sex.npcId>><</npc>> rubbing your wet thighs together where his cum was leaking from your snatch just minutes ago. "I can <i>feel</i> everything. Your cock throbs inside me, warmth spreading through my hips, I just feel <i>full</i> when you come inside me. And it feels really really good."</p>
 				<</if>>
 			<</if>>
 			<<if getvar("$booty_call['accidental_creampie_convo']") == 0 and ($npcs.get($sex.npcId,'know_not_bc') == 1 or getvar("$booty_call['risky_creampie']") > 0 or $npcs.get($sex.npcId,'childfree') > 0) and getvar("$booty_call['safe_day']") != 1 and getvar("$booty_call['probably_safe_day']") != 1>>
@@ -1134,7 +1134,7 @@
 					<</if>>
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<<else>>
-					<p>"I liked it when I swallowed your cum," you tell <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+					<p>"I liked it when I swallowed your cum," you tell <<npc $sex.npcId>><</npc>>.</p>
 					<p>"What did you like about it?" he asks in response, eyes gleaming with arousal and curiosity.</p>
 					<<actCLA 'The situation'>>
 						<p>"Just... doing it I guess?" you say with a shy smile. "There's just something... <i>hot</i> about swallowing a guys's load. I don't really get it myself if I'm being honest. All I know is that it turns me on."</p>
@@ -1160,7 +1160,7 @@
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				<<if $booty_call['boy_favorite'] == 'facial'>>
 					"The same as you," you admit with a smile. "There''s something strangely hot about when a guy blows his load all over my face. I just feel... <i>sexy</i>."
-					<p>"You look sexy too," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+					<p>"You look sexy too," <<npc $sex.npcId>><</npc>> grins.</p>
 				<<else>>
 					"I liked it when you came on my face," you smile. "There''s something strangely hot about when a guy blows his load all over my face. I just feel... <i>sexy</i>."
 				<</if>>
@@ -1176,7 +1176,7 @@
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				<<if $booty_call['boy_favorite'] == 'tit_cum'>>
 					"The same as you," you admit with a smile. "There''s something strangely hot about when a guy blows his load all over my tits. I just feel... <i>sexy</i>. And the warmth is oddly comforting..."
-					<p>"You look sexy too," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+					<p>"You look sexy too," <<npc $sex.npcId>><</npc>> grins.</p>
 				<<else>>
 					"I liked it when you came on my face," you smile. "There''s something strangely hot about when a guy blows his load all over my face. I just feel... <i>sexy</i>. And the warmth is oddly comforting..."
 				<</if>>
@@ -1187,7 +1187,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'good_for_you_too'>>
 	<<actCLA 'Satisfied'>>
-		<p>"I had fun," you say, smiling at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+		<p>"I had fun," you say, smiling at <<npc $sex.npcId>><</npc>>.</p>
 		<<gs 'booty_call_pillow_talk' 'topics'>>
 	<</actCLA>>
 	<<if getvar("$booty_call['fuck_count']") > 0>>
@@ -1210,9 +1210,9 @@
 				<<setinit $booty_call['keep_it_up'] = 1>>
 				<<setinit $booty_call['sore_pussy_talk'] = 1>>
 				<<if $booty_call['cum_count'] == $npcs.get($sex.npcId,'sexdrive')>>
-					<p>"I might not be able to walk right for a week either," you say, rubbing your thighs over your thoroughly fucked sex and grinning as you add, "I think you might've pounded my pussy into a <<=$npcs.get($sex.npcId,'firstname')>> shape."</p>
+					<p>"I might not be able to walk right for a week either," you say, rubbing your thighs over your thoroughly fucked sex and grinning as you add, "I think you might've pounded my pussy into a <<npc $sex.npcId>><</npc>> shape."</p>
 				<<else>>
-					<p>"I'm not gonna be able to walk right for a week," you say, rubbing your thighs over your thoroughly fucked sex and grinning as you add, "I think you might've pounded my pussy into a <<=$npcs.get($sex.npcId,'firstname')>> shape."</p>
+					<p>"I'm not gonna be able to walk right for a week," you say, rubbing your thighs over your thoroughly fucked sex and grinning as you add, "I think you might've pounded my pussy into a <<npc $sex.npcId>><</npc>> shape."</p>
 				<</if>>
 				<<gs 'booty_call_pillow_talk' 'topics'>>
 			<</actCLA>>
@@ -1233,10 +1233,10 @@
 				<<setinit $booty_call['sore_pussy_talk'] = 1>>
 				"I'm a little sore," you say with a half smile, rubbing your wet thighs together over your delightfully tender sex. "But in a good way."
 				<<if $npcs.get($sex.npcId,'gymrat') == 1>>
-					<p>"Like the soreness after a workout?" <<=$npcs.get($sex.npcId,'firstname')>> asks amusedly.</p>
+					<p>"Like the soreness after a workout?" <<npc $sex.npcId>><</npc>> asks amusedly.</p>
 					"Yeah," you nod. "Something like that. But in my pussy."
 				<<else>>
-					<p>"How can you feel sore in a good way?" <<=$npcs.get($sex.npcId,'firstname')>> asks amusedly.</p>
+					<p>"How can you feel sore in a good way?" <<npc $sex.npcId>><</npc>> asks amusedly.</p>
 					"I just do," you shrug. "Besides, it's your fault for fucking me so well."
 				<</if>>
 				You both grin at that.
@@ -1251,12 +1251,12 @@
 	<</if>>
 	<<if $booty_call['orgasm_count'] + getvar("$booty_call['fake_orgasm_count']") > 3>>
 		<<actCLA 'Lots of orgasms'>>
-			<p>"You made me come lots," you say, flashing a tired smile at <<=$npcs.get($sex.npcId,'firstname')>>. "It was more than good."</p>
+			<p>"You made me come lots," you say, flashing a tired smile at <<npc $sex.npcId>><</npc>>. "It was more than good."</p>
 			<<gs 'booty_call_pillow_talk' 'topics'>>
 		<</actCLA>>
 	<<elseif getvar("$booty_call['orgasm_count']") > 0>>
 		<<actCLA 'You got me off'>>
-			<p>"You made me come," you say, smiling at <<=$npcs.get($sex.npcId,'firstname')>>. "How could I complain?"</p>
+			<p>"You made me come," you say, smiling at <<npc $sex.npcId>><</npc>>. "How could I complain?"</p>
 			<<gs 'booty_call_pillow_talk' 'topics'>>
 		<</actCLA>>
 	<</if>>
@@ -1265,13 +1265,13 @@
 			"I could''ve gone a few more rounds," you say wistfully.
 			"Sorry," he says, looking a little embarrassed. "The spirit is willing, but the flesh is spongey and bruised.
 			<<actCLA 'Laugh'>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>>'s response makes you laugh out loud.</p>
+				<p><<npc $sex.npcId>><</npc>>'s response makes you laugh out loud.</p>
 				"That's okay," you giggle. "I forgive you."
 				<<gs 'booty_call_pillow_talk' 'topics'>>
 			<</actCLA>>
 			<<actCLA 'Roll your eyes'>>
 				<<video "shared/sex/after/pillow_talk_eyeroll.mp4">>
-				<p>You roll your eyes to the heavens though <<=$npcs.get($sex.npcId,'firstname')>> looks quite amused by his own joke.</p>
+				<p>You roll your eyes to the heavens though <<npc $sex.npcId>><</npc>> looks quite amused by his own joke.</p>
 				"You've endured such hardship, getting fucked by me so many times," you say flatly.
 				<<gs 'booty_call_pillow_talk' 'topics'>>
 			<</actCLA>>
@@ -1281,7 +1281,7 @@
 		<<actCLA 'I`m full (of cum)'>>
 			<<gs 'booty_call_pillow_talk' 'talk_time_add'>>
 			<<setinit $booty_call['creampie_pillow_talk'] = 1>>
-			<p>"I'm all full," you smile, rubbing your belly in tired satisfaction as <<=$npcs.get($sex.npcId,'firstname')>>'s cum overflows from your snatch.</p>
+			<p>"I'm all full," you smile, rubbing your belly in tired satisfaction as <<npc $sex.npcId>><</npc>>'s cum overflows from your snatch.</p>
 			<<gs 'booty_call_pillow_talk' 'topics'>>
 		<</actCLA>>
 	<</if>>

+ 67 - 67
sugarcube/src/activities/bootycall/booty_call_leave.tw

@@ -128,7 +128,7 @@
 	<<actCLA 'Break things off'>>
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		"This is the last time I'm coming over," you say, abruptly.
-		<p>"Huh?" <<=$npcs.get($sex.npcId,'firstname')>> looks at you oddly. "What are you talking about?"</p>
+		<p>"Huh?" <<npc $sex.npcId>><</npc>> looks at you oddly. "What are you talking about?"</p>
 		"Don't text me expecting a booty call after this."
 		<p>"Why not?" he asks.</p>
 		<<actCLA 'Don`t explain'>>
@@ -195,7 +195,7 @@
 					<<actCLA 'As long as it`s just physical'>>
 						<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 						"Well..." you say slowly. "As long as it's <i>just</i> physical..."
-						<p>"Thatta girl," <<=$npcs.get($sex.npcId,'firstname')>> grins from bed.</p>
+						<p>"Thatta girl," <<npc $sex.npcId>><</npc>> grins from bed.</p>
 						<<gs 'booty_call_after' 'cheating_end'>>
 					<</actCLA>>
 					<<actCLA 'Set some rules'>>
@@ -258,7 +258,7 @@
 			<!-- !! add in rape chance later-->
 			<<video "shared/romance/misc/depart_annoyed1.mp4">>
 			"Fuck this," you say, getting up and grabbing your clothes.
-			<p>"Where the fuck are you going?" <<=$npcs.get($sex.npcId,'firstname')>> asks in bewilderment.</p>
+			<p>"Where the fuck are you going?" <<npc $sex.npcId>><</npc>> asks in bewilderment.</p>
 			"I'm not gonna be fuckbuddies with a guy who never uses condoms," you sneer at him. "<i>Don't</i> text me again."
 			The second you're dressed you stalk out the door and slam it behind you.
 			<<gs 'booty_call_leave' 'break_up'>>
@@ -271,7 +271,7 @@
 	<</actCLA>>
 	<<actCLA 'Leave a note'>>
 		<<=$npcs.get($sex.npcId,'apt_hall')>>
-		<p>Not wanting to leave without saying goodbye but not wanting to wake <<=$npcs.get($sex.npcId,'firstname')>> either, you find a piece of paper and a pen and scribble out a quick message.</p>
+		<p>Not wanting to leave without saying goodbye but not wanting to wake <<npc $sex.npcId>><</npc>> either, you find a piece of paper and a pen and scribble out a quick message.</p>
 		<<gs 'booty_call_leave' 'sneak_out_note1'>>
 	<</actCLA>>
 	<<if $wardrobe.pantyworntype != 'none'>>
@@ -280,9 +280,9 @@
 			<<gs 'panties' 'dispose'>>
 			<<=$npcs.get($sex.npcId,'apt_hall')>>
 			<<if getvar("$CloSkirtShortness") > 0>>
-				<p>Suddenly feeling naughty, you quickly slip your panties down your legs, leaving your pussy bare underneath your skirt. You loop your warm underwear around the handle of <<=$npcs.get($sex.npcId,'firstname')>>'s bedroom door and then quietly sneak out of his apartment, leaving only your gift behind.</p>
+				<p>Suddenly feeling naughty, you quickly slip your panties down your legs, leaving your pussy bare underneath your skirt. You loop your warm underwear around the handle of <<npc $sex.npcId>><</npc>>'s bedroom door and then quietly sneak out of his apartment, leaving only your gift behind.</p>
 			<<else>>
-				<p>Suddenly feeling naughty, you pull down your trousers down and spend a minute untangling your legs before pulling your bottoms back up back up, sans panties. You loop your warm underwear around the handle of <<=$npcs.get($sex.npcId,'firstname')>>'s bedroom door and then quietly sneak out of his apartment, leaving only your gift behind.</p>
+				<p>Suddenly feeling naughty, you pull down your trousers down and spend a minute untangling your legs before pulling your bottoms back up back up, sans panties. You loop your warm underwear around the handle of <<npc $sex.npcId>><</npc>>'s bedroom door and then quietly sneak out of his apartment, leaving only your gift behind.</p>
 			<</if>>
 			<<actCLA 'Leave'>>
 				<<gt 'booty_call_leave' 'exit'>>
@@ -294,9 +294,9 @@
 			<<gs 'panties' 'dispose'>>
 			<<=$npcs.get($sex.npcId,'apt_hall')>>
 			<<if getvar("$CloSkirtShortness") > 0>>
-				<p>Not wanting to leave without saying goodbye but not wanting to wake <<=$npcs.get($sex.npcId,'firstname')>> either, you start to look for a piece of paper when a naughty thought runs through your mind. Unable to resist the thought, you quickly slip your panties down from underneath your skirt and then rummage for a big marker.</p>
+				<p>Not wanting to leave without saying goodbye but not wanting to wake <<npc $sex.npcId>><</npc>> either, you start to look for a piece of paper when a naughty thought runs through your mind. Unable to resist the thought, you quickly slip your panties down from underneath your skirt and then rummage for a big marker.</p>
 			<<else>>
-				<p>Not wanting to leave without saying goodbye but not wanting to wake <<=$npcs.get($sex.npcId,'firstname')>> either, you start to look for a piece of paper when a naughty thought runs through your mind. Unable to resist the thought, you quickly pull down your trousers down and spend a minute untangling your legs before pulling your bottoms back up, sans panties. Then you rummage for a big marker.</p>
+				<p>Not wanting to leave without saying goodbye but not wanting to wake <<npc $sex.npcId>><</npc>> either, you start to look for a piece of paper when a naughty thought runs through your mind. Unable to resist the thought, you quickly pull down your trousers down and spend a minute untangling your legs before pulling your bottoms back up, sans panties. Then you rummage for a big marker.</p>
 			<</if>>
 			You pop the cap with a grin and start scribbling.
 			<<gs 'booty_call_leave' 'sneak_out_note1'>>
@@ -385,7 +385,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'sneak_out_note_end'>>
 	<<if getvar("$booty_call['panty_note']") == 1>>
-		<p>Satisfied, you leave your panties on the counter and quietly slip out the door, wondering what <<=$npcs.get($sex.npcId,'firstname')>> will think when he discovers them.</p>
+		<p>Satisfied, you leave your panties on the counter and quietly slip out the door, wondering what <<npc $sex.npcId>><</npc>> will think when he discovers them.</p>
 	<<else>>
 		Satisfied, you leave your note on the counter and quietly slip out the door, letting it click shut behind you.
 	<</if>>
@@ -395,7 +395,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'sneak_out2'>>
 	<<=$npcs.get($sex.npcId,'apt_hall')>>
-	<p>You tip toe your way to the door, turning the handle as gently as you can so you don't disturb <<=$npcs.get($sex.npcId,'firstname')>>, closing it with a soft click behind you.</p>
+	<p>You tip toe your way to the door, turning the handle as gently as you can so you don't disturb <<npc $sex.npcId>><</npc>>, closing it with a soft click behind you.</p>
 	<<actCLA 'Leave'>>
 		<<gt 'booty_call_leave' 'exit'>>
 	<</actCLA>>
@@ -452,15 +452,15 @@
 	<<if getvar("$booty_call['sleepover']") == 1 and $npcs.get($sex.npcId,'latesleeper') == 1 and getvar("$booty_call['boy_asleep']") != 0>>
 		<<if getvar("$booty_call['towel']") == 1>>
 			<<setinit $booty_call['towel'] = 0>>
-			<p>You drop the towel and quietly reach down for your clothes and try to pick them up without waking <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+			<p>You drop the towel and quietly reach down for your clothes and try to pick them up without waking <<npc $sex.npcId>><</npc>>.</p>
 		<<else>>
-			<p>You quietly reach down for where you left your clothes and try to pick them up without waking <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+			<p>You quietly reach down for where you left your clothes and try to pick them up without waking <<npc $sex.npcId>><</npc>>.</p>
 		<</if>>
 		<<gs 'booty_call_leave' 'dressing2'>>
 	<<else>>
 		<<gs 'booty_call_leave' 'dress_start_desc'>>
 		<<if getvar("$booty_call['angry_after']") == 1 or getvar("$booty_call['annoyed']") > 0>>
-			<p>"I have to go," you say flatly, reaching down for your clothes without looking at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+			<p>"I have to go," you say flatly, reaching down for your clothes without looking at <<npc $sex.npcId>><</npc>>.</p>
 			<<gs 'booty_call_leave' 'dressing2'>>
 		<<elseif getvar("$booty_call['cant_stay']") == 1>>
 			<!-- !! there is an additional dress_loop here to make it possible to give panties here-->
@@ -469,7 +469,7 @@
 			<<gs 'booty_call_leave' 'dressing2'>>
 			<<gs 'booty_call_leave' 'panty_gift'>>
 		<<elseif getvar("$booty_call['npc_late']") == 0>>
-			<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you are $booty_call['dress_describe'].</p>
+			<p>"You heading out?" <<npc $sex.npcId>><</npc>> asks as you are $booty_call['dress_describe'].</p>
 			<<gs 'booty_call_leave' 'not_leaving'>>
 			<<gs 'booty_call_leave' 'leaving_soon'>>
 			<<gs 'booty_call_leave' 'something_to_do'>>
@@ -485,7 +485,7 @@
 				<<gs 'booty_call_leave' 'dress_talk'>>
 			<</if>>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> starts getting dressed next to you.</p>
+			<p><<npc $sex.npcId>><</npc>> starts getting dressed next to you.</p>
 			<<gs 'booty_call_leave' 'dressing2'>>
 		<</if>>
 		<!-- !!	act'Talk while you dress':-->
@@ -517,7 +517,7 @@
 	<<actCLA 'Not yet'>>
 		<<gs 'booty_call_leave' 'dress_loop'>>
 		<<gs 'booty_call_leave' 'dress_start_desc'>>
-		<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+		<p>"You heading out?" <<npc $sex.npcId>><</npc>> asks.</p>
 		<p>"Not yet," you say, $booty_call['dress_describe']. "Just tired of hanging around naked."</p>
 		"I'm never tired of seeing you naked."
 		"Whatever," you roll your eyes.
@@ -529,7 +529,7 @@
 		<<setinit $booty_call['leaving'] = 1>>
 		<<gs 'booty_call_leave' 'dress_loop'>>
 		<<gs 'booty_call_leave' 'dress_start_desc'>>
-		<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+		<p>"You heading out?" <<npc $sex.npcId>><</npc>> asks.</p>
 		<<if getvar("$booty_call['sleepover']") < 1>>
 			<p>"Yeah," you say, $booty_call['dress_describe'].</p>
 			<<gs 'booty_call_leave' 'dressing2'>>
@@ -551,7 +551,7 @@
 			<<actCLA 'Going to the disco'>>
 				<<gs 'booty_call_leave' 'dress_loop'>>
 				<<gs 'booty_call_leave' 'dress_start_desc'>>
-				<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+				<p>"You heading out?" <<npc $sex.npcId>><</npc>> asks.</p>
 				<<if getvar("$booty_call['disco_after']") == 1>>
 					<p>"Weren't you listening to me?" you say, $booty_call['dress_describe']. "I told you, I'm going to the disco tonight."</p>
 				<<else>>
@@ -565,7 +565,7 @@
 			<<actCLA 'Going to the club'>>
 				<<gs 'booty_call_leave' 'dress_loop'>>
 				<<gs 'booty_call_leave' 'dress_start_desc'>>
-				<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+				<p>"You heading out?" <<npc $sex.npcId>><</npc>> asks.</p>
 				<<if getvar("$booty_call['club_after']") == 1>>
 					<p>"Weren't you listening to me?" you say, $booty_call['dress_describe']. "I told you, I'm going clubbing tonight."</p>
 				<<else>>
@@ -584,7 +584,7 @@
 			<<setinit $booty_call['mom_kill'] = 1>>
 			<<gs 'booty_call_leave' 'dress_loop'>>
 			<<gs 'booty_call_leave' 'dress_start_desc'>>
-			<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+			<p>"You heading out?" <<npc $sex.npcId>><</npc>> asks.</p>
 			<<if $time.hour < 3>>
 				<p>"Yeah," you say, $booty_call['dress_describe']. "I'm already going to be in trouble as it is, but if I don't come home at all tonight, my mom will kill me."</p>
 			<<else>>
@@ -600,7 +600,7 @@
 		<<actCLA 'Need to finish my homework'>>
 			<<gs 'booty_call_leave' 'dress_loop'>>
 			<<gs 'booty_call_leave' 'dress_start_desc'>>
-			<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+			<p>"You heading out?" <<npc $sex.npcId>><</npc>> asks.</p>
 			<p>"Yeah," you say, $booty_call['dress_describe']. "I need to do my homework."</p>
 			<!-- !!			if rand(0,1) = 1:-->
 			<p>"Seriously? That's what you're in a rush for?"</p>
@@ -625,7 +625,7 @@
 		<<setinit $booty_call['leaving'] = 1>>
 		<<gs 'booty_call_leave' 'dress_loop'>>
 		<<gs 'booty_call_leave' 'dress_start_desc'>>
-		<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+		<p>"You heading out?" <<npc $sex.npcId>><</npc>> asks.</p>
 		<<if getvar("$booty_call['sleepover']") < 1>>
 			<p>"Yeah," you say, $booty_call['dress_describe']. "Have a few things I need to get done."</p>
 			<<gs 'booty_call_leave' 'dressing2'>>
@@ -646,7 +646,7 @@
 		<<setinit $booty_call['leaving'] = 1>>
 		<<gs 'booty_call_leave' 'dress_loop'>>
 		<<gs 'booty_call_leave' 'dress_start_desc'>>
-		<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+		<p>"You heading out?" <<npc $sex.npcId>><</npc>> asks.</p>
 		<<if getvar("$booty_call['sleepover']") < 1>>
 			<p>"Yeah," you say, $booty_call['dress_describe']. "Need to see a friend later."</p>
 			<<gs 'booty_call_leave' 'dressing2'>>
@@ -668,9 +668,9 @@
 			<<setinit $booty_call['leaving'] = 1>>
 			<<gs 'booty_call_leave' 'dress_loop'>>
 			<<gs 'booty_call_leave' 'dress_start_desc'>>
-			<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+			<p>"You heading out?" <<npc $sex.npcId>><</npc>> asks.</p>
 			<p>"Yeah," you smirk, $booty_call['dress_describe']. "Got another booty call to show up to."</p>
-			<p>"You really get around don't you?" <<=$npcs.get($sex.npcId,'firstname')>> smirks back.</p>
+			<p>"You really get around don't you?" <<npc $sex.npcId>><</npc>> smirks back.</p>
 			<<gs 'booty_call_leave' 'dressing2'>>
 			<<gs 'booty_call_leave' 'panty_gift'>>
 		<</actCLA>>
@@ -681,7 +681,7 @@
 		<<actCLA 'School'>>
 			<<gs 'booty_call_leave' 'dress_loop'>>
 			<<gs 'booty_call_leave' 'dress_start_desc'>>
-			<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+			<p>"You heading out?" <<npc $sex.npcId>><</npc>> asks.</p>
 			<<if getvar("$booty_call['late_for_school']") == 1 and $time.hour >= 8>>
 				<p>"I already told you, I'm late for school," you say, $booty_call['dress_describe']. "But thanks for letting me spend the night. And the second fuck," you add with a wink.</p>
 			<<elseif getvar("$booty_call['late_for_school']") == 1>>
@@ -706,7 +706,7 @@
 		<<actCLA 'It`s a school night'>>
 			<<gs 'booty_call_leave' 'dress_loop'>>
 			<<gs 'booty_call_leave' 'dress_start_desc'>>
-			<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+			<p>"You heading out?" <<npc $sex.npcId>><</npc>> asks.</p>
 			<!-- !! if schoolprogul = 1:-->
 			<p>"It's a school night," you say, $booty_call['dress_describe']. "Gotta get home so I can set my alarm and get up for class tomorrow."</p>
 			<<if rand(1,3) == 3 and (npc_day_off[$sex.npcId] == $time.weekday or $npcs.get($sex.npcId,'day_off') == $time.weekday + 1 or ($time.weekday == 7 and $npcs.get($sex.npcId,'day_off') == 1))>>
@@ -727,11 +727,11 @@
 			Just after you put on your panties, a sexy thought pops into your head.
 			"But before I go," you say mischievously. "I have a gift for you."
 			<<if $npcs.get($sex.npcId,'panty_give') == 1>>
-				<p>"A gift?" <<=$npcs.get($sex.npcId,'firstname')>> asks curiously.</p>
-				<p>In one smooth motion, you slide your panties down your legs and daintily toss them onto the rumpled sheets of the bed on which you fucked <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+				<p>"A gift?" <<npc $sex.npcId>><</npc>> asks curiously.</p>
+				<p>In one smooth motion, you slide your panties down your legs and daintily toss them onto the rumpled sheets of the bed on which you fucked <<npc $sex.npcId>><</npc>>.</p>
 				<<gs 'booty_call_leave' 'panty_gift2'>>
 			<<else>>
-				<p>"Another pair of your panties?" <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+				<p>"Another pair of your panties?" <<npc $sex.npcId>><</npc>> grins.</p>
 				<p>"You guessed correctly," you grin back. "And your prize is-!"</p>
 				In one smooth motion, you slide your panties down your legs and daintily toss them into the rumpled sheets of the bed you were just fucked in.
 				"Enjoy," you smirk.
@@ -752,7 +752,7 @@
 			<p>"And what am I supposed to do with these when my girlfriend comes home?" he asks, looking at them amusedly.</p>
 			<<gs 'booty_call_leave' 'panty_gift_girlfriend'>>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't reply, but his expression says that he isn't displeased.</p>
+			<p><<npc $sex.npcId>><</npc>> doesn't reply, but his expression says that he isn't displeased.</p>
 			<<gs 'booty_call_leave' 'dressing2'>>
 		<</if>>
 	<</actCLA>>
@@ -771,7 +771,7 @@
 			<p>"And what am I supposed to do with these when my girlfriend comes home?" he asks, looking at them amusedly.</p>
 			<<gs 'booty_call_leave' 'panty_gift_girlfriend'>>
 		<<else>>
-			<p>"Maybe I should frame it," <<=$npcs.get($sex.npcId,'firstname')>> snickers.</p>
+			<p>"Maybe I should frame it," <<npc $sex.npcId>><</npc>> snickers.</p>
 			<<gs 'booty_call_leave' 'dressing2'>>
 		<</if>>
 	<</actCLA>>
@@ -786,7 +786,7 @@
 			<p>"And what am I supposed to do with these when my girlfriend comes home?" he asks, looking at them amusedly.</p>
 			<<gs 'booty_call_leave' 'panty_gift_girlfriend'>>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't reply, but his expression says that he isn't displeased.</p>
+			<p><<npc $sex.npcId>><</npc>> doesn't reply, but his expression says that he isn't displeased.</p>
 			<<gs 'booty_call_leave' 'dressing2'>>
 		<</if>>
 	<</actCLA>>
@@ -802,7 +802,7 @@
 				<p>"And what am I supposed to do with these when my girlfriend comes home?" he asks, looking at them amusedly.</p>
 				<<gs 'booty_call_leave' 'panty_gift_girlfriend'>>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't reply, but his expression says that he isn't displeased.</p>
+				<p><<npc $sex.npcId>><</npc>> doesn't reply, but his expression says that he isn't displeased.</p>
 				<<gs 'booty_call_leave' 'dressing2'>>
 			<</if>>
 		<</actCLA>>
@@ -822,22 +822,22 @@
 		<p>"Tell her they're yours," you shrug with a wry smirk, $booty_call['dress_describe']. "A guy can't wear a cute pair of panties now and then?"</p>
 		<<if $npcs.get($sex.npcId,'insecure') == 1>>
 			<<gs 'booty_call_leave' 'dress_loop_code'>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>>'s face immediately reddens and he looks at you with an angry glare.</p>
+			<p><<npc $sex.npcId>><</npc>>'s face immediately reddens and he looks at you with an angry glare.</p>
 			<p>"What the fuck? I'm not some twink who puts on girlie panties like a fucking faggot!"</p>
 			<<actCLA 'I was kidding (amused)'>>
 				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				"I was just kidding," you snicker, rolling your eyes. "Bad joke, sorry."
-				<p>You move to $booty_call['dress_describe'] but <<=$npcs.get($sex.npcId,'firstname')>> continues to glare at you out of the corner of your eye for a few moments longer before looking away.</p>
+				<p>You move to $booty_call['dress_describe'] but <<npc $sex.npcId>><</npc>> continues to glare at you out of the corner of your eye for a few moments longer before looking away.</p>
 				<<gs 'booty_call_leave' 'dressing2'>>
 			<</actCLA>>
 			<<actCLA 'I was kidding (acerbic)'>>
 				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-				<p>"Christ, I was just kidding," you say, giving <<=$npcs.get($sex.npcId,'firstname')>> a look of exasperation. "Of course I wasn't seriously suggesting that. Take a joke, dumbass."</p>
-				<p>You start $booty_call['dress_describe'] but <<=$npcs.get($sex.npcId,'firstname')>> continues to glare at you out of the corner of your eye for a few moments longer before looking away.</p>
+				<p>"Christ, I was just kidding," you say, giving <<npc $sex.npcId>><</npc>> a look of exasperation. "Of course I wasn't seriously suggesting that. Take a joke, dumbass."</p>
+				<p>You start $booty_call['dress_describe'] but <<npc $sex.npcId>><</npc>> continues to glare at you out of the corner of your eye for a few moments longer before looking away.</p>
 				<<gs 'booty_call_leave' 'dressing2'>>
 			<</actCLA>>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> laughs aloud.</p>
+			<p><<npc $sex.npcId>><</npc>> laughs aloud.</p>
 			"Yeah, I bet that''d get me off the hook."
 			<<gs 'booty_call_leave' 'dressing2'>>
 		<</if>>
@@ -991,10 +991,10 @@
 			<p>"Got any plans for the rest day?" you ask, casually $booty_call['dress_describe'].</p>
 			<<gs 'booty_call_leave' 'dress_talk'>>
 			<<if $npcs.get($sex.npcId,'day_off') == $time.weekday>>
-				<p>"Not really," <<=$npcs.get($sex.npcId,'firstname')>> shrugs. "It's my day off so I'm just chilling."</p>
+				<p>"Not really," <<npc $sex.npcId>><</npc>> shrugs. "It's my day off so I'm just chilling."</p>
 				<<gs 'booty_call_leave' 'pc_booty_call_invite'>>
 			<<else>>
-				<p>"I have to go to work," <<=$npcs.get($sex.npcId,'firstname')>> replies.</p>
+				<p>"I have to go to work," <<npc $sex.npcId>><</npc>> replies.</p>
 				<<gs 'booty_call_leave' 'when_do_you_get_off'>>
 			<</if>>
 		<</actCLA>>
@@ -1016,11 +1016,11 @@
 			<<setinit $booty_call['good_time'] = 1>>
 			<<gs 'booty_call_leave' 'dress_loop'>>
 			<<if getvar("$booty_call['spend_night_thanks']") == 1>>
-				<p>"Last night was really great," you smile at <<=$npcs.get($sex.npcId,'firstname')>>. "I had a lot of fun."</p>
+				<p>"Last night was really great," you smile at <<npc $sex.npcId>><</npc>>. "I had a lot of fun."</p>
 			<<elseif getvar("$booty_call['sleepover']") == 1>>
-				<p>"I had a great time last night," you smile at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+				<p>"I had a great time last night," you smile at <<npc $sex.npcId>><</npc>>.</p>
 			<<else>>
-				<p>"This was really fun," you smile at <<=$npcs.get($sex.npcId,'firstname')>>. "I had a great time."</p>
+				<p>"This was really fun," you smile at <<npc $sex.npcId>><</npc>>. "I had a great time."</p>
 			<</if>>
 			<<if getvar("$booty_call['blue_ball']") == 0>>
 				<p>"Me too," he smirks back, watching you $booty_call['dress_describe'].</p>
@@ -1043,9 +1043,9 @@
 			<<setinit $booty_call['spend_night_thanks'] = 1>>
 			<<gs 'booty_call_leave' 'dress_loop'>>
 			<<if getvar("$booty_call['good_time']") == 1>>
-				<p>"Thanks for letting me stay over too," you tell <<=$npcs.get($sex.npcId,'firstname')>>. "I really appreciate it."</p>
+				<p>"Thanks for letting me stay over too," you tell <<npc $sex.npcId>><</npc>>. "I really appreciate it."</p>
 			<<else>>
-				<p>"Thanks for letting me spend the night," you tell <<=$npcs.get($sex.npcId,'firstname')>>. "I really appreciate it."</p>
+				<p>"Thanks for letting me spend the night," you tell <<npc $sex.npcId>><</npc>>. "I really appreciate it."</p>
 			<</if>>
 			<<if $npcs.get($sex.npcId,'girlfriend') == 1 and $npcs.get($sex.npcId,'fidelity') == 6>>
 				<<setinit $pc_know_npc_has_girlfriend[$sex.npcId] = 1>>
@@ -1088,15 +1088,15 @@
 <<if $location_var[$here][0] == 'npc_date_later_response'>>
 	<<if $npcs.get($sex.npcId,'know_cheat') == 1>>
 		<<if $npcs.get($sex.npcId,'fidelity') < 7>>
-			<p>"You're still with that stick in the mud?" <<=$npcs.get($sex.npcId,'firstname')>> scoffs.</p>
+			<p>"You're still with that stick in the mud?" <<npc $sex.npcId>><</npc>> scoffs.</p>
 		<<else>>
 		<</if>>
 	<<else>>
 		<<run $npcs.set($sex.npcId,'know_cheat',1)>>
 		<<if $npcs.get($sex.npcId,'fidelity') < 7>>
-			<p>"And you're fucking me right before your date?" <<=$npcs.get($sex.npcId,'firstname')>> snickers. "Hot."</p>
+			<p>"And you're fucking me right before your date?" <<npc $sex.npcId>><</npc>> snickers. "Hot."</p>
 		<<else>>
-			<p>"Oh." <<=$npcs.get($sex.npcId,'firstname')>> looks away uncomfortably.</p>
+			<p>"Oh." <<npc $sex.npcId>><</npc>> looks away uncomfortably.</p>
 		<</if>>
 	<</if>>
 <</if>>
@@ -1115,7 +1115,7 @@
 					<p>"Maybe. What time were you thinking?"</p>
 					<<gs 'booty_call_leave' 'pc_booty_call_timeset'>>
 				<<else>>
-					<p>"Twice in one day might be a little bit too much for me," <<=$npcs.get($sex.npcId,'firstname')>> smiles back ruefully.</p>
+					<p>"Twice in one day might be a little bit too much for me," <<npc $sex.npcId>><</npc>> smiles back ruefully.</p>
 					<<gs 'booty_call_leave' 'pc_booty_call_invite_denied'>>
 				<</if>>
 			<<else>>
@@ -1123,7 +1123,7 @@
 					<p>"What time were you thinking?"</p>
 					<<gs 'booty_call_leave' 'pc_booty_call_timeset'>>
 				<<else>>
-					<p>"Think I might be a little too tapped out from work," <<=$npcs.get($sex.npcId,'firstname')>> grunts.</p>
+					<p>"Think I might be a little too tapped out from work," <<npc $sex.npcId>><</npc>> grunts.</p>
 					<<gs 'booty_call_leave' 'pc_booty_call_invite_denied'>>
 				<</if>>
 			<</if>>
@@ -1174,7 +1174,7 @@
 		<<else>>
 			<p>"How about npc_booty_call_time[$sex.npcId]?" you ask $booty_call['dress_describe'].</p>
 			<<if $npcs.get($sex.npcId,'booty_call_time') > $npcs.get($sex.npcId,'end_free_time')>>
-				<p>"Sorry, that doesn't work for me," <<=$npcs.get($sex.npcId,'firstname')>> grunts.</p>
+				<p>"Sorry, that doesn't work for me," <<npc $sex.npcId>><</npc>> grunts.</p>
 				<<gs 'booty_call_leave' 'pc_booty_call_invite_denied'>>
 			<<else>>
 				<<gs 'booty_call_leave' 'pc_booty_call_invite_accepted'>>
@@ -1183,7 +1183,7 @@
 	<<else>>
 		<p>"How about npc_booty_call_time[$sex.npcId]?" you ask $booty_call['dress_describe'].</p>
 		<<if $npcs.get($sex.npcId,'booty_call_time') > $npcs.get($sex.npcId,'end_free_time')>>
-			<p>"Sorry, that doesn't work for me," <<=$npcs.get($sex.npcId,'firstname')>> grunts.</p>
+			<p>"Sorry, that doesn't work for me," <<npc $sex.npcId>><</npc>> grunts.</p>
 			<<gs 'booty_call_leave' 'pc_booty_call_invite_denied'>>
 		<<else>>
 			<<gs 'booty_call_leave' 'pc_booty_call_invite_accepted'>>
@@ -1191,7 +1191,7 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'pc_booty_call_invite_accepted'>>
-	<p>"That sounds good," <<=$npcs.get($sex.npcId,'firstname')>> grins back. "Okay, see you then."</p>
+	<p>"That sounds good," <<npc $sex.npcId>><</npc>> grins back. "Okay, see you then."</p>
 	<<gs 'booty_call' 'set_booty_call_date'>>
 	<<gs 'booty_call_leave' 'dress_talk'>>
 <</if>>
@@ -1209,32 +1209,32 @@
 			<<setinit $booty_call['invite_tomorrow'] = 1>>
 			<<if $npcs.get($sex.npcId,'girlfriend') == 1 and $npcs.get($sex.npcId,'fidelity') == 6>>
 				<<setinit $pc_know_npc_has_girlfriend[$sex.npcId] = 1>>
-				<p>"You busy tomorrow?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $booty_call['dress_describe']. "It'll be my day off and my girlfriend won't be around. Want to come over and do this again?"</p>
+				<p>"You busy tomorrow?" <<npc $sex.npcId>><</npc>> asks as you're $booty_call['dress_describe']. "It'll be my day off and my girlfriend won't be around. Want to come over and do this again?"</p>
 			<<else>>
-				<p>"You busy tomorrow?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $booty_call['dress_describe']. "It'll be my day off. Want to come by and do this again?"</p>
+				<p>"You busy tomorrow?" <<npc $sex.npcId>><</npc>> asks as you're $booty_call['dress_describe']. "It'll be my day off. Want to come by and do this again?"</p>
 			<</if>>
 		<<elseif $npcs.get($sex.npcId,'day_off') == $time.weekday and (getvar("$booty_call['sleepover']") == 1 or $time.hour < 5)>>
 			<<setinit $booty_call['invite_today'] = 1>>
 			<<if $npcs.get($sex.npcId,'girlfriend') == 1 and $npcs.get($sex.npcId,'fidelity') == 6>>
 				<<setinit $pc_know_npc_has_girlfriend[$sex.npcId] = 1>>
-				<p>"You busy later?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $booty_call['dress_describe']. "Today's my day off and my girlfriend won't be around. Want to come over and do this again?"</p>
+				<p>"You busy later?" <<npc $sex.npcId>><</npc>> asks as you're $booty_call['dress_describe']. "Today's my day off and my girlfriend won't be around. Want to come over and do this again?"</p>
 			<<else>>
-				<p>"You busy later?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $booty_call['dress_describe']. "It's my day off. Want to come by and do this again?"</p>
+				<p>"You busy later?" <<npc $sex.npcId>><</npc>> asks as you're $booty_call['dress_describe']. "It's my day off. Want to come by and do this again?"</p>
 			<</if>>
 		<<else>>
 			<<setinit $booty_call['invite_tomorrow'] = 1>>
 			<<if $npcs.get($sex.npcId,'girlfriend') == 1 and $npcs.get($sex.npcId,'fidelity') == 6>>
 				<<setinit $pc_know_npc_has_girlfriend[$sex.npcId] = 1>>
-				<p>"You busy tomorrow?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $booty_call['dress_describe']. "My girlfriend won't be around. Want to come over and do this again?"</p>
+				<p>"You busy tomorrow?" <<npc $sex.npcId>><</npc>> asks as you're $booty_call['dress_describe']. "My girlfriend won't be around. Want to come over and do this again?"</p>
 			<<else>>
-				<p>"You busy tomorrow?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $booty_call['dress_describe']. "Want to come by and do this again?"</p>
+				<p>"You busy tomorrow?" <<npc $sex.npcId>><</npc>> asks as you're $booty_call['dress_describe']. "Want to come by and do this again?"</p>
 			<</if>>
 		<</if>>
 		<<gs 'booty_call_leave' 'busy_tomorrow'>>
 		<<actCLA 'What time?'>>
 			<<gs 'booty_call_leave' 'dress_loop'>>
 			<p>"That depends," you say, $booty_call['dress_describe']. "What time were you thinking?"</p>
-			<p>"npc_start_free_time[$sex.npcId]?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+			<p>"npc_start_free_time[$sex.npcId]?" <<npc $sex.npcId>><</npc>> asks.</p>
 			<<gs 'booty_call_leave' 'busy_time'>>
 			<<gs 'booty_call_leave' 'booty_call_plan'>>
 		<</actCLA>>
@@ -1249,7 +1249,7 @@
 		<<else>>
 			<p>"I can't, sorry," you say, $booty_call['dress_describe']. "I'm busy."</p>
 		<</if>>
-		<p>"Damn," <<=$npcs.get($sex.npcId,'firstname')>> says disappointedly.</p>
+		<p>"Damn," <<npc $sex.npcId>><</npc>> says disappointedly.</p>
 		<<gs 'booty_call_leave' 'dress_talk'>>
 	<</actCLA>>
 <</if>>
@@ -1258,7 +1258,7 @@
 		<<gs 'booty_call' 'block_booty_calls'>>
 		<<gs 'booty_call_leave' 'dress_loop'>>
 		<p>"I can't, sorry," you say, $booty_call['dress_describe']. "I have something to do then."</p>
-		<p>"Damn," <<=$npcs.get($sex.npcId,'firstname')>> says disappointedly.</p>
+		<p>"Damn," <<npc $sex.npcId>><</npc>> says disappointedly.</p>
 		<<gs 'booty_call_leave' 'dress_talk'>>
 	<</actCLA>>
 <</if>>
@@ -1267,14 +1267,14 @@
 		<<gs 'booty_call' 'set_booty_call_date'>>
 		<<gs 'booty_call_leave' 'dress_loop'>>
 		<p>"Sounds good," you grin, $booty_call['dress_describe']. "I'll see you then."</p>
-		<p>"Great," <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
+		<p>"Great," <<npc $sex.npcId>><</npc>> grins back.</p>
 		<<gs 'booty_call_leave' 'dress_talk'>>
 	<</actCLA>>
 	<<actCLA 'I`ve got nothing better to do'>>
 		<<gs 'booty_call' 'set_booty_call_date'>>
 		<<gs 'booty_call_leave' 'dress_loop'>>
 		<p>"Sure," you smirk, $booty_call['dress_describe']. "I got nothing better to do."</p>
-		<p>"Great," <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
+		<p>"Great," <<npc $sex.npcId>><</npc>> grins back.</p>
 		<<gs 'booty_call_leave' 'dress_talk'>>
 	<</actCLA>>
 	<<actCLA 'I could fit it in'>>
@@ -1282,9 +1282,9 @@
 		<<gs 'booty_call_leave' 'dress_loop'>>
 		<p>"I think I can fit that in," you smirk, $booty_call['dress_describe'].</p>
 		<<if $npcs.get($sex.npcId,'humor') == 2>>
-			<p>"You sure can," <<=$npcs.get($sex.npcId,'firstname')>> grins lewdly at you.</p>
+			<p>"You sure can," <<npc $sex.npcId>><</npc>> grins lewdly at you.</p>
 		<<else>>
-			<p>"Great," <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
+			<p>"Great," <<npc $sex.npcId>><</npc>> grins back.</p>
 		<</if>>
 		<<gs 'booty_call_leave' 'dress_talk'>>
 	<</actCLA>>

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 223 - 223
sugarcube/src/activities/bootycall/booty_call_miss.tw


+ 111 - 111
sugarcube/src/activities/bootycall/booty_call_morning.tw

@@ -19,7 +19,7 @@
 		'A sharp lance of pain pierces your consciousness, bringing you out of sleep. You wake up blearily, head <i>pounding</i> with an awful hangover.'
 		act'<i>Ugh, my head</i>':gt'booty_call_morning', 'hangover'
 		else} -->
-		<p>Your mind stirs and you slowly come to consciousness, tucked under the covers of <<=$npcs.get($sex.npcId,'firstname')>>'s bed.</p>
+		<p>Your mind stirs and you slowly come to consciousness, tucked under the covers of <<npc $sex.npcId>><</npc>>'s bed.</p>
 		<<actCLA '<i>Yawn</i>'>>
 			<<gt 'booty_call_morning' 'yawn_wake'>>
 		<</actCLA>>
@@ -41,7 +41,7 @@
 		<<if getvar("$booty_call['sleep_fuck']") == 2>>
 			<<actCLA 'Nice night'>>
 				<<image "shared/sex/after/pillow_talk4.jpg">>
-				<p>"That was nice," you smile sleepily at <<=$npcs.get($sex.npcId,'firstname')>>. "Our little mid-night romp I mean. Slept like a baby after. How about you?"</p>
+				<p>"That was nice," you smile sleepily at <<npc $sex.npcId>><</npc>>. "Our little mid-night romp I mean. Slept like a baby after. How about you?"</p>
 				<<if $npcs.get($sex.npcId,'humor') == 3>>
 					"I would say that fucking you always puts me to sleep, but that feels like sending the wrong message," he smiles back.
 				<<else>>
@@ -84,7 +84,7 @@
 	<<elseif $cum_loc['stomach'] > $booty_call['sleep_cum_stomach']>>
 		<i>Is that cum on me?</i>
 		<!-- !!	else-->
-		<!-- !!		'<i>Was <<<<=$npcs.get($sex.npcId,'firstname')>>>> wearing a condom when you went to sleep last night?</i>'-->
+		<!-- !!		'<i>Was <<<<npc $sex.npcId>><</npc>>>> wearing a condom when you went to sleep last night?</i>'-->
 	<</if>>
 	<<actCLA 'Continue'>>
 		<<if $cum_loc['vagina'] > $booty_call['sleep_cum_vagina']>>
@@ -100,7 +100,7 @@
 			<<image "pc/body/cum/cumbelly/cumbelly10.jpg">>
 			You sit up, looking down to discover, yes, there is indeed fresh cum on your belly.
 			<!-- !!		else-->
-			<!-- !!			'<i>Was <<<<=$npcs.get($sex.npcId,'firstname')>>>> wearing a condom when you went to sleep last night?</i>'-->
+			<!-- !!			'<i>Was <<<<npc $sex.npcId>><</npc>>>> wearing a condom when you went to sleep last night?</i>'-->
 		<</if>>
 		<<actCLA 'Did you fuck me in my sleep?'>>
 			<p>"... did you fuck me while I was sleeping last night?" you ask.</p>
@@ -116,7 +116,7 @@
 				"Yeah. Got horny while you were asleep."
 				<<actCLA 'Don`t make a habit out of it'>>
 					"It was fine this time," you say rolling your eyes. "But don't make a habit out of it."
-					<p>"No promises," <<=$npcs.get($sex.npcId,'firstname')>> smirks mischievously.</p>
+					<p>"No promises," <<npc $sex.npcId>><</npc>> smirks mischievously.</p>
 					<<gs 'booty_call_morning' 'wakeup1'>>
 				<</actCLA>>
 				<<actCLA 'Wake me up next time'>>
@@ -156,7 +156,7 @@
 			<</if>>
 		<</actCLA>>
 		<<actCLA 'Someone had fun last night'>>
-			<p>"Somebody had fun last night," you muse, looking over at <<=$npcs.get($sex.npcId,'firstname')>> who is also waking.</p>
+			<p>"Somebody had fun last night," you muse, looking over at <<npc $sex.npcId>><</npc>> who is also waking.</p>
 			<<if $npcs.get($sex.npcId,'sleep_sex_okay') == 0>>
 				<p>"Yeah. Got horny while you were asleep. Is that okay?"</p>
 				<<actCLA 'Ask next time'>>
@@ -220,10 +220,10 @@
 		<<else>>
 			<p>You need to get home and change into your uniform! You're not sure if you have time for a shower, but you definitely <i>need</i> to get your uniform!</p>
 		<</if>>
-		<p>"Hey, what's wrong?" <<=$npcs.get($sex.npcId,'firstname')>> says, turning over and squinting at you with sleepy eyes.</p>
+		<p>"Hey, what's wrong?" <<npc $sex.npcId>><</npc>> says, turning over and squinting at you with sleepy eyes.</p>
 		<<actCLA 'I need to be somewhere!'>>
 			<p>"I'm gonna be late for something!" you say hurriedly. "Gotta go!"</p>
-			<p>With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<=$npcs.get($sex.npcId,'firstname')>> and your night together behind you.</p>
+			<p>With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<npc $sex.npcId>><</npc>> and your night together behind you.</p>
 			<<actCLA 'Leave'>>
 				<<gs 'booty_call_leave' 'exit'>>
 			<</actCLA>>
@@ -291,7 +291,7 @@
 	<<if $npcs.get($sex.npcId,'earlyriser') == 1>>
 		<<if getvar("$booty_call['boy_make_breakfast']") == 1>>
 			<<if $npcs.get($sex.npcId,'apt_type') == 2>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> is already up, doing something in his kitchen area and the smell of coffee and fresh food wafts over to you in bed.</p>
+				<p><<npc $sex.npcId>><</npc>> is already up, doing something in his kitchen area and the smell of coffee and fresh food wafts over to you in bed.</p>
 			<<else>>
 				The bed next to you is empty but the smell of coffee and cooked grains and proteins waft through the apartment.
 			<</if>>
@@ -301,17 +301,17 @@
 			<<if $npcs.get($sex.npcId,'apt_type') == 2>>
 				The bed next to you is empty but the bathroom door is closed. You can hear water running behind it.
 			<<elseif $npcs.get($sex.npcId,'apt_type') == 3>>
-				<p>The bed next to you is empty but you can hear water running through the wall. <<=$npcs.get($sex.npcId,'firstname')>> must be in the shower.</p>
+				<p>The bed next to you is empty but you can hear water running through the wall. <<npc $sex.npcId>><</npc>> must be in the shower.</p>
 			<<else>>
-				<p>The bed is empty except for yourself and <<=$npcs.get($sex.npcId,'firstname')>> is nowhere to be found.</p>
+				<p>The bed is empty except for yourself and <<npc $sex.npcId>><</npc>> is nowhere to be found.</p>
 			<</if>>
 			Checking your phone, the time reads:
 		<</if>>
 	<<elseif $npcs.get($sex.npcId,'latesleeper') == 1>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> is still completely passed out beside you, your movement not interrupting his snoring in the slightest.</p>
+		<p><<npc $sex.npcId>><</npc>> is still completely passed out beside you, your movement not interrupting his snoring in the slightest.</p>
 		<<setinit $booty_call['boy_asleep'] = 1>>
 	<<else>>
-		<p>Your movement causes <<=$npcs.get($sex.npcId,'firstname')>> to stir as well, blinking his eyes open. Reaching down, you grab your phone and switch on the display.</p>
+		<p>Your movement causes <<npc $sex.npcId>><</npc>> to stir as well, blinking his eyes open. Reaching down, you grab your phone and switch on the display.</p>
 	<</if>>
 	<<gs 'shortgs' 'calendar_display'>>
 	<<if getvar("$booty_call['boy_make_breakfast']") == 1>>
@@ -332,7 +332,7 @@
 	<<setinit $booty_call['boy_asleep'] = 0>>
 	<<run $npcs.inc($sex.npcId,'rel',1)>>
 	<<image "shared/sex/kiss/bed1.jpg">>
-	<p>You roll over onto <<=$npcs.get($sex.npcId,'firstname')>>, letting your breasts rest on his chest as you straddle him.</p>
+	<p>You roll over onto <<npc $sex.npcId>><</npc>>, letting your breasts rest on his chest as you straddle him.</p>
 	<p>"Good <i>-mmmph-</i> morning," you murmur, planting a kiss on his lips.</p>
 	<<if getvar("$cum_loc['face']") > 0>>
 		<p>"Ugch~! What the fuck is that?" he sputters, shaking his head in disgust.</p>
@@ -364,7 +364,7 @@
 		<<actCLA 'Give $npcs.get('+$sex.npcId,'firstname')+' a blowjob'>>
 			<<arouse 'bj' 1 `['no_orgasm_msg']`>>
 			<<video "shared/sex/blowjob/bj47.mp4">>
-			<p>You break the kiss from <<=$npcs.get($sex.npcId,'firstname')>>'s lips and start trailing them down his neck and then his chest and then his stomach and soon you have your lips wrapped around his already stiff member.</p>
+			<p>You break the kiss from <<npc $sex.npcId>><</npc>>'s lips and start trailing them down his neck and then his chest and then his stomach and soon you have your lips wrapped around his already stiff member.</p>
 			<<gs 'booty_call_morning' 'bj_wake'>>
 		<</actCLA>>
 	<</if>>
@@ -377,7 +377,7 @@
 		"Nngh," he grunts as you start sucking his cock. "I'm gonna be late for work..."
 		<<actCLA 'Too bad (stop)'>>
 			<<video "shared/sex/blowjob/bj48.mp4">>
-			<p>You give <<=$npcs.get($sex.npcId,'firstname')>> one more good suck before you withdraw your lips.</p>
+			<p>You give <<npc $sex.npcId>><</npc>> one more good suck before you withdraw your lips.</p>
 			"Too bad," you smirk, teasing his cock with your hand while you savour his taste. "Guess it'll have to wait until later."
 			<<gs 'booty_call_morning' 'wakeup1'>>
 		<</actCLA>>
@@ -385,7 +385,7 @@
 			<<setinit $booty_call['morning_fuck'] = 1>>
 			<<setinit $booty_call['extra_cum'] += $npcs.get($sex.npcId,'sexdrive')>>
 			<<video "shared/sex/blowjob/bj48.mp4">>
-			<p>You give <<=$npcs.get($sex.npcId,'firstname')>> one more good suck before you withdraw your lips to speak.</p>
+			<p>You give <<npc $sex.npcId>><</npc>> one more good suck before you withdraw your lips to speak.</p>
 			"Don't worry," you say, working his cock with your hand as a smirk spreads across your lips. "I'll be fast."
 			And you wrap your lips back around his shaft.
 			<<actCLA 'Continue'>>
@@ -430,7 +430,7 @@
 			<<actCLA 'Guess'>>
 				<<video "shared/sex/blowjob/play1.mp4">>
 				<p>"Nngh... Hey... what are you doing...?" he groans sleepily.</p>
-				<p>You pull your lips away with a pop and stare <<=$npcs.get($sex.npcId,'firstname')>> straight in the eye.</p>
+				<p>You pull your lips away with a pop and stare <<npc $sex.npcId>><</npc>> straight in the eye.</p>
 				"Guess."
 				Without waiting for a response you start running your tongue up and down his shaft and peppering it with kisses before swallowing it whole again.
 				<<actCLA 'Continue'>>
@@ -444,7 +444,7 @@
 	<<setinit $booty_call['morning_after'] = 1>>
 	<!-- !!	if npc_earlyriser[$sex.npcId] = 1 and npc_caretaker[$sex.npcId] = 1:-->
 	<<if getvar("$booty_call['boy_make_breakfast']") == 1 and getvar("$booty_call['breakfast_finished']") == 0>>
-		<p>"Want some breakfast?" <<=$npcs.get($sex.npcId,'firstname')>> asks. "It'll just take me a few minutes."</p>
+		<p>"Want some breakfast?" <<npc $sex.npcId>><</npc>> asks. "It'll just take me a few minutes."</p>
 		<<actCLA 'No thanks'>>
 			<<setinit $booty_call['breakfast_finished'] = -1>>
 			<<actCLA 'No time'>>
@@ -486,7 +486,7 @@
 				<<video "shared/sex/blowjob/bj47.mp4">>
 				"Yeah," you say crawling over to him. "I could really use some <i>meat</i> right now."
 				You slink down between his legs, wrapping your lips around his cock and slurp hard.
-				<p>"Nngh, fuck..." <<=$npcs.get($sex.npcId,'firstname')>> grunts, getting harder by the second. "Not what I had in mind but..." You cut him off as you plunge your lips back down his shaft.</p>
+				<p>"Nngh, fuck..." <<npc $sex.npcId>><</npc>> grunts, getting harder by the second. "Not what I had in mind but..." You cut him off as you plunge your lips back down his shaft.</p>
 				<<actCLA 'Continue'>>
 					<<gt 'booty_call_start' 'bj_dom2'>>
 				<</actCLA>>
@@ -523,7 +523,7 @@
 				<<if getvar("$booty_call['boy_asleep']") != 1 and getvar("$booty_call['npc_morning_shower']") != 1 and rand(1,3) == 1 and getvar("$booty_call['bathroom_check']") == 0>>
 					<<setinit $booty_call['bathroom_check'] = 1>>
 					<<=$npcs.get($sex.npcId,'bedroom')>>
-					<p>You get up to pad your way towards <<=$npcs.get($sex.npcId,'firstname')>>'s bathroom and he calls from behind you.</p>
+					<p>You get up to pad your way towards <<npc $sex.npcId>><</npc>>'s bathroom and he calls from behind you.</p>
 					<p>"Hey, where you going?"</p>
 					<<actCLA 'Brush my hair'>>
 						"I need to brush my hair," you say. "It's a mess from... you know."
@@ -599,7 +599,7 @@
 		<<if getvar("$booty_call['boy_asleep']") == 1 and getvar("$booty_call['breakfast_eat']") == 0>>
 			<<actCLA 'Wake $npcs.get('+$sex.npcId,'firstname')+' with a blowjob'>>
 				<<video "shared/sex/blowjob/bj47.mp4">>
-				<p>You slither under the covers and wrap your lips around <<=$npcs.get($sex.npcId,'firstname')>>'s already hard cock.</p>
+				<p>You slither under the covers and wrap your lips around <<npc $sex.npcId>><</npc>>'s already hard cock.</p>
 				<<gs 'booty_call_morning' 'bj_wake'>>
 			<</actCLA>>
 		<</if>>
@@ -608,7 +608,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'wakeup2'>>
 	<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-	<p>You are in <<=$npcs.get($sex.npcId,'firstname')>>'s room.</p>
+	<p>You are in <<npc $sex.npcId>><</npc>>'s room.</p>
 	<<gs 'booty_call_morning' 'wakeup1'>>
 <</if>>
 <<if $location_var[$here][0] == 'shower'>>
@@ -640,13 +640,13 @@
 <</if>>
 <<if $location_var[$here][0] == '2nd_shower'>>
 	<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-	<p>"I need another shower because of you," you say, giving <<=$npcs.get($sex.npcId,'firstname')>> a look as you swagger your way to his bathroom.</p>
+	<p>"I need another shower because of you," you say, giving <<npc $sex.npcId>><</npc>> a look as you swagger your way to his bathroom.</p>
 	<<actCLA 'Shower'>>
 		<<video "shared/home/bathroom/dush.mp4">>
 		<<set $time.minutes += 5>>
 		<<run $inventory.inc('shampoo',1)>>
 		<<gs 'cleanBody'>>
-		<p>You get into <<=$npcs.get($sex.npcId,'firstname')>>'s shower for the <i>second</i> time this morning, washing the sex sweat from your body.</p>
+		<p>You get into <<npc $sex.npcId>><</npc>>'s shower for the <i>second</i> time this morning, washing the sex sweat from your body.</p>
 		You take a shorter one this time, mostly just rinsing off, before shutting the water off and getting out.
 		<<actCLA 'Wrap yourself in a towel'>>
 			<<gt 'booty_call_morning' 'shower_leave'>>
@@ -679,7 +679,7 @@
 		<<gt 'booty_call_leave' 'dressing1'>>
 	<<else>>
 		<<if $npcs.get($sex.npcId,'latesleeper') == 1 and getvar("$booty_call['boy_wakeup']") == 0>>
-			<p>Not wanting to wake <<=$npcs.get($sex.npcId,'firstname')>>, you sneak over to the door and let yourself out, closing it as gently as you can behind you.</p>
+			<p>Not wanting to wake <<npc $sex.npcId>><</npc>>, you sneak over to the door and let yourself out, closing it as gently as you can behind you.</p>
 			<<actCLA 'Leave'>>
 				<<gt 'booty_call_leave' 'exit'>>
 			<</actCLA>>
@@ -696,7 +696,7 @@ if booty_call['hangover'] = 1:
 act'I need coffee':
 cla & *nl
 '"I desperately need coffee," you wince, rubbing your brow as if will somehow make your blindingly painful headache go away.'
-'"Me too." <<<<=$npcs.get($sex.npcId,'firstname')>>>> says, seemingly in the same state.'
+'"Me too." <<<<npc $sex.npcId>><</npc>>>> says, seemingly in the same state.'
 end
 act'Can I use your shower?':
 end
@@ -729,14 +729,14 @@ end} -->
 		<<video "pc/activities/misc/dress_1.mp4">>
 	<</if>>
 	<<if $npcs.get($sex.npcId,'latesleeper') == 1 and getvar("$booty_call['boy_wakeup']") == 0>>
-		<p>You reach down for your discarded clothes and tug them on quietly, not wanting to wake <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+		<p>You reach down for your discarded clothes and tug them on quietly, not wanting to wake <<npc $sex.npcId>><</npc>>.</p>
 		Once everything is in place, you sneak over to the door and let yourself out, closing it as gently as you can behind you.
 		<<actCLA 'Leave'>>
 			<<gt 'booty_call_leave' 'exit'>>
 		<</actCLA>>
 	<<else>>
 		You reach down for where you left your clothes and start to pick them up.
-		<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+		<p>"You heading out?" <<npc $sex.npcId>><</npc>> asks.</p>
 		<<gs 'booty_call_after' 'dress_loop'>>
 		<!-- !!	act'Talk while you dress':-->
 		<!-- !!		gs'booty_call_morning', 'dress_talk'-->
@@ -748,24 +748,24 @@ end} -->
 		<<setinit $booty_call['invite_today'] = 1>>
 		<<if $npcs.get($sex.npcId,'girlfriend') == 1>>
 			<<setinit $pc_know_npc_has_girlfriend[$sex.npcId] = 1>>
-			<p>"You busy later?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $booty_call['dress_describe']. "It's my day off and my girlfriend won't be around. Want to come over and do this again?"</p>
+			<p>"You busy later?" <<npc $sex.npcId>><</npc>> asks as you're $booty_call['dress_describe']. "It's my day off and my girlfriend won't be around. Want to come over and do this again?"</p>
 		<<else>>
-			<p>"You busy later?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $booty_call['dress_describe']. "It's my day off. Want to come by and do this again?"</p>
+			<p>"You busy later?" <<npc $sex.npcId>><</npc>> asks as you're $booty_call['dress_describe']. "It's my day off. Want to come by and do this again?"</p>
 		<</if>>
 	<<elseif $npcs.get($sex.npcId,'day_off') == $time.weekday + 1 or ($time.weekday == 7 and $npcs.get($sex.npcId,'day_off') == 1)>>
 		<<setinit $booty_call['invite_tomorrow'] = 1>>
 		<<if $npcs.get($sex.npcId,'girlfriend') == 1>>
 			<<setinit $pc_know_npc_has_girlfriend[$sex.npcId] = 1>>
-			<p>"You busy tomorrow?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $booty_call['dress_describe']. "My girlfriend won't be around. Want to come over and do this again?"</p>
+			<p>"You busy tomorrow?" <<npc $sex.npcId>><</npc>> asks as you're $booty_call['dress_describe']. "My girlfriend won't be around. Want to come over and do this again?"</p>
 		<<else>>
-			<p>"You busy tomorrow?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $booty_call['dress_describe']. "It'll be my day off. Want to come by and do this again?"</p>
+			<p>"You busy tomorrow?" <<npc $sex.npcId>><</npc>> asks as you're $booty_call['dress_describe']. "It'll be my day off. Want to come by and do this again?"</p>
 		<</if>>
 	<</if>>
 	<<gs 'booty_call_after' 'dress_loop'>>
 	<<gs 'booty_call_morning' 'busy_today'>>
 	<<actCLA 'What time?'>>
 		<p>"That depends," you say, $booty_call['dress_describe']. "What time were you thinking?"</p>
-		<p>"npc_start_free_time[$sex.npcId]?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+		<p>"npc_start_free_time[$sex.npcId]?" <<npc $sex.npcId>><</npc>> asks.</p>
 		<<gs 'booty_call_after' 'dress_loop'>>
 		<<gs 'booty_call_morning' 'busy_time'>>
 		<<gs 'booty_call_morning' 'booty_call_plan'>>
@@ -775,7 +775,7 @@ end} -->
 	<<actCLA 'I`m busy'>>
 		<<gs 'booty_call' 'block_booty_calls'>>
 		<p>"I can't, sorry," you say, $booty_call['dress_describe']. "I'm busy."</p>
-		<p>"Damn," <<=$npcs.get($sex.npcId,'firstname')>> says disappointedly.</p>
+		<p>"Damn," <<npc $sex.npcId>><</npc>> says disappointedly.</p>
 		<<gs 'booty_call_after' 'dress_loop'>>
 		<<gs 'booty_call_morning' 'end_morning'>>
 	<</actCLA>>
@@ -784,7 +784,7 @@ end} -->
 	<<actCLA 'I`m busy'>>
 		<<gs 'booty_call' 'block_booty_calls'>>
 		<p>"I can't, sorry," you say, $booty_call['dress_describe']. "I have something to do then."</p>
-		<p>"Damn," <<=$npcs.get($sex.npcId,'firstname')>> says disappointedly.</p>
+		<p>"Damn," <<npc $sex.npcId>><</npc>> says disappointedly.</p>
 		<<gs 'booty_call_after' 'dress_loop'>>
 		<<gs 'booty_call_morning' 'end_morning'>>
 	<</actCLA>>
@@ -793,14 +793,14 @@ end} -->
 	<<actCLA 'Sounds good'>>
 		<<gs 'booty_call' 'set_booty_call_date'>>
 		<p>"Sounds good," you grin, $booty_call['dress_describe']. "I'll see you then."</p>
-		<p>"Great," <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
+		<p>"Great," <<npc $sex.npcId>><</npc>> grins back.</p>
 		<<gs 'booty_call_after' 'dress_loop'>>
 		<<gs 'booty_call_morning' 'end_morning'>>
 	<</actCLA>>
 	<<actCLA 'I`ve got nothing better to do'>>
 		<<gs 'booty_call' 'set_booty_call_date'>>
 		<p>"Sure," you smirk, $booty_call['dress_describe']. "I got nothing better to do."</p>
-		<p>"Great," <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
+		<p>"Great," <<npc $sex.npcId>><</npc>> grins back.</p>
 		<<gs 'booty_call_after' 'dress_loop'>>
 		<<gs 'booty_call_morning' 'end_morning'>>
 	<</actCLA>>
@@ -808,9 +808,9 @@ end} -->
 		<<gs 'booty_call' 'set_booty_call_date'>>
 		<p>"I think I can fit that in," you smirk, $booty_call['dress_describe'].</p>
 		<<if $npcs.get($sex.npcId,'humor') == 2>>
-			<p>"You sure can," <<=$npcs.get($sex.npcId,'firstname')>> grins lewdly at you.</p>
+			<p>"You sure can," <<npc $sex.npcId>><</npc>> grins lewdly at you.</p>
 		<<else>>
-			<p>"Great," <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
+			<p>"Great," <<npc $sex.npcId>><</npc>> grins back.</p>
 		<</if>>
 		<<gs 'booty_call_after' 'dress_loop'>>
 		<<gs 'booty_call_morning' 'end_morning'>>
@@ -831,18 +831,18 @@ end} -->
 <!-- !! ------------------------------------ Morning Sex Stuff --------------------------------------------------------->
 <<if $location_var[$here][0] == 'cumshot_wakeup1'>>
 	<<video "shared/sex/sleep/cumshot_wake1.mp4">>
-	<p>You gasp as you are suddenly awakened by the shock of liquid splashing across your skin. Your eyes flutter open just in time to see another spurt of cum exit <<=$npcs.get($sex.npcId,'firstname')>>'s cock and hit you square in the face.</p>
+	<p>You gasp as you are suddenly awakened by the shock of liquid splashing across your skin. Your eyes flutter open just in time to see another spurt of cum exit <<npc $sex.npcId>><</npc>>'s cock and hit you square in the face.</p>
 	<<actCLA 'What the fuck!'>>
 		<<video "shared/sex/sleep/cumshot_wake2.mp4">>
 		<p>"What the fuck are you doing?!" you exclaim, sputtering as strands of semen dribble last your lips.</p>
-		<p>"You were so hot lying there," <<=$npcs.get($sex.npcId,'firstname')>> snickers, a lewd grin smeared across his face. "I got hard just looking at you."</p>
+		<p>"You were so hot lying there," <<npc $sex.npcId>><</npc>> snickers, a lewd grin smeared across his face. "I got hard just looking at you."</p>
 		<p>"So you thought it would be a good idea to cum on my face?!"</p>
 		"Come on, don't be like that. Here, clean me off. Get the rest out." He lowers his cock, pushing it towards your lips.
 		<<gs 'booty_call_morning' 'cumshot_wakeup_clean1'>>
 	<</actCLA>>
 	<<actCLA 'Take it in stride'>>
 		<<video "shared/sex/sleep/cumshot_wake2.mp4">>
-		<p>You sputter briefly as some of the salty sperm slips past your lips, but can't help but feel amusement when you see the lewd satisfaction on <<=$npcs.get($sex.npcId,'firstname')>>'s face.</p>
+		<p>You sputter briefly as some of the salty sperm slips past your lips, but can't help but feel amusement when you see the lewd satisfaction on <<npc $sex.npcId>><</npc>>'s face.</p>
 		<<actCLA 'Guess that means no morning BJ'>>
 			"Guess that means it's too late for a morning blowjob," you snicker.
 			"No it's not," he grins back and pushes his cock towards your lips.
@@ -874,7 +874,7 @@ end} -->
 		<<video "shared/sex/sleep/cumshot_wake3.mp4">>
 		<<arouse 'bj' 1 `['sub']`>>
 		<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1 0 5>>
-		<p>Before you can make any more protest, <<=$npcs.get($sex.npcId,'firstname')>>'s cock pushes into your mouth. Your eyes accuse him of being a jerk but your lips suck obediently, drawing the last drops of cum from his shaft.</p>
+		<p>Before you can make any more protest, <<npc $sex.npcId>><</npc>>'s cock pushes into your mouth. Your eyes accuse him of being a jerk but your lips suck obediently, drawing the last drops of cum from his shaft.</p>
 		<<gs 'booty_call_morning' 'wakeup1'>>
 	<</actCLA>>
 <</if>>
@@ -888,7 +888,7 @@ end} -->
 		<<video "shared/sex/sleep/cumshot_wake3.mp4">>
 		<<arouse 'bj' 1 `['sub']`>>
 		<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1 0 5>>
-		<p>"Oh fiiiine," you say, mock frowning as <<=$npcs.get($sex.npcId,'firstname')>>'s cock pushes past your lips and you subserviently suck out the last drops of cum from it.</p>
+		<p>"Oh fiiiine," you say, mock frowning as <<npc $sex.npcId>><</npc>>'s cock pushes past your lips and you subserviently suck out the last drops of cum from it.</p>
 		<<gs 'booty_call_morning' 'wakeup1'>>
 	<</actCLA>>
 <</if>>
@@ -909,14 +909,14 @@ end} -->
 			<<video "shared/sex/after/wakeup_shock2.mp4">>
 			Panic begins to set in as you sit up, your breathing already at the edge of hyperventilation.
 			<<if getvar("$booty_call['creampie_count']") > 3>>
-				<p>Not only did you forget your birth control, but <<=$npcs.get($sex.npcId,'firstname')>> came inside you last night too. <i>A lot.</i> How could you fuck up like this?</p>
+				<p>Not only did you forget your birth control, but <<npc $sex.npcId>><</npc>> came inside you last night too. <i>A lot.</i> How could you fuck up like this?</p>
 			<<elseif getvar("$booty_call['creampie_count']") > 0>>
-				<p>Not only did you forget your birth control, but <<=$npcs.get($sex.npcId,'firstname')>> came inside you last night too. How could you fuck up like this?</p>
+				<p>Not only did you forget your birth control, but <<npc $sex.npcId>><</npc>> came inside you last night too. How could you fuck up like this?</p>
 			<<else>>
 				<<if getvar("$pharmacy_timers['birth_control']") > 0>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> didn't come inside you yesterday, but this breaks your streak. Aunt Luda said you need to take it every day or it won't work. So if you take it now, does that mean you're still not safe?</p>
+					<p><<npc $sex.npcId>><</npc>> didn't come inside you yesterday, but this breaks your streak. Aunt Luda said you need to take it every day or it won't work. So if you take it now, does that mean you're still not safe?</p>
 				<<else>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> didn't come inside you yesterday, but this breaks your streak. Are you still safe if you skip a day?</p>
+					<p><<npc $sex.npcId>><</npc>> didn't come inside you yesterday, but this breaks your streak. Are you still safe if you skip a day?</p>
 				<</if>>
 			<</if>>
 			<<if getvar("$morning_after_pill") > 0>>
@@ -933,11 +933,11 @@ end} -->
 			You sit up and start taking big deep breaths, forcing yourself to calm down, trying to approach the situation logically.
 			<<if getvar("$booty_call['creampie_count']") > 0>>
 				<<if getvar("$booty_call['creampie_count']") > 5>>
-					<p>Okay, so <<=$npcs.get($sex.npcId,'firstname')>> came inside you last night... <i>Many</i> times. But you can still take a morning after pill. Maybe it'll be okay.</p>
+					<p>Okay, so <<npc $sex.npcId>><</npc>> came inside you last night... <i>Many</i> times. But you can still take a morning after pill. Maybe it'll be okay.</p>
 				<<elseif getvar("$booty_call['creampie_count']") > 1>>
-					<p>Okay, so <<=$npcs.get($sex.npcId,'firstname')>> came inside you last night... More than once... A <i>few</i> times. But you can still take a morning after pill. Maybe it'll be okay.</p>
+					<p>Okay, so <<npc $sex.npcId>><</npc>> came inside you last night... More than once... A <i>few</i> times. But you can still take a morning after pill. Maybe it'll be okay.</p>
 				<<elseif getvar("$booty_call['creampie_count']") == 1>>
-					<p>Okay, so <<=$npcs.get($sex.npcId,'firstname')>> came inside you last night... But only once. That's not too bad, right? Maybe you can still take a morning after pill. Maybe it'll be okay.</p>
+					<p>Okay, so <<npc $sex.npcId>><</npc>> came inside you last night... But only once. That's not too bad, right? Maybe you can still take a morning after pill. Maybe it'll be okay.</p>
 				<</if>>
 				<<if getvar("$morning_after_pill") > 0>>
 					<<if getvar("$LudaQW['free_condoms']") == 1 and $pc.sexStat('morning_after_pill') == 0>>
@@ -948,9 +948,9 @@ end} -->
 				<</if>>
 			<<else>>
 				<<if getvar("$pharmacy_timers['birth_control']") > 0>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> didn't come inside you yesterday, but this breaks your streak. Aunt Luda said you need to take it every day or it won't work. So if you take it now, does that mean you're still not safe?</p>
+					<p><<npc $sex.npcId>><</npc>> didn't come inside you yesterday, but this breaks your streak. Aunt Luda said you need to take it every day or it won't work. So if you take it now, does that mean you're still not safe?</p>
 				<<else>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> didn't come inside you yesterday, so you're probably not in immediate danger of getting pregnant. But does this mean you'll need to wait a few days to build up the birth control in your system again?</p>
+					<p><<npc $sex.npcId>><</npc>> didn't come inside you yesterday, so you're probably not in immediate danger of getting pregnant. But does this mean you'll need to wait a few days to build up the birth control in your system again?</p>
 				<</if>>
 			<</if>>
 			<<gs 'booty_call_morning' 'forgot_bc_pill2'>>
@@ -967,16 +967,16 @@ end} -->
 				The bed next to you is empty and the bathroom door is closed. You can hear the water running behind it.
 			<<elseif $npcs.get($sex.npcId,'apt_type') == 3>>
 				<<setinit $booty_call['npc_morning_shower'] = 1>>
-				<p>The bed next to you is empty but you can hear water running through the wall. <<=$npcs.get($sex.npcId,'firstname')>> must be in the shower.</p>
+				<p>The bed next to you is empty but you can hear water running through the wall. <<npc $sex.npcId>><</npc>> must be in the shower.</p>
 			<<else>>
-				<p>The bed next to you is empty. <<=$npcs.get($sex.npcId,'firstname')>> is nowhere to be seen.</p>
+				<p>The bed next to you is empty. <<npc $sex.npcId>><</npc>> is nowhere to be seen.</p>
 			<</if>>
 			<<gs 'booty_call_morning' 'wakeup1'>>
 		<<elseif $npcs.get($sex.npcId,'latesleeper') == 1>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> is still asleep next to you snoring softly, completely ignorant to the situation.</p>
+			<p><<npc $sex.npcId>><</npc>> is still asleep next to you snoring softly, completely ignorant to the situation.</p>
 			<<gs 'booty_call_morning' 'wakeup1'>>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> stirs next to you.</p>
+			<p><<npc $sex.npcId>><</npc>> stirs next to you.</p>
 			<<if $npcs.get($sex.npcId,'selfish') != 1 and $npcs.get($sex.npcId,'abusive') != 1 and rand(1,3) == 3>>
 				<p>"Hey." He yawns, glancing over at you before blinking, a look of concern on his face. "What's up? Something wrong?"</p>
 				<<actCLA 'Don`t tell him'>>
@@ -1019,7 +1019,7 @@ end} -->
 			<<video "shared/sex/after/wakeup_shock2.mp4">>
 			<p>Throwing your legs over the side of the bed, you sit up, hands on your knees, breathing hard in your guilt-driven panic.</p>
 			<i>I just cheated on my <<$booty_call[''cheat'']>>...</i>
-			<p>Your thoughts wander through your night with <<=$npcs.get($sex.npcId,'firstname')>>...</p>
+			<p>Your thoughts wander through your night with <<npc $sex.npcId>><</npc>>...</p>
 			<<if getvar("$booty_call['bj']") > 0>>
 				<i>Sucking his cock...</i>
 
@@ -1088,7 +1088,7 @@ end} -->
 	<</actCLA>>
 	<<actCLA 'It`s just sex'>>
 		<<video "shared/sex/after/wakeup_shock2.mp4">>
-		<p><i>It's just sex,</i> you try to rationalize. <i>It's not like I'm falling in love with <<=$npcs.get($sex.npcId,'firstname')>> or anything. It's not cheating. It's just sex...</i>.</p>
+		<p><i>It's just sex,</i> you try to rationalize. <i>It's not like I'm falling in love with <<npc $sex.npcId>><</npc>> or anything. It's not cheating. It's just sex...</i>.</p>
 		You're not sure whether you believe yourself.
 		<<gs 'booty_call_morning' 'guilt2'>>
 	<</actCLA>>
@@ -1129,16 +1129,16 @@ end} -->
 			The bed next to you is empty and the bathroom door is closed. You can hear the water running behind it.
 		<<elseif $npcs.get($sex.npcId,'apt_type') == 3>>
 			<<setinit $booty_call['npc_morning_shower'] = 1>>
-			<p>The bed next to you is empty but you can hear water running through the wall. <<=$npcs.get($sex.npcId,'firstname')>> must be in the shower.</p>
+			<p>The bed next to you is empty but you can hear water running through the wall. <<npc $sex.npcId>><</npc>> must be in the shower.</p>
 		<<else>>
-			<p>The bed next to you is empty. <<=$npcs.get($sex.npcId,'firstname')>> is nowhere to be seen.</p>
+			<p>The bed next to you is empty. <<npc $sex.npcId>><</npc>> is nowhere to be seen.</p>
 		<</if>>
 		<<gs 'booty_call_morning' 'wakeup1'>>
 	<<elseif $npcs.get($sex.npcId,'latesleeper') == 1>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>>, the guy from last night, is still asleep next to you, completely ignorant to your internal strife, snoring softly.</p>
+		<p><<npc $sex.npcId>><</npc>>, the guy from last night, is still asleep next to you, completely ignorant to your internal strife, snoring softly.</p>
 		<<gs 'booty_call_morning' 'wakeup1'>>
 	<<else>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> stirs next to you.</p>
+		<p><<npc $sex.npcId>><</npc>> stirs next to you.</p>
 		<<if $npcs.get($sex.npcId,'selfish') != 1 and $npcs.get($sex.npcId,'abusive') != 1 and rand(1,3) == 3>>
 			<p>"Hey." He yawns, glancing over at you before blinking, a look of concern on his face. "What's up? Something wrong?"</p>
 			<<actCLA 'It`s nothing'>>
@@ -1167,10 +1167,10 @@ end} -->
 	<<setinit $booty_call['find_boy'] = 1>>
 	<<=$npcs.get($sex.npcId,'apt_kitchen')>>
 	<<if $npcs.get($sex.npcId,'apt_type') < 3>>
-		<p>You wait patiently in bed while <<=$npcs.get($sex.npcId,'firstname')>> whips up a full breakfast with coffee to drink and brings the tray back to you.</p>
+		<p>You wait patiently in bed while <<npc $sex.npcId>><</npc>> whips up a full breakfast with coffee to drink and brings the tray back to you.</p>
 		<p>"What can I help you with first?" he asks.</p>
 	<<else>>
-		<p>You follow <<=$npcs.get($sex.npcId,'firstname')>> into the kitchen and wait patiently while he whips up a full breakfast with coffee to drink, putting all the plates on his kitchen table.</p>
+		<p>You follow <<npc $sex.npcId>><</npc>> into the kitchen and wait patiently while he whips up a full breakfast with coffee to drink, putting all the plates on his kitchen table.</p>
 	<</if>>
 	<<gs 'booty_call_morning' 'breakfast_in_bed_menu'>>
 <</if>>
@@ -1178,7 +1178,7 @@ end} -->
 	<<setinit $booty_call['find_boy'] = 1>>
 	<<set $time.minutes += 1>>
 	<<video "shared/romance/misc/nude_walk1.mp4">>
-	<p>You climb out of bed and leave the bedroom, walking through the halls of <<=$npcs.get($sex.npcId,'firstname')>>'s apartment naked as you peek into various rooms searching for him.</p>
+	<p>You climb out of bed and leave the bedroom, walking through the halls of <<npc $sex.npcId>><</npc>>'s apartment naked as you peek into various rooms searching for him.</p>
 	<<actCLA 'Continue'>>
 		<<=$npcs.get($sex.npcId,'apt_kitchen')>>
 		You follow the smell of food and find him in the kitchen cooking breakfast.
@@ -1190,9 +1190,9 @@ end} -->
 	<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 	<<setinit $booty_call['b_i_b'] = 1>>
 	<<if $npcs.get($sex.npcId,'apt_type') == 2>>
-		<p>"Hey sleepyhead," <<=$npcs.get($sex.npcId,'firstname')>> says as you finish rubbing the sleep from your eyes. "I just finished making breakfast."</p>
+		<p>"Hey sleepyhead," <<npc $sex.npcId>><</npc>> says as you finish rubbing the sleep from your eyes. "I just finished making breakfast."</p>
 	<<else>>
-		<p>As you finish rubbing the sleep from your eyes <<=$npcs.get($sex.npcId,'firstname')>> comes in through the doorway carrying a tray.</p>
+		<p>As you finish rubbing the sleep from your eyes <<npc $sex.npcId>><</npc>> comes in through the doorway carrying a tray.</p>
 		"Hey," he smiles. "I didn''t want to wake you, so I thought I''d make breakfast and bring it to you."
 	<</if>>
 	<<actCLA 'How sweet'>>
@@ -1214,20 +1214,20 @@ end} -->
 	<<actCLA 'Coffee'>>
 		<<actCLA 'Coffee first'>>
 			"Coffee first," you say. "Definitely the coffee first."
-			<p><<=$npcs.get($sex.npcId,'firstname')>> pours a mug for you and you eagerly grab for it, taking that first wonderful sip and sigh with relief.</p>
+			<p><<npc $sex.npcId>><</npc>> pours a mug for you and you eagerly grab for it, taking that first wonderful sip and sigh with relief.</p>
 			"Okay, now food," you grin.
 			<<gs 'booty_call_morning' 'eat_breakfast1'>>
 		<</actCLA>>
 		<<actCLA 'Just coffee (no food)'>>
 			"Coffee," you say. "Give me coffee."
-			<p><<=$npcs.get($sex.npcId,'firstname')>> pours a mug for you and you eagerly grab for it, taking that first wonderful sip and sigh with relief.</p>
+			<p><<npc $sex.npcId>><</npc>> pours a mug for you and you eagerly grab for it, taking that first wonderful sip and sigh with relief.</p>
 			<<actCLA 'Continue'>>
 				<<gs 'booty_call_morning' 'eat_breakfast_coffee'>>
 			<</actCLA>>
 		<</actCLA>>
 	<</actCLA>>
 	<<actCLA 'Toast'>>
-		<p>"That toast looks good," you smile and <<=$npcs.get($sex.npcId,'firstname')>> hands it over.</p>
+		<p>"That toast looks good," you smile and <<npc $sex.npcId>><</npc>> hands it over.</p>
 		<<actCLA 'Plain'>>
 			<<gs 'booty_call_morning' 'breakfast_image'>>
 			You grab the toast not bothering to put on any additional spreads or condiments and bite in. The crispy crust crunches under your teeth, the nice cooked but not burnt flavour fills your mouth.
@@ -1249,7 +1249,7 @@ end} -->
 		<<actCLA 'Sour cream'>>
 			<<gs 'booty_call_morning' 'breakfast_image'>>
 			You grab the toast and slather sour cream across its surface before biting in. The crispy crust crunches under your teeth, the nice cooked but not burnt flavour fills your mouth, supplemented by the creaminess of your chosen condiment.
-			<p>"Isn't sour cream normally for the pancakes?" <<=$npcs.get($sex.npcId,'firstname')>> asks amused.</p>
+			<p>"Isn't sour cream normally for the pancakes?" <<npc $sex.npcId>><</npc>> asks amused.</p>
 			<p>"Isn't toast just a crispy pancake?" you shrug back, grinning at him with a full mouth.</p>
 			<<gs 'booty_call_morning' 'eat_breakfast1'>>
 		<</actCLA>>
@@ -1257,7 +1257,7 @@ end} -->
 	<<actCLA 'Eggs'>>
 		"A bit of protein sounds good right now," you smile, reaching for the plate with fried eggs on it.
 		<<if $npcs.get($sex.npcId,'humor') == 2>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> snickers, giving you a dirty smirk, saying, "I got some protein for you to swallow if you really want some."</p>
+			<p><<npc $sex.npcId>><</npc>> snickers, giving you a dirty smirk, saying, "I got some protein for you to swallow if you really want some."</p>
 			<<actCLA 'Roll your eyes'>>
 				You sigh deeply, rolling your eyes to the heavens as you ignore his vulgar remarks and take your first bite of egg. It's perfectly fried, the edges crispy but the the yolk is runny and delicious.
 				<<gs 'booty_call_morning' 'eat_breakfast1'>>
@@ -1272,14 +1272,14 @@ end} -->
 				<<gs 'booty_call_morning' 'eat_breakfast1'>>
 			<</actCLA>>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> provides you with a plate and you eagerly cut it up and stab it with your fork to take your first bite of egg. It's perfectly fried, the edges crispy but the the yolk is runny and delicious.</p>
+			<p><<npc $sex.npcId>><</npc>> provides you with a plate and you eagerly cut it up and stab it with your fork to take your first bite of egg. It's perfectly fried, the edges crispy but the the yolk is runny and delicious.</p>
 			<<gs 'booty_call_morning' 'eat_breakfast1'>>
 		<</if>>
 	<</actCLA>>
 	<<actCLA 'Kolbasa'>>
 		"A bit of protein sounds good right now," you smile, reaching for the sandwiches he made, the slice of bread with cheese and kolbasa.
 		<<if $npcs.get($sex.npcId,'humor') == 2>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> snickers, giving you a dirty smirk, saying, "I got some protein for you to swallow if you really want some."</p>
+			<p><<npc $sex.npcId>><</npc>> snickers, giving you a dirty smirk, saying, "I got some protein for you to swallow if you really want some."</p>
 			<<actCLA 'Roll your eyes'>>
 				You sigh deeply, rolling your eyes to the heavens as you ignore his vulgar remarks and bite into the sandwich. The bread is nice and soft, the cheese creamy, and the kolbasa salty and cheap but full of familiar comfort.
 				<<gs 'booty_call_morning' 'eat_breakfast1'>>
@@ -1294,12 +1294,12 @@ end} -->
 				<<gs 'booty_call_morning' 'eat_breakfast1'>>
 			<</actCLA>>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> provides you with a plate and you eagerly bite into the sandwich. The bread is nice and soft, the cheese creamy, and the kolbasa salty and cheap but full of familiar comfort.</p>
+			<p><<npc $sex.npcId>><</npc>> provides you with a plate and you eagerly bite into the sandwich. The bread is nice and soft, the cheese creamy, and the kolbasa salty and cheap but full of familiar comfort.</p>
 			<<gs 'booty_call_morning' 'eat_breakfast1'>>
 		<</if>>
 	<</actCLA>>
 	<<actCLA 'Pancakes'>>
-		<p>"Those pancakes look great," you smile, eagerly reaching for them. <<=$npcs.get($sex.npcId,'firstname')>> hands you a plate and you spread raspberry jam and sour cream across the small discs of cooked batter. You take your first bite and close your eyes, savouring the sweet, sour, creamy deliciousness before opening them to grin back at <<=$npcs.get($sex.npcId,'firstname')>>. "Taste great too," you grin without swallowing.</p>
+		<p>"Those pancakes look great," you smile, eagerly reaching for them. <<npc $sex.npcId>><</npc>> hands you a plate and you spread raspberry jam and sour cream across the small discs of cooked batter. You take your first bite and close your eyes, savouring the sweet, sour, creamy deliciousness before opening them to grin back at <<npc $sex.npcId>><</npc>>. "Taste great too," you grin without swallowing.</p>
 		<<gs 'booty_call_morning' 'eat_breakfast1'>>
 	<</actCLA>>
 <</if>>
@@ -1314,10 +1314,10 @@ end} -->
 			<</if>>
 			<p>"Hungry?" you ask. "How about I make us some breakfast?"</p>
 			<<if $npcs.get($sex.npcId,'caretaker') == 1>>
-				<p>"You don't have to do that," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+				<p>"You don't have to do that," <<npc $sex.npcId>><</npc>> says.</p>
 				"I want to," you smile back and haul yourself out of bed.
 			<<else>>
-				<p>"That'd be great," <<=$npcs.get($sex.npcId,'firstname')>> smiles. You smile back and haul yourself out of bed.</p>
+				<p>"That'd be great," <<npc $sex.npcId>><</npc>> smiles. You smile back and haul yourself out of bed.</p>
 			<</if>>
 			<<actCLA 'Make breakfast'>>
 				<<gt 'booty_call_morning' 'pc_make_breakfast'>>
@@ -1329,9 +1329,9 @@ end} -->
 	<<image "pc/activities/cooking/nude_fridge1.jpg">>
 	<<set $time.minutes += rand(1,2)>>
 	<<if $npcs.get($sex.npcId,'apt_type') == 2>>
-		<p>You head over to <<=$npcs.get($sex.npcId,'firstname')>>'s kitchen area and look through his fridge. Opening it, you take a look inside, mulling over what you can make with what he's got...</p>
+		<p>You head over to <<npc $sex.npcId>><</npc>>'s kitchen area and look through his fridge. Opening it, you take a look inside, mulling over what you can make with what he's got...</p>
 	<<else>>
-		<p>You head over to the kitchen and look through <<=$npcs.get($sex.npcId,'firstname')>> fridge. Opening it, you take a look inside, mulling over what you can make with what he's got...</p>
+		<p>You head over to the kitchen and look through <<npc $sex.npcId>><</npc>> fridge. Opening it, you take a look inside, mulling over what you can make with what he's got...</p>
 	<</if>>
 	<<gs 'booty_call_morning' 'pc_make_breakfast_choices'>>
 <</if>>
@@ -1440,7 +1440,7 @@ end} -->
 			You put the coffee into the machine and wait, drumming your fingers on the counter until the dark liquid is brewed.
 		<<elseif getvar("$booty_call['toast_make']") == 1>>
 			<<image "pc/activities/cooking/nude_misc1.jpg">>
-			<p>You grab a couple slices of bread and toss them in the toaster. While the bread browns, you rifle through <<=$npcs.get($sex.npcId,'firstname')>>'s fridge and pantry, pulling out plates and butter and raspberry jam to spread.</p>
+			<p>You grab a couple slices of bread and toss them in the toaster. While the bread browns, you rifle through <<npc $sex.npcId>><</npc>>'s fridge and pantry, pulling out plates and butter and raspberry jam to spread.</p>
 		<<elseif getvar("$booty_call['eggs_make']") == 1>>
 			<<image `'pc/activities/cooking/nude_stove'+rand(1,3)+'.jpg'`>>
 			You crack eggs into the pan, sending sputters and sizzles the moment it makes contact with the hot metal. A couple minutes later, they're plated and ready to eat.
@@ -1467,20 +1467,20 @@ end} -->
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		<<if getvar("$booty_call['cooking_total']") == 1 and getvar("$booty_call['coffee_make']") == 1>>
 			<<if $npcs.get($sex.npcId,'latesleeper') == 1>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> begins to stir in bed, blearily blinking at you.</p>
+				<p><<npc $sex.npcId>><</npc>> begins to stir in bed, blearily blinking at you.</p>
 				"Hey sleepyhead," you smile, turning to face him with two steaming mugs. "I made coffee."
 			<<else>>
-				<p>"Coffee's ready," you say, turning around to walk two steaming mugs back to <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+				<p>"Coffee's ready," you say, turning around to walk two steaming mugs back to <<npc $sex.npcId>><</npc>>.</p>
 			<</if>>
 			<<actCLA 'Drink your coffee'>>
 				<<gt 'booty_call_morning' 'eat_breakfast1'>>
 			<</actCLA>>
 		<<else>>
 			<<if getvar("$booty_call['boy_asleep']") == 1 and getvar("$booty_call['wake_fuck']") == 0 and getvar("$booty_call['morning_fuck']") == 0>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> begins to stir in bed, blearily blinking at you.</p>
+				<p><<npc $sex.npcId>><</npc>> begins to stir in bed, blearily blinking at you.</p>
 				"Hey sleepyhead," you say, turning to smile at him with plates in each hand. "I made breakfast."
 			<<else>>
-				<p>"Food's done," you tell <<=$npcs.get($sex.npcId,'firstname')>>, carefully carrying a few plates over to his table.</p>
+				<p>"Food's done," you tell <<npc $sex.npcId>><</npc>>, carefully carrying a few plates over to his table.</p>
 			<</if>>
 			<<gs 'booty_call_morning' 'eat_breakfast1'>>
 		<</if>>
@@ -1488,10 +1488,10 @@ end} -->
 		<<=$npcs.get($sex.npcId,'apt_kitchen')>>
 		<<if getvar("$booty_call['cooking_total']") == 1 and getvar("$booty_call['coffee_make']") == 1>>
 			<<if $npcs.get($sex.npcId,'latesleeper') == 1 and getvar("$booty_call['wake_fuck']") == 0 and getvar("$booty_call['morning_fuck']") == 0>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> comes in right as you're pouring it out, letting out a mighty yawn.</p>
+				<p><<npc $sex.npcId>><</npc>> comes in right as you're pouring it out, letting out a mighty yawn.</p>
 				"Hey sleepyhead," you smile. "I made coffee."
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> comes in right as you're pouring it out.</p>
+				<p><<npc $sex.npcId>><</npc>> comes in right as you're pouring it out.</p>
 				"Hey. Just finished brewing," you smile, handing him a steaming mug.
 			<</if>>
 			<<actCLA 'Drink your coffee'>>
@@ -1499,10 +1499,10 @@ end} -->
 			<</actCLA>>
 		<<else>>
 			<<if $npcs.get($sex.npcId,'latesleeper') == 1>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> comes in right as you're pouring it out, letting out a mighty yawn.</p>
+				<p><<npc $sex.npcId>><</npc>> comes in right as you're pouring it out, letting out a mighty yawn.</p>
 				"Hey sleepyhead," you smile. "I made breakfast."
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> comes in right as you start setting the table.</p>
+				<p><<npc $sex.npcId>><</npc>> comes in right as you start setting the table.</p>
 				"Hey," you smile at him. "Just finished up. Help yourself."
 			<</if>>
 			<<gs 'booty_call_morning' 'eat_breakfast1'>>
@@ -1515,7 +1515,7 @@ end} -->
 	<<set $time.minutes += 5>>
 	<<run $npcs.inc($sex.npcId,'rel',rand(1,3))>>
 	<<gs 'booty_call_morning' 'breakfast_image'>>
-	<p>The two of you settle down at <<=$npcs.get($sex.npcId,'firstname')>>'s table and sip away at your coffee, casually chit-chatting with each other until there's nothing but dregs left.</p>
+	<p>The two of you settle down at <<npc $sex.npcId>><</npc>>'s table and sip away at your coffee, casually chit-chatting with each other until there's nothing but dregs left.</p>
 	<<actCLA 'Wash your mugs'>>
 		<<gt 'booty_call_morning' 'breakfast_dishes'>>
 	<</actCLA>>
@@ -1554,13 +1554,13 @@ end} -->
 	<</if>>
 	<<if $npcs.get($sex.npcId,'apt_type') == 2>>
 		<<gs 'booty_call_morning' 'breakfast_image'>>
-		<p>You settle down on <<=$npcs.get($sex.npcId,'firstname')>>'s bed while he pulls up a chair, nibbling on small bits of food.</p>
+		<p>You settle down on <<npc $sex.npcId>><</npc>>'s bed while he pulls up a chair, nibbling on small bits of food.</p>
 	<<elseif getvar("$booty_call['boy_make_breakfast']") == 1 and getvar("$booty_call['find_boy']") == 0>>
 		<<gs 'booty_call_morning' 'breakfast_image'>>
-		<p>You sit up in <<=$npcs.get($sex.npcId,'firstname')>>'s bed and start taking small bites of food as <<=$npcs.get($sex.npcId,'firstname')>> while he pulls up a chair.</p>
+		<p>You sit up in <<npc $sex.npcId>><</npc>>'s bed and start taking small bites of food as <<npc $sex.npcId>><</npc>> while he pulls up a chair.</p>
 	<<else>>
 		<<gs 'booty_call_morning' 'breakfast_image'>>
-		<p>The two of you settle down at <<=$npcs.get($sex.npcId,'firstname')>>'s table. You nibble at small bits of food while he digs in.</p>
+		<p>The two of you settle down at <<npc $sex.npcId>><</npc>>'s table. You nibble at small bits of food while he digs in.</p>
 	<</if>>
 	<!-- !! add chat section here later-->
 	<p>"Not hungry?" he asks curiously.</p>
@@ -1608,10 +1608,10 @@ end} -->
 	<</if>>
 	<<if $npcs.get($sex.npcId,'apt_type') == 2>>
 		<<gs 'booty_call_morning' 'breakfast_image'>>
-		<p>You settle down on <<=$npcs.get($sex.npcId,'firstname')>>'s bed while he pulls up a chair and you both dig in, casually chatting away until you've cleared your plates.</p>
+		<p>You settle down on <<npc $sex.npcId>><</npc>>'s bed while he pulls up a chair and you both dig in, casually chatting away until you've cleared your plates.</p>
 	<<else>>
 		<<gs 'booty_call_morning' 'breakfast_image'>>
-		<p>The two of you settle down at <<=$npcs.get($sex.npcId,'firstname')>>'s table and dig in, casually chatting away until you've cleared your plates.</p>
+		<p>The two of you settle down at <<npc $sex.npcId>><</npc>>'s table and dig in, casually chatting away until you've cleared your plates.</p>
 	<</if>>
 	<!-- !! add chat section here later-->
 	<<actCLA 'Clear your dishes'>>
@@ -1628,10 +1628,10 @@ end} -->
 	<</if>>
 	<<if $npcs.get($sex.npcId,'apt_type') == 2>>
 		<<gs 'booty_call_morning' 'breakfast_image'>>
-		<p>You settle down on <<=$npcs.get($sex.npcId,'firstname')>>'s bed while he pulls up a chair and you both dig in, you especially, happily stuffing your face as the two of you casually chat away until you've cleared your plates.</p>
+		<p>You settle down on <<npc $sex.npcId>><</npc>>'s bed while he pulls up a chair and you both dig in, you especially, happily stuffing your face as the two of you casually chat away until you've cleared your plates.</p>
 	<<else>>
 		<<gs 'booty_call_morning' 'breakfast_image'>>
-		<p>The two of you settle down at <<=$npcs.get($sex.npcId,'firstname')>>'s table and dig in, you especially, happily stuffing your face as the two of you casually chat away until you've cleared your plates.</p>
+		<p>The two of you settle down at <<npc $sex.npcId>><</npc>>'s table and dig in, you especially, happily stuffing your face as the two of you casually chat away until you've cleared your plates.</p>
 	<</if>>
 	<!-- !! add chat section here later-->
 	<<actCLA 'Clear your dishes'>>
@@ -1645,13 +1645,13 @@ end} -->
 	<<if $npcs.get($sex.npcId,'apt_type') == 2>>
 		<<gs 'booty_call_morning' 'breakfast_image'>>
 		<<if getvar("$booty_call['boy_make_breakfast']") == 1 and getvar("$booty_call['find_boy']") == 0>>
-			<p>You sit up in <<=$npcs.get($sex.npcId,'firstname')>>'s bed while he pulls up a chair, sipping on your coffee as he digs in.</p>
+			<p>You sit up in <<npc $sex.npcId>><</npc>>'s bed while he pulls up a chair, sipping on your coffee as he digs in.</p>
 		<<else>>
-			<p>You settle down on <<=$npcs.get($sex.npcId,'firstname')>>'s bed while he pulls up a chair, sipping on your coffee as he digs in.</p>
+			<p>You settle down on <<npc $sex.npcId>><</npc>>'s bed while he pulls up a chair, sipping on your coffee as he digs in.</p>
 		<</if>>
 	<<else>>
 		<<gs 'booty_call_morning' 'breakfast_image'>>
-		<p>The two of you settle down at <<=$npcs.get($sex.npcId,'firstname')>>'s table. You sip at your coffee while he digs in.</p>
+		<p>The two of you settle down at <<npc $sex.npcId>><</npc>>'s table. You sip at your coffee while he digs in.</p>
 	<</if>>
 	<!-- !! add chat section here later-->
 	<p>"Not going to eat?" he asks curiously.</p>
@@ -1753,17 +1753,17 @@ end} -->
 			<<setinit $booty_call['extra_cum'] += $npcs.get($sex.npcId,'sexdrive')>>
 		<</if>>
 		<<actCLA 'You`re gonna make me late'>>
-			<p>"You're gonna make me late," you giggle uncontrollably as <<=$npcs.get($sex.npcId,'firstname')>> gets friskier, dragging you back to bed to do what he wants to you.</p>
+			<p>"You're gonna make me late," you giggle uncontrollably as <<npc $sex.npcId>><</npc>> gets friskier, dragging you back to bed to do what he wants to you.</p>
 			<<gs 'booty_call_start' 'bed_start'>>
 		<</actCLA>>
 		<<actCLA 'Let him do what he wants'>>
-			<p>You giggle uncontrollably, giving <<=$npcs.get($sex.npcId,'firstname')>> the non-verbal go ahead and you let him drag you back to the bed to do what he wants to you.</p>
+			<p>You giggle uncontrollably, giving <<npc $sex.npcId>><</npc>> the non-verbal go ahead and you let him drag you back to the bed to do what he wants to you.</p>
 			<<gs 'booty_call_start' 'bed_start'>>
 		<</actCLA>>
 		<<if getvar("$booty_call['wake_fuck']") == 1 or getvar("$booty_call['morning_fuck']") == 1>>
 			<<actCLA 'Again?!'>>
-				<p>"Again?!" you giggle as <<=$npcs.get($sex.npcId,'firstname')>> begins groping your breast and fingering your clit. "You're insatiable!"</p>
-				<p>But you don't protest and let <<=$npcs.get($sex.npcId,'firstname')>> drag you back to the bed to do what he wants to you.</p>
+				<p>"Again?!" you giggle as <<npc $sex.npcId>><</npc>> begins groping your breast and fingering your clit. "You're insatiable!"</p>
+				<p>But you don't protest and let <<npc $sex.npcId>><</npc>> drag you back to the bed to do what he wants to you.</p>
 				<<gs 'booty_call_start' 'bed_start'>>
 			<</actCLA>>
 		<</if>>
@@ -1774,7 +1774,7 @@ end} -->
 				<<run $npcs.dec($sex.npcId,'rel',2)>>
 
 			<</if>>
-			<p>"Ugh!" you groan, giving <<=$npcs.get($sex.npcId,'firstname')>> a look of disgust and forcibly pulling his hands off your body. "Right when I feel all gross after eating? How can you even <i>think</i> about that right now?"</p>
+			<p>"Ugh!" you groan, giving <<npc $sex.npcId>><</npc>> a look of disgust and forcibly pulling his hands off your body. "Right when I feel all gross after eating? How can you even <i>think</i> about that right now?"</p>
 			<<gs 'booty_call_morning' 'wakeup1'>>
 		<</actCLA>>
 	<</if>>
@@ -1799,9 +1799,9 @@ end} -->
 		<!-- !! add correct travel times for each location-->
 		<<if $npcs.get($sex.npcId,'residence') == 1>>
 			<!-- !! Pav residential-->
-			<p><<=$npcs.get($sex.npcId,'firstname')>> drives you the short distance to school, stopping right outside the gates. You probably could have just walked, but it's nice to spend a little more time with him.</p>
+			<p><<npc $sex.npcId>><</npc>> drives you the short distance to school, stopping right outside the gates. You probably could have just walked, but it's nice to spend a little more time with him.</p>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> drives you from the city back to Pavlovsk, stopping right outside the school gates.</p>
+			<p><<npc $sex.npcId>><</npc>> drives you from the city back to Pavlovsk, stopping right outside the school gates.</p>
 			<<if $npcs.get($sex.npcId,'residence') == 2>>
 				<!-- !! Student dorms-->
 			<<elseif $npcs.get($sex.npcId,'residence') == 3>>
@@ -1865,9 +1865,9 @@ end} -->
 <</if>>
 <<if $location_var[$here][0] == 'classmates_see'>>
 	<<if $time.hour > 6 and rand(1,20) > rand(3,6)>>
-		<p>You step out of the car, looking around and don't see anybody who would recognize you. <<=$npcs.get($sex.npcId,'firstname')>> gives you a wave and you wave back as he drives off.</p>
+		<p>You step out of the car, looking around and don't see anybody who would recognize you. <<npc $sex.npcId>><</npc>> gives you a wave and you wave back as he drives off.</p>
 	<<else>>
 		As you exit the vehicle, some of your classmates are walking by and they glance at you stepping out of a stranger''s car. Some of them immediately look away. Others wear a look of disgust. Judging by the reactions, they must have clocked you.
-		<p><<=$npcs.get($sex.npcId,'firstname')>> gives you a small wave and drives off.</p>
+		<p><<npc $sex.npcId>><</npc>> gives you a small wave and drives off.</p>
 	<</if>>
 <</if>>

+ 76 - 76
sugarcube/src/activities/bootycall/booty_call_pillow_talk.tw

@@ -4,7 +4,7 @@
 <<if $location_var[$here][0] == 'start'>>
 	<<image "shared/sex/after/pillow_talk1.jpg">>
 	<<setinit $booty_call['pillow_talking'] = 1>>
-	<p>You and <<=$npcs.get($sex.npcId,'firstname')>> relax on the bed together, basking in the afterglow as you idly chit chat about things.</p>
+	<p>You and <<npc $sex.npcId>><</npc>> relax on the bed together, basking in the afterglow as you idly chit chat about things.</p>
 	<<if getvar("$booty_call['virgin']") == 1 and getvar("$booty_call['virgin_talk']") == 0 and getvar("$booty_call['fuck_count']") > 0>>
 		<<gs 'booty_call_virgin' 'first_time_talk'>>
 	<<else>>
@@ -126,7 +126,7 @@
 			<<else>>
 				<p>"You're a psycho, you know that?" you say. "What kind of crazy person makes a girl come that much with just their tongue? I came so many times it <i>hurt</i>."</p>
 				"I like eating pussy," he shrugs. "I think it's fun."
-				<p>"You have a problem," you say, giving <<=$npcs.get($sex.npcId,'firstname')>> a sidelong glance, still feeling residual throbs pulsing through your clit.</p>
+				<p>"You have a problem," you say, giving <<npc $sex.npcId>><</npc>> a sidelong glance, still feeling residual throbs pulsing through your clit.</p>
 			<</if>>
 			<<gs 'booty_call_pillow_talk' 'sex_talk'>>
 		<</actCLA>>
@@ -177,7 +177,7 @@
 			<<setinit $booty_call['better_than_lover_talk'] = 1>>
 			<<run $npcs.set($sex.npcId,'know_have_boyfriend',1)>>
 			<<image "shared/sex/after/pillow_talk2.jpg">>
-			<p>"You're even better than my boyfriend," you tell <<=$npcs.get($sex.npcId,'firstname')>> with a satisfied smile.</p>
+			<p>"You're even better than my boyfriend," you tell <<npc $sex.npcId>><</npc>> with a satisfied smile.</p>
 			<<gs 'booty_call_pillow_talk' 'sex_talk'>>
 		<</actCLA>>
 	<</if>>
@@ -211,7 +211,7 @@
 				<<if $npcs.get($sex.npcId,'argumentative') > 0>>
 					<<gs 'booty_call_pillow_talk' 'condom_buy_fight'>>
 				<<else>>
-					<p>"I'll put it on my shopping list," <<=$npcs.get($sex.npcId,'firstname')>> chuckles.</p>
+					<p>"I'll put it on my shopping list," <<npc $sex.npcId>><</npc>> chuckles.</p>
 					<<gs 'booty_call_pillow_talk' 'sex_talk'>>
 				<</if>>
 			<<else>>
@@ -223,21 +223,21 @@
 						<<if $npcs.get($sex.npcId,'argumentative') > 0>>
 							<<gs 'booty_call_pillow_talk' 'condom_buy_fight'>>
 						<<else>>
-							<p>"I'll put it on my shopping list," <<=$npcs.get($sex.npcId,'firstname')>> chuckles.</p>
+							<p>"I'll put it on my shopping list," <<npc $sex.npcId>><</npc>> chuckles.</p>
 							<<gs 'booty_call_pillow_talk' 'sex_talk'>>
 						<</if>>
 					<</if>>
 				<<else>>
 					"You really need to buy more condoms," you sigh. "We shouldn''t be taking chances like this."
 					<<if $npcs.get($sex.npcId,'know_bc') == 1>>
-						<p>"Aren't you on birth control?" <<=$npcs.get($sex.npcId,'firstname')>> asks, bemused.</p>
+						<p>"Aren't you on birth control?" <<npc $sex.npcId>><</npc>> asks, bemused.</p>
 						"I just like being safe. Better to have multiple kinds of birth control in case one fails."
 						<<gs 'booty_call_pillow_talk' 'sex_talk'>>
 					<<else>>
 						<<if $npcs.get($sex.npcId,'argumentative') > 0>>
 							<<gs 'booty_call_pillow_talk' 'condom_buy_fight'>>
 						<<else>>
-							<p>"I'll put it on my shopping list," <<=$npcs.get($sex.npcId,'firstname')>> chuckles.</p>
+							<p>"I'll put it on my shopping list," <<npc $sex.npcId>><</npc>> chuckles.</p>
 							<<gs 'booty_call_pillow_talk' 'sex_talk'>>
 						<</if>>
 					<</if>>
@@ -248,7 +248,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'condom_buy_fight'>>
 	<<run $npcs.dec($sex.npcId,'rel',1)>>
-	<p>"<i>You</i> could always buy more condoms," <<=$npcs.get($sex.npcId,'firstname')>> grumbles. "I don't see why it's all up to me to get the condoms!"</p>
+	<p>"<i>You</i> could always buy more condoms," <<npc $sex.npcId>><</npc>> grumbles. "I don't see why it's all up to me to get the condoms!"</p>
 	<<actCLA 'Don`t respond'>>
 		You stay slient, choosing to ignore his response and avoid a fight.
 		<<gs 'booty_call_pillow_talk' 'sex_talk'>>
@@ -256,7 +256,7 @@
 	<<actCLA 'He`s got a point'>>
 		<<run $npcs.inc($sex.npcId,'rel',2)>>
 		<<setinit $pc_buy_condoms[$sex.npcId] = 1>>
-		<p>"I guess you've got a point," you say, giving <<=$npcs.get($sex.npcId,'firstname')>> a guilty smile. "I'll try to buy some for next time."</p>
+		<p>"I guess you've got a point," you say, giving <<npc $sex.npcId>><</npc>> a guilty smile. "I'll try to buy some for next time."</p>
 	<</actCLA>>
 	<<actCLA 'He`s the one with the dick (argue)'>>
 		<<run $npcs.dec($sex.npcId,'rel',2)>>
@@ -276,7 +276,7 @@
 			<<setinit $pc_start_bc[$sex.npcId] = $time.daystart>>
 			You chew your lip for a moment, mulling it over. He's kind of right. It's a little unfair that he's the one paying for all your safe sex.
 			<p>"I guess..." you say slowly. "I could start the pill? Then we wouldn't have to worry about condoms or pregnancy."</p>
-			<p>You look at <<=$npcs.get($sex.npcId,'firstname')>>, a gentle smile on your face.</p>
+			<p>You look at <<npc $sex.npcId>><</npc>>, a gentle smile on your face.</p>
 			"That sounds... good," he says back.
 			<<gs 'booty_call_pillow_talk' 'sex_talk'>>
 		<</actCLA>>
@@ -298,7 +298,7 @@
 		<<run $npcs.dec($sex.npcId,'rel',2)>>
 		<p>"Yeah, because <i>I'm</i> the one in danger of getting pregnant! If I have a kid, are you going to chip in then?" you shout at him.</p>
 		<<if $npcs.get($sex.npcId,'caretaker') == 1 and getvar("$npc_childfree") != 1>>
-			<p>"Of course I am!" <<=$npcs.get($sex.npcId,'firstname')>> yells back.</p>
+			<p>"Of course I am!" <<npc $sex.npcId>><</npc>> yells back.</p>
 			<<gs 'booty_call_pillow_talk' 'condom_buy_apology'>>
 			<<actCLA 'I don`t believe you!'>>
 				<<run $npcs.dec($sex.npcId,'rel',2)>>
@@ -307,15 +307,15 @@
 				<<gs 'booty_call_pillow_talk' 'angry_end'>>
 			<</actCLA>>
 		<<elseif getvar("$npc_childfree") == 1>>
-			<p>"No, because you're going to get an abortion if that shit happens!" <<=$npcs.get($sex.npcId,'firstname')>> growls. "I'm not taking care of a fucking kid!"</p>
+			<p>"No, because you're going to get an abortion if that shit happens!" <<npc $sex.npcId>><</npc>> growls. "I'm not taking care of a fucking kid!"</p>
 			<<gs 'booty_call_pillow_talk' 'condom_buy_apology'>>
 			<<actCLA 'What the fuck did you just say?'>>
 				<<run $npcs.dec($sex.npcId,'rel',10)>>
 				<<run $npcs.set($sex.npcId,'big_fight',$time.daystart)>>
 				$npc_apt_bedroom
-				<p>"What the fuck did you just say?" you say, gaping at <<=$npcs.get($sex.npcId,'firstname')>> in disbelief. "You did <i>not</i> just say that."</p>
+				<p>"What the fuck did you just say?" you say, gaping at <<npc $sex.npcId>><</npc>> in disbelief. "You did <i>not</i> just say that."</p>
 				"I sure did," he glares back. "There''s no way I'm having kids, especially unwanted ones. Because they're all unwanted."
-				<p>"It's my <i>fucking</i> body!" you scream at <<=$npcs.get($sex.npcId,'firstname')>>. "You don't get to make demands like that! You know what? I'm fucking leaving."</p>
+				<p>"It's my <i>fucking</i> body!" you scream at <<npc $sex.npcId>><</npc>>. "You don't get to make demands like that! You know what? I'm fucking leaving."</p>
 				You get up, grabbing your things in a huff.
 				<<actCLA 'Asshole!'>>
 					$npc_apt_bedroom
@@ -354,18 +354,18 @@
 		<<run $npcs.inc($sex.npcId,'rel',4)>>
 		<<image "shared/sex/after/pillow_talk1.jpg">>
 		You open your mouth to respond but the argument dies in your throat.
-		<p>"I'm sorry," you say, looking regretfully at <<=$npcs.get($sex.npcId,'firstname')>>. "You're right. It's not fair that I'm making you spend money on something that's both our problem."</p>
+		<p>"I'm sorry," you say, looking regretfully at <<npc $sex.npcId>><</npc>>. "You're right. It's not fair that I'm making you spend money on something that's both our problem."</p>
 		<<actCLA 'You`ll buy some condoms'>>
 			<<setinit $pc_buy_condoms[$sex.npcId] = 1>>
 			<p>"I'll try to buy some condoms for next time. Does that sound fair?"</p>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> nods, accepting your apology.</p>
+			<p><<npc $sex.npcId>><</npc>> nods, accepting your apology.</p>
 			<<gs 'booty_call_pillow_talk' 'sex_talk'>>
 		<</actCLA>>
 		<<if $finances.bank + $finances.cash <= 2000>>
 			<<actCLA 'I don`t have a lot of money'>>
 				<<setinit $pc_buy_condoms[$sex.npcId] = 1>>
 				<p>"It's just..." You sigh. "Money's really tight for me right now. As dumb as it sounds, I can't afford to buy condoms. So that's why I have to rely on you. Does that make sense?"</p>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> nods, maybe a little begrudgingly, but he seems understanding at least.</p>
+				<p><<npc $sex.npcId>><</npc>> nods, maybe a little begrudgingly, but he seems understanding at least.</p>
 				<<gs 'booty_call_pillow_talk' 'sex_talk'>>
 			<</actCLA>>
 		<</if>>
@@ -377,7 +377,7 @@
 			<<gs 'booty_call_pillow_talk' 'talk_time_add'>>
 			<<setinit $booty_call['better_without'] = 1>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
-			<p>"By the way," you say, looking at <<=$npcs.get($sex.npcId,'firstname')>>. "It was nice without the condom."</p>
+			<p>"By the way," you say, looking at <<npc $sex.npcId>><</npc>>. "It was nice without the condom."</p>
 			<<if $npcs.get($sex.npcId,'selfish') == 1>>
 				<<if getvar("$booty_call['creampie_count']") > 0>>
 					<<actCLA 'Worry'>>
@@ -412,9 +412,9 @@
 					<<if getvar("$booty_call['promise_no_creampie']") == 1 and getvar("$booty_call['creampie_surprise']") == 1>>
 						"Sorry I... uhh... you know..." He seems embarrassed. "I promised I wouldn''t come inside you but I ended up doing it anyways."
 						<<if getvar("$cum_loc['vagina']") > 0>>
-							<p><<=$npcs.get($sex.npcId,'firstname')>> looks at your pussy still leaking his cum and blushes.</p>
+							<p><<npc $sex.npcId>><</npc>> looks at your pussy still leaking his cum and blushes.</p>
 						<<else>>
-							<p><<=$npcs.get($sex.npcId,'firstname')>> looks at your pussy and blushes.</p>
+							<p><<npc $sex.npcId>><</npc>> looks at your pussy and blushes.</p>
 						<</if>>
 					<<else>>
 						"Your pussy was amazing."
@@ -430,7 +430,7 @@
 							"Yeah," you nod. "So, no harm done."
 							<<gs 'booty_call_pillow_talk' 'topics'>>
 						<<else>>
-							<p>"Is it okay that I... you know...?" <<=$npcs.get($sex.npcId,'firstname')>> eyes your pussy, his cum still leaking from it.</p>
+							<p>"Is it okay that I... you know...?" <<npc $sex.npcId>><</npc>> eyes your pussy, his cum still leaking from it.</p>
 							<<gs 'booty_call_pillow_talk' 'creampie_okay'>>
 						<</if>>
 					<<elseif $npcs.get($sex.npcId,'know_bc') == 1>>
@@ -544,7 +544,7 @@
 			<<image "shared/sex/after/pillow_talk1.jpg">>
 			"I wish we didn''t need to use condoms," you sigh disappointedly.
 			<<if $npcs.get($sex.npcId,'condom_conscious') > 0>>
-				<p>"Safety is important," <<=$npcs.get($sex.npcId,'firstname')>> says sternly. "We don't want to be taking chances do we?"</p>
+				<p>"Safety is important," <<npc $sex.npcId>><</npc>> says sternly. "We don't want to be taking chances do we?"</p>
 			<<elseif getvar("$booty_call['pc_wants_condoms']") == 1>>
 			<<else>>
 			<</if>>
@@ -580,20 +580,20 @@
 			<<elseif getvar("$birth_control['think_safe']") == 1>>
 				"It's fine. I'm on the pill," you reassure him. "I just wanted to be extra safe. No harm done."
 			<</if>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> seems to relax, relieved that you're not upset.</p>
+			<p><<npc $sex.npcId>><</npc>> seems to relax, relieved that you're not upset.</p>
 			<<gs 'booty_call_pillow_talk' 'topics'>>
 		<</actCLA>>
 	<<else>>
 		<<actCLA 'I`m on birth control (lie)'>>
 			<<if $npcs.get($sex.npcId,'know_not_bc') == 1>>
 				"It's okay," you smile, telling a barefaced lie. "I'm on birth control."
-				<p><<=$npcs.get($sex.npcId,'firstname')>> seems to relax, relieved that you're not upset.</p>
+				<p><<npc $sex.npcId>><</npc>> seems to relax, relieved that you're not upset.</p>
 			<<else>>
 				"It's okay," you smile, telling a barefaced lie. "I'm on birth control."
-				<p><<=$npcs.get($sex.npcId,'firstname')>> seems to relax, relieved that you're not upset.</p>
+				<p><<npc $sex.npcId>><</npc>> seems to relax, relieved that you're not upset.</p>
 			<</if>>
 			<<actCLA '<i>It`ll be fine</i>'>>
-				<i>I'm not gonna get pregnant,</i> you think to yourself. <i>Why bother stressing <<<<=$npcs.get($sex.npcId,'firstname')>>>> out about it?</i>
+				<i>I'm not gonna get pregnant,</i> you think to yourself. <i>Why bother stressing <<<<npc $sex.npcId>><</npc>>>> out about it?</i>
 				<<gs 'booty_call_stats' 'birth_control_know'>>
 				<<gs 'booty_call_pillow_talk' 'topics'>>
 			<</actCLA>>
@@ -669,7 +669,7 @@
 					<</if>>
 				<</if>>
 				<<if $npcs.get($sex.npcId,'bukakke_fetish') == 1>>
-					<p>"But you look so fucking hot like that," <<=$npcs.get($sex.npcId,'firstname')>> says, unabashedly leering at your cum-covered body. "Fuck, I want to walk you into the street looking like that."</p>
+					<p>"But you look so fucking hot like that," <<npc $sex.npcId>><</npc>> says, unabashedly leering at your cum-covered body. "Fuck, I want to walk you into the street looking like that."</p>
 					"You're disgusting," you say, grimacing at the slimy feeling that coats every part of you.
 				<<elseif $npcs.get($sex.npcId,'argumentative') == 1>>
 					"It's not my fault," he grumbles. "You're the one who made me come so many times."
@@ -697,7 +697,7 @@
 					<</if>>
 				<</if>>
 				<<if $npcs.get($sex.npcId,'bukakke_fetish') == 1>>
-					<p>"You look so fucking hot like that," <<=$npcs.get($sex.npcId,'firstname')>> says, unabashedly leering at your cum-covered body. "Fuck, I want to walk you into the street looking like that."</p>
+					<p>"You look so fucking hot like that," <<npc $sex.npcId>><</npc>> says, unabashedly leering at your cum-covered body. "Fuck, I want to walk you into the street looking like that."</p>
 					<<actCLA 'Too far'>>
 						"I get bedroom play, but that's an extreme I'm not gonna go to I think," you say, eyeballing him.
 						<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -763,7 +763,7 @@
 			<<setinit $booty_call['creampie_pillow_talk'] = 1>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
 			<<if getvar("$cum_loc['vagina']") > 0>>
-				<p>"We made so many creampies," you murmur, shivering as you feel <<=$npcs.get($sex.npcId,'firstname')>>'s warm cum continue to ooze from your sex.</p>
+				<p>"We made so many creampies," you murmur, shivering as you feel <<npc $sex.npcId>><</npc>>'s warm cum continue to ooze from your sex.</p>
 			<<else>>
 				"We made so many creampies," you murmur, rubbing your legs together, missing the warmth that was filling you up before.
 			<</if>>
@@ -771,7 +771,7 @@
 				<<if getvar("$cum_loc['vagina']") > 0>>
 					"Coming inside you is the best," he says. "If I could, I''d fill you up with so much cum that you''d still be dripping next week."
 				<<else>>
-					<p>"I love coming inside you," <<=$npcs.get($sex.npcId,'firstname')>> says. "Shame you already cleaned it out. It'd be so hot if you went home with it still inside you."</p>
+					<p>"I love coming inside you," <<npc $sex.npcId>><</npc>> says. "Shame you already cleaned it out. It'd be so hot if you went home with it still inside you."</p>
 				<</if>>
 			<<else>>
 				<<if getvar("$cum_loc['vagina']") > 0>>
@@ -788,7 +788,7 @@
 			<<setinit $booty_call['creampie_pillow_talk'] = 1>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
 			<<if getvar("$cum_loc['vagina']") > 0>>
-				<p>"Did you have to come inside me so many times?" you ask, shivering as you feel <<=$npcs.get($sex.npcId,'firstname')>>'s warm cum continue to ooze from your sex.</p>
+				<p>"Did you have to come inside me so many times?" you ask, shivering as you feel <<npc $sex.npcId>><</npc>>'s warm cum continue to ooze from your sex.</p>
 			<<else>>
 				<p>"Did you have to come inside me so many times?" you ask in annoyance. "It took forever to clean out."</p>
 			<</if>>
@@ -818,21 +818,21 @@
 		<<actCLA 'You don`t need to ask to come inside'>>
 			<<gs 'booty_call_pillow_talk' 'talk_time_add'>>
 			<<image "shared/sex/after/pillow_talk2.jpg">>
-			<p>"Y'know," you say, gently looking into <<=$npcs.get($sex.npcId,'firstname')>>'s eyes. "You don't need to ask if you want to come inside me..."</p>
+			<p>"Y'know," you say, gently looking into <<npc $sex.npcId>><</npc>>'s eyes. "You don't need to ask if you want to come inside me..."</p>
 			<<actCLA 'I don`t mind'>>
 				<<image "shared/sex/after/pillow_talk2.jpg">>
-				<p>"Y'know," you say, gently looking into <<=$npcs.get($sex.npcId,'firstname')>>'s eyes. "You don't need to ask if you want to come inside me. I don't mind."</p>
+				<p>"Y'know," you say, gently looking into <<npc $sex.npcId>><</npc>>'s eyes. "You don't need to ask if you want to come inside me. I don't mind."</p>
 				<<gs 'booty_call_pillow_talk' 'free_creampies2'>>
 			<</actCLA>>
 			<<actCLA 'I love creampies'>>
 				<<image "shared/sex/after/pillow_talk2.jpg">>
-				<p>"Y'know," you say, gently looking into <<=$npcs.get($sex.npcId,'firstname')>>'s eyes. "You don't need to ask if you want to come inside me. I really like it. It makes me feel good."</p>
+				<p>"Y'know," you say, gently looking into <<npc $sex.npcId>><</npc>>'s eyes. "You don't need to ask if you want to come inside me. I really like it. It makes me feel good."</p>
 				<<gs 'booty_call_pillow_talk' 'free_creampies2'>>
 			<</actCLA>>
 			<<if $pc_cum_pref_know[$sex.npcId] == 'creampie'>>
 				<<actCLA 'I know how much you like it'>>
 					<<image "shared/sex/after/pillow_talk2.jpg">>
-					<p>"Y'know," you say, gently looking into <<=$npcs.get($sex.npcId,'firstname')>>'s eyes. "You don't need to ask if you want to come inside me. I know how much you like it. And I want you to feel good."</p>
+					<p>"Y'know," you say, gently looking into <<npc $sex.npcId>><</npc>>'s eyes. "You don't need to ask if you want to come inside me. I know how much you like it. And I want you to feel good."</p>
 					<<gs 'booty_call_pillow_talk' 'free_creampies2'>>
 				<</actCLA>>
 			<</if>>
@@ -841,7 +841,7 @@
 					<<run $npcs.set($sex.npcId,'free_creampies',1)>>
 					$booty_call['temp_pic']
 					"You don't need to ask to come inside me y''know," you murmur. "Not <i>every</i> time. I'll let you know when it's a safe day," you smile gently. "And then you can come inside me as much as you want."
-					<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> smiles back, beaming at you.</p>
+					<p>"Okay." <<npc $sex.npcId>><</npc>> smiles back, beaming at you.</p>
 					<<gs 'booty_call_talk' 'free_creampies_exit'>>
 				<</actCLA>>
 			<</if>>
@@ -854,7 +854,7 @@
 	<<if $npcs.get($sex.npcId,'abusive') == 1 and $npcs.get($sex.npcId,'childfree') != 1>>
 		<<run $npcs.set($sex.npcId,'free_creampies',2)>>
 		<<if $npcs.get($sex.npcId,'cum_pref') == 'creampie'>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> gives you a predatory grin, so full of desire that it makes you involuntarily swallow.</p>
+			<p><<npc $sex.npcId>><</npc>> gives you a predatory grin, so full of desire that it makes you involuntarily swallow.</p>
 			"Good to know..."
 		<<else>>
 			"Good to know," he smirks amusedly.
@@ -863,7 +863,7 @@
 	<<elseif ($npcs.get($sex.npcId,'selfish') == 1 or $npcs.get($sex.npcId,'know_bc') == 1) and $npcs.get($sex.npcId,'childfree') != 1>>
 		<<run $npcs.set($sex.npcId,'free_creampies',2)>>
 		<<if $npcs.get($sex.npcId,'cum_pref') == 'creampie'>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> gives you a look like he might just burst inside you again before giving you a delighted grin.</p>
+			<p><<npc $sex.npcId>><</npc>> gives you a look like he might just burst inside you again before giving you a delighted grin.</p>
 			"Next time, I'm gonna pump you full of so much cum, you're going to still be dripping next week," he says excitedly and you can't help but giggle at his boyish glee.
 		<<else>>
 			"Good to know," he smirks amusedly.
@@ -871,19 +871,19 @@
 		<<gs 'booty_call_pillow_talk' 'topics'>>
 	<<else>>
 		<<if $npcs.get($sex.npcId,'childfree') == 1 and $npcs.get($sex.npcId,'know_bc') != 1>>
-			<p>"Are you sure...?" <<=$npcs.get($sex.npcId,'firstname')>> asks hesitantly. "You're not worried you're going to get pregnant? I'm... I'm not really up for having kids..."</p>
+			<p>"Are you sure...?" <<npc $sex.npcId>><</npc>> asks hesitantly. "You're not worried you're going to get pregnant? I'm... I'm not really up for having kids..."</p>
 			<!-- !! add more options later-->
 		<<else>>
-			<p>"Is that really okay?" <<=$npcs.get($sex.npcId,'firstname')>> asks, wide-eyed.</p>
+			<p>"Is that really okay?" <<npc $sex.npcId>><</npc>> asks, wide-eyed.</p>
 		<</if>>
 		<<actCLA 'I`ll be fine'>>
 			<p>"I'll be fine," you insist, smiling gently. "What could go wrong?"</p>
 			<<if $npcs.get($sex.npcId,'childfree') == 1 or rand(1,4) == 1>>
 				<<run $npcs.set($sex.npcId,'free_creampies',-1)>>
-				<p>"I'm not comfortable with it," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head. "Maybe if you started birth control..."</p>
+				<p>"I'm not comfortable with it," <<npc $sex.npcId>><</npc>> says, shaking his head. "Maybe if you started birth control..."</p>
 			<<else>>
 				<<run $npcs.set($sex.npcId,'free_creampies',2)>>
-				<p>"Okay..." <<=$npcs.get($sex.npcId,'firstname')>> says hesitantly, but smiles back at you anyways.</p>
+				<p>"Okay..." <<npc $sex.npcId>><</npc>> says hesitantly, but smiles back at you anyways.</p>
 			<</if>>
 			<<gs 'booty_call_pillow_talk' 'topics'>>
 		<</actCLA>>
@@ -891,15 +891,15 @@
 			"It feels so good," you coo gently. "I <i>want</i> you to come inside me. I want you to fill me with your cum..."
 			<<if ($npcs.get($sex.npcId,'cum_pref') == 'creampie' and $npcs.get($sex.npcId,'childfree') == 1 and rand(npc_willpwr[$sex.npcId],100) <= pcs_persuas) or ($npcs.get($sex.npcId,'cum_pref') == 'creampie' and $npcs.get($sex.npcId,'childfree') != 1)>>
 				<<run $npcs.set($sex.npcId,'free_creampies',2)>>
-				<p>Desire wars with willpower within <<=$npcs.get($sex.npcId,'firstname')>>. You watch as he struggles back and forth until he leers at you with a hungry stare and you know which one won out.</p>
-				<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> says. "I won't ask anymore."</p>
+				<p>Desire wars with willpower within <<npc $sex.npcId>><</npc>>. You watch as he struggles back and forth until he leers at you with a hungry stare and you know which one won out.</p>
+				<p>"Okay." <<npc $sex.npcId>><</npc>> says. "I won't ask anymore."</p>
 			<<elseif $npcs.get($sex.npcId,'childfree') == 1>>
 				<<run $npcs.set($sex.npcId,'free_creampies',-1)>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> hesitates for a moment before shaking his head.</p>
+				<p><<npc $sex.npcId>><</npc>> hesitates for a moment before shaking his head.</p>
 				"I'm not comfortable with it," he says. "Maybe if you started birth control..."
 			<<else>>
 				<<run $npcs.set($sex.npcId,'free_creampies',2)>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> hesitates for a moment before nodding slowly.</p>
+				<p><<npc $sex.npcId>><</npc>> hesitates for a moment before nodding slowly.</p>
 				"Okay," he says, smiling. "I won''t ask anymore."
 			<</if>>
 			<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -911,7 +911,7 @@
 			<<else>>
 				"I'll let you know when it's a safe day," you smile gently. "And then you can come inside me as much as you want."
 			<</if>>
-			<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> smiles back, beaming at you.</p>
+			<p>"Okay." <<npc $sex.npcId>><</npc>> smiles back, beaming at you.</p>
 			<<gs 'booty_call_pillow_talk' 'topics'>>
 		<</actCLA>>
 		<<if getvar("$birth_control['think_safe']") == 1>>
@@ -925,7 +925,7 @@
 					<<gs 'booty_call_stats' 'birth_control_know'>>
 					"I'm on birth control," you smile gently. "So you can come inside me as much as you want."
 				<</if>>
-				<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> smiles back, beaming at you.</p>
+				<p>"Okay." <<npc $sex.npcId>><</npc>> smiles back, beaming at you.</p>
 				<<gs 'booty_call_pillow_talk' 'topics'>>
 			<</actCLA>>
 		<<elseif getvar("$pillcon2") >= 20000>>
@@ -939,7 +939,7 @@
 					<<gs 'booty_call_stats' 'birth_control_know'>>
 					"I'm on birth control," you smile gently. "So you can come inside me as much as you want."
 				<</if>>
-				<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> smiles back, beaming at you.</p>
+				<p>"Okay." <<npc $sex.npcId>><</npc>> smiles back, beaming at you.</p>
 				<<gs 'booty_call_pillow_talk' 'topics'>>
 			<</actCLA>>
 		<<else>>
@@ -953,7 +953,7 @@
 					<<gs 'booty_call_stats' 'birth_control_know'>>
 					"I'm on birth control," you lie with a seductively gentle smile. "So you can come inside me as much as you want."
 				<</if>>
-				<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> smiles back, beaming at you.</p>
+				<p>"Okay." <<npc $sex.npcId>><</npc>> smiles back, beaming at you.</p>
 				<<gs 'booty_call_pillow_talk' 'topics'>>
 			<</actCLA>>
 		<</if>>
@@ -968,7 +968,7 @@
 				<<actCLA 'Be irritated'>>
 					<<image "shared/sex/after/pillow_talk3.jpg">>
 					"I can't believe you came inside me," you mutter in annoyance. "You made me break my rule."
-					<p>"You're the one who's cheating," <<=$npcs.get($sex.npcId,'firstname')>> grumbles. "Don't blame me."</p>
+					<p>"You're the one who's cheating," <<npc $sex.npcId>><</npc>> grumbles. "Don't blame me."</p>
 					<<if $npcs.get($sex.npcId,'boyfriend_creampie_rule') == 2>>
 						<p>"Well, I am <i>now</i>!" you snap. "That's why I told you not to come inside!"</p>
 					<<else>>
@@ -980,10 +980,10 @@
 			<<actCLA 'Regret'>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				"I guess my rule is broken," you say, twiddling your thumbs awkwardly. "You came inside me..."
-				<p>"So?" <<=$npcs.get($sex.npcId,'firstname')>> asks. "What does that mean?"</p>
+				<p>"So?" <<npc $sex.npcId>><</npc>> asks. "What does that mean?"</p>
 				<<actCLA 'One time thing'>>
 					<p>"It was a one time thing," you say, half to yourself, trying to rationalize. "It was just a mistake, it won't happen again. So it doesn't count!"</p>
-					<p>"Sure," <<=$npcs.get($sex.npcId,'firstname')>> shrugs. "Whatever you want to tell yourself..."</p>
+					<p>"Sure," <<npc $sex.npcId>><</npc>> shrugs. "Whatever you want to tell yourself..."</p>
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<</actCLA>>
 				<<actCLA 'I guess I`m a cheater'>>
@@ -996,14 +996,14 @@
 			<<actCLA 'Unashamed'>>
 				<<run $npcs.set($sex.npcId,'boyfriend_creampie_rule',3)>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
-				<p>"I guess my rule is broken," you say, looking at <<=$npcs.get($sex.npcId,'firstname')>> wistfully. "You came inside me..."</p>
+				<p>"I guess my rule is broken," you say, looking at <<npc $sex.npcId>><</npc>> wistfully. "You came inside me..."</p>
 				<p>"So?" he asks. "What does that mean?"</p>
 				<<actCLA 'If it`s already broken...'>>
 					"If I already broke the rule," you smile. "Then there''s no need to hold back anymore. More creampies for me."
 					<<if $booty_call['cum_count'] < $npcs.get($sex.npcId,'sexdrive')>>
 						<<actCLA 'Continue'>>
 							<<image "shared/sex/foreplay/miss3.jpg">>
-							<p>Hearing you say that, <<=$npcs.get($sex.npcId,'firstname')>> pounces on you, spreading your legs apart and resting his cock up against your pussy.</p>
+							<p>Hearing you say that, <<npc $sex.npcId>><</npc>> pounces on you, spreading your legs apart and resting his cock up against your pussy.</p>
 							<p>"No need to hold back, right?" he grins.</p>
 							<<actCLA 'Down boy'>>
 								<<image "shared/sex/after/pillow_talk1.jpg">>
@@ -1050,7 +1050,7 @@
 <!-- !! --------------------------------------- Boy Talk -------------------------------------------->
 <<if $location_var[$here][0] == 'high_five1'>>
 	<<gs 'booty_call_pillow_talk' 'talk_time_add'>>
-	<p>"That was great," <<=$npcs.get($sex.npcId,'firstname')>> pants, grinning sideways at you.</p>
+	<p>"That was great," <<npc $sex.npcId>><</npc>> pants, grinning sideways at you.</p>
 	<<actCLA 'Yeah'>>
 		"Yeah," you pant back. "It was."
 		<<gs 'booty_call_pillow_talk' 'high_five2'>>
@@ -1074,7 +1074,7 @@
 	<</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'high_five2'>>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> holds up his hand towards you, causing you to glance over at him.</p>
+	<p><<npc $sex.npcId>><</npc>> holds up his hand towards you, causing you to glance over at him.</p>
 	"Come on," he says. "Don't leave me hanging."
 	<<actCLA 'Leave him hanging'>>
 		<<run $npcs.dec($sex.npcId,'rel',2)>>
@@ -1110,7 +1110,7 @@
 <<if $location_var[$here][0] == 'sleep_fucking_talk'>>
 	<<actCLA 'Couldn`t sleep?'>>
 		<<image "shared/sex/after/pillow_talk1.jpg">>
-		<p>"So... couldn't sleep?" you ask <<=$npcs.get($sex.npcId,'firstname')>> amusedly.</p>
+		<p>"So... couldn't sleep?" you ask <<npc $sex.npcId>><</npc>> amusedly.</p>
 		<<if $booty_call['cum_count'] >= $npcs.get($sex.npcId,'sexdrive') + $booty_call['extra_cum']>>
 			"Hard to sleep with my cock snuggled up against your ass," he grins.
 			"Easy to get hard you mean," you snicker.
@@ -1162,7 +1162,7 @@
 	<<setinit $booty_call['good_for_you'] = 1>>
 	<<setinit $booty_call['boy_topics'] -= 1>>
 	<<image "shared/sex/after/pillow_talk1.jpg">>
-	<p>"Was it good for you too?" <<=$npcs.get($sex.npcId,'firstname')>> asks, grinning tiredly at you.</p>
+	<p>"Was it good for you too?" <<npc $sex.npcId>><</npc>> asks, grinning tiredly at you.</p>
 	<<gs 'booty_call_pillow_talk' 'good_for_you'>>
 <</if>>
 <<if $location_var[$here][0] == 'boy_broken_condom'>>
@@ -1170,9 +1170,9 @@
 		<<gs 'booty_call_pillow_talk' 'talk_time_add'>>
 		<<image "shared/sex/after/pillow_talk1.jpg">>
 		<<if getvar("$cum_loc['vagina']") > 0>>
-			<p>"Are you going to be okay?" <<=$npcs.get($sex.npcId,'firstname')>> asks, looking worriedly at your pussy still leaking his cum. "You know, with the... broken condom and everything...?"</p>
+			<p>"Are you going to be okay?" <<npc $sex.npcId>><</npc>> asks, looking worriedly at your pussy still leaking his cum. "You know, with the... broken condom and everything...?"</p>
 		<<else>>
-			<p>"Are you going to be okay?" <<=$npcs.get($sex.npcId,'firstname')>> asks, looking worriedly at your pussy. "You know, with the... broken condom and everything...?"</p>
+			<p>"Are you going to be okay?" <<npc $sex.npcId>><</npc>> asks, looking worriedly at your pussy. "You know, with the... broken condom and everything...?"</p>
 		<</if>>
 		<<if getvar("$morning_after_pill") == 0>>
 			<<actCLA 'I`ll buy a morning after pill'>>
@@ -1189,7 +1189,7 @@
 			<</actCLA>>
 			<<actCLA 'Take your morning after pill (shy)'>>
 				"It's okay," you say. "In fact..."
-				<p><<=$npcs.get($sex.npcId,'firstname')>> watches you reach into your purse and pull out your morning after pill and you can't help but blush beneath his gaze.</p>
+				<p><<npc $sex.npcId>><</npc>> watches you reach into your purse and pull out your morning after pill and you can't help but blush beneath his gaze.</p>
 				<<if getvar("$LudaQW['free_condoms']") == 1 and $pc.sexStat('morning_after_pill') == 0>>
 					"My aunt gave me this for emergencies," you say shyly, blush intensifying as you put it in your mouth and force it down with a dry swallow.
 				<<else>>
@@ -1200,12 +1200,12 @@
 			<</actCLA>>
 			<<actCLA 'Take your morning after pill (sexy)'>>
 				"It's fine," you say, smiling mischievously. "In fact..."
-				<p>As <<=$npcs.get($sex.npcId,'firstname')>> watches you pull your morning after pill from your purse, you give him a smouldering look. Sticking out your tongue at him, you pop the pill onto your mouth, swallowing with a wide grin.</p>
+				<p>As <<npc $sex.npcId>><</npc>> watches you pull your morning after pill from your purse, you give him a smouldering look. Sticking out your tongue at him, you pop the pill onto your mouth, swallowing with a wide grin.</p>
 				<<if $booty_call['last_cum'] == 'swallow'>>
 					"If only I thought to do this earlier," you grin. "Could''ve washed it down with your load."
 				<<elseif getvar("$LudaQW['free_condoms']") == 1 and $pc.sexStat('morning_after_pill') == 0>>
 					"My aunt gave me this," you grin.
-					<p>"She sounds like a good aunt," <<=$npcs.get($sex.npcId,'firstname')>> smirks back. "Or a slutty one."</p>
+					<p>"She sounds like a good aunt," <<npc $sex.npcId>><</npc>> smirks back. "Or a slutty one."</p>
 					"Kind of both actually," you say, causing both of you to laugh.
 				<<else>>
 					"I'm not ready to be a mom," you smirk.
@@ -1229,10 +1229,10 @@
 		<!-- !! find real number later-->
 		<<if $npcs.get($sex.npcId,'like_pubestyle') == $pc.pubestyle>>
 			<!-- !! this determines if you've already had this conversation before-->
-			<p>"I still can't get over how sexy your bush is," <<=$npcs.get($sex.npcId,'firstname')>> says, looking admiringly at your furry pussy.</p>
+			<p>"I still can't get over how sexy your bush is," <<npc $sex.npcId>><</npc>> says, looking admiringly at your furry pussy.</p>
 			<<gs 'booty_call_pillow_talk' 'boy_likes_pubes2'>>
 		<<else>>
-			<p>"So, you don't shave?" <<=$npcs.get($sex.npcId,'firstname')>> asks, looking at your furry pussy.</p>
+			<p>"So, you don't shave?" <<npc $sex.npcId>><</npc>> asks, looking at your furry pussy.</p>
 			<<actCLA 'I like it this way'>>
 				<<setinit $booty_call['like_bush'] = 1>>
 				<p>"I like it this way," you say. "I think it's pretty sexy. Why do you ask?"</p>
@@ -1304,7 +1304,7 @@
 	<</actCLA>>
 	<<actCLA 'You think I should?'>>
 		<p>"You think I should?" you ask him, looking down and inspecting your bush.</p>
-		<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> says. "I think you'd look super sexy if you styled it. Or just shaved it all off."</p>
+		<p>"Yeah," <<npc $sex.npcId>><</npc>> says. "I think you'd look super sexy if you styled it. Or just shaved it all off."</p>
 		<<gs 'booty_call_pillow_talk' 'shave_for_you'>>
 	<</actCLA>>
 	<<gs 'booty_call_pillow_talk' 'annoyed_shave'>>
@@ -1320,7 +1320,7 @@
 	<</actCLA>>
 	<<actCLA 'You think I should?'>>
 		<p>"You think I should?" you ask him, looking down and inspecting your bush.</p>
-		<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> says. "I think you'd look super sexy if you styled it. Or just shaved it all off."</p>
+		<p>"Yeah," <<npc $sex.npcId>><</npc>> says. "I think you'd look super sexy if you styled it. Or just shaved it all off."</p>
 		<<gs 'booty_call_pillow_talk' 'shave_for_you'>>
 	<</actCLA>>
 	<<gs 'booty_call_pillow_talk' 'annoyed_shave'>>
@@ -1335,7 +1335,7 @@
 	<<actCLA 'For you'>>
 		<<run $npcs.set($sex.npcId,'shave_promise',$time.daystart)>>
 		<p>"Well..." you say. "I guess I could try it? For you."</p>
-		<p>You punctuate your promise with a gentle smile, returned with an eager grin from <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+		<p>You punctuate your promise with a gentle smile, returned with an eager grin from <<npc $sex.npcId>><</npc>>.</p>
 		<<gs 'booty_call_pillow_talk' 'topics'>>
 	<</actCLA>>
 <</if>>
@@ -1374,12 +1374,12 @@
 			"Well I'm glad I have your permission to shave the way I like it," you huff, acerbically rolling your eyes.
 			<<if $npcs.get($sex.npcId,'argumentative') == 1>>
 				<<run $npcs.dec($sex.npcId,'rel',2)>>
-				<p>"What the fuck is your problem?" <<=$npcs.get($sex.npcId,'firstname')>> growls. "I was trying to pay you a compliment!"</p>
+				<p>"What the fuck is your problem?" <<npc $sex.npcId>><</npc>> growls. "I was trying to pay you a compliment!"</p>
 				<<actCLA 'Apologize'>>
 					<<image "shared/sex/after/pillow_talk1.jpg">>
 					You immediately feel bad and look back at him with a guilty expression on your face.
 					"I'm sorry," you say. "I... I don't know why I snapped at you like that. You're right. I should be happy you think I'm sexy."
-					<p>You give him an apologetic smile and though <<=$npcs.get($sex.npcId,'firstname')>> still seems a little annoyed with you, he mostly calms down as well.</p>
+					<p>You give him an apologetic smile and though <<npc $sex.npcId>><</npc>> still seems a little annoyed with you, he mostly calms down as well.</p>
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<</actCLA>>
 				<<actCLA 'I didn`t ask!'>>
@@ -1390,12 +1390,12 @@
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<</actCLA>>
 			<<else>>
-				<p>"I didn't mean it like that," <<=$npcs.get($sex.npcId,'firstname')>> says, looking bemused at you. "I just wanted to let you know I think you're hot."</p>
+				<p>"I didn't mean it like that," <<npc $sex.npcId>><</npc>> says, looking bemused at you. "I just wanted to let you know I think you're hot."</p>
 				<<actCLA 'Apologize'>>
 					<<image "shared/sex/after/pillow_talk1.jpg">>
 					You immediately feel guilty and look back at him.
 					"I'm sorry," you say. "I... I don't know why I snapped at you like that. That was... uncalled for..."
-					<p>You give him an apologetic smile and <<=$npcs.get($sex.npcId,'firstname')>> smiles back, letting you know he accepts it.</p>
+					<p>You give him an apologetic smile and <<npc $sex.npcId>><</npc>> smiles back, letting you know he accepts it.</p>
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<</actCLA>>
 				<<actCLA 'I didn't ask for a man's opinion!'>>
@@ -1520,7 +1520,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'boy_no_kids'>>
 	<<if getvar("$booty_call['no_kids']") == 1 and getvar("$npc_know_no_kids") == 1>>
-		<p>"So you don't want kids?" <<=$npcs.get($sex.npcId,'firstname')>> asks, looking over at you.</p>
+		<p>"So you don't want kids?" <<npc $sex.npcId>><</npc>> asks, looking over at you.</p>
 		<<actCLA 'Not right now'>>
 			<p>"Not right now," you shake your head. "Maybe one day, but I'm not ready to be a mother. What about you?"</p>
 			<<if $npcs.get($sex.npcId,'childfree') == 1>>
@@ -1553,7 +1553,7 @@
 				"I feel the same way," he says, nodding. "I never want to be a parent. That sounds awful."
 				<<gs 'booty_call_pillow_talk' 'topics'>>
 			<<else>>
-				<p>"Don't you think you'd get lonely?" <<=$npcs.get($sex.npcId,'firstname')>> asks. "Y'know, knowing that you wouldn't have anything to live for except yourself when you get old?"</p>
+				<p>"Don't you think you'd get lonely?" <<npc $sex.npcId>><</npc>> asks. "Y'know, knowing that you wouldn't have anything to live for except yourself when you get old?"</p>
 				<<actCLA 'I guess...'>>
 					<p>"I guess, maybe," you mumble. "I don't know. Why does everything have to be about procreation? Why can't I just live my life?"</p>
 					<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -1565,7 +1565,7 @@
 				<<actCLA 'Play it off'>>
 					<<image "shared/sex/after/pillow_talk1.jpg">>
 					"That's what I have guys like you for," you smirk. "To fuck me when I get lonely."
-					<p><<=$npcs.get($sex.npcId,'firstname')>> can tell you just sidestepped the question, but doesn't press the topic any further.</p>
+					<p><<npc $sex.npcId>><</npc>> can tell you just sidestepped the question, but doesn't press the topic any further.</p>
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<</actCLA>>
 			<</if>>

+ 90 - 90
sugarcube/src/activities/bootycall/booty_call_pillow_talk2.tw

@@ -25,38 +25,38 @@
 				<<setinit $booty_call['weather_pillow_talk'] = 1>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				"It's so hot today," you pant. "I'm sweating after that. And not just from the sex."
-				<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> nods. "I'm practically dripping."</p>
+				<p>"Yeah," <<npc $sex.npcId>><</npc>> nods. "I'm practically dripping."</p>
 				<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 			<</actCLA>>
 		<<elseif getvar("$weather.temperature") <= 10>>
 			<<actCLA 'It`s so cold'>>
 				<<setinit $booty_call['weather_pillow_talk'] = 1>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
-				<p>"Brrr," you shiver, cuddling up closer against <<=$npcs.get($sex.npcId,'firstname')>>'s body. "It's so chilly today."</p>
-				<p>"You get cold easily?" <<=$npcs.get($sex.npcId,'firstname')>> asks, seemingly pleased by your naked body pressed up against his.</p>
+				<p>"Brrr," you shiver, cuddling up closer against <<npc $sex.npcId>><</npc>>'s body. "It's so chilly today."</p>
+				<p>"You get cold easily?" <<npc $sex.npcId>><</npc>> asks, seemingly pleased by your naked body pressed up against his.</p>
 				<<actCLA 'Not really'>>
 					<<setinit $pc_gets_chilly[$sex.npcId] = -1>>
 					"Not really," you shake your head. "I'm usually pretty tolerant of the cold. Must be the contrast from how warm I was during the sex."
 					<<actCLA 'Smile'>>
-						<p>You smile softly at <<=$npcs.get($sex.npcId,'firstname')>> who grins back confidently, wrapping his arm around you.</p>
+						<p>You smile softly at <<npc $sex.npcId>><</npc>> who grins back confidently, wrapping his arm around you.</p>
 						<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 					<</actCLA>>
 					<<actCLA 'Grin'>>
-						<p>You grin at <<=$npcs.get($sex.npcId,'firstname')>> who grins back just as wide as he wraps his arm around you.</p>
+						<p>You grin at <<npc $sex.npcId>><</npc>> who grins back just as wide as he wraps his arm around you.</p>
 						<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 					<</actCLA>>
 					<<actCLA 'Demure'>>
-						<p>You snuggle in closer to <<=$npcs.get($sex.npcId,'firstname')>> without further comment, letting the implication of your words speak for itself. You figure he got the message when he grins as he wraps his arm around you.</p>
+						<p>You snuggle in closer to <<npc $sex.npcId>><</npc>> without further comment, letting the implication of your words speak for itself. You figure he got the message when he grins as he wraps his arm around you.</p>
 						<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 					<</actCLA>>
 				<</actCLA>>
 				<<actCLA 'Sometimes'>>
-					<p>"Sometimes yes, sometimes no. I think I'm just like anybody else," you shrug, snuggling closer into <<=$npcs.get($sex.npcId,'firstname')>>'s warmth.</p>
+					<p>"Sometimes yes, sometimes no. I think I'm just like anybody else," you shrug, snuggling closer into <<npc $sex.npcId>><</npc>>'s warmth.</p>
 					<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 				<</actCLA>>
 				<<actCLA 'I`m always cold'>>
 					<<setinit $pc_gets_chilly[$sex.npcId] = 1>>
-					<p>"I'm always cold," you shiver, snuggling as far as you can into <<=$npcs.get($sex.npcId,'firstname')>>'s warmth. "I would wear a jacket in the summer."</p>
+					<p>"I'm always cold," you shiver, snuggling as far as you can into <<npc $sex.npcId>><</npc>>'s warmth. "I would wear a jacket in the summer."</p>
 					<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 				<</actCLA>>
 			<</actCLA>>
@@ -68,7 +68,7 @@
 		<<actCLA 'What do you like about my body?'>>
 			<<setinit $booty_call['body_talk'] = 1>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
-			<p>"What do you find sexy about me?" you ask <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+			<p>"What do you find sexy about me?" you ask <<npc $sex.npcId>><</npc>>.</p>
 			<<if $npcs.get($sex.npcId,'fav_body_part') == 'tits'>>
 				<!-- !!			if npc_humor[$sex.npcId] = 2:-->
 				<!-- !!				'"Your tits," he grins, bending his head and popping your nipple into his mouth for a gentle suckle. "Definitely your tits."'-->
@@ -117,7 +117,7 @@
 				<</actCLA>>
 				<<actCLA 'Glad you think so'>>
 					<<image "shared/sex/after/pillow_talk2.jpg">>
-					<p>"Aww! Thanks," you smile fondly at <<=$npcs.get($sex.npcId,'firstname')>>. "Means a lot to me that you think so."</p>
+					<p>"Aww! Thanks," you smile fondly at <<npc $sex.npcId>><</npc>>. "Means a lot to me that you think so."</p>
 					"Boobs are great," he grins. "And your boobs are especially great because you let me fuck you."
 					<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 				<</actCLA>>
@@ -140,7 +140,7 @@
 				<</actCLA>>
 				<<actCLA 'Glad you think so'>>
 					<<image "shared/sex/after/pillow_talk2.jpg">>
-					<p>"Aww! Thanks," you smile fondly at <<=$npcs.get($sex.npcId,'firstname')>>. "Means a lot to me that you think so."</p>
+					<p>"Aww! Thanks," you smile fondly at <<npc $sex.npcId>><</npc>>. "Means a lot to me that you think so."</p>
 					"There''s something irresistible about a good ass," he grins, grabbing another handful of yours.
 					<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 				<</actCLA>>
@@ -164,24 +164,24 @@
 					<<arouse 'vaginal_finger' -5 `['no_orgasm_msg']`>>
 					<<image "shared/sex/after/pillow_talk2.jpg">>
 					<p>"You really think so?" you ask. "Not my boobs or my ass or-"</p>
-					<p>Your next words are interrupted by a gasp as <<=$npcs.get($sex.npcId,'firstname')>> drives a finger knuckle deep into your just-fucked pussy. Soft squelching sounds emanate from between your legs as he gently caresses your insides, forcing whimpers from your lips while he stares into your eyes.</p>
+					<p>Your next words are interrupted by a gasp as <<npc $sex.npcId>><</npc>> drives a finger knuckle deep into your just-fucked pussy. Soft squelching sounds emanate from between your legs as he gently caresses your insides, forcing whimpers from your lips while he stares into your eyes.</p>
 					"Yeah..." he says, giving a predatory smile as he draws his hand away trailing strands of your juices. "Your pussy is the best."
 					<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 				<</actCLA>>
 				<<actCLA 'Glad you think so'>>
 					<<image "shared/sex/after/pillow_talk2.jpg">>
 					<<if getvar("$booty_call['fuck_count']") > 0 or $npcs.get($sex.npcId,'fuck_times') > 0>>
-						<p>"Glad you think so," you smile at <<=$npcs.get($sex.npcId,'firstname')>>. "I'd hate to find out you don't appreciate the pussy you're fucking."</p>
+						<p>"Glad you think so," you smile at <<npc $sex.npcId>><</npc>>. "I'd hate to find out you don't appreciate the pussy you're fucking."</p>
 					<<else>>
-						<p>"Glad you think so," you smile at <<=$npcs.get($sex.npcId,'firstname')>>. "Always nice to get compliments."</p>
+						<p>"Glad you think so," you smile at <<npc $sex.npcId>><</npc>>. "Always nice to get compliments."</p>
 					<</if>>
 					<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 				<</actCLA>>
 				<<actCLA 'I like it too'>>
 					<<if getvar("$booty_call['fuck_count']") > 0 or $npcs.get($sex.npcId,'fuck_times') > 0>>
-						<p>"Me too," you grin at <<=$npcs.get($sex.npcId,'firstname')>>. "I like the way it lets me fuck you."</p>
+						<p>"Me too," you grin at <<npc $sex.npcId>><</npc>>. "I like the way it lets me fuck you."</p>
 					<<else>>
-						<p>"Me too," you grin at <<=$npcs.get($sex.npcId,'firstname')>>. "I've always thought my pussy was cute."</p>
+						<p>"Me too," you grin at <<npc $sex.npcId>><</npc>>. "I've always thought my pussy was cute."</p>
 					<</if>>
 					"Glad we're in agreement," he grins back.
 					<<gs 'booty_call_pillow_talk2' 'small_talk'>>
@@ -202,7 +202,7 @@
 							"You taste good," he says, licking his lips.
 						<<else>>
 							"That's not the <i>only</i> reason," he says. "There''s just something hot about them. But yours is especially hot when I'm fucking it."
-							<p><<=$npcs.get($sex.npcId,'firstname')>> grins shamelessly.</p>
+							<p><<npc $sex.npcId>><</npc>> grins shamelessly.</p>
 						<</if>>
 						<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 					<</actCLA>>
@@ -222,7 +222,7 @@
 							"But you were also really tight," he says, licking his lips. "Mmm... You taste good..."
 						<<else>>
 							"That's not the <i>only</i> reason," he says. "There''s just something hot about them. But yours is especially hot because I got to be your first."
-							<p><<=$npcs.get($sex.npcId,'firstname')>> grins shamelessly.</p>
+							<p><<npc $sex.npcId>><</npc>> grins shamelessly.</p>
 						<</if>>
 						<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 					<</actCLA>>
@@ -267,9 +267,9 @@
 			<<actCLA 'Annoyed'>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				<<if $npcs.get($sex.npcId,'last_sex') == $time.daystart>>
-					<p>"You made me late for school this morning," you grumble, eyeballing <<=$npcs.get($sex.npcId,'firstname')>>. "Again."</p>
+					<p>"You made me late for school this morning," you grumble, eyeballing <<npc $sex.npcId>><</npc>>. "Again."</p>
 				<<else>>
-					<p>"You made me late for school the last time I came over," you grumble, eyeballing  <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+					<p>"You made me late for school the last time I came over," you grumble, eyeballing  <<npc $sex.npcId>><</npc>>.</p>
 				<</if>>
 				<<gs 'booty_call_pillow_talk2' 'made_me_late2'>>
 			<</actCLA>>
@@ -282,9 +282,9 @@
 			<<actCLA 'Annoyed'>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				<<if $npcs.get($sex.npcId,'last_sex') == $time.daystart>>
-					<p>"You made me late for school this morning," you grumble, eyeballing <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+					<p>"You made me late for school this morning," you grumble, eyeballing <<npc $sex.npcId>><</npc>>.</p>
 				<<else>>
-					<p>"You made me late for school the last time I came over," you grumble, eyeballing  <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+					<p>"You made me late for school the last time I came over," you grumble, eyeballing  <<npc $sex.npcId>><</npc>>.</p>
 				<</if>>
 				<<gs 'booty_call_pillow_talk2' 'made_me_late2'>>
 			<</actCLA>>
@@ -309,7 +309,7 @@
 				<<else>>
 					<<if $npcs.get($sex.npcId,'end_free_time') >= $time.hour and $time.hour > 0>>
 						"I have to go to work after this," he says, checking the time. "Shit, I'm gonna be late. I gotta get going now."
-						<p><<=$npcs.get($sex.npcId,'firstname')>> hauls himself out of bed and you guess you should do the same.</p>
+						<p><<npc $sex.npcId>><</npc>> hauls himself out of bed and you guess you should do the same.</p>
 						<<setinit $booty_call['npc_late'] = 1>>
 						<<gs 'booty_call_after' 'after_sex2'>>
 					<<else>>
@@ -329,7 +329,7 @@
 			<<actCLA 'Doing anything else today?'>>
 				<<setinit $booty_call['what_do_today'] = 1>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
-				<p>"So, what else have you done today? Besides me I mean," you smirk at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+				<p>"So, what else have you done today? Besides me I mean," you smirk at <<npc $sex.npcId>><</npc>>.</p>
 				<<gs 'booty_call_pillow_talk2' 'day_events'>>
 			<</actCLA>>
 		<</if>>
@@ -427,20 +427,20 @@
 			<<elseif getvar("$booty_call['club_after']") == 1>>
 				"Thinking about going clubbing later," you reply. "I wanna go dancing with your cum running down my thighs."
 			<</if>>
-			<p>You give <<=$npcs.get($sex.npcId,'firstname')>> a mischievous smirk, rubbing your legs together where his cum still leaks from your snatch.</p>
+			<p>You give <<npc $sex.npcId>><</npc>> a mischievous smirk, rubbing your legs together where his cum still leaks from your snatch.</p>
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 		<</actCLA>>
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'day_events'>>
 	<<if $npcs.get($sex.npcId,'work_end') < $time.hour and $npcs.get($sex.npcId,'day_off') != $time.weekday>>
-		<p>"Just work," <<=$npcs.get($sex.npcId,'firstname')>> shrugs turning to look at you. "Getting together with you was my fun time today. What about you?"</p>
+		<p>"Just work," <<npc $sex.npcId>><</npc>> shrugs turning to look at you. "Getting together with you was my fun time today. What about you?"</p>
 		<<gs 'booty_call_pillow_talk2' 'pc_day_events'>>
 		<<gs 'booty_call_pillow_talk2' 'pc_plans_later'>>
 		<!-- !!		gs'booty_call_work_talk1', 'job_talk'-->
 	<<else>>
 		<<if $npcs.get($sex.npcId,'girlfriend') == 1 and $npcs.get($sex.npcId,'fidelity') == 6 and rand(1,3) == 1>>
-			<p>"Went on a date with my girlfriend," <<=$npcs.get($sex.npcId,'firstname')>> responds casually.</p>
+			<p>"Went on a date with my girlfriend," <<npc $sex.npcId>><</npc>> responds casually.</p>
 			<<actCLA 'Uncomfortable'>>
 				"Oh. I see..." you murmur uncomfortably. You leave it at that, unsure of what else to say.
 				<<gs 'booty_call_pillow_talk2' 'small_talk'>>
@@ -484,7 +484,7 @@
 	<<if $pc.isSchoolStudent and getvar("$q.school.homeworkLeft") == 0 and $time.isSchoolHoliday == 0>>
 		<<actCLA 'Homework'>>
 			"Just did my homework," you shrug. "Got the boring stuff out of the way so I could enjoy my fun without worry."
-			<p>You give <<=$npcs.get($sex.npcId,'firstname')>> an affectionate smile.</p>
+			<p>You give <<npc $sex.npcId>><</npc>> an affectionate smile.</p>
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 		<</actCLA>>
 	<</if>>
@@ -553,7 +553,7 @@
 				<<if getvar("$AlbinaQW['StarletsShutDown']") == 0>>
 					<<actCLA 'Part of a dance troupe'>>
 						<<setinit $booty_call['dance_type'] = 'starlet'>>
-						<p>"I'm part of a dance troupe in Pavlovsk. The Starlets, ever heard of us?" <<=$npcs.get($sex.npcId,'firstname')>> shakes his head. "Oh, well we do performances every few weeks. That's my practice later."</p>
+						<p>"I'm part of a dance troupe in Pavlovsk. The Starlets, ever heard of us?" <<npc $sex.npcId>><</npc>> shakes his head. "Oh, well we do performances every few weeks. That's my practice later."</p>
 						<p>"So you're saying there's a bunch of other sexy girls just like you who all dance together?" he grins. "Sounds hot."</p>
 						<<actCLA 'Keep talking'>>
 							 <<gs 'booty_call_pillow_talk2' 'small_talk'>>
@@ -563,7 +563,7 @@
 				<<else>>
 					<<actCLA 'Used to be part of a dance troupe'>>
 						<<setinit $booty_call['dance_type'] = 'starlet'>>
-						<p>"I used to dance as part of a troupe in Pavlovsk. The Starlets, ever heard of them?" <<=$npcs.get($sex.npcId,'firstname')>> shakes his head. "Oh, well we did performances every few weeks. But we had to shut down because of some stuff."</p>
+						<p>"I used to dance as part of a troupe in Pavlovsk. The Starlets, ever heard of them?" <<npc $sex.npcId>><</npc>> shakes his head. "Oh, well we did performances every few weeks. But we had to shut down because of some stuff."</p>
 						"Damn, I would have thought a bunch of sexy girls dancing would be impossible to get rid of," he grins. "I bet the customers rioted."
 						<<actCLA 'Keep talking'>>
 							 <<gs 'booty_call_pillow_talk2' 'small_talk'>>
@@ -583,10 +583,10 @@
 			"Yeah... too bad..." you mumble.
 		<</if>>
 		<<if rand(1,2) == 1 and $npcs.get($sex.npcId,'seen_dance') == 1>>
-			<p>"Could you dance for me again?" <<=$npcs.get($sex.npcId,'firstname')>> asks. "It was really sexy the last time you showed me."</p>
+			<p>"Could you dance for me again?" <<npc $sex.npcId>><</npc>> asks. "It was really sexy the last time you showed me."</p>
 			<<actCLA 'Not right now'>>
 				<<image "shared/sex/after/pillow_talk2.jpg">>
-				<p>"Sorry, I can't right now. My legs are still a little wobbly," you say, giving <<=$npcs.get($sex.npcId,'firstname')>> a suggestive look as you rub your wet thighs together.</p>
+				<p>"Sorry, I can't right now. My legs are still a little wobbly," you say, giving <<npc $sex.npcId>><</npc>> a suggestive look as you rub your wet thighs together.</p>
 				<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 			<</actCLA>>
 			<<actCLA 'Dance for him'>>
@@ -605,38 +605,38 @@
 						You grab your shoes from the hallway and come back, doing a freestyle shuffle for him, bouncing up and down with nothing covering you but your sneakers.
 					<</if>>
 					<p>"Happy now?" you ask with a twirl and a smile.</p>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> just nods back, too busy enjoying the show.</p>
+					<p><<npc $sex.npcId>><</npc>> just nods back, too busy enjoying the show.</p>
 					<<gs 'booty_call_pillow_talk2' 'show_dance_end'>>
 				<</actCLA>>
 				<<actCLA 'A sexy one'>>
 					<<video "pc/activities/dancing/sexy_naked1.mp4">>
 					<<if getvar("$cum_loc['face']") > 0 and getvar("$cum_loc['vagina']") > 0>>
-						<p>You start swaying your hips, shaking your ass at <<=$npcs.get($sex.npcId,'firstname')>> with rolling, sensual movements, eye-fucking him as his cum drips down your face and legs.</p>
+						<p>You start swaying your hips, shaking your ass at <<npc $sex.npcId>><</npc>> with rolling, sensual movements, eye-fucking him as his cum drips down your face and legs.</p>
 					<<elseif getvar("$cum_loc['face']") > 0>>
-						<p>You start swaying your hips, shaking your ass at <<=$npcs.get($sex.npcId,'firstname')>> with rolling, sensual movements, eye-fucking him as his cum drips down your face.</p>
+						<p>You start swaying your hips, shaking your ass at <<npc $sex.npcId>><</npc>> with rolling, sensual movements, eye-fucking him as his cum drips down your face.</p>
 					<<elseif getvar("$cum_loc['vagina']") > 0>>
-						<p>You start swaying your hips, shaking your ass at <<=$npcs.get($sex.npcId,'firstname')>> with rolling, sensual movements, eye-fucking him as his cum drips down your legs.</p>
+						<p>You start swaying your hips, shaking your ass at <<npc $sex.npcId>><</npc>> with rolling, sensual movements, eye-fucking him as his cum drips down your legs.</p>
 					<<else>>
-						<p>You hop out of bed and start swaying your hips, shaking your ass at <<=$npcs.get($sex.npcId,'firstname')>> with rolling, sensual movements, not dissimilar to the movements you were making minutes ago when you were fucking him.</p>
+						<p>You hop out of bed and start swaying your hips, shaking your ass at <<npc $sex.npcId>><</npc>> with rolling, sensual movements, not dissimilar to the movements you were making minutes ago when you were fucking him.</p>
 					<</if>>
 					<p>"Happy now?" you ask with a husky voice.</p>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> just nods back, too busy enjoying the show.</p>
+					<p><<npc $sex.npcId>><</npc>> just nods back, too busy enjoying the show.</p>
 					<<gs 'booty_call_pillow_talk2' 'show_dance_end'>>
 				<</actCLA>>
 				<<if getvar("$AlbinaQW['StarletsJoined']") > 0>>
 					<<actCLA 'A Starlets routine'>>
 						<<video "pc/activities/dancing/shuffle_naked1.mp4">>
 						<<if getvar("$cum_loc['face']") > 0 and getvar("$cum_loc['vagina']") > 0>>
-							<p>You grab your shoes from the hallway and come back, counting off time before jumping into an energetic Starlets routine, <<=$npcs.get($sex.npcId,'firstname')>>'s cum still painting your face and running down your legs.</p>
+							<p>You grab your shoes from the hallway and come back, counting off time before jumping into an energetic Starlets routine, <<npc $sex.npcId>><</npc>>'s cum still painting your face and running down your legs.</p>
 						<<elseif getvar("$cum_loc['face']") > 0>>
-							<p>You grab your shoes from the hallway and come back, counting off time before jumping into an energetic Starlets routine, <<=$npcs.get($sex.npcId,'firstname')>>'s cum still painting your face.</p>
+							<p>You grab your shoes from the hallway and come back, counting off time before jumping into an energetic Starlets routine, <<npc $sex.npcId>><</npc>>'s cum still painting your face.</p>
 						<<elseif getvar("$cum_loc['vagina']") > 0>>
-							<p>You grab your shoes from the hallway and come back, counting off time before jumping into an energetic Starlets routine, <<=$npcs.get($sex.npcId,'firstname')>>'s cum still running down your legs.</p>
+							<p>You grab your shoes from the hallway and come back, counting off time before jumping into an energetic Starlets routine, <<npc $sex.npcId>><</npc>>'s cum still running down your legs.</p>
 						<<else>>
 							You grab your shoes from the hallway and come back, counting off time before jumping into an energetic Starlets routine.
 						<</if>>
 						<p>"Happy now?" you ask with a twirl and a smile.</p>
-						<p><<=$npcs.get($sex.npcId,'firstname')>> just nods back, too busy enjoying the show.</p>
+						<p><<npc $sex.npcId>><</npc>> just nods back, too busy enjoying the show.</p>
 						<<gs 'booty_call_pillow_talk2' 'show_dance_end'>>
 					<</actCLA>>
 				<</if>>
@@ -675,18 +675,18 @@
 		You hop out of bed and grab your shoes from where you tossed them, tugging each one on before moving to a clear space in the room.
 		<<actCLA 'Shuffle'>>
 			<<video "pc/activities/dancing/shuffle_naked1.mp4">>
-			<p>Picking a favorite song of yours in your head, you skip your way into the middle of <<=$npcs.get($sex.npcId,'firstname')>>'s floor and show him how you shuffle. With every step, your ass cheeks jiggle and your breasts bounce wildly, and the silliness of it spreads an uncontrollable grin across your lips.</p>
+			<p>Picking a favorite song of yours in your head, you skip your way into the middle of <<npc $sex.npcId>><</npc>>'s floor and show him how you shuffle. With every step, your ass cheeks jiggle and your breasts bounce wildly, and the silliness of it spreads an uncontrollable grin across your lips.</p>
 			<<if getvar("$cum_loc['face']") > 0 and getvar("$cum_loc['vagina']") > 0>>
-				<p>You're sure you must be quite a sight, shuffling naked in the middle of <<=$npcs.get($sex.npcId,'firstname')>>'s apartment, his cum all over your face and running down your legs.</p>
+				<p>You're sure you must be quite a sight, shuffling naked in the middle of <<npc $sex.npcId>><</npc>>'s apartment, his cum all over your face and running down your legs.</p>
 			<<elseif getvar("$cum_loc['face']") > 0>>
-				<p>You're sure you must be quite a sight, shuffling naked in the middle of <<=$npcs.get($sex.npcId,'firstname')>>'s apartment, his cum all over your face.</p>
+				<p>You're sure you must be quite a sight, shuffling naked in the middle of <<npc $sex.npcId>><</npc>>'s apartment, his cum all over your face.</p>
 			<<elseif getvar("$cum_loc['vagina']") > 0>>
-				<p>You're sure you must be quite a sight, shuffling naked in the middle of <<=$npcs.get($sex.npcId,'firstname')>>'s apartment, his cum dripping from your snatch and running down your legs.</p>
+				<p>You're sure you must be quite a sight, shuffling naked in the middle of <<npc $sex.npcId>><</npc>>'s apartment, his cum dripping from your snatch and running down your legs.</p>
 			<<else>>
-				<p>You're sure you must be quite a sight, shuffling in the middle of <<=$npcs.get($sex.npcId,'firstname')>>'s apartment with nothing covering you but your sneakers.</p>
+				<p>You're sure you must be quite a sight, shuffling in the middle of <<npc $sex.npcId>><</npc>>'s apartment with nothing covering you but your sneakers.</p>
 			<</if>>
 			<p>"Pretty good, right?" you say with a twirl, still grinning and still dancing.</p>
-			<p>"Oh yeah. <i>Really</i> good," <<=$npcs.get($sex.npcId,'firstname')>> replies. Though the look on his face says he's not really talking about your dance moves.</p>
+			<p>"Oh yeah. <i>Really</i> good," <<npc $sex.npcId>><</npc>> replies. Though the look on his face says he's not really talking about your dance moves.</p>
 			<<gs 'booty_call_pillow_talk2' 'show_dance_end'>>
 		<</actCLA>>
 	<</actCLA>>
@@ -694,10 +694,10 @@
 <<if $location_var[$here][0] == 'show_sexy'>>
 	<<actCLA 'Dance sexily'>>
 		<<video "pc/activities/dancing/sexy_naked1.mp4">>
-		<p>You hop out of bed and start swaying your hips, shaking your ass at <<=$npcs.get($sex.npcId,'firstname')>> with rolling, sensual movements, not dissimilar to the movements you were making minutes ago when you were fucking him.</p>
+		<p>You hop out of bed and start swaying your hips, shaking your ass at <<npc $sex.npcId>><</npc>> with rolling, sensual movements, not dissimilar to the movements you were making minutes ago when you were fucking him.</p>
 		<p>"Pretty hot, right?"</p>
 		"Yeah..."
-		<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't say anything more. He's too busy drooling as until you finish dancing.</p>
+		<p><<npc $sex.npcId>><</npc>> doesn't say anything more. He's too busy drooling as until you finish dancing.</p>
 		<<gs 'booty_call_pillow_talk2' 'show_dance_end'>>
 	<</actCLA>>
 <</if>>
@@ -708,19 +708,19 @@
 			<p>"Okay! Let me just put my shoes on. It's kind of hard to do this with bare feet."</p>
 			You hop out of bed and grab your shoes from where you tossed them, tugging each one on before moving to a clear space in the room.
 			<<if getvar("$AlbinaQW['StarletsShutDown']") == 0>>
-				<p>"Ready?" you ask and <<=$npcs.get($sex.npcId,'firstname')>> nods. "This is one of our routines our troupe uses for performances."</p>
+				<p>"Ready?" you ask and <<npc $sex.npcId>><</npc>> nods. "This is one of our routines our troupe uses for performances."</p>
 			<<else>>
-				<p>"Ready?" you ask and <<=$npcs.get($sex.npcId,'firstname')>> nods. "This is one of the dances my old troupe used to do."</p>
+				<p>"Ready?" you ask and <<npc $sex.npcId>><</npc>> nods. "This is one of the dances my old troupe used to do."</p>
 			<</if>>
 			<<actCLA 'Dance for him'>>
 				<<video "pc/activities/dancing/modern_naked1.mp4">>
 				Without further ado, you count off a time in your head and jump into the routine that Albina devised for the Starlets. It feels different, going through the movements in nothing but your sneakers as opposed to wearing tight spandex. Makes you wonder if Albina devised it at home naked.
-				<p>The look on <<=$npcs.get($sex.npcId,'firstname')>>'s face as you dance almost makes you burst into giggles but you somehow manage to contain it to a wide grin instead.</p>
+				<p>The look on <<npc $sex.npcId>><</npc>>'s face as you dance almost makes you burst into giggles but you somehow manage to contain it to a wide grin instead.</p>
 				<<actCLA 'Continue'>>
 					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					You end the routine, sticking the final pose and breathing hard.
 					<p>"So?" you pant. "What did you think?"</p>
-					<p>"I think that was the sexiest dance I've ever seen," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+					<p>"I think that was the sexiest dance I've ever seen," <<npc $sex.npcId>><</npc>> grins.</p>
 					<<actCLA 'Glad you enjoyed it'>>
 						"I'm glad you enjoyed it," you smile back, finally managing to catch your breath as you stand up straight.
 						<<gs 'booty_call_pillow_talk2' 'show_dance_end'>>
@@ -738,15 +738,15 @@
 	<<actCLA 'Back into bed'>>
 		<<image "shared/sex/after/pillow_talk1.jpg">>
 		<<if $booty_call['dance_type'] == 'modern' or $booty_call['dance_type'] == 'starlet'>>
-			<p>Your little performance finished, you kick off your shoes and snuggle back into the bed with <<=$npcs.get($sex.npcId,'firstname')>>, picking up your pillow talk from where you left off.</p>
+			<p>Your little performance finished, you kick off your shoes and snuggle back into the bed with <<npc $sex.npcId>><</npc>>, picking up your pillow talk from where you left off.</p>
 		<<else>>
-			<p>Your little performance finished, you snuggle back into the bed with <<=$npcs.get($sex.npcId,'firstname')>>, picking up your pillow talk from where you left off.</p>
+			<p>Your little performance finished, you snuggle back into the bed with <<npc $sex.npcId>><</npc>>, picking up your pillow talk from where you left off.</p>
 		<</if>>
 		<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 	<</actCLA>>
 	<<actCLA 'Do something else'>>
 		$npc_apt_bedroom
-		<p>Since you've already gotten out of <<=$npcs.get($sex.npcId,'firstname')>>'s bed, you figure you ought to do something other than crawl back in.</p>
+		<p>Since you've already gotten out of <<npc $sex.npcId>><</npc>>'s bed, you figure you ought to do something other than crawl back in.</p>
 		<<gs 'booty_call_after' 'after_sex2'>>
 	<</actCLA>>
 <</if>>
@@ -764,23 +764,23 @@
 		<<setinit $booty_call['dick_play'] = 1>>
 		<<if $npcs.get($sex.npcId,'dick_play') == 0>>
 			<<if $booty_call['cum_count'] == $npcs.get($sex.npcId,'sexdrive')>>
-				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it between your fingers.</p>
+				<p>You reach over to <<npc $sex.npcId>><</npc>>, gently taking hold of his cock in your hand, squeezing and playing with it between your fingers.</p>
 				"If you're trying to get me hard, I don't think I can go again," he chuckles.
 			<<elseif $booty_call['cum_count'] < $npcs.get($sex.npcId,'sexdrive') / 2>>
-				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, stiffening slightly between your fingers.</p>
+				<p>You reach over to <<npc $sex.npcId>><</npc>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, stiffening slightly between your fingers.</p>
 				<p>"You trying to get me hard again?" he snickers.</p>
 			<<else>>
-				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, immediately stiffening between your fingers.</p>
+				<p>You reach over to <<npc $sex.npcId>><</npc>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, immediately stiffening between your fingers.</p>
 				<p>"You want to go again?" he grins.</p>
 			<</if>>
 			"That's not what I'm doing," you say, affectionately rolling your eyes. "I'm just... playing with it."
 		<<else>>
 			<<if $booty_call['cum_count'] == $npcs.get($sex.npcId,'sexdrive')>>
-				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it between your fingers.</p>
+				<p>You reach over to <<npc $sex.npcId>><</npc>>, gently taking hold of his cock in your hand, squeezing and playing with it between your fingers.</p>
 			<<elseif $booty_call['cum_count'] < $npcs.get($sex.npcId,'sexdrive') / 2>>
-				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, stiffening slightly between your fingers.</p>
+				<p>You reach over to <<npc $sex.npcId>><</npc>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, stiffening slightly between your fingers.</p>
 			<<else>>
-				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, stiffening slightly between your fingers.</p>
+				<p>You reach over to <<npc $sex.npcId>><</npc>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, stiffening slightly between your fingers.</p>
 			<</if>>
 			<p>"Amusing yourself with my dick again?"</p>
 			"Yeah," you grin back shamelessly.
@@ -802,23 +802,23 @@
 		<<setinit $booty_call['dick_play'] = 1>>
 		<<if $npcs.get($sex.npcId,'dick_play') == 0>>
 			<<if $booty_call['cum_count'] == $npcs.get($sex.npcId,'sexdrive')>>
-				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it between your fingers.</p>
+				<p>You reach over to <<npc $sex.npcId>><</npc>>, gently taking hold of his cock in your hand, squeezing and playing with it between your fingers.</p>
 				"If you're trying to get me hard, I don't think I can go again," he chuckles.
 			<<elseif $booty_call['cum_count'] < $npcs.get($sex.npcId,'sexdrive') / 2>>
-				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, stiffening slightly between your fingers.</p>
+				<p>You reach over to <<npc $sex.npcId>><</npc>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, stiffening slightly between your fingers.</p>
 				<p>"You trying to get me hard again?" he snickers.</p>
 			<<else>>
-				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, immediately stiffening between your fingers.</p>
+				<p>You reach over to <<npc $sex.npcId>><</npc>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, immediately stiffening between your fingers.</p>
 				<p>"You want to go again?" he grins.</p>
 			<</if>>
 			"That's not what I'm doing," you say, affectionately rolling your eyes. "I'm just... playing with it."
 		<<else>>
 			<<if $booty_call['cum_count'] == $npcs.get($sex.npcId,'sexdrive')>>
-				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it between your fingers.</p>
+				<p>You reach over to <<npc $sex.npcId>><</npc>>, gently taking hold of his cock in your hand, squeezing and playing with it between your fingers.</p>
 			<<elseif $booty_call['cum_count'] < $npcs.get($sex.npcId,'sexdrive') / 2>>
-				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, stiffening slightly between your fingers.</p>
+				<p>You reach over to <<npc $sex.npcId>><</npc>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, stiffening slightly between your fingers.</p>
 			<<else>>
-				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, stiffening slightly between your fingers.</p>
+				<p>You reach over to <<npc $sex.npcId>><</npc>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches in your grasp, stiffening slightly between your fingers.</p>
 			<</if>>
 			<p>"Amusing yourself with my dick again?"</p>
 			"Yeah," you grin back shamelessly.
@@ -842,7 +842,7 @@
 	<<if getvar("$booty_call['whats_it_like_dick_talk']") == 0>>
 		<<actCLA 'What`s it like having a dick?'>>
 			<<gs 'booty_call_pillow_talk2' 'dick_grab_image'>>
-			<p>"What's it like having a dick?" you ask, giving <<=$npcs.get($sex.npcId,'firstname')>>'s meat a funny look as you fondle it.</p>
+			<p>"What's it like having a dick?" you ask, giving <<npc $sex.npcId>><</npc>>'s meat a funny look as you fondle it.</p>
 			<<if $npcs.get($sex.npcId,'humor') == 1>>
 				<p>"What's it like having a pussy?" he shrugs. "I don't know, it's just a dick. I have one. I don't know how to explain that."</p>
 			<<elseif $npcs.get($sex.npcId,'humor') == 2>>
@@ -855,7 +855,7 @@
 				"Random erections can be... awkward..."
 				<p>"Random?" you ask confusedly. "What do you mean?"</p>
 				"It's like it has a mind of its own," he chuckles. "Gets hard for no reason at all."
-				<p>"That's cause all guys want is sex," you giggle but <<=$npcs.get($sex.npcId,'firstname')>> shakes his head.</p>
+				<p>"That's cause all guys want is sex," you giggle but <<npc $sex.npcId>><</npc>> shakes his head.</p>
 				<p>"No," he says. "Even when I'm not horny. Sometimes I'll just be watching TV or going to the store and suddenly, bam-! I'm hard. Gotta figure out how to stuff it down there without everybody thinking I'm a pervert."</p>
 				<p>"Really???" you ask, staring in bewilderment at his inactive cock.</p>
 			<</if>>
@@ -880,11 +880,11 @@
 	<<if getvar("$booty_call['dicks_compliment_talk']") == 0>>
 		<<actCLA 'Compliment his dick'>>
 			<<gs 'booty_call_pillow_talk2' 'dick_grab_image'>>
-			<p>"You have a great dick, you know that?" you say while giving <<=$npcs.get($sex.npcId,'firstname')>>'s manhood an appreciative fondle.</p>
-			<p>"Yeah?" <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+			<p>"You have a great dick, you know that?" you say while giving <<npc $sex.npcId>><</npc>>'s manhood an appreciative fondle.</p>
+			<p>"Yeah?" <<npc $sex.npcId>><</npc>> grins.</p>
 			<<actCLA 'You know how to use it'>>
 				"Not every guy with a cock like yours knows how to use it," you smile. "But you sure do. Fucked me silly with this thing."
-				<p><<=$npcs.get($sex.npcId,'firstname')>> looks more than a little smug after your compliment.</p>
+				<p><<npc $sex.npcId>><</npc>> looks more than a little smug after your compliment.</p>
 				<<gs 'booty_call_pillow_talk2' 'dick_talk_topics'>>
 			<</actCLA>>
 			<<if $npcs.get($sex.npcId,'dick_desc') == 'thick' or $npcs.get($sex.npcId,'dick_desc') == 'long' or $npcs.get($sex.npcId,'dick_desc') == 'huge' or $npcs.get($sex.npcId,'dick_desc') == 'enormous' or $npcs.get($sex.npcId,'dick_desc') == 'lengthy' or $npcs.get($sex.npcId,'dick_desc') == 'gigantic' or $npcs.get($sex.npcId,'dick_desc') == 'monster'>>
@@ -904,9 +904,9 @@
 			<<if $npcs.get($sex.npcId,'humor') == 1>>
 				"Like having my dick surrounded with hot sticky goo," he says, grinning childishly. "Once I'm in, I just want to keep pumping until I explode."
 			<<elseif $npcs.get($sex.npcId,'humor') == 2>>
-				<p>"Hot and wet," <<=$npcs.get($sex.npcId,'firstname')>> smiles affectionately. "Like having my dick wrapped in warm silk that squeezes me tight and pulls me in. That's what your pussy feels like."</p>
+				<p>"Hot and wet," <<npc $sex.npcId>><</npc>> smiles affectionately. "Like having my dick wrapped in warm silk that squeezes me tight and pulls me in. That's what your pussy feels like."</p>
 			<<else>>
-				<p>"It's... hot," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+				<p>"It's... hot," <<npc $sex.npcId>><</npc>> says.</p>
 				"I know it's hot," you roll your eyes. "Of course fucking is hot."
 				"No, I mean temperature hot," he replies, causing you to twerk your head in confusion. "You expect it to be wet inside, and soft, and smooth, but it's also really physically hot. It's like a pussy is an oven and my dick gets baked when I put it in."
 				<p>"<i>Really?</i>" Your eyes go wide, looking down at your own pussy in awe.</p>
@@ -937,9 +937,9 @@
 			<<if $npcs.get($sex.npcId,'sleep_sex_okay') > 0>>
 				"Well, that was a nice way to wake up," you sigh happily, stretching out on the bed.
 				<<if $npcs.get($sex.npcId,'humor') == 3>>
-					<p>"As requested Ms. $pc.name_last, your hourAM wake up call," <<=$npcs.get($sex.npcId,'firstname')>> says, doing a mock half-bow.</p>
+					<p>"As requested Ms. $pc.name_last, your hourAM wake up call," <<npc $sex.npcId>><</npc>> says, doing a mock half-bow.</p>
 				<<else>>
-					<p>"You really like it when I fuck you while you're sleeping don't you?" <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+					<p>"You really like it when I fuck you while you're sleeping don't you?" <<npc $sex.npcId>><</npc>> grins.</p>
 				<</if>>
 				<<actCLA 'It feels really good'>>
 					"It feels really good," you giggle, rubbing your thighs together, maybe still a little dick drunk.
@@ -972,7 +972,7 @@
 				<<actCLA 'You should do it more often'>>
 					<<run $npcs.set($sex.npcId,'sleep_sex_okay',2)>>
 					"You should do it again," you say with an erotic smirk. "Feels good to wake up with cock inside me."
-					<p>"Really?" <<=$npcs.get($sex.npcId,'firstname')>> looks surprised. "You mean I can do that whenever I want?"</p>
+					<p>"Really?" <<npc $sex.npcId>><</npc>> looks surprised. "You mean I can do that whenever I want?"</p>
 					"Just make sure I wake up before you finish," you grin.
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<</actCLA>>
@@ -1018,10 +1018,10 @@
 				<<setinit $booty_call['morning_sore_pussy'] = 1>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				<<if $time.isSchoolHoliday == 0 and $pc.isSchoolStudent and $time.weekday < 6>>
-					<p>"How am I going to get through my classes today?" you say, giving <<=$npcs.get($sex.npcId,'firstname')>> a loopy smile. "If I fall asleep in school today, it's your fault."</p>
-					<p>"I'll take credit for that," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+					<p>"How am I going to get through my classes today?" you say, giving <<npc $sex.npcId>><</npc>> a loopy smile. "If I fall asleep in school today, it's your fault."</p>
+					<p>"I'll take credit for that," <<npc $sex.npcId>><</npc>> grins.</p>
 				<<else>>
-					<p>"We might have overdone it," you say, giving <<=$npcs.get($sex.npcId,'firstname')>> a loopy smile. "I already want to go back to bed."</p>
+					<p>"We might have overdone it," you say, giving <<npc $sex.npcId>><</npc>> a loopy smile. "I already want to go back to bed."</p>
 					<<if $npcs.get($sex.npcId,'day_off') == $time.weekday>>
 						"I just might after you leave," he replies with a mirror of your expression.
 					<<else>>
@@ -1044,9 +1044,9 @@
 			<<if $time.hour < 8>>
 				"Damn," you mutter. "I might be late for school cause of that."
 				<<if $npcs.get($sex.npcId,'caretaker') == 1>>
-					<p>"Sorry," <<=$npcs.get($sex.npcId,'firstname')>> says, looking genuinely apologetic.</p>
+					<p>"Sorry," <<npc $sex.npcId>><</npc>> says, looking genuinely apologetic.</p>
 				<<else>>
-					<p>"Sorry," <<=$npcs.get($sex.npcId,'firstname')>> says, the grin on his face making him look like he doesn't mean it at all.</p>
+					<p>"Sorry," <<npc $sex.npcId>><</npc>> says, the grin on his face making him look like he doesn't mean it at all.</p>
 				<</if>>
 				<<if $time.minutes <= 30 and $region == 'pav' and $time.hour == 7>>
 					<<actCLA 'I might still make it'>>
@@ -1076,9 +1076,9 @@
 			<<elseif $time.hour == 8>>
 				"Shit," you curse. "I'm late for school."
 				<<if $npcs.get($sex.npcId,'caretaker') == 1>>
-					<p>"Sorry," <<=$npcs.get($sex.npcId,'firstname')>> says, looking genuinely apologetic.</p>
+					<p>"Sorry," <<npc $sex.npcId>><</npc>> says, looking genuinely apologetic.</p>
 				<<else>>
-					<p>"Sorry," <<=$npcs.get($sex.npcId,'firstname')>> says, the grin on his face making him not look like he means it at all.</p>
+					<p>"Sorry," <<npc $sex.npcId>><</npc>> says, the grin on his face making him not look like he means it at all.</p>
 				<</if>>
 				<<actCLA 'I need to hurry'>>
 					"I gotta get out of here," you say. "I can't afford to be absent too many times."
@@ -1102,7 +1102,7 @@
 					<<else>>
 						"I don't even have time to shower and clean my pussy out," you say. "Your cum is going to be running down my legs all day."
 					<</if>>
-					<p>You give <<=$npcs.get($sex.npcId,'firstname')>> a wry smirk.</p>
+					<p>You give <<npc $sex.npcId>><</npc>> a wry smirk.</p>
 					<<gs 'booty_call_pillow_talk2' 'morning_sex_talk'>>
 				<</actCLA>>
 			<</if>>
@@ -1151,7 +1151,7 @@ end
 <<if $location_var[$here][0] == 'new_with_you_boy'>>
 	<<setinit $booty_call['new_with_you'] = 1>>
 	<<image "shared/sex/after/pillow_talk1.jpg">>
-	<p>"So, anything new going on with you?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+	<p>"So, anything new going on with you?" <<npc $sex.npcId>><</npc>> asks.</p>
 	<<actCLA 'Nothing new'>>
 		"Not really," you shrug. "Same old same old."
 		<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -1162,10 +1162,10 @@ end
 				<<gs 'booty_call_stats' 'single_know'>>
 				<<actCLA 'Broke up with...'>>
 					<<actCLA 'My boyfriend'>>
-						<p>"I broke up with my boyfriend," you tell <<=$npcs.get($sex.npcId,'firstname')>>. "So I guess I'm single now."</p>
+						<p>"I broke up with my boyfriend," you tell <<npc $sex.npcId>><</npc>>. "So I guess I'm single now."</p>
 					<</actCLA>>
 					<<actCLA 'My girlfriend'>>
-						<p>"I broke up with my boyfriend," you tell <<=$npcs.get($sex.npcId,'firstname')>>. "So I guess I'm single now."</p>
+						<p>"I broke up with my boyfriend," you tell <<npc $sex.npcId>><</npc>>. "So I guess I'm single now."</p>
 					<</actCLA>>
 				<</actCLA>>
 				<!-- !!{	act'Got broken up with...':

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 166 - 166
sugarcube/src/activities/bootycall/booty_call_reactions.tw


+ 86 - 86
sugarcube/src/activities/bootycall/booty_call_sex.tw

@@ -46,7 +46,7 @@
 			<<else>>
 				<!-- !!					cla & *clr-->
 				<!-- !!					'<<image `'shared/sex/misc/smile.jpg'`>>'-->
-				<!-- !!					'"Ready to go again?" you grin eagerly at <<<<=$npcs.get($sex.npcId,'firstname')>>>>.'-->
+				<!-- !!					'"Ready to go again?" you grin eagerly at <<<<npc $sex.npcId>><</npc>>>>.'-->
 				<!-- !!					'"Yeah, gimme a minute to get hard again," he grunts back, working himself with his hand to force some stiffness back into his cock while you decide what position you want to fuck in next.'-->
 				<<gs 'booty_call_sex' 'reset'>>
 				<<setinit $booty_call['must_fuck'] = 1>>
@@ -71,7 +71,7 @@
 			"Enough of the foreplay," you say with a lusty growl. "It's time to fuck."
 		<<elseif getvar("$booty_call['not_today']") == 1>>
 			<<setinit $booty_call['not_today'] = 2>>
-			<p>"I thought you didn't want to fuck today," <<=$npcs.get($sex.npcId,'firstname')>> says with a wry smile.</p>
+			<p>"I thought you didn't want to fuck today," <<npc $sex.npcId>><</npc>> says with a wry smile.</p>
 			"Changed my mind," you grin back.
 		<<elseif getvar("$booty_call['position_choose']") == 0>>
 			"I want you inside me," you smile seductively.
@@ -83,12 +83,12 @@
 			After a minute or so, he starts to stiffen up again.
 			<i>Finally...</i>
 		<<else>>
-			<p>"I haven't had enough yet," you say, seductively, pulling <<=$npcs.get($sex.npcId,'firstname')>> towards you.</p>
+			<p>"I haven't had enough yet," you say, seductively, pulling <<npc $sex.npcId>><</npc>> towards you.</p>
 		<</if>>
 	<</if>>
 	<<if getvar("$know_virgin["+$sex.npcId+"]") == 1>>
 		<<setinit $know_virgin[$sex.npcId] = 2>>
-		<p>"I thought you said you were saving your virginity," <<=$npcs.get($sex.npcId,'firstname')>> says, looking a little confused but extremely excited.</p>
+		<p>"I thought you said you were saving your virginity," <<npc $sex.npcId>><</npc>> says, looking a little confused but extremely excited.</p>
 		"I accidentally lost it somewhere," you grin. "Now hurry up and fuck me."
 	<</if>>
 	<<setinit $booty_call['position_choose'] = 1>>
@@ -161,7 +161,7 @@
 	<<actCLA 'Continue'>>
 		<<if $pc.thinksIsVirgin and getvar("$booty_call['fuck_count']") == 0>>
 			<<image "shared/sex/foreplay/miss3.jpg">>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> pushes you down onto the bed and puts his hands on your knees, spreading your legs apart, and lines his cock up with your pussy.</p>
+			<p><<npc $sex.npcId>><</npc>> pushes you down onto the bed and puts his hands on your knees, spreading your legs apart, and lines his cock up with your pussy.</p>
 			"I wanna fuck your pussy."
 			<<actCLA 'Stop him (virgin)'>>
 				<<gt 'booty_call_virgin' 'wait'>>
@@ -179,7 +179,7 @@
 			<<elseif $npcs.get($sex.npcId,'fav_pos') == 'blowjob' and getvar("$booty_call['must_fuck']") != 1>>
 				<<gs 'booty_call_start' 'bj_ask'>>
 			<<elseif $npcs.get($sex.npcId,'pussyeater') == 1 and getvar("$booty_call['must_fuck']") != 1>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> starts leading a trail of kisses down your stomach towards your pussy.</p>
+				<p><<npc $sex.npcId>><</npc>> starts leading a trail of kisses down your stomach towards your pussy.</p>
 				<<gs 'booty_call_start' 'kuni_start'>>
 			<<else>>
 				<<gs 'booty_call_sex' 'rand_position'>>
@@ -209,7 +209,7 @@
 			<!-- !! blowjob-->
 			<<gs 'booty_call_start' 'bj_ask'>>
 		<<elseif getvar("$booty_call['position_rand']") == 5 and getvar("$booty_call['must_fuck']") != 1 and (getvar("$booty_call['creampie_count']") < 1 or $npcs.get($sex.npcId,'pussyeater') == 1)>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> starts leading a trail of kisses down your stomach towards your pussy.</p>
+			<p><<npc $sex.npcId>><</npc>> starts leading a trail of kisses down your stomach towards your pussy.</p>
 			<<gs 'booty_call_start' 'kuni_start'>>
 		<<else>>
 			<!-- !! failsafe: default to missionary-->
@@ -396,7 +396,7 @@
 			<<if getvar("$booty_call['cock_inserted']") == 0>>
 				<<image "shared/sex/cum/vagcreampie/miss1.jpg">>
 				<<gs 'booty_call_sex' 'break_ask'>>
-				<p>You flop down onto the bed beside <<=$npcs.get($sex.npcId,'firstname')>>, feeling his cum trickling from your pussy.</p>
+				<p>You flop down onto the bed beside <<npc $sex.npcId>><</npc>>, feeling his cum trickling from your pussy.</p>
 				A few minutes pass and your breathing slowly calms, relaxing in a moment of quiet satisfaction.
 				<<gs 'booty_call_sex' 'break_time'>>
 			<<else>>
@@ -413,24 +413,24 @@
 					<<if $booty_call['last_cum'] == 'creampie'>>
 						<<if $booty_call['position'] == 'miss'>>
 							<<image "shared/sex/cum/vagcreampie/after1.jpg">>
-							<p><<=$npcs.get($sex.npcId,'firstname')>> climbs off of you and flops down beside you. You breathe slowly, letting yourself sink into the bed as you feel <<=$npcs.get($sex.npcId,'firstname')>>'s cum trickle from your pussy.</p>
+							<p><<npc $sex.npcId>><</npc>> climbs off of you and flops down beside you. You breathe slowly, letting yourself sink into the bed as you feel <<npc $sex.npcId>><</npc>>'s cum trickle from your pussy.</p>
 						<<elseif $booty_call['position'] == 'doggy'>>
 							<<image "shared/sex/cum/vagcreampie/doggy2.jpg">>
-							<p><<=$npcs.get($sex.npcId,'firstname')>> climbs off of you and flops down beside you. You barely move, breathing slowly and let your face sink into the pillow as <<=$npcs.get($sex.npcId,'firstname')>>'s cum trickles from your pussy.</p>
+							<p><<npc $sex.npcId>><</npc>> climbs off of you and flops down beside you. You barely move, breathing slowly and let your face sink into the pillow as <<npc $sex.npcId>><</npc>>'s cum trickles from your pussy.</p>
 						<<elseif $booty_call['position'] == 'cowgirl'>>
 							<<image "shared/sex/cum/vagcreampie/after1.jpg">>
-							<p>You climb off of <<=$npcs.get($sex.npcId,'firstname')>>, flopping down beside him and let yourself sink into the softness of the bed. His cum slowly oozes from your pussy.</p>
+							<p>You climb off of <<npc $sex.npcId>><</npc>>, flopping down beside him and let yourself sink into the softness of the bed. His cum slowly oozes from your pussy.</p>
 						<</if>>
 					<<elseif $booty_call['last_cum'] == 'condom'>>
 						<<if $booty_call['position'] == 'miss'>>
 							<<video "shared/sex/after/miss_after1.mp4">>
-							<p><<=$npcs.get($sex.npcId,'firstname')>> climbs off of you and flops down beside you. You breathe slowly, letting yourself sink into the bed, feeling your your pussy continue to leak as <<=$npcs.get($sex.npcId,'firstname')>> pulls off the used condom and tosses it aside.</p>
+							<p><<npc $sex.npcId>><</npc>> climbs off of you and flops down beside you. You breathe slowly, letting yourself sink into the bed, feeling your your pussy continue to leak as <<npc $sex.npcId>><</npc>> pulls off the used condom and tosses it aside.</p>
 						<<elseif $booty_call['position'] == 'doggy'>>
 							<<video "shared/sex/after/doggy_after1.mp4">>
-							<p><<=$npcs.get($sex.npcId,'firstname')>> climbs off of you and you roll over to face him, thighs slick with your own juices and head swimming with post-fuck endorphins, while he pulls off the used condom and tosses it aside.</p>
+							<p><<npc $sex.npcId>><</npc>> climbs off of you and you roll over to face him, thighs slick with your own juices and head swimming with post-fuck endorphins, while he pulls off the used condom and tosses it aside.</p>
 						<<elseif $booty_call['position'] == 'cowgirl'>>
 							<<video "shared/sex/after/cowgirl_after1.mp4">>
-							<p>You climb off of <<=$npcs.get($sex.npcId,'firstname')>>, flopping down beside him and let yourself sink into the softness of the bed, sighing with satisfaction as you feel post-fuck juices continue to leak from your pussy and <<=$npcs.get($sex.npcId,'firstname')>> pulls off the used condom and tosses it aside.</p>
+							<p>You climb off of <<npc $sex.npcId>><</npc>>, flopping down beside him and let yourself sink into the softness of the bed, sighing with satisfaction as you feel post-fuck juices continue to leak from your pussy and <<npc $sex.npcId>><</npc>> pulls off the used condom and tosses it aside.</p>
 						<</if>>
 					<</if>>
 					<<if getvar("$booty_call['speed']") <= 2>>
@@ -442,11 +442,11 @@
 				<</actCLA>>
 				<<actCLA 'Stay like this'>>
 					<<if $booty_call['position'] == 'miss'>>
-						<p>You lay still, leaving <<=$npcs.get($sex.npcId,'firstname')>>'s occasionally twitching cock stuffed inside you, your pussy full of his cum, taking deep breaths as you wind down.</p>
+						<p>You lay still, leaving <<npc $sex.npcId>><</npc>>'s occasionally twitching cock stuffed inside you, your pussy full of his cum, taking deep breaths as you wind down.</p>
 					<<elseif $booty_call['position'] == 'doggy'>>
-						<p>You let your legs give out from under you, collapsing to the bed with <<=$npcs.get($sex.npcId,'firstname')>> still on top, his occasionally twitching cock stuffed inside you and your pussy full of his cum, taking deep breaths as you wind down.</p>
+						<p>You let your legs give out from under you, collapsing to the bed with <<npc $sex.npcId>><</npc>> still on top, his occasionally twitching cock stuffed inside you and your pussy full of his cum, taking deep breaths as you wind down.</p>
 					<<elseif $booty_call['position'] == 'cowgirl'>>
-						<p>You collapse onto <<=$npcs.get($sex.npcId,'firstname')>>, feeling his breathing through your breasts pressed up against his chest and the occasional twitch of his cock still stuffed inside your pussy.</p>
+						<p>You collapse onto <<npc $sex.npcId>><</npc>>, feeling his breathing through your breasts pressed up against his chest and the occasional twitch of his cock still stuffed inside your pussy.</p>
 					<</if>>
 					<<if getvar("$booty_call['speed']") <= 2>>
 						<p>The two of you just stay like that for a while, basking in the afterglow of your love-making.</p>
@@ -459,7 +459,7 @@
 		<<elseif $booty_call['last_cum'] == 'condom'>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
 			<<if getvar("$booty_call['cock_inserted']") == 0>>
-				<p>You flop down onto the bed, breathing hard as your body slowly unwinds, relaxing as you let yourself sink into the bed. <<=$npcs.get($sex.npcId,'firstname')>> removes the condom from his cock, tossing it aside before laying down beside you.</p>
+				<p>You flop down onto the bed, breathing hard as your body slowly unwinds, relaxing as you let yourself sink into the bed. <<npc $sex.npcId>><</npc>> removes the condom from his cock, tossing it aside before laying down beside you.</p>
 				<<if getvar("$booty_call['speed']") <= 2>>
 					<p>The two of you just stay like that for a while, basking in the afterglow of your love-making.</p>
 				<<else>>
@@ -467,11 +467,11 @@
 				<</if>>
 			<<else>>
 				<<if $booty_call['position'] == 'miss'>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> climbs off of you, removing the condom from his softening cock before flopping down beside you. You breathe slowly, letting yourself sink into the bed as your body relaxes.</p>
+					<p><<npc $sex.npcId>><</npc>> climbs off of you, removing the condom from his softening cock before flopping down beside you. You breathe slowly, letting yourself sink into the bed as your body relaxes.</p>
 				<<elseif $booty_call['position'] == 'doggy'>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> climbs off of you, removing the condom from his softening cock before flopping down beside you. You turn over onto your back and breathe slowly, letting yourself sink into the bed as your body relaxes.</p>
+					<p><<npc $sex.npcId>><</npc>> climbs off of you, removing the condom from his softening cock before flopping down beside you. You turn over onto your back and breathe slowly, letting yourself sink into the bed as your body relaxes.</p>
 				<<elseif $booty_call['position'] == 'cowgirl'>>
-					<p>You climb off of <<=$npcs.get($sex.npcId,'firstname')>>, flopping down beside him as he removes the condom from his softening cock, and let yourself sink into the softness of the bed. He ties off the rubber and tosses it aside.</p>
+					<p>You climb off of <<npc $sex.npcId>><</npc>>, flopping down beside him as he removes the condom from his softening cock, and let yourself sink into the softness of the bed. He ties off the rubber and tosses it aside.</p>
 				<</if>>
 				<<if getvar("$booty_call['speed']") <= 2>>
 					<p>The two of you just stay like that for a while, basking in the afterglow of your love-making.</p>
@@ -483,26 +483,26 @@
 		<<else>>
 			<<if $booty_call['last_cum'] == 'face_mouth'>>
 				<<image "shared/sex/cum/facial/facial35.jpg">>
-				<p>You lay back, breathing slowly as you wind down, the warm mask of <<=$npcs.get($sex.npcId,'firstname')>>'s cum across your face, its salty taste on your tongue.</p>
+				<p>You lay back, breathing slowly as you wind down, the warm mask of <<npc $sex.npcId>><</npc>>'s cum across your face, its salty taste on your tongue.</p>
 			<<elseif $booty_call['last_cum'] == 'spit'>>
 				<<image "shared/sex/cum/facial/facial35.jpg">>
-				<p>You lay back, breathing slowly as you wind down, the salty taste of <<=$npcs.get($sex.npcId,'firstname')>>'s sperm on your tongue as it dribbles down your chin.</p>
+				<p>You lay back, breathing slowly as you wind down, the salty taste of <<npc $sex.npcId>><</npc>>'s sperm on your tongue as it dribbles down your chin.</p>
 			<<elseif $booty_call['last_cum'] == 'swallow'>>
 				<<image "shared/sex/cum/facial/facial35.jpg">>
-				<p>You lay back, breathing slowly as you wind down, the salty taste of <<=$npcs.get($sex.npcId,'firstname')>>'s sperm still on your lips.</p>
+				<p>You lay back, breathing slowly as you wind down, the salty taste of <<npc $sex.npcId>><</npc>>'s sperm still on your lips.</p>
 			<<elseif $booty_call['last_cum'] == 'facial'>>
 				<<image "shared/sex/cum/facial/facial35.jpg">>
-				<p>You lay back, breathing slowly as you wind down, the warm mask of <<=$npcs.get($sex.npcId,'firstname')>>'s cum across your face already beginning to cool.</p>
+				<p>You lay back, breathing slowly as you wind down, the warm mask of <<npc $sex.npcId>><</npc>>'s cum across your face already beginning to cool.</p>
 			<<elseif $booty_call['last_cum'] == 'tits'>>
 				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-				<p>You lay back, breathing slowly as you wind down, the warm glaze of <<=$npcs.get($sex.npcId,'firstname')>>'s cum across your chest already beginning to cool.</p>
+				<p>You lay back, breathing slowly as you wind down, the warm glaze of <<npc $sex.npcId>><</npc>>'s cum across your chest already beginning to cool.</p>
 			<<elseif $booty_call['last_cum'] == 'pullout'>>
 				<<if $booty_call['position'] == 'miss' or $booty_call['position'] == 'cowgirl'>>
 					<<image "shared/sex/cum/stomach/sleep1.jpg">>
 					You lay back, breathing slowly as you wind down, feeling the warm cum on your belly already beginning to cool.
 				<<elseif $booty_call['position'] == 'doggy'>>
 					<<image "shared/sex/cum/back1.jpg">>
-					<p>You just lay there, <<=$npcs.get($sex.npcId,'firstname')>>'s cum spattered across your ass, breathing slowly as you wind down.</p>
+					<p>You just lay there, <<npc $sex.npcId>><</npc>>'s cum spattered across your ass, breathing slowly as you wind down.</p>
 				<</if>>
 			<</if>>
 			A few minutes pass and your breathing slowly calms, relaxing in a moment of quiet satisfaction.
@@ -567,10 +567,10 @@
 			<<actCLA 'Take it shyly'>>
 				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				<<if getvar("$booty_call['cock_inserted']") == 1>>
-					<p>You somehow manage to grab hold of your purse without extricating yourself from <<=$npcs.get($sex.npcId,'firstname')>> and pop a birth control pill from the packaging.</p>
+					<p>You somehow manage to grab hold of your purse without extricating yourself from <<npc $sex.npcId>><</npc>> and pop a birth control pill from the packaging.</p>
 					"This is what the pill is for after all," you blush, shyly placing it between your lips, feeling your pussy squeeze his cock as you swallow.
 				<<elseif $pc.cumAtLocation(0) > 0>>
-					<p>With <<=$npcs.get($sex.npcId,'firstname')>>'s cum still leaking from your pussy, you reach down to your purse and pull out your birth control.</p>
+					<p>With <<npc $sex.npcId>><</npc>>'s cum still leaking from your pussy, you reach down to your purse and pull out your birth control.</p>
 					<<if getvar("$booty_call['risky_creampie']") == 1>>
 						"Hopefully we won''t have to worry about this stuff soon," you smile, shyly placing the pill between your lips and swallowing.
 					<<else>>
@@ -595,7 +595,7 @@
 			<</actCLA>>
 			<<actCLA 'Take it sexily'>>
 				<<if getvar("$booty_call['cock_inserted']") == 1>>
-					<p>You somehow manage to grab hold of your purse without extricating yourself from <<=$npcs.get($sex.npcId,'firstname')>> and pop a birth control pill from the packaging.</p>
+					<p>You somehow manage to grab hold of your purse without extricating yourself from <<npc $sex.npcId>><</npc>> and pop a birth control pill from the packaging.</p>
 					<<if getvar("$booty_call['risky_creampie']") == 1>>
 						"You better hope this stuff kicks in soon," you say, placing the pill between your lips and swallowing with a grin, feeling your pussy squeeze his cock as it goes down.
 					<<elseif getvar("$birth_control['think_safe']") == 1>>
@@ -605,7 +605,7 @@
 						"This is what the pill is for after all," you grin, placing it between your lips, feeling your pussy squeeze his cock as you swallow.
 					<</if>>
 				<<elseif $pc.cumAtLocation(0) > 0>>
-					<p>With <<=$npcs.get($sex.npcId,'firstname')>>'s cum still leaking from your pussy, you reach down to your purse and pull out your birth control.</p>
+					<p>With <<npc $sex.npcId>><</npc>>'s cum still leaking from your pussy, you reach down to your purse and pull out your birth control.</p>
 					<<if getvar("$booty_call['risky_creampie']") == 1>>
 						"You better hope this stuff kicks in soon," you say, placing the pill between your lips and swallowing with a grin.
 					<<elseif getvar("$birth_control['think_safe']") == 1>>
@@ -638,10 +638,10 @@
 	<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 	<<if getvar("$booty_call['position_rand']") == 1 or $npcs.get($sex.npcId,'fav_pos') == 'missionary' or ($pc.thinksIsVirgin and getvar("$booty_call['fuck_count']") == 0 and getvar("$booty_call['position_rand']") <= 3)>>
 		<!-- !! missionary-->
-		<p>After a few minutes, you glance over at <<=$npcs.get($sex.npcId,'firstname')>> and find him hungrily staring at you. You realize what's about to happen just before he jumps on top of you, eliciting...</p>
+		<p>After a few minutes, you glance over at <<npc $sex.npcId>><</npc>> and find him hungrily staring at you. You realize what's about to happen just before he jumps on top of you, eliciting...</p>
 		<<actCLA '... giggles'>>
 			<<image "shared/sex/foreplay/miss3.jpg">>
-			<p>After a few minutes, you glance over at <<=$npcs.get($sex.npcId,'firstname')>> and find him hungrily staring at you with a raging erection. You realize what's about to happen just before he jumps on top of you, eliciting uncontrollable giggles from your lips as he forces your legs open and lines his cock up with your pussy.</p>
+			<p>After a few minutes, you glance over at <<npc $sex.npcId>><</npc>> and find him hungrily staring at you with a raging erection. You realize what's about to happen just before he jumps on top of you, eliciting uncontrollable giggles from your lips as he forces your legs open and lines his cock up with your pussy.</p>
 			<<if $pc.thinksIsVirgin and getvar("$booty_call['fuck_count']") == 0>>
 				<<actCLA 'Stop him (virgin)'>>
 					<<gt 'booty_call_virgin' 'wait'>>
@@ -657,7 +657,7 @@
 		<</actCLA>>
 		<<actCLA '... a yelp of surprise'>>
 			<<image "shared/sex/foreplay/miss3.jpg">>
-			<p>After a few minutes, you glance over at <<=$npcs.get($sex.npcId,'firstname')>> and find him hungrily staring at you with a raging erection. You realize what's about to happen just before he jumps on top of you, eliciting a yelp of surprise from your lips as he forces your legs open and lines his cock up with your pussy.</p>
+			<p>After a few minutes, you glance over at <<npc $sex.npcId>><</npc>> and find him hungrily staring at you with a raging erection. You realize what's about to happen just before he jumps on top of you, eliciting a yelp of surprise from your lips as he forces your legs open and lines his cock up with your pussy.</p>
 			<<if $pc.thinksIsVirgin and getvar("$booty_call['fuck_count']") == 0>>
 				<<actCLA 'Stop him (virgin)'>>
 					<<gt 'booty_call_virgin' 'wait'>>
@@ -673,35 +673,35 @@
 		<</actCLA>>
 	<<elseif getvar("$booty_call['position_rand']") == 2 or $npcs.get($sex.npcId,'fav_pos') == 'doggy'>>
 		<!-- !! doggy-->
-		<p>After a few minutes, you glance over at <<=$npcs.get($sex.npcId,'firstname')>> and find him hungrily staring at you. You realize what's about to happen just before he jumps you, eliciting...</p>
+		<p>After a few minutes, you glance over at <<npc $sex.npcId>><</npc>> and find him hungrily staring at you. You realize what's about to happen just before he jumps you, eliciting...</p>
 		<<actCLA '... giggles'>>
 			<<image "shared/sex/foreplay/doggy1.jpg">>
-			<p>After a few minutes, you glance over at <<=$npcs.get($sex.npcId,'firstname')>> and find him hungrily staring at you with a raging erection. You realize what's about to happen just before he jumps on top of you, eliciting uncontrollable giggles from your lips as flips you onto your stomach, pulls you up by the hips, and slaps your ass, lining his cock up with your pussy.</p>
+			<p>After a few minutes, you glance over at <<npc $sex.npcId>><</npc>> and find him hungrily staring at you with a raging erection. You realize what's about to happen just before he jumps on top of you, eliciting uncontrollable giggles from your lips as flips you onto your stomach, pulls you up by the hips, and slaps your ass, lining his cock up with your pussy.</p>
 			<<actCLA 'Get fucked'>>
 				<<gs 'booty_call_doggy' 'doggy_goto'>>
 			<</actCLA>>
 		<</actCLA>>
 		<<actCLA '... a yelp of surprise'>>
 			<<image "shared/sex/foreplay/doggy1.jpg">>
-			<p>After a few minutes, you glance over at <<=$npcs.get($sex.npcId,'firstname')>> and find him hungrily staring at you with a raging erection. You realize what's about to happen just before he jumps on top of you, eliciting a yelp of surprise from from your lips as flips you onto your stomach, pulls you up by the hips, and slaps your ass before plunging his cock into your pussy.</p>
+			<p>After a few minutes, you glance over at <<npc $sex.npcId>><</npc>> and find him hungrily staring at you with a raging erection. You realize what's about to happen just before he jumps on top of you, eliciting a yelp of surprise from from your lips as flips you onto your stomach, pulls you up by the hips, and slaps your ass before plunging his cock into your pussy.</p>
 			<<actCLA 'Get fucked'>>
 				<<gs 'booty_call_doggy' 'doggy_goto'>>
 			<</actCLA>>
 		<</actCLA>>
 	<<elseif getvar("$booty_call['position_rand']") == 3 and getvar("$booty_call['must_fuck']") != 1>>
 		<!-- !! blowjob-->
-		<p>After a few minutes, you glance over at <<=$npcs.get($sex.npcId,'firstname')>> and find him hungrily staring at you.</p>
+		<p>After a few minutes, you glance over at <<npc $sex.npcId>><</npc>> and find him hungrily staring at you.</p>
 		<p>"What...?" you ask hesitantly.</p>
 		"I can't stop thinking about you sucking my cock," he growls, his stare becoming even more predatory.
 		<<gs 'booty_call_start' 'bj_ask2'>>
 	<<elseif getvar("$booty_call['position_rand']") == 4 and (getvar("$cum_loc['vagina']") == 0 or $npcs.get($sex.npcId,'pussyeater') == 1)>>
 		<<arouse 'foreplay' -5 `['no_orgasm_msg']`>>
-		<p>After a few minutes, <<=$npcs.get($sex.npcId,'firstname')>> climbs on top of you without saying anything.</p>
+		<p>After a few minutes, <<npc $sex.npcId>><</npc>> climbs on top of you without saying anything.</p>
 		<p>"Hey, what are you-" you start to ask until his head descends to your stomach. He lightly kisses it, sending shivers across your skin, before kissing again and again and again, each kiss lower than the last, slowly heading towards your thighs.</p>
 		<<gs 'booty_call_start' 'kuni_start'>>
 	<<else>>
 		<<arouse 'foreplay' -5 `['no_orgasm_msg']`>>
-		<p>After a few minutes, <<=$npcs.get($sex.npcId,'firstname')>> climbs on top of you without saying anything.</p>
+		<p>After a few minutes, <<npc $sex.npcId>><</npc>> climbs on top of you without saying anything.</p>
 		<p>"Hey, what are you-" you start to ask until his head descends to your neck. He lightly kisses your throat, sending shivers across your skin, before kissing again and again and again, each kiss lower than the last, blazing a trail down your collarbone to the breasts his hands are already thoroughly massaging.</p>
 		<<actCLA 'Continue'>>
 			<<gs 'booty_call_start' 'nipple_play'>>
@@ -718,7 +718,7 @@
 				<p>"Wanna keep going?" you ask, flexing your pussy around his cock. It twitches inside in response, feeling a little stiffer than before, causing you to grin. "That feels like a yes."</p>
 			<<else>>
 				<<video "shared/sex/misc/wait.mp4">>
-				<p>"Wanna keep going?" you ask, looking over at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+				<p>"Wanna keep going?" you ask, looking over at <<npc $sex.npcId>><</npc>>.</p>
 				"Yeah, gimme a minute to get hard again," he grunts back, working himself with his hand to force some stiffness back into his cock.
 				<!-- !!act'Sex':cla & gs'booty_call_sex', 'position_choose' & gs 'booty_call_condoms', 'condoms'-->
 			<</if>>
@@ -731,7 +731,7 @@
 			<<if $booty_call['cum_choice'] != ''>>
 				"Yeah, gimme a minute to get hard again," he grunts back, working himself with his hand to force some stiffness back into his cock.
 			<<else>>
-				<p>"What do you have in mind?" <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
+				<p>"What do you have in mind?" <<npc $sex.npcId>><</npc>> grins back.</p>
 			<</if>>
 			<<gs 'booty_call_sex' 'reset'>>
 			<<gs 'booty_call_sex' 'sex_menu'>>
@@ -769,22 +769,22 @@
 				<<if $npcs.get($sex.npcId,'smoker') > 0>>
 					<<image "shared/sex/after/bed_smoke3.jpg">>
 					<<if getvar("$booty_call['cock_inserted']") == 0>>
-						<p>You reach down and pull out your pack of cigarettes, placing one in your mouth and tossing the pack back into your purse. <<=$npcs.get($sex.npcId,'firstname')>> takes the opportunity to light up as well while you take your first drag.</p>
+						<p>You reach down and pull out your pack of cigarettes, placing one in your mouth and tossing the pack back into your purse. <<npc $sex.npcId>><</npc>> takes the opportunity to light up as well while you take your first drag.</p>
 					<<else>>
 						<<setinit $booty_call['cock_inserted'] = 0>>
 						<<if $booty_call['last_cum'] == 'creampie'>>
-							<p>You finally pull apart, immediately feeling <<=$npcs.get($sex.npcId,'firstname')>>'s cum spill from inside you as his cock vacates your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. <<=$npcs.get($sex.npcId,'firstname')>> takes the opportunity to light up as well while you take your first drag.</p>
+							<p>You finally pull apart, immediately feeling <<npc $sex.npcId>><</npc>>'s cum spill from inside you as his cock vacates your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. <<npc $sex.npcId>><</npc>> takes the opportunity to light up as well while you take your first drag.</p>
 						<<elseif $booty_call['last_cum'] == 'condom'>>
-							<p>You finally pull apart, letting <<=$npcs.get($sex.npcId,'firstname')>>'s rubber coated cock slip from your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. <<=$npcs.get($sex.npcId,'firstname')>> takes the opportunity to light up as well while you take your first drag.</p>
+							<p>You finally pull apart, letting <<npc $sex.npcId>><</npc>>'s rubber coated cock slip from your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. <<npc $sex.npcId>><</npc>> takes the opportunity to light up as well while you take your first drag.</p>
 						<</if>>
 					<</if>>
 					Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it's like all your stress goes with it and you sigh happily, and the two of you continue to puff away until there''s but the charred butts left.
 				<<else>>
 					<<image "shared/sex/after/bed_smoke1.jpg">>
 					<<if $booty_call['last_cum'] == 'creampie'>>
-						<p>You finally pull apart, immediately feeling <<=$npcs.get($sex.npcId,'firstname')>>'s cum spill from inside you as his cock vacates your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. You spark your lighter, inhaling deeply as you take your first drag.</p>
+						<p>You finally pull apart, immediately feeling <<npc $sex.npcId>><</npc>>'s cum spill from inside you as his cock vacates your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. You spark your lighter, inhaling deeply as you take your first drag.</p>
 					<<elseif $booty_call['last_cum'] == 'condom'>>
-						<p>You finally pull apart, letting <<=$npcs.get($sex.npcId,'firstname')>>'s rubber coated cock slip from your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. You spark your lighter, inhaling deeply as you take your first drag.</p>
+						<p>You finally pull apart, letting <<npc $sex.npcId>><</npc>>'s rubber coated cock slip from your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. You spark your lighter, inhaling deeply as you take your first drag.</p>
 					<</if>>
 					Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it's like all your stress goes with it and you sigh happily, puffing away until there''s nothing but a charred butt left.
 				<</if>>
@@ -799,24 +799,24 @@
 					<<gs 'drugs' 'smoke'>>
 					<<image "shared/sex/after/bed_smoke3.jpg">>
 					<<if getvar("$booty_call['cock_inserted']") == 0>>
-						<p>"Got any smokes?" you ask. <<=$npcs.get($sex.npcId,'firstname')>> nods and fishes out a pack, proffering the first one to you and igniting it for you. He pulls out one for himself and lights up as well while you take your first drag.</p>
+						<p>"Got any smokes?" you ask. <<npc $sex.npcId>><</npc>> nods and fishes out a pack, proffering the first one to you and igniting it for you. He pulls out one for himself and lights up as well while you take your first drag.</p>
 					<<else>>
 						<<setinit $booty_call['cock_inserted'] = 0>>
 						<<if $booty_call['last_cum'] == 'creampie'>>
-							<p>"Got any smokes?" you ask, feeling the cum spill from your pussy as you finally let <<=$npcs.get($sex.npcId,'firstname')>>'s cock slip from your pussy before sitting up. <<=$npcs.get($sex.npcId,'firstname')>> nods and fishes out a pack, proffering the first one to you and igniting it for you. He pulls out one for himself and lights up as well while you take your first drag.</p>
+							<p>"Got any smokes?" you ask, feeling the cum spill from your pussy as you finally let <<npc $sex.npcId>><</npc>>'s cock slip from your pussy before sitting up. <<npc $sex.npcId>><</npc>> nods and fishes out a pack, proffering the first one to you and igniting it for you. He pulls out one for himself and lights up as well while you take your first drag.</p>
 						<<else>>
-							<p>"Got any smokes?" you ask as you pull apart, finally letting <<=$npcs.get($sex.npcId,'firstname')>>'s cock slip from your pussy before sitting up. <<=$npcs.get($sex.npcId,'firstname')>> nods and fishes out a pack, proffering the first one to you and igniting it for you. He pulls out one for himself and lights up as well while you take your first drag.</p>
+							<p>"Got any smokes?" you ask as you pull apart, finally letting <<npc $sex.npcId>><</npc>>'s cock slip from your pussy before sitting up. <<npc $sex.npcId>><</npc>> nods and fishes out a pack, proffering the first one to you and igniting it for you. He pulls out one for himself and lights up as well while you take your first drag.</p>
 						<</if>>
 					<</if>>
 					Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it's like all your stress goes with it and you sigh happily, and the two of you continue to puff away until there''s but the charred butts left.
 				<<else>>
 					<<image "shared/sex/after/annoyed1.jpg">>
 					<<if getvar("$booty_call['cock_inserted']") == 0>>
-						<p>"Got any smokes?" you ask but <<=$npcs.get($sex.npcId,'firstname')>> just shakes his head.</p>
+						<p>"Got any smokes?" you ask but <<npc $sex.npcId>><</npc>> just shakes his head.</p>
 					<<elseif $booty_call['last_cum'] == 'creampie'>>
-						<p>"Got any smokes?" you ask, feeling the cum spill from your pussy as you finally let <<=$npcs.get($sex.npcId,'firstname')>>'s cock slip from your pussy before sitting up. Unfortunately, he just shakes his head.</p>
+						<p>"Got any smokes?" you ask, feeling the cum spill from your pussy as you finally let <<npc $sex.npcId>><</npc>>'s cock slip from your pussy before sitting up. Unfortunately, he just shakes his head.</p>
 					<<else>>
-						<p>"Got any smokes?" you ask as you pull apart, finally letting <<=$npcs.get($sex.npcId,'firstname')>>'s cock slip from your pussy before sitting up. Unfortunately, he just shakes his head.</p>
+						<p>"Got any smokes?" you ask as you pull apart, finally letting <<npc $sex.npcId>><</npc>>'s cock slip from your pussy before sitting up. Unfortunately, he just shakes his head.</p>
 					<</if>>
 					<<setinit $booty_call['cock_inserted'] = 0>>
 					<<if $npcs.get($sex.npcId,'smoker') > 0>>
@@ -842,7 +842,7 @@
 					"Oh no you're not," you growl lustfully.
 				<</if>>
 				<<if $booty_call['cum_choice'] == 'creampie' or $booty_call['cum_choice'] == 'creampie_surprise'>>
-					<p>You pull away, pussy trailing semen as you get down in front of <<=$npcs.get($sex.npcId,'firstname')>> and grab his cock. You work his shaft furiously, trying to keep him hard. But despite your best efforts, his dick softens in your grasp and you can't get it to rise again. </p>
+					<p>You pull away, pussy trailing semen as you get down in front of <<npc $sex.npcId>><</npc>> and grab his cock. You work his shaft furiously, trying to keep him hard. But despite your best efforts, his dick softens in your grasp and you can't get it to rise again. </p>
 				<<else>>
 					Taking hold of his cock, you work his shaft furiously, trying to keep him hard. But despite your best efforts, his dick softens in your grasp and you can't get it to rise again.
 				<</if>>
@@ -856,9 +856,9 @@
 					"Oh no you're not," you growl lustfully.
 				<</if>>
 				<<if $booty_call['cum_choice'] == 'creampie' or $booty_call['cum_choice'] == 'creampie_surprise'>>
-					<p>You pull away, pussy trailing semen as you get down in front of <<=$npcs.get($sex.npcId,'firstname')>> and grab his cock. You work his shaft furiously, trying to keep him hard. It doesn't take long, only a minute or two, and before you know it <<=$npcs.get($sex.npcId,'firstname')>> is standing at attention once again.</p>
+					<p>You pull away, pussy trailing semen as you get down in front of <<npc $sex.npcId>><</npc>> and grab his cock. You work his shaft furiously, trying to keep him hard. It doesn't take long, only a minute or two, and before you know it <<npc $sex.npcId>><</npc>> is standing at attention once again.</p>
 				<<else>>
-					<p>Taking hold of his cock, you work his shaft furiously, trying to keep him hard. It doesn't take long, only a minute or two, and before you know it <<=$npcs.get($sex.npcId,'firstname')>> is standing at attention once again.</p>
+					<p>Taking hold of his cock, you work his shaft furiously, trying to keep him hard. It doesn't take long, only a minute or two, and before you know it <<npc $sex.npcId>><</npc>> is standing at attention once again.</p>
 				<</if>>
 				<<if getvar("$booty_call['not_done']") == 1>>
 					"Yeah, that's right...  Just like that little guy..."
@@ -887,11 +887,11 @@
 					"Oh no you're not," you growl lustfully.
 				<</if>>
 				<<if ($booty_call['last_cum'] == 'creampie' or $booty_call['cum_choice'] == 'creampie_surprise') and getvar("$booty_call['cock_inserted']") == 1>>
-					<p>You pull away, pussy trailing semen as you get down in front of <<=$npcs.get($sex.npcId,'firstname')>>. You take him in your mouth, tasting of cum and your own juices, and suck gently on its head, licking, teasing, playing with his softening cock. But try as you might, it's like trying to play billiards with a rope. You just can't get him hard again.</p>
+					<p>You pull away, pussy trailing semen as you get down in front of <<npc $sex.npcId>><</npc>>. You take him in your mouth, tasting of cum and your own juices, and suck gently on its head, licking, teasing, playing with his softening cock. But try as you might, it's like trying to play billiards with a rope. You just can't get him hard again.</p>
 				<<elseif $booty_call['last_cum'] == 'condom'>>
-					<p>You pull away and get down in front of <<=$npcs.get($sex.npcId,'firstname')>>. You slip the condom from his cock and take him in your mouth, you suck gently on its head, licking, teasing, playing, cleaning the cum from with his softening cock. But try as you might, it's like trying to play billiards with a rope. You just can't get him hard agains.</p>
+					<p>You pull away and get down in front of <<npc $sex.npcId>><</npc>>. You slip the condom from his cock and take him in your mouth, you suck gently on its head, licking, teasing, playing, cleaning the cum from with his softening cock. But try as you might, it's like trying to play billiards with a rope. You just can't get him hard agains.</p>
 				<<else>>
-					<p>You pull away and get down in front of <<=$npcs.get($sex.npcId,'firstname')>>. Taking his cock in your mouth, you suck gently on its head, licking, teasing, playing with his softening cock. But try as you might, it's like trying to play billiards with a rope. You just can't get him hard again.</p>
+					<p>You pull away and get down in front of <<npc $sex.npcId>><</npc>>. Taking his cock in your mouth, you suck gently on its head, licking, teasing, playing with his softening cock. But try as you might, it's like trying to play billiards with a rope. You just can't get him hard again.</p>
 				<</if>>
 				<<if getvar("$booty_call['not_done']") == 1>>
 					<p>"Goddammit!" you growl. "I still wanted more out of you!"</p>
@@ -906,13 +906,13 @@
 					"Oh no you're not," you growl lustfully.
 				<</if>>
 				<<if $booty_call['last_cum'] == 'creampie' and getvar("$booty_call['cock_inserted']") == 1>>
-					<p>You pull away, pussy trailing semen as you get down in front of <<=$npcs.get($sex.npcId,'firstname')>>. You take him in your mouth, tasting of cum and your own juices, and suck gently on its head, licking, teasing, playing, trying to keep him hard. As you do, the dick between your lips begins to stiffen up again.</p>
+					<p>You pull away, pussy trailing semen as you get down in front of <<npc $sex.npcId>><</npc>>. You take him in your mouth, tasting of cum and your own juices, and suck gently on its head, licking, teasing, playing, trying to keep him hard. As you do, the dick between your lips begins to stiffen up again.</p>
 				<<elseif $booty_call['last_cum'] == 'creampie' and getvar("$booty_call['cock_inserted']") == 1 and getvar("$booty_call['force_harden']") > 0>>
-					<p>You pull away, pussy trailing semen as you get down in front of <<=$npcs.get($sex.npcId,'firstname')>>. You take him in your mouth, tasting of cum and your own juices as you lick, tease, and play with his shaft. After a few moments of softness, <<=$npcs.get($sex.npcId,'firstname')>> groans in a way that sounds almost painful and the dick between your lips begins to stiffen up again..</p>
+					<p>You pull away, pussy trailing semen as you get down in front of <<npc $sex.npcId>><</npc>>. You take him in your mouth, tasting of cum and your own juices as you lick, tease, and play with his shaft. After a few moments of softness, <<npc $sex.npcId>><</npc>> groans in a way that sounds almost painful and the dick between your lips begins to stiffen up again..</p>
 				<<elseif $booty_call['last_cum'] == 'condom'>>
-					<p>You pull away and get down in front of <<=$npcs.get($sex.npcId,'firstname')>>. You slip the condom from his cock and take him in your mouth, you suck gently on its head, licking, teasing, playing, cleaning the cum from his shaft. As you do, the dick between your lips begins to stiffen up again.</p>
+					<p>You pull away and get down in front of <<npc $sex.npcId>><</npc>>. You slip the condom from his cock and take him in your mouth, you suck gently on its head, licking, teasing, playing, cleaning the cum from his shaft. As you do, the dick between your lips begins to stiffen up again.</p>
 				<<elseif getvar("$booty_call['force_harden']") > 0>>
-					<p>Taking his cock in your mouth, you suck gently on its head, licking, teasing, playing, with your lips and tongue across his shaft. After a few moments of softness, <<=$npcs.get($sex.npcId,'firstname')>> groans in a way that sounds almost painful and the dick between your lips begins to stiffen up again.</p>
+					<p>Taking his cock in your mouth, you suck gently on its head, licking, teasing, playing, with your lips and tongue across his shaft. After a few moments of softness, <<npc $sex.npcId>><</npc>> groans in a way that sounds almost painful and the dick between your lips begins to stiffen up again.</p>
 				<<else>>
 					Taking his cock in your mouth, you suck gently on its head, licking, teasing, playing, with your lips and tongue across his shaft. After a few moments of softness, the dick between your lips begins to stiffen up again.
 				<</if>>
@@ -1085,7 +1085,7 @@
 			<i>Hang on a minute.</i>
 			Even in your sleep your brow wrinkles.
 			<i>Hammock on the water? That doesn''t make any sense. And it doesn''t feel like there''s a pillow between <b>my legs</b>, it feels like it's...</i>
-			<p>Your eyes flutter open and find <<=$npcs.get($sex.npcId,'firstname')>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.</p>
+			<p>Your eyes flutter open and find <<npc $sex.npcId>><</npc>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.</p>
 			<<gs 'booty_call_sex' 'sleep_wake_options'>>
 		<</actCLA>>
 	<</actCLA>>
@@ -1105,7 +1105,7 @@
 			<i>Hang on a minute.</i>
 			Even in your sleep your brow wrinkles.
 			<i>That doesn''t feel like wood. I'm not being impaled, I'm being...</i>
-			<p>Your eyes flutter open and find <<=$npcs.get($sex.npcId,'firstname')>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.</p>
+			<p>Your eyes flutter open and find <<npc $sex.npcId>><</npc>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.</p>
 			<<gs 'booty_call_sex' 'sleep_wake_options'>>
 		<</actCLA>>
 	<</actCLA>>
@@ -1129,7 +1129,7 @@
 			<i>Hang on a minute.</i>
 			You moan involuntarily as a spark of pleasure jumps through your chest.
 			<i>I'm not dreaming... I'm...</i>
-			<p>Your eyes flutter open and find <<=$npcs.get($sex.npcId,'firstname')>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.</p>
+			<p>Your eyes flutter open and find <<npc $sex.npcId>><</npc>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.</p>
 			<<gs 'booty_call_sex' 'sleep_wake_options'>>
 		<</actCLA>>
 	<</actCLA>>
@@ -1149,7 +1149,7 @@
 			<i>Hang on a minute.</i>
 			Even in your sleep your brow wrinkles.
 			<i>It <b>is</b> inside me! And that's not jelly, that's...</i>
-			<p>Your eyes flutter open and find <<=$npcs.get($sex.npcId,'firstname')>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.</p>
+			<p>Your eyes flutter open and find <<npc $sex.npcId>><</npc>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.</p>
 			<<gs 'booty_call_sex' 'sleep_wake_options'>>
 		<</actCLA>>
 	<</actCLA>>
@@ -1161,14 +1161,14 @@
 		<</actCLA>>
 	<<elseif $npcs.get($sex.npcId,'sleep_sex_okay') == 1>>
 		<!-- !! npc_sleep_sex_okay[$sex.npcId] = 2 means you've asked him to wake you up for sleep sex-->
-		<p>"You're finally awake," <<=$npcs.get($sex.npcId,'firstname')>> smiles.</p>
+		<p>"You're finally awake," <<npc $sex.npcId>><</npc>> smiles.</p>
 	<</if>>
 	<<actCLA 'Moan'>>
 		<<setinit $booty_call['sleep_fuck'] = 2>>
 		<<setinit $booty_call['position'] = 'miss'>>
 		<<video "shared/sex/sleep/wake1.mp4">>
 		<i>Ahh~! Aahn~!</i>
-		<p>You moan with hoarse arousal, spreading your legs wider so <<=$npcs.get($sex.npcId,'firstname')>> can keep fucking you.</p>
+		<p>You moan with hoarse arousal, spreading your legs wider so <<npc $sex.npcId>><</npc>> can keep fucking you.</p>
 		<<if getvar("$npc_sex_speed") <= 2>>
 			<<setinit $booty_call['speed'] = 1>>
 			<<actCLA 'Fuck $npcs.get('+$sex.npcId,'firstname')+''>>
@@ -1189,7 +1189,7 @@
 		<<set $orgasm_or = 'yes'>>
 		<<arouse 'vaginal' 1 `['no_orgasm_msg']`>>
 		<<video "shared/sex/vag/miss/orgasm1.mp4">>
-		<p>In your relaxed state of sleep, you didn't realize how close you were to orgasm. The instant you're aware of it, your arousal finally breaks and an orgasm rocks through your body. You whimper sleepily as you squirm beneath <<=$npcs.get($sex.npcId,'firstname')>> and your climax washes over you.</p>
+		<p>In your relaxed state of sleep, you didn't realize how close you were to orgasm. The instant you're aware of it, your arousal finally breaks and an orgasm rocks through your body. You whimper sleepily as you squirm beneath <<npc $sex.npcId>><</npc>> and your climax washes over you.</p>
 		<<actCLA 'Back to sleep'>>
 			$booty_call['sleep_video2']
 			<i>That was... nice...</i> you think before tiredness overtakes you and you drift off back to dreamland.
@@ -1201,7 +1201,7 @@
 			<<setinit $booty_call['position'] = 'miss'>>
 			<<video "shared/sex/sleep/wake1.mp4">>
 			<i>Ahh~! Aahn~!</i>
-			<p>You moan with hoarse arousal as your orgasm fades and control comes back to your body, spreading your legs wider so <<=$npcs.get($sex.npcId,'firstname')>> can keep fucking you.</p>
+			<p>You moan with hoarse arousal as your orgasm fades and control comes back to your body, spreading your legs wider so <<npc $sex.npcId>><</npc>> can keep fucking you.</p>
 			<<if getvar("$npc_sex_speed") <= 2>>
 				<<setinit $booty_call['speed'] = 1>>
 				<<actCLA 'Fuck $npcs.get('+$sex.npcId,'firstname')+''>>
@@ -1222,9 +1222,9 @@
 <</if>>
 <<if $location_var[$here][0] == 'sleep_wake_wtf'>>
 	<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-	<p>"<i>WHAT THE FUCK!</i>" you scream, kicking <<=$npcs.get($sex.npcId,'firstname')>> out of you and scrambling across the bed from him. "What the fuck do you think you're doing?!"</p>
+	<p>"<i>WHAT THE FUCK!</i>" you scream, kicking <<npc $sex.npcId>><</npc>> out of you and scrambling across the bed from him. "What the fuck do you think you're doing?!"</p>
 	<<if (npc_caretaker[$sex.npcId] == 1 or rand(1,3) == 1) and $npcs.get($sex.npcId,'abusive') != 1>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> looks deeply embarrassed.</p>
+		<p><<npc $sex.npcId>><</npc>> looks deeply embarrassed.</p>
 		<<if $booty_call['cum_count'] >= $npcs.get($sex.npcId,'sexdrive')>>
 			<p>"I- I'm sorry," he stammers. "After you fell asleep, I woke up. You were right there and I was so hard. I just couldn't get back to sleep. And since we just... you know... I thought I could...</p>
 		<<else>>
@@ -1273,7 +1273,7 @@
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		Your anger returns swiftly.
 		<p>"No! Did you really think I was going to say yes after you were just <i>molesting</i> me in my sleep?"</p>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> sighs disappointedly and lays back in bed.</p>
+		<p><<npc $sex.npcId>><</npc>> sighs disappointedly and lays back in bed.</p>
 		<<actCLA 'Time to leave'>>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			"Ugh." You sneer at him as you get up. "I see how it's gonna be. Not gonna get a wink of sleep with you around. I'm leaving."
@@ -1357,7 +1357,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'wakeup_sex2'>>
 	<<image "shared/sex/vag/miss/3.jpg">>
-	<p>Your eyes flutter open and find <<=$npcs.get($sex.npcId,'firstname')>> balls deep inside you, happily fucking you first thing in the morning.</p>
+	<p>Your eyes flutter open and find <<npc $sex.npcId>><</npc>> balls deep inside you, happily fucking you first thing in the morning.</p>
 	<<gs 'booty_call_sex' 'wakeup_sex_options'>>
 <</if>>
 <<if $location_var[$here][0] == 'wakeup_sex_options'>>
@@ -1365,15 +1365,15 @@
 		<!-- !! npc_sleep_sex_okay[$sex.npcId] = 2 means you've asked him to wake you up for sleep sex-->
 		<<if $npcs.get($sex.npcId,'humor') == 1 and $npcs.get($sex.npcId,'apt_spare') == 'gaming' and rand(1,3) == 1>>
 			<<setinit $booty_call['skyrim_joke'] = 1>>
-			<p>"You're finally awake," <<=$npcs.get($sex.npcId,'firstname')>> says, putting on a stern face and a gruff voice. "You were trying to cross the border, right?"</p>
+			<p>"You're finally awake," <<npc $sex.npcId>><</npc>> says, putting on a stern face and a gruff voice. "You were trying to cross the border, right?"</p>
 		<<else>>
-			<p>"Good morning," <<=$npcs.get($sex.npcId,'firstname')>> smiles. "Have any good dreams?"</p>
+			<p>"Good morning," <<npc $sex.npcId>><</npc>> smiles. "Have any good dreams?"</p>
 		<</if>>
 	<</if>>
 	<<actCLA 'Moan'>>
 		<<gs 'booty_call_sex' 'morning_wake_fuck_code'>>
 		<i>Ahh~! Aahn~!</i>
-		<p>You moan with hoarse arousal, spreading your legs wider so <<=$npcs.get($sex.npcId,'firstname')>> can keep fucking you.</p>
+		<p>You moan with hoarse arousal, spreading your legs wider so <<npc $sex.npcId>><</npc>> can keep fucking you.</p>
 		<<gs 'booty_call_sex' 'wakeup_sex_continue'>>
 	<</actCLA>>
 	<<if $npcs.get($sex.npcId,'sleep_sex_okay') < 1>>
@@ -1383,7 +1383,7 @@
 	<<elseif $npcs.get($sex.npcId,'sleep_sex_okay') == 1>>
 		<<actCLA '"You were supposed to wake me" (not mad)'>>
 			<<gs 'booty_call_sex' 'morning_wake_fuck_code'>>
-			<p>"Weren't <i>mm-!</i> you supposed to <i>aah~!</i> wake me?" you moan with hoarse arousal, spreading your legs wider so <<=$npcs.get($sex.npcId,'firstname')>> can keep fucking you.</p>
+			<p>"Weren't <i>mm-!</i> you supposed to <i>aah~!</i> wake me?" you moan with hoarse arousal, spreading your legs wider so <<npc $sex.npcId>><</npc>> can keep fucking you.</p>
 			"I just did," he grins.
 			<<gs 'booty_call_sex' 'wakeup_sex_continue'>>
 		<</actCLA>>
@@ -1391,7 +1391,7 @@
 	<<if getvar("$booty_call['skyrim_joke']") == 1>>
 		<<actCLA 'Giggle'>>
 			<<gs 'booty_call_sex' 'morning_wake_fuck_code'>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>>'s internet video game joke is stupid to be sure, but despite that you can't help but smile at it.</p>
+			<p><<npc $sex.npcId>><</npc>>'s internet video game joke is stupid to be sure, but despite that you can't help but smile at it.</p>
 			"You're such a dork," you say, your giggles turning to moans as you feel him thrust again inside you.
 			<<gs 'booty_call_sex' 'wakeup_sex_continue'>>
 		<</actCLA>>
@@ -1431,17 +1431,17 @@
 		<<actCLA 'Are you a child?'>>
 			<<video "shared/sex/sleep/wake1.mp4">>
 			<p>"Ugh," you groan loudly. "Internet memes? Seriously? What are you? Twelve?"</p>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> seems to feel no shame at all, letting his shit eating grin widen as he keeps fucking you.</p>
+			<p><<npc $sex.npcId>><</npc>> seems to feel no shame at all, letting his shit eating grin widen as he keeps fucking you.</p>
 			<<gs 'booty_call_sex' 'wakeup_sex_continue'>>
 		<</actCLA>>
 		<<actCLA 'That killed the mood'>>
 			<<video "shared/sex/sleep/wake1.mp4">>
 			"<i>Wow</i>," you say, cringing something awful. "You sure know how to instantly kill the mood. I think we're done here."
-			<p>"Oh come on! It wasn't that bad!" <<=$npcs.get($sex.npcId,'firstname')>> tries to protest as you push him away. "Come on, don't be like that."</p>
+			<p>"Oh come on! It wasn't that bad!" <<npc $sex.npcId>><</npc>> tries to protest as you push him away. "Come on, don't be like that."</p>
 			<<actCLA 'Yes it was'>>
 				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				"Uhh, <i>yes</i>. It was," you say, giving him a look of contempt. "I practically felt the moisture in my vagina evaporate. There is no way I'm going to let you fuck me right after saying that with your cock <i>inside</i> me."
-				<p>You successfully push <<=$npcs.get($sex.npcId,'firstname')>> off of you, shuddering with utter disgust the moment he's out from between your legs.</p>
+				<p>You successfully push <<npc $sex.npcId>><</npc>> off of you, shuddering with utter disgust the moment he's out from between your legs.</p>
 				<<gs 'booty_call_morning' 'wakeup1'>>
 			<</actCLA>>
 			<<actCLA 'Ugh, fine'>>
@@ -1455,9 +1455,9 @@
 <</if>>
 <<if $location_var[$here][0] == 'morning_wake_wtf'>>
 	<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-	<p>"<i>WHAT THE FUCK!</i>" you scream, kicking <<=$npcs.get($sex.npcId,'firstname')>> out of you and scrambling across the bed from him. "What the fuck do you think you're doing?!"</p>
+	<p>"<i>WHAT THE FUCK!</i>" you scream, kicking <<npc $sex.npcId>><</npc>> out of you and scrambling across the bed from him. "What the fuck do you think you're doing?!"</p>
 	<<if (npc_caretaker[$sex.npcId] == 1 or rand(1,3) == 1) and $npcs.get($sex.npcId,'abusive') != 1>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> looks deeply embarrassed.</p>
+		<p><<npc $sex.npcId>><</npc>> looks deeply embarrassed.</p>
 		<p>"I- I'm sorry," he stammers. "I woke up. You were right there and... I thought it would be sexy if I... you know...</p>
 		<<actCLA 'Forgive him'>>
 			Your hard stare softens and you feel the anger slowly drain from your body.
@@ -1502,7 +1502,7 @@
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		Your anger returns swiftly.
 		<p>"No! Did you really think I was going to say yes after you were just <i>molesting</i> me in my sleep?"</p>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> sighs disappointedly and lays back in bed.</p>
+		<p><<npc $sex.npcId>><</npc>> sighs disappointedly and lays back in bed.</p>
 		<<gs 'booty_call_morning' 'wakeup1'>>
 	<</actCLA>>
 	<<actCLA 'Oh alright'>>

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 142 - 142
sugarcube/src/activities/bootycall/booty_call_shower.tw


+ 129 - 129
sugarcube/src/activities/bootycall/booty_call_start.tw

@@ -46,7 +46,7 @@
 		<<gt 'booty_call_start' 'uninvited_start'>>
 	<<else>>
 		<<gs 'booty_call_start' 'neighborhood_image'>>
-		<p>You knock on <<=$npcs.get($sex.npcId,'firstname')>>'s door but there is no answer.</p>
+		<p>You knock on <<npc $sex.npcId>><</npc>>'s door but there is no answer.</p>
 		<<actCLA 'Leave'>>
 			<<gt $loc>>
 		<</actCLA>>
@@ -69,7 +69,7 @@
 	<<=$npcs.get($sex.npcId,'apt_hall')>>
 	You knock on the door and you hear the latch unlock and the door swings open.
 	<<actCLA 'I was in the neighborhood'>>
-		<p>"Hey," you smile at <<=$npcs.get($sex.npcId,'firstname')>> who blinks in surprise. "I was in the neighborhood and I started thinking about you, wondering if you wanted to fool around some...?"</p>
+		<p>"Hey," you smile at <<npc $sex.npcId>><</npc>> who blinks in surprise. "I was in the neighborhood and I started thinking about you, wondering if you wanted to fool around some...?"</p>
 		<<if $npcs.get($sex.npcId,'booty_call') == $time.daystart>>
 			"I was just about to text you," he grins.
 			<p>So am I coming in or what?" you grin back.</p>
@@ -97,7 +97,7 @@
 	<</actCLA>>
 	<<actCLA 'Surprise!'>>
 		<<if rand(1,10) < $npcs.get($sex.npcId,'sexdrive')>>
-			<p>"Surprise!" you shout gleefully at a startled <<=$npcs.get($sex.npcId,'firstname')>>. "Just happened to be walking by and I thought I might drop in, see if you wanted to fool around?" You grin at him, bouncing your eyebrows suggestively.</p>
+			<p>"Surprise!" you shout gleefully at a startled <<npc $sex.npcId>><</npc>>. "Just happened to be walking by and I thought I might drop in, see if you wanted to fool around?" You grin at him, bouncing your eyebrows suggestively.</p>
 			"Well I won''t say no if that's what you want," he smirks, stepping aside to let you in and leering at your ass as you walk past.
 			<<actCLA 'Go to the bedroom'>>
 				<<gt 'booty_call_start' 'undress'>>
@@ -108,7 +108,7 @@
 	<</actCLA>>
 	<<actCLA 'I need a good fuck'>>
 		<<if rand(1,10) < $npcs.get($sex.npcId,'sexdrive')>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> stands there startled as you step forward, putting your hand on his chest.</p>
+			<p><<npc $sex.npcId>><</npc>> stands there startled as you step forward, putting your hand on his chest.</p>
 			"I need a good fuck and I need it right now," you say.
 			A moment passes with you staring into his eyes with a smouldering gaze before he drags you inside, slamming the door behind you.
 			<<actCLA 'Go to the bedroom'>>
@@ -121,7 +121,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'uninvited_deny'>>
 	<<run $npcs.set($sex.npcId,'no_booty_call',$time.daystart)>>
-	<p>"You should've texted," <<=$npcs.get($sex.npcId,'firstname')>> says shaking his head. "I'm not in the mood, maybe some other time."</p>
+	<p>"You should've texted," <<npc $sex.npcId>><</npc>> says shaking his head. "I'm not in the mood, maybe some other time."</p>
 	He closes the door on you abruptly and you're left standing outside horny and alone.
 	<<actCLA 'Leave'>>
 		<<gt $loc>>
@@ -130,17 +130,17 @@
 <<if $location_var[$here][0] == 'girlfriend_surprise1'>>
 	You knock on the door and you hear the latch unlock and the door swings open.
 	<<actCLA 'I was in the neighborhood'>>
-		<p>"Hey, I was in the neighborhood-" you start to smile and freeze when you realize it's not <<=$npcs.get($sex.npcId,'firstname')>>, but another woman standing in front of you.</p>
+		<p>"Hey, I was in the neighborhood-" you start to smile and freeze when you realize it's not <<npc $sex.npcId>><</npc>>, but another woman standing in front of you.</p>
 	<</actCLA>>
 	<<actCLA 'Surprise!'>>
-		<p>"Surprise!" you shout gleefully at a startled <<=$npcs.get($sex.npcId,'firstname')>>. "Just happened to be walking by and I thought I might drop in, see if you wanted to fool around?" You grin at him, bouncing your eyebrows suggestively.</p>
+		<p>"Surprise!" you shout gleefully at a startled <<npc $sex.npcId>><</npc>>. "Just happened to be walking by and I thought I might drop in, see if you wanted to fool around?" You grin at him, bouncing your eyebrows suggestively.</p>
 		"Well I won''t say no if that's what you want," he smirks, stepping aside to let you in and leering at your ass as you walk past.
 		<<actCLA 'Go to the bedroom'>>
 			<<gt 'booty_call_start' 'undress'>>
 		<</actCLA>>
 	<</actCLA>>
 	<<actCLA 'I need a good fuck'>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> stands there startled as you step forward, putting your hand on his chest.</p>
+		<p><<npc $sex.npcId>><</npc>> stands there startled as you step forward, putting your hand on his chest.</p>
 		"I need a good fuck and I need it right now," you say.
 		A moment passes with you staring into his eyes with a smouldering gaze before he drags you inside, slamming the door behind you.
 		<<actCLA 'Go to the bedroom'>>
@@ -151,11 +151,11 @@
 <<if $location_var[$here][0] == 'girlfriend_surprise2'>>
 <</if>>
 <<if $location_var[$here][0] == 'girlfriend_cheater1'>>
-	<p>You walk into <<=$npcs.get($sex.npcId,'firstname')>>'s apartment, you freeze as you enter seeing a woman standing there, clearly not expecting someone else to arrive here today.</p>
+	<p>You walk into <<npc $sex.npcId>><</npc>>'s apartment, you freeze as you enter seeing a woman standing there, clearly not expecting someone else to arrive here today.</p>
 	<p>woman: "who are you?"</p>
-	<p>Sveta: "Uhm, I'm $pc.name_nick, I'm here to see <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+	<p>Sveta: "Uhm, I'm $pc.name_nick, I'm here to see <<npc $sex.npcId>><</npc>>.</p>
 	The woman looks at you questiongly, wondering why you're here and how you got a key to the apartment. looking at her face you see she it's dawning on here why you're here.
-	<p>"oh fuck" you think inwardly realizing this is either another one of <<=$npcs.get($sex.npcId,'firstname')>> fuckbuddies who didn't know he was fucking other girls or this is a girlfriend.</p>
+	<p>"oh fuck" you think inwardly realizing this is either another one of <<npc $sex.npcId>><</npc>> fuckbuddies who didn't know he was fucking other girls or this is a girlfriend.</p>
 	<p>"why?" she says with a hint of poison to her words</p>
 	Sveta: "ehhh, I'm just here to..."
 <</if>>
@@ -166,7 +166,7 @@
 	<!-- !!	savegame 'autosave_booty_call.sav'-->
 	<<gs 'booty_call_start' 'begin'>>
 	<<=$npcs.get($sex.npcId,'apt_hall')>>
-	<p>You knock on the door and <<=$npcs.get($sex.npcId,'firstname')>> opens up.</p>
+	<p>You knock on the door and <<npc $sex.npcId>><</npc>> opens up.</p>
 	<<if $pc.pcs_sweat > 29>>
 		<!-- !!		if AlbinaQW['startletsday'] = daystart:-->
 		<<actCLA 'Didn`t have time'>>
@@ -218,7 +218,7 @@
 			"Hey," he says, looking up and down at you in amusement. "You're soaking wet."
 			<<if $pc.horny >= 70>>
 				<<actCLA 'Yeah'>>
-					<p>"Yeah," you say huskily, letting your arousal seep into your voice. <<=$npcs.get($sex.npcId,'firstname')>> locks eyes with you for a split second.</p>
+					<p>"Yeah," you say huskily, letting your arousal seep into your voice. <<npc $sex.npcId>><</npc>> locks eyes with you for a split second.</p>
 					<p>"Bed?"</p>
 					"Now," you pant and rush inside.
 					<<actCLA 'Clothes. Off. Now.'>>
@@ -236,7 +236,7 @@
 		<<actCLA 'Hey'>>
 			"Hey," you smile back. "So..."
 			<<if $npcs.get($sex.npcId,'selfish') > 0 and rand(0,1) == 1>>
-				<p>"Let's get you naked," <<=$npcs.get($sex.npcId,'firstname')>> says, pulling you inside and immediately tugging at your clothes.</p>
+				<p>"Let's get you naked," <<npc $sex.npcId>><</npc>> says, pulling you inside and immediately tugging at your clothes.</p>
 			<<else>>
 				"Come on in," he says, and leads you inside.
 			<</if>>
@@ -314,7 +314,7 @@
 				<<setinit $pc_buy_condoms[$sex.npcId] = 2>>
 				"I brought condoms," you grin, holding up the rubbers for him to see.
 				<<if getvar("$know_virgin["+$sex.npcId+"]") == 1>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> stares in awe.</p>
+					<p><<npc $sex.npcId>><</npc>> stares in awe.</p>
 					<p>"Does that mean...?"</p>
 					"Come and find out," you say, moving inside.
 				<<else>>
@@ -340,7 +340,7 @@
 <<if $location_var[$here][0] == 'fuck_or_what'>>
 	<<actCLA 'Are we going to fuck or what?'>>
 		<p>"So are you going to stand here complaining or are we going to fuck?" you grin.</p>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't say anything, instead grabbing you by the arms and dragging you inside.</p>
+		<p><<npc $sex.npcId>><</npc>> doesn't say anything, instead grabbing you by the arms and dragging you inside.</p>
 		<<actCLA 'Clothes. Off. Now.'>>
 			<<gt 'booty_call_start' 'undress'>>
 		<</actCLA>>
@@ -397,17 +397,17 @@
 	<<if (rand(0,1) == 1 or $npcs.get($sex.npcId,'pussyeater') == 1) and getvar("$booty_call['sensitive_cuni']") != 1>>
 		<!-- !! cunnilingus-->
 		<<if getvar("$booty_call['start_shower']") == 1>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> drags you into his bedroom, your hair still wet from the shower, and shoves you backwards onto the bed kneeling between your legs.</p>
+			<p><<npc $sex.npcId>><</npc>> drags you into his bedroom, your hair still wet from the shower, and shoves you backwards onto the bed kneeling between your legs.</p>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> shoves you backwards onto onto the bed begins laying a trail of kisses, heading down between your legs.</p>
+			<p><<npc $sex.npcId>><</npc>> shoves you backwards onto onto the bed begins laying a trail of kisses, heading down between your legs.</p>
 		<</if>>
 		<<gs 'booty_call_start' 'kuni_start'>>
 	<<else>>
 		<!-- !! nipple play-->
 		<<if getvar("$booty_call['start_shower']") == 1>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> drags you into his bedroom and shoves you backwards onto onto the bed, starting a trail of kisses up your wet stomach, towards your breasts.</p>
+			<p><<npc $sex.npcId>><</npc>> drags you into his bedroom and shoves you backwards onto onto the bed, starting a trail of kisses up your wet stomach, towards your breasts.</p>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> shoves you backwards onto onto the bed and begins leaving a new trail of kisses up your stomach, towards your breasts.</p>
+			<p><<npc $sex.npcId>><</npc>> shoves you backwards onto onto the bed and begins leaving a new trail of kisses up your stomach, towards your breasts.</p>
 		<</if>>
 		<<actCLA 'Continue'>>
 			<<gs 'booty_call_start' 'nipple_play'>>
@@ -422,7 +422,7 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'selfish_bj_start'>>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> pulls you towards him and pushes you to your knees in the same motion, dangling his cock in front of your face. It's pretty obvious what he wants right now...</p>
+	<p><<npc $sex.npcId>><</npc>> pulls you towards him and pushes you to your knees in the same motion, dangling his cock in front of your face. It's pretty obvious what he wants right now...</p>
 	<<actCLA 'Don`t wanna suck cock'>>
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		<p>"I don't really want to suck your dick right now," you complain. "Can we do something else?"</p>
@@ -447,7 +447,7 @@
 				<<actCLA 'How about a handy instead? (will_cost Willpower)'>>
 					<<gs 'willpower' 'bj' 'resist'>>
 					<<gs 'willpower' 'pay' 'self'>>
-					<p>"Seriously <<=$npcs.get($sex.npcId,'firstname')>>, I don't feel like it today. Can I give you a handy instead?" you ask looking up at him, gently tugging on his cock already. "Please?"</p>
+					<p>"Seriously <<npc $sex.npcId>><</npc>>, I don't feel like it today. Can I give you a handy instead?" you ask looking up at him, gently tugging on his cock already. "Please?"</p>
 					"Oh alright," he sighs. "That's fine I guess."
 					<<actCLA 'Jerk him off'>>
 						 <<gs 'booty_call_start' 'handjob_dom1'>>
@@ -489,7 +489,7 @@
 	<<setinit $booty_call['must_fuck'] = 1>>
 	<<gs 'booty_call_sex' 'speed_select'>>
 	<<if $npcs.get($sex.npcId,'fav_pos') == 'missionary' or getvar("$booty_call['position_rand']") == 1>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> pushes you down on the bed and spreads your legs, preparing to thrust between them.</p>
+		<p><<npc $sex.npcId>><</npc>> pushes you down on the bed and spreads your legs, preparing to thrust between them.</p>
 		<<if $pc.thinksIsVirgin and getvar("$booty_call['fuck_count']") == 0>>
 			<<actCLA 'Stop him (virgin)'>>
 				<<gt 'booty_call_virgin' 'wait'>>
@@ -502,10 +502,10 @@
 		<</if>>
 	<<elseif !$pc.thinksIsVirgin or getvar("$booty_call['fuck_count']") > 0>>
 		<<if $npcs.get($sex.npcId,'fav_pos') == 'doggy' or getvar("$booty_call['position_rand']") == 2>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> pushes you down on the bed and draws you up to your knees, preparing to thrust into you from behind.</p>
+			<p><<npc $sex.npcId>><</npc>> pushes you down on the bed and draws you up to your knees, preparing to thrust into you from behind.</p>
 			<<gs 'booty_call_doggy' 'doggy_start'>>
 		<<elseif $npcs.get($sex.npcId,'fav_pos') == 'cowgirl' or getvar("$booty_call['position_rand']") == 3>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> drags you down on the bed with him, pulling you up so you're straddling him to ride his cock.</p>
+			<p><<npc $sex.npcId>><</npc>> drags you down on the bed with him, pulling you up so you're straddling him to ride his cock.</p>
 			<<gs 'booty_call_cowgirl' 'cowgirl_start'>>
 		<</if>>
 	<<else>>
@@ -518,9 +518,9 @@
 	<<actCLA 'Ask him to eat you out'>>
 		<p>"Do you think you could give me some TLC?" you ask, eyes wide and practically begging. "A little tongue action?"</p>
 		<<if $npcs.get($sex.npcId,'pussyeater') == 1>>
-			<p>"Be careful what you ask for," <<=$npcs.get($sex.npcId,'firstname')>> grins, quickly settling between your thighs.</p>
+			<p>"Be careful what you ask for," <<npc $sex.npcId>><</npc>> grins, quickly settling between your thighs.</p>
 		<<else>>
-			<p>"I guess I could do that," <<=$npcs.get($sex.npcId,'firstname')>> says, moving down between your thighs.</p>
+			<p>"I guess I could do that," <<npc $sex.npcId>><</npc>> says, moving down between your thighs.</p>
 		<</if>>
 		<<actCLA 'Get eaten out'>>
 			<<gs 'booty_call_start' 'pussy_lick'>>
@@ -557,7 +557,7 @@
 				<</actCLA>>
 			<<else>>
 				<p>"Oh. Maybe not then. How about this insted?"</p>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> climbs up in front of you, bending his head towards your breasts.</p>
+				<p><<npc $sex.npcId>><</npc>> climbs up in front of you, bending his head towards your breasts.</p>
 				<<actCLA 'Continue'>>
 					<<gs 'booty_call_start' 'nipple_play'>>
 				<</actCLA>>
@@ -574,7 +574,7 @@
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			<<if getvar("$kuni_no["+$sex.npcId+"]") == 0>>
 				<p>"Woah!" you say with wide eyes, snapping your legs closed.</p>
-				<p>"What?" <<=$npcs.get($sex.npcId,'firstname')>> looks up at you confused.</p>
+				<p>"What?" <<npc $sex.npcId>><</npc>> looks up at you confused.</p>
 				<<actCLA 'Too personal'>>
 					<<setinit $kuni_no[$sex.npcId] = 1>>
 					<<setinit $booty_call['kuni_no'] = 1>>
@@ -586,7 +586,7 @@
 					<<actCLA 'Too sensitive'>>
 						<<setinit $booty_call['sensitive_cuni'] = 1>>
 						"You've eaten me out too many times today already," you say with a wry smile. "My pussy is too sensitive to let you down there again."
-						<p>"Oh. Well..." <<=$npcs.get($sex.npcId,'firstname')>> smirks back at you smugly.</p>
+						<p>"Oh. Well..." <<npc $sex.npcId>><</npc>> smirks back at you smugly.</p>
 						<<gs 'booty_call_start' 'cuni_alternatives'>>
 					<</actCLA>>
 				<</if>>
@@ -644,13 +644,13 @@
 	<<arouse 'cuni' `rand(5,10)` `['no_orgasm_msg']`>>
 	<<arouse 'cuni' -10 `['no_orgasm_msg']`>>
 	<<setinit $booty_call['position'] = 'kuni'>>
-	<p>You lay back on the bed, letting your eyes roll back in your skull. Blood and pussy juice flow like water from your cunt and <<=$npcs.get($sex.npcId,'firstname')>> laps it up like it's the nectar of the gods. It feels <i>so</i> good and you relax while he goes to work on you down there.</p>
+	<p>You lay back on the bed, letting your eyes roll back in your skull. Blood and pussy juice flow like water from your cunt and <<npc $sex.npcId>><</npc>> laps it up like it's the nectar of the gods. It feels <i>so</i> good and you relax while he goes to work on you down there.</p>
 	<<if $booty_call['orgasm'] < $orgasm>>
 		<<actCLA 'Orgasm'>>
 			<<video "shared/sex/kuni/pussylickorgasm2.mp4">>
 			<<setinit $booty_call['orgasm_count'] += 1>>
 			<<setinit $booty_call['orgasm'] = $orgasm>>
-			<p>It doesn't take long before you're buckling under <<=$npcs.get($sex.npcId,'firstname')>>'s tongue, squirming in orgasm as he continues teasing, sucking, playing with your clit. You groan a loud ragged breath as you come hard beneath his touch.</p>
+			<p>It doesn't take long before you're buckling under <<npc $sex.npcId>><</npc>>'s tongue, squirming in orgasm as he continues teasing, sucking, playing with your clit. You groan a loud ragged breath as you come hard beneath his touch.</p>
 			<<if $npcs.get($sex.npcId,'pussyeater') == 1>>
 				<<gs 'booty_call_start' 'pussy_lick_loop'>>
 			<<else>>
@@ -697,9 +697,9 @@
 		<<setinit $booty_call['creampie_eat'] += 1>>
 		<<set $cumspclnt = 0>>
 		<<gs 'cum_cleanup'>>
-		<p>You lay back on the bed, closing your eyes, letting them roll back in your skull, and focus on the sensation of <<=$npcs.get($sex.npcId,'firstname')>>'s tongue exploring your pussy. It playfully flicks across your clit, making you squirm. It runs up the lips of your snatch and you can feel <<=$npcs.get($sex.npcId,'firstname')>> slurping up the load he deposited inside you, sending shivers through your spine. Every once in a while, he licks the side of your thigh, prompting ticklish giggles. It feels <i>so</i> good and you relax while he goes to work on you down there.</p>
+		<p>You lay back on the bed, closing your eyes, letting them roll back in your skull, and focus on the sensation of <<npc $sex.npcId>><</npc>>'s tongue exploring your pussy. It playfully flicks across your clit, making you squirm. It runs up the lips of your snatch and you can feel <<npc $sex.npcId>><</npc>> slurping up the load he deposited inside you, sending shivers through your spine. Every once in a while, he licks the side of your thigh, prompting ticklish giggles. It feels <i>so</i> good and you relax while he goes to work on you down there.</p>
 	<<else>>
-		<p>You lay back on the bed, closing your eyes, letting them roll back in your skull, and focus on the sensation of <<=$npcs.get($sex.npcId,'firstname')>>'s tongue exploring your pussy. It playfully flicks across your clit, making you squirm. It runs up the lips of your snatch, sending shivers through your spine. Every once in a while, he licks the side of your thigh, prompting ticklish giggles. It feels <i>so</i> good and you relax while he goes to work on you down there.</p>
+		<p>You lay back on the bed, closing your eyes, letting them roll back in your skull, and focus on the sensation of <<npc $sex.npcId>><</npc>>'s tongue exploring your pussy. It playfully flicks across your clit, making you squirm. It runs up the lips of your snatch, sending shivers through your spine. Every once in a while, he licks the side of your thigh, prompting ticklish giggles. It feels <i>so</i> good and you relax while he goes to work on you down there.</p>
 	<</if>>
 	<<if $booty_call['orgasm'] < $orgasm>>
 		<<actCLA 'Orgasm'>>
@@ -707,7 +707,7 @@
 			<<setinit $booty_call['orgasm_count'] += 1>>
 			<<setinit $booty_call['cuni_orgasm'] += 1>>
 			<<setinit $booty_call['orgasm'] = $orgasm>>
-			<p>It doesn't take long before you're buckling under <<=$npcs.get($sex.npcId,'firstname')>>'s tongue, squirming in orgasm as he continues teasing, sucking, playing with your clit. You groan a loud ragged breath as you come hard beneath his touch.</p>
+			<p>It doesn't take long before you're buckling under <<npc $sex.npcId>><</npc>>'s tongue, squirming in orgasm as he continues teasing, sucking, playing with your clit. You groan a loud ragged breath as you come hard beneath his touch.</p>
 			<<if $npcs.get($sex.npcId,'pussyeater') == 1>>
 				<<gs 'booty_call_start' 'pussy_lick_loop'>>
 			<<else>>
@@ -748,7 +748,7 @@
 <<if $location_var[$here][0] == 'pussy_lick_loop'>>
 	<<setinit $booty_call['cuni_count'] += 1>>
 	<<if getvar("$booty_call['consecutive_cuni_orgasm']") == 0>>
-		<p>But <<=$npcs.get($sex.npcId,'firstname')>> is relentless. Even as your climax winds down, he doesn't stop, continuing to eat you out.</p>
+		<p>But <<npc $sex.npcId>><</npc>> is relentless. Even as your climax winds down, he doesn't stop, continuing to eat you out.</p>
 	<</if>>
 	<<if getvar("$booty_call['consecutive_cuni_orgasm']") < 4>>
 		<<actCLA 'Come again'>>
@@ -792,7 +792,7 @@
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		<p>"Stop! Stop! Stop!" you cry desperately, pushing his head away and snapping your legs closed, your entire body writhing uncontrollably on the bed as orgasmic tremors continue to quake through you.</p>
 		<p>"I can't take it anymore!"</p>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> looks up at you, wet lips pulled back in a grin. You look at him from the corner of your eye, face half buried in the sheets, breathing hard as he stands up. You can see he's still as hard as a rock, but something about his expression says to you that he got off on this anyway.</p>
+		<p><<npc $sex.npcId>><</npc>> looks up at you, wet lips pulled back in a grin. You look at him from the corner of your eye, face half buried in the sheets, breathing hard as he stands up. You can see he's still as hard as a rock, but something about his expression says to you that he got off on this anyway.</p>
 		<<actCLA 'I`m done'>>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			"I'm done," you say, taking ragged breaths. "I can't do anything else after that."
@@ -801,7 +801,7 @@
 		<<actCLA 'Give me a minute'>>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			"Give me a minute..." you pant. "And we can do something else..."
-			<p><<=$npcs.get($sex.npcId,'firstname')>> waits patiently for you, a satisfied looking smirk on his face.</p>
+			<p><<npc $sex.npcId>><</npc>> waits patiently for you, a satisfied looking smirk on his face.</p>
 			"Oh fuck you," you say.
 			"Ready and waiting for it," he says back, still smirking.
 			<<gs 'booty_call_start' 'foreplay_choose'>>
@@ -813,14 +813,14 @@
 	<<video "shared/sex/foreplay/nipple_play1.mp4">>
 	<<arouse 'foreplay' `rand(5,10)` `['no_orgasm_msg']`>>
 	<<setinit $booty_call['position'] = 'nipple_play'>>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> leans forward, grabbing ahold of your breasts with his hands and uses his mouth on your nipples. He sucks them up, flicks at the tips with his tongue, sending electricity flying through them. Heat spreads through your hips and you can feel wetness pooling between your thighs.</p>
+	<p><<npc $sex.npcId>><</npc>> leans forward, grabbing ahold of your breasts with his hands and uses his mouth on your nipples. He sucks them up, flicks at the tips with his tongue, sending electricity flying through them. Heat spreads through your hips and you can feel wetness pooling between your thighs.</p>
 	<<actCLA 'Continue'>>
 		<<if rand(0,1) == 1 and getvar("$kuni_no["+$sex.npcId+"]") != 1 and (getvar("$mesec") == 0 or $npcs.get($sex.npcId,'pussyeater_know') == 1) and getvar("$booty_call['sensitive_cuni']") != 1>>
-			<p>After a few minutes, <<=$npcs.get($sex.npcId,'firstname')>> pulls back from your chest and pushes you down, beginning to move between your legs to eat you out.</p>
+			<p>After a few minutes, <<npc $sex.npcId>><</npc>> pulls back from your chest and pushes you down, beginning to move between your legs to eat you out.</p>
 			<<gs 'booty_call_start' 'kuni_start'>>
 		<<else>>
 			<<setinit $booty_call['position_choose'] = 1>>
-			<p>After a few minutes, <<=$npcs.get($sex.npcId,'firstname')>> pulls back from your chest and pushes you down, climbing on top of you with his rock hard cock between your legs.</p>
+			<p>After a few minutes, <<npc $sex.npcId>><</npc>> pulls back from your chest and pushes you down, climbing on top of you with his rock hard cock between your legs.</p>
 			<<if $pc.thinksIsVirgin and getvar("$booty_call['fuck_count']") == 0>>
 				<<actCLA 'Stop him (virgin)'>>
 					<<gt 'booty_call_virgin' 'wait'>>
@@ -837,7 +837,7 @@
 <</if>>
 <!-- !! --------------------- selfish stuff ----------------------------------------------------->
 <<if $location_var[$here][0] == 'bj_ask'>>
-	<p>"How about a blowjob?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+	<p>"How about a blowjob?" <<npc $sex.npcId>><</npc>> asks.</p>
 	<<gs 'booty_call_start' 'bj_ask2'>>
 <</if>>
 <<if $location_var[$here][0] == 'bj_ask2'>>
@@ -876,12 +876,12 @@
 				<p>"Hmmm... I couuuuld..." you hum, pretending to think before breaking into a wide grin. "Or we could just fuck?"</p>
 			<</if>>
 			<<if $npcs.get($sex.npcId,'fav_pos') == 'doggy'>>
-				<p>Your eyes meet for just a moment before <<=$npcs.get($sex.npcId,'firstname')>> jumps you, eliciting uncontrollable giggles as he flips you onto your knees and plunges into your pussy.</p>
+				<p>Your eyes meet for just a moment before <<npc $sex.npcId>><</npc>> jumps you, eliciting uncontrollable giggles as he flips you onto your knees and plunges into your pussy.</p>
 				<<actCLA 'Get fucked'>>
 					<<gt 'booty_call_doggy' 'doggybooty_call['speed']'>>
 				<</actCLA>>
 			<<else>>
-				<p>Your eyes meet for just a moment before <<=$npcs.get($sex.npcId,'firstname')>> jumps you, eliciting uncontrollable giggles as he forces your legs apart and plunges into your pussy.</p>
+				<p>Your eyes meet for just a moment before <<npc $sex.npcId>><</npc>> jumps you, eliciting uncontrollable giggles as he forces your legs apart and plunges into your pussy.</p>
 				<<actCLA 'Get fucked'>>
 					<<gt 'booty_call_miss' 'missbooty_call['speed']'>>
 				<</actCLA>>
@@ -907,7 +907,7 @@
 		You grumble internally but get to work anyway, spending a few minutes bobbing your head up and down on his cock. You weren''t really in the mood to begin with, so you get bored quickly, but hopefully he'll want to do something else soon.
 	<<else>>
 		<<video "shared/sex/blowjob/bj#.mp4" 46 50>>
-		<p>You lean forward and take him in your mouth, gently sucking his cock and bobbing your head up and down on it. You take pride in your work, doing your best to make <<=$npcs.get($sex.npcId,'firstname')>> feel good.</p>
+		<p>You lean forward and take him in your mouth, gently sucking his cock and bobbing your head up and down on it. You take pride in your work, doing your best to make <<npc $sex.npcId>><</npc>> feel good.</p>
 	<</if>>
 	<<gs 'booty_call_start' 'bj_cum_sort'>>
 <</if>>
@@ -915,7 +915,7 @@
 	<<setinit $booty_call['bj_count'] += 1>>
 	<<arouse 'bj' `rand(2,7)` `['no_orgasm_msg']`>>
 	<<video "shared/sex/blowjob/bj52.mp4">>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> slowly pumps his cock in and out of your mouth, plunging it all the way down your throat where you can feel it press against your windpipe. You keep it loose while he does all the work, occasionally letting your tongue snake out for a cheekly lick, but otherwise just let <<=$npcs.get($sex.npcId,'firstname')>> keep fucking your face.</p>
+	<p><<npc $sex.npcId>><</npc>> slowly pumps his cock in and out of your mouth, plunging it all the way down your throat where you can feel it press against your windpipe. You keep it loose while he does all the work, occasionally letting your tongue snake out for a cheekly lick, but otherwise just let <<npc $sex.npcId>><</npc>> keep fucking your face.</p>
 	<<gs 'booty_call_start' 'bj_cum_sort'>>
 <</if>>
 <<if $location_var[$here][0] == 'bj_sub_cum_surprise'>>
@@ -924,9 +924,9 @@
 		<<setinit $booty_call['last_cum'] = 'mouth'>>
 		<<setinit $booty_call['cum_mouth_surprise'] = 1>>
 		<<if $pc.pcs_throat <= 10>>
-			<p>Without any warning <<=$npcs.get($sex.npcId,'firstname')>> grabs your head and shoves it down to the base of his cock. It stretches your jaw wide, making you gag reflexively, and just as you're about to protest, something spurts out into your throat.</p>
+			<p>Without any warning <<npc $sex.npcId>><</npc>> grabs your head and shoves it down to the base of his cock. It stretches your jaw wide, making you gag reflexively, and just as you're about to protest, something spurts out into your throat.</p>
 		<<else>>
-			<p>Without any warning <<=$npcs.get($sex.npcId,'firstname')>> grabs your head and shoves it down to the base of his cock. You've sucked enough dick that it doesn't cause any real problems for you, though a little warning would have been nice. And then something spurts directly into the back of your throat.</p>
+			<p>Without any warning <<npc $sex.npcId>><</npc>> grabs your head and shoves it down to the base of his cock. You've sucked enough dick that it doesn't cause any real problems for you, though a little warning would have been nice. And then something spurts directly into the back of your throat.</p>
 		<</if>>
 		<<actCLA 'Take it in stride (swallow)'>>
 			<<setinit $booty_call['bj_cum'] = 1>>
@@ -934,7 +934,7 @@
 			<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 			<<setinit $booty_call['cum_count'] += 1>>
 			<<video "shared/sex/cum/mouth/swallow5.mp4">>
-			<p>You hum in surprise, but take it in stride anyway, continuing to suck as <<=$npcs.get($sex.npcId,'firstname')>> comes right down your throat. You swallow it all as best you can until his hips stop bucking beneath you and you slowly pull away, gulping one last time to get the last drops.</p>
+			<p>You hum in surprise, but take it in stride anyway, continuing to suck as <<npc $sex.npcId>><</npc>> comes right down your throat. You swallow it all as best you can until his hips stop bucking beneath you and you slowly pull away, gulping one last time to get the last drops.</p>
 			<<gs 'booty_call_reactions' 'bj_warning_next_time'>>
 			<<gs 'booty_call_reactions' 'bj_tasty'>>
 			<<gs 'booty_call_reactions' 'bj_already'>>
@@ -945,7 +945,7 @@
 			<<gs 'cum_call' 'mouth' $sex.npcId 1>>
 			<<setinit $booty_call['cum_count'] += 1>>
 			<<video "shared/sex/cum/mouth/spit6.mp4">>
-			<p>You hum in surprise, but take it in stride anyway, continuing to suck as <<=$npcs.get($sex.npcId,'firstname')>> straight into the back of your throat. You carefully let it pool there, waiting until his hips stop bucking beneath you. When he finally stops, you gather it to the front of your mouth and spit it out, letting it spill past your lips and all over <<=$npcs.get($sex.npcId,'firstname')>>'s dick.</p>
+			<p>You hum in surprise, but take it in stride anyway, continuing to suck as <<npc $sex.npcId>><</npc>> straight into the back of your throat. You carefully let it pool there, waiting until his hips stop bucking beneath you. When he finally stops, you gather it to the front of your mouth and spit it out, letting it spill past your lips and all over <<npc $sex.npcId>><</npc>>'s dick.</p>
 			<<gs 'booty_call_reactions' 'bj_warning_next_time'>>
 			<<gs 'booty_call_reactions' 'bj_already'>>
 		<</actCLA>>
@@ -955,17 +955,17 @@
 			<<setinit $booty_call['cum_count'] += 1>>
 			<<gs 'cum_call' 'mouth' $sex.npcId 1>>
 			<<video "shared/sex/cum/mouth/spit3.mp4">>
-			<p>The moment the cum touches your throat, you gag. Your eyes water and you cough involuntarily, mouth explosively erupting with cum and spilling all over <<=$npcs.get($sex.npcId,'firstname')>>'s cock and the floor.</p>
+			<p>The moment the cum touches your throat, you gag. Your eyes water and you cough involuntarily, mouth explosively erupting with cum and spilling all over <<npc $sex.npcId>><</npc>>'s cock and the floor.</p>
 			<<actCLA 'Sorry'>>
 				<!-- !!'<<image `'shared/sex/cum/mouth/cum52.jpg'`>>'-->
 				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				"I'm sorry," you wheeze, eyes stinging with tears as you try to clear your throat. "It was... I'll do better next time."
 				<<if $npcs.get($sex.npcId,'generous') == 1>>
 					<<run $npcs.set($sex.npcId,'bj_cum_warn',1)>>
-					<p>"No, no!" <<=$npcs.get($sex.npcId,'firstname')>> says hurriedly. "It's my fault. I should have warned you. You were just so good, I couldn't hold back. I'll be more careful next time."</p>
+					<p>"No, no!" <<npc $sex.npcId>><</npc>> says hurriedly. "It's my fault. I should have warned you. You were just so good, I couldn't hold back. I'll be more careful next time."</p>
 					<<gs 'booty_call_sex' 'sex_end'>>
 				<<elseif $npcs.get($sex.npcId,'selfish') == 1>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> raises you by the chin, tilting your head back to look into your eyes.</p>
+					<p><<npc $sex.npcId>><</npc>> raises you by the chin, tilting your head back to look into your eyes.</p>
 					<p>"So that means you'll swallow it all next time, right?"</p>
 					<<actCLA 'I`ll try'>>
 						"I'll do my best," you say.
@@ -995,7 +995,7 @@
 <<if $location_var[$here][0] == 'bj_sub_cum_mouth1'>>
 	<<setinit $booty_call['he_ask_mouth'] = 1>>
 	<<setinit $booty_call['cum_choice'] = 'mouth'>>
-	<p>Within a few minutes, <<=$npcs.get($sex.npcId,'firstname')>> taps you on the head."</p>
+	<p>Within a few minutes, <<npc $sex.npcId>><</npc>> taps you on the head."</p>
 	<p>"I'm gonna- <i>nngh-!</i> Can I cum in your mouth?"</p>
 	<<actCLA 'Why?'>>
 		<<video "shared/sex/blowjob/play1.mp4">>
@@ -1029,13 +1029,13 @@
 		<</if>>
 		<<actCLA 'Couldn`t hurt'>>
 			<<video "shared/sex/cum/mouth/deep1.mp4">>
-			<p>"Well, it couldn't hurt I suppose..." you smile and plunge your lips all the way down to the base of <<=$npcs.get($sex.npcId,'firstname')>>'s shaft. He blows his load moments later.</p>
+			<p>"Well, it couldn't hurt I suppose..." you smile and plunge your lips all the way down to the base of <<npc $sex.npcId>><</npc>>'s shaft. He blows his load moments later.</p>
 			<<gs 'booty_call_start' 'bj_sub_cum_mouth_spit'>>
 			<<gs 'booty_call_start' 'bj_sub_cum_mouth_swallow'>>
 		<</actCLA>>
 		<<actCLA 'Just wondered (let him)'>>
 			<<video "shared/sex/cum/mouth/deep1.mp4">>
-			<p>"Just wondered if you actually had a reason," you smile. With that, you give him a few sudden and furious jerks before plunging your head all the way to the base of <<=$npcs.get($sex.npcId,'firstname')>>'s cock. A moment later, he exploded inside your mouth.</p>
+			<p>"Just wondered if you actually had a reason," you smile. With that, you give him a few sudden and furious jerks before plunging your head all the way to the base of <<npc $sex.npcId>><</npc>>'s cock. A moment later, he exploded inside your mouth.</p>
 			<<gs 'booty_call_start' 'bj_sub_cum_mouth_spit'>>
 			<<gs 'booty_call_start' 'bj_sub_cum_mouth_swallow'>>
 		<</actCLA>>
@@ -1130,8 +1130,8 @@
 		<<setinit $booty_call['cum_count'] += 1>>
 		<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 		<<video "shared/sex/cum/mouth/swallow4.mp4">>
-		<p>Cum spurts into your throat and you carefully push your lips down <<=$npcs.get($sex.npcId,'firstname')>>'s shaft and pull back up, forcing a loud groan from his lips as you try to draw every last bit of sperm from inside him.</p>
-		<p>You struggle to keep the salty liquid from spilling past your lips but manage to all the way back up to his tip losing only a single drop along the way. And then, without removing your lips, you swallow the entire load in one gulp with a satisfied, "<i>Ahhh,</i>" smiling up at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+		<p>Cum spurts into your throat and you carefully push your lips down <<npc $sex.npcId>><</npc>>'s shaft and pull back up, forcing a loud groan from his lips as you try to draw every last bit of sperm from inside him.</p>
+		<p>You struggle to keep the salty liquid from spilling past your lips but manage to all the way back up to his tip losing only a single drop along the way. And then, without removing your lips, you swallow the entire load in one gulp with a satisfied, "<i>Ahhh,</i>" smiling up at <<npc $sex.npcId>><</npc>>.</p>
 		<<gs 'booty_call_sex' 'sex_end'>>
 	<</actCLA>>
 	<<actCLA 'Swallow (gross)'>>
@@ -1142,22 +1142,22 @@
 		<<setinit $booty_call['cum_count'] += 1>>
 		<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 		<<video "shared/sex/cum/mouth/yuck1.mp4">>
-		<p>Thick, salty sperm sprays into your mouth and you can't help but feel just a little bit nauseous even as you continue to suck out more cum from <<=$npcs.get($sex.npcId,'firstname')>>'s cock. But you power through regardless, and with a grimace of deep disgust, you force it down, swallowing the entire load.</p>
+		<p>Thick, salty sperm sprays into your mouth and you can't help but feel just a little bit nauseous even as you continue to suck out more cum from <<npc $sex.npcId>><</npc>>'s cock. But you power through regardless, and with a grimace of deep disgust, you force it down, swallowing the entire load.</p>
 		<<if getvar("$booty_call['cum_swallow']") > 1>>
 			<p>"<i>Yeech</i>!" you wince. "I'm never going to get used to that!"</p>
-			<p>"But you still keep doing it anyway," <<=$npcs.get($sex.npcId,'firstname')>> smirks.</p>
+			<p>"But you still keep doing it anyway," <<npc $sex.npcId>><</npc>> smirks.</p>
 			"Yeah, yeah, shut up," you say, rolling your eyes and sticking out your tongue, trying to air it out.
 			<<gs 'booty_call_sex' 'sex_end'>>
 		<<else>>
 			<p>"<i>Blech</i>!" you shudder. "That's awful!"</p>
 			<<if $booty_call['cum_choice'] == 'face'>>
-				<p>"If you hate swallowing so much, then why didn't you just let me cum on your face like I wanted to?" <<=$npcs.get($sex.npcId,'firstname')>> asks quizzically.</p>
+				<p>"If you hate swallowing so much, then why didn't you just let me cum on your face like I wanted to?" <<npc $sex.npcId>><</npc>> asks quizzically.</p>
 				<<gs 'booty_call_reactions' 'cum_mouth_swallow_why'>>
 			<<elseif $booty_call['cum_choice'] == 'tits'>>
-				<p>"If you hate swallowing so much, then why didn't you just let me cum on your tits?" <<=$npcs.get($sex.npcId,'firstname')>> asks quizzically.</p>
+				<p>"If you hate swallowing so much, then why didn't you just let me cum on your tits?" <<npc $sex.npcId>><</npc>> asks quizzically.</p>
 				<<gs 'booty_call_reactions' 'cum_mouth_swallow_why'>>
 			<<else>>
-				<p>"Then why'd you do it?" <<=$npcs.get($sex.npcId,'firstname')>> asks, a dumbfounded look on his face.</p>
+				<p>"Then why'd you do it?" <<npc $sex.npcId>><</npc>> asks, a dumbfounded look on his face.</p>
 				<<gs 'booty_call_reactions' 'cum_mouth_swallow_why'>>
 				<<gs 'booty_call_reactions' 'bj_swallow_gross2'>>
 			<</if>>
@@ -1168,7 +1168,7 @@
 	<!-- !! asks to come on face-->
 	<<setinit $booty_call['he_ask_facial'] = 1>>
 	<<setinit $booty_call['cum_choice'] = 'face'>>
-	<p>Within a few minutes, <<=$npcs.get($sex.npcId,'firstname')>> taps you on the head."</p>
+	<p>Within a few minutes, <<npc $sex.npcId>><</npc>> taps you on the head."</p>
 	<p>"<i>nngh-!</i> $pc.name_nick-! Can I come on your face? You'd look so hot."</p>
 	<<actCLA 'No way'>>
 		"Nuh uh," you pop off his cock, giving him a disgusted look. "There''s no <i>way</i> I'm letting your spray that all over my face."
@@ -1176,7 +1176,7 @@
 		<<gs 'booty_call_start' 'bj_sub_cum_tits2'>>
 		<<actCLA 'How about my mouth instead?'>>
 			<p>"How about my mouth?" you smile. "Don't you want to just pump it straight down my throat instead?"</p>
-			<p><<=$npcs.get($sex.npcId,'firstname')>>'s face turns to a hungry expression. "Well, when you put it like that..."</p>
+			<p><<npc $sex.npcId>><</npc>>'s face turns to a hungry expression. "Well, when you put it like that..."</p>
 			<<gs 'booty_call_start' 'bj_sub_cum_mouth2'>>
 		<</actCLA>>
 	<</actCLA>>
@@ -1186,7 +1186,7 @@
 		<<setinit $booty_call['cum_count'] += 1>>
 		<<gs 'cum_call' 'face' $sex.npcId 1>>
 		<<video "shared/sex/cum/facial/facial0,3.mp4">>
-		<p>"Alright," you sigh. <<=$npcs.get($sex.npcId,'firstname')>> eagerly sits up positioninig himself over you.</p>
+		<p>"Alright," you sigh. <<npc $sex.npcId>><</npc>> eagerly sits up positioninig himself over you.</p>
 		You close your eyes right before something warm, wet, and slimy spatters across your face. You flinch at the impact and your expression turns into a grimace as it piles up, slowly dripping down your cheeks.
 		<p>"Ugh! That's fucking disgusting!" you whine. "I can't believe I let you talk me into this."</p>
 		"You look great though." You can't see him with the cum gluing your eyelids shut, but you're pretty sure he's wearing a grin you would slap him for.
@@ -1201,7 +1201,7 @@
 		<<gs 'cum_call' 'face' $sex.npcId 1>>
 		<<video "shared/sex/cum/facial/facial0,3.mp4">>
 		<p>"Hmmm?" you hum around his cock before letting it pop from your mouth. "Sure. If you like."</p>
-		<p>You let him position himself over you and close your eyes. Moments later warm fluid spatters across your face and within seconds, your face is covered in <<=$npcs.get($sex.npcId,'firstname')>>'s cum. After a little bit to make sure <<=$npcs.get($sex.npcId,'firstname')>>'s finished, you crack an eye and look up at him.</p>
+		<p>You let him position himself over you and close your eyes. Moments later warm fluid spatters across your face and within seconds, your face is covered in <<npc $sex.npcId>><</npc>>'s cum. After a little bit to make sure <<npc $sex.npcId>><</npc>>'s finished, you crack an eye and look up at him.</p>
 		<p>"Happy?" you ask.</p>
 		"You have no idea how fucking hot you look right now."
 		<!-- !! add reactions later?-->
@@ -1220,10 +1220,10 @@
 		<p>"Hmmm?" you hum around his cock before letting it slip from your mouth. Without saying anything else, you kneel down and close your eyes, sticking out your tongue.</p>
 		<p>"Ahhhhh~!"</p>
 		"You're the fucking best."
-		<p>You can hear the wet squelching sound of his hand working his cock and after a couple seconds, you feel a shot of cum land directly on your tongue. <<=$npcs.get($sex.npcId,'firstname')>> makes sure to spread his shots around, approximately half of them spattering across your face and the other half landing in your mouth, keeping it open the entire time until you feel him shaking the last drips of his load onto the tip of your tongue.</p>
+		<p>You can hear the wet squelching sound of his hand working his cock and after a couple seconds, you feel a shot of cum land directly on your tongue. <<npc $sex.npcId>><</npc>> makes sure to spread his shots around, approximately half of them spattering across your face and the other half landing in your mouth, keeping it open the entire time until you feel him shaking the last drips of his load onto the tip of your tongue.</p>
 		<<actCLA 'Gulp'>>
 			<<video "shared/sex/cum/facial/facial26.mp4">>
-			<p>Gathering it to the back of your throat, you let his cum pool there for a moment before swallowing the whole thing in a mighty gulp. You look up at <<=$npcs.get($sex.npcId,'firstname')>> with cum glazed cheeks and smile at him.</p>
+			<p>Gathering it to the back of your throat, you let his cum pool there for a moment before swallowing the whole thing in a mighty gulp. You look up at <<npc $sex.npcId>><</npc>> with cum glazed cheeks and smile at him.</p>
 			"You're so fucking hot."
 			"Yeah, I know," you grin back.
 			<<gs 'booty_call_sex' 'sex_end'>>
@@ -1240,7 +1240,7 @@
 		<<gs 'cum_call' 'mouth' $sex.npcId 1>>
 		<<video "shared/sex/cum/facial/facial29.mp4">>
 		<p>"Hmmm?" you hum around his cock before letting it pop from your mouth. "Alright. Sure."</p>
-		<p>You stick out your tongue and <<=$npcs.get($sex.npcId,'firstname')>> takes this as an invitation, grabbing you by the hair with one hand and working his shaft with the other. A huge blast of cum sprays directly across your face, most of it landing on your cheeks and some even getting in your hair. A little falls inside your mouth and you spit it out as it comes, as <<=$npcs.get($sex.npcId,'firstname')>> finishes finishing himself over your face. When the cum stops flying, you crack an eye and look up at him.</p>
+		<p>You stick out your tongue and <<npc $sex.npcId>><</npc>> takes this as an invitation, grabbing you by the hair with one hand and working his shaft with the other. A huge blast of cum sprays directly across your face, most of it landing on your cheeks and some even getting in your hair. A little falls inside your mouth and you spit it out as it comes, as <<npc $sex.npcId>><</npc>> finishes finishing himself over your face. When the cum stops flying, you crack an eye and look up at him.</p>
 		<p>"Happy?" you ask.</p>
 		"You have no idea how fucking hot you look right now."
 		<!-- !! add reactions later?-->
@@ -1264,7 +1264,7 @@
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		You pull your lips back from his cock with a pop.
 		<p>"$booty_call['cum_desc']" you ask.</p>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> sits up, working his shaft with his hand as he points it at your face. That seems like a "yes" to you.</p>
+		<p><<npc $sex.npcId>><</npc>> sits up, working his shaft with his hand as he points it at your face. That seems like a "yes" to you.</p>
 		<<gs 'booty_call_cum' 'facial_close_eyes'>>
 		<<gs 'booty_call_cum' 'facial_tongue_swallow'>>
 		<<gs 'booty_call_cum' 'facial_tongue_spit'>>
@@ -1277,7 +1277,7 @@
 <<if $location_var[$here][0] == 'bj_sub_cum_tits1'>>
 	<<setinit $booty_call['he_ask_tits'] = 1>>
 	<<setinit $booty_call['cum_choice'] = 'tits'>>
-	<p>Within a few minutes, <<=$npcs.get($sex.npcId,'firstname')>> taps you on the head."</p>
+	<p>Within a few minutes, <<npc $sex.npcId>><</npc>> taps you on the head."</p>
 	<p>"I'm gonna- <i>nngh-!</i> You'd look super hot with my cum on your tits. Can I?"</p>
 	<<actCLA 'No way'>>
 		"Ew." You wrinkle your nose in disgust as you pop your mouth off his cock.
@@ -1368,8 +1368,8 @@
 		<<gs 'cum_call' 'mouth' $sex.npcId 1>>
 		<<setinit $booty_call['cum_count'] += 1>>
 		<<video "shared/sex/cum/mouth/spit3.mp4">>
-		<p>Finally, your body can't take it anymore and you begin to choke. You cough hard, cum exploding out from your lips and with the strength of a drowning woman, you force yourself off of <<=$npcs.get($sex.npcId,'firstname')>>'s cock. You retch, violently spewing the rest of his cum from your mouth, taking ragged breaths as you continue to cough.</p>
-		<p>"Why would the fuck would you do that?" you ask, looking up at <<=$npcs.get($sex.npcId,'firstname')>> with teary eyes.</p>
+		<p>Finally, your body can't take it anymore and you begin to choke. You cough hard, cum exploding out from your lips and with the strength of a drowning woman, you force yourself off of <<npc $sex.npcId>><</npc>>'s cock. You retch, violently spewing the rest of his cum from your mouth, taking ragged breaths as you continue to cough.</p>
+		<p>"Why would the fuck would you do that?" you ask, looking up at <<npc $sex.npcId>><</npc>> with teary eyes.</p>
 		"I told you I wanted to come in your mouth." He takes you by the chin and lifts your head with his finger. "It's not a request. If I want it, you do it."
 		<<gs 'booty_call_after' 'quit'>>
 		<<gs 'booty_call_start' 'bj_force_cum_grumble'>>
@@ -1381,7 +1381,7 @@
 		<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 		<<video "shared/sex/cum/mouth/forced1.mp4">>
 		You gag but he keeps your face held all the way down to his balls. His cum overflows from your mouth and in a desperate attempt to avoid drowning, you swallow. It seems to be exactly what he was waiting for and continues to unload himself directly down your throat.
-		<p>After what seems like an eternity, his orgasm fades and fluid stops filling the back of your mouth and with that, <<=$npcs.get($sex.npcId,'firstname')>> finally releases you.</p>
+		<p>After what seems like an eternity, his orgasm fades and fluid stops filling the back of your mouth and with that, <<npc $sex.npcId>><</npc>> finally releases you.</p>
 		<<gs 'booty_call_start' 'bj_force_cum_wtf'>>
 		<<gs 'booty_call_start' 'be_nice'>>
 		<<gs 'booty_call_start' 'lucky_like'>>
@@ -1392,7 +1392,7 @@
 		<<setinit $booty_call['cum_count'] += 1>>
 		<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 		<<video "shared/sex/cum/mouth/swallow5.mp4">>
-		<p>You're surprised by his force but you take it in stride, swallowing as <<=$npcs.get($sex.npcId,'firstname')>> pumps his member and his cum straight into the back of your throat. You continually swallow it as it comes until there is nothing left to suck up but your own saliva and <<=$npcs.get($sex.npcId,'firstname')>>'s cock.</p>
+		<p>You're surprised by his force but you take it in stride, swallowing as <<npc $sex.npcId>><</npc>> pumps his member and his cum straight into the back of your throat. You continually swallow it as it comes until there is nothing left to suck up but your own saliva and <<npc $sex.npcId>><</npc>>'s cock.</p>
 		<<gs 'booty_call_start' 'bj_force_cum_wtf'>>
 		<<gs 'booty_call_start' 'be_nice'>>
 		<<gs 'booty_call_start' 'lucky_like'>>
@@ -1401,7 +1401,7 @@
 	<<actCLA 'Spit (take it in stride)'>>
 		<<setinit $booty_call['last_cum'] = 'mouth'>>
 		<<video "shared/sex/cum/mouth/spit6.mp4">>
-		<p>You're surprised by his force but you take it in stride, swallowing as <<=$npcs.get($sex.npcId,'firstname')>> pumps his member and his cum straight into the back of your throat. You let it pool there until you stop feeling him pulse between your lips and he finally releases you, allowing you to slip off his cock and take a breath as the semen spills from your lips.</p>
+		<p>You're surprised by his force but you take it in stride, swallowing as <<npc $sex.npcId>><</npc>> pumps his member and his cum straight into the back of your throat. You let it pool there until you stop feeling him pulse between your lips and he finally releases you, allowing you to slip off his cock and take a breath as the semen spills from your lips.</p>
 		<<gs 'booty_call_start' 'bj_force_cum_wtf'>>
 		<<gs 'booty_call_start' 'be_nice'>>
 		<<gs 'booty_call_start' 'lucky_like'>>
@@ -1413,7 +1413,7 @@
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		<<setinit $booty_call['mad'] = 1>>
 		<p>"What the fuck," you cough, dislodging a few stray globules at the back of your throat. "Why would you do that?"</p>
-		<p>"I told you I wanted to come in your mouth." <<=$npcs.get($sex.npcId,'firstname')>> takes you by the chin and lifts your head with his finger. "It's not a request. If I want it, you do it."</p>
+		<p>"I told you I wanted to come in your mouth." <<npc $sex.npcId>><</npc>> takes you by the chin and lifts your head with his finger. "It's not a request. If I want it, you do it."</p>
 		<<gs 'booty_call_after' 'quit'>>
 		<<gs 'booty_call_start' 'bj_force_cum_grumble'>>
 	<</actCLA>>
@@ -1427,7 +1427,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'lucky_like'>>
 	<<actCLA 'You`re lucky I like you'>>
-		<p>Pulling back, you wipe your lips and give <<=$npcs.get($sex.npcId,'firstname')>> a dry stare.</p>
+		<p>Pulling back, you wipe your lips and give <<npc $sex.npcId>><</npc>> a dry stare.</p>
 		"You're lucky I like you," you say. "Otherwise I might get really mad about that."
 		<p>"Oh yeah?" he says. "What does that look like? Maybe I'd like to see that."</p>
 		<<gs 'booty_call_sex' 'sex_end'>>
@@ -1473,15 +1473,15 @@
 					<<actCLA 'Help him out (hand)'>>
 						<<arouse 'hj' 1 `['no_orgasm_msg']`>>
 						<<video "shared/sex/handjob/hj3.mp4">>
-						<p>"Let me help you out with that," you smile, rolling over and taking <<=$npcs.get($sex.npcId,'firstname')>>'s dick in your hand. Even soft, you feel it twitch in response to your touch and you can't help but smile wider at the reaction. You begin working the shaft up and down and in no time at all, you've got nice stiff cock ready for fucking.</p>
+						<p>"Let me help you out with that," you smile, rolling over and taking <<npc $sex.npcId>><</npc>>'s dick in your hand. Even soft, you feel it twitch in response to your touch and you can't help but smile wider at the reaction. You begin working the shaft up and down and in no time at all, you've got nice stiff cock ready for fucking.</p>
 						<<setinit $booty_call['position'] = ''>>
 						<<gs 'booty_call_sex' 'sex_start'>>
 					<</actCLA>>
 					<<actCLA 'Help him out (mouth)'>>
 						<<arouse 'bj' 1 `['no_orgasm_msg']`>>
 						<<video "shared/sex/blowjob/play1.mp4">>
-						<p>"Let me help you out with that," you smile, rolling over and taking <<=$npcs.get($sex.npcId,'firstname')>>'s dick in your hand. Leaning down, you take the soft tip of his dick and place it between your lips, sucking gently. You instantly feel it twitch and you can't help but smirk, even with a cock in your mouth.</p>
-						<p>Through a variation of kissing, licking, and sucking, <<=$npcs.get($sex.npcId,'firstname')>> rapidly stiffens up and in no time at all, you have a nice hard cock ready for fucking.</p>
+						<p>"Let me help you out with that," you smile, rolling over and taking <<npc $sex.npcId>><</npc>>'s dick in your hand. Leaning down, you take the soft tip of his dick and place it between your lips, sucking gently. You instantly feel it twitch and you can't help but smirk, even with a cock in your mouth.</p>
+						<p>Through a variation of kissing, licking, and sucking, <<npc $sex.npcId>><</npc>> rapidly stiffens up and in no time at all, you have a nice hard cock ready for fucking.</p>
 						<<setinit $booty_call['position'] = ''>>
 						<<gs 'booty_call_sex' 'sex_start'>>
 					<</actCLA>>
@@ -1499,7 +1499,7 @@
 						<<else>>
 							<<video "shared/sex/handjob/hj3.mp4">>
 							"Not if I have anything to say about it," you grin.
-							<p>You forcibly grab <<=$npcs.get($sex.npcId,'firstname')>>'s dick in your hand and begin kneading it with your fingers. You work the shaft up and down and within minutes, despite his initial protests, you have a fully erect cock in your hands. Ready and waiting to be fucked.</p>
+							<p>You forcibly grab <<npc $sex.npcId>><</npc>>'s dick in your hand and begin kneading it with your fingers. You work the shaft up and down and within minutes, despite his initial protests, you have a fully erect cock in your hands. Ready and waiting to be fucked.</p>
 							<<setinit $booty_call['position'] = ''>>
 							<<gs 'booty_call_start' 'handjob_dom1'>>
 							<<gs 'booty_call_start' 'foreplay_choose'>>
@@ -1518,7 +1518,7 @@
 						<<else>>
 							<<video "shared/sex/blowjob/play1.mp4">>
 							"Not if I have anything to say about it," you grin.
-							<p>You forcibly grab <<=$npcs.get($sex.npcId,'firstname')>>'s dick in your hand and begin kneading it with your fingers. You lean down, sucking on the tip and immediately feel life within, feel it expand and twitch inside your mouth. Continuing to kiss, lick, and suck on it, within minutes, despite his initial protests, you have a fully erect cock in your possession. Ready and waiting to be fucked.</p>
+							<p>You forcibly grab <<npc $sex.npcId>><</npc>>'s dick in your hand and begin kneading it with your fingers. You lean down, sucking on the tip and immediately feel life within, feel it expand and twitch inside your mouth. Continuing to kiss, lick, and suck on it, within minutes, despite his initial protests, you have a fully erect cock in your possession. Ready and waiting to be fucked.</p>
 							<<setinit $booty_call['position'] = ''>>
 							<<gs 'booty_call_start' 'bj_dom1'>>
 							<<gs 'booty_call_start' 'foreplay_choose'>>
@@ -1554,7 +1554,7 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'bj_sub_lets_fuck'>>
-	<p>After a couple minutes <<=$npcs.get($sex.npcId,'firstname')>> pushes your head away, your saliva trailing from his cock.</p>
+	<p>After a couple minutes <<npc $sex.npcId>><</npc>> pushes your head away, your saliva trailing from his cock.</p>
 	<<if $pc.thinksIsVirgin and getvar("$booty_call['fuck_count']") == 0>>
 		<<if getvar("$know_virgin["+$sex.npcId+"]") == 1>>
 			"That was great," he smiles. "That was exactly what I wanted. But I want more now."
@@ -1603,14 +1603,14 @@
 			<<else>>
 				<<setinit $booty_call['not_today'] = 1>>
 				<<if rand(0,1) == 1>>
-					<p>"Really?" <<=$npcs.get($sex.npcId,'firstname')>> asks quizzically. "You want to <i>keep</i> blowing me?"</p>
+					<p>"Really?" <<npc $sex.npcId>><</npc>> asks quizzically. "You want to <i>keep</i> blowing me?"</p>
 				<<else>>
-					<p>"What?" <<=$npcs.get($sex.npcId,'firstname')>> asks quizzically. "Why?"</p>
+					<p>"What?" <<npc $sex.npcId>><</npc>> asks quizzically. "Why?"</p>
 				<</if>>
 				<<actCLA 'Don`t feel like it today'>>
 					<<video "shared/sex/blowjob/play1.mp4">>
 					"I don't know," you shrug, continuing to play with his cock. "I'm just not in the mood. Would rather just do this."
-					<p>"Well... if that's what you want I guess," <<=$npcs.get($sex.npcId,'firstname')>> shrugs back.</p>
+					<p>"Well... if that's what you want I guess," <<npc $sex.npcId>><</npc>> shrugs back.</p>
 					<<actCLA 'Get back to it'>>
 						<<gt 'booty_call_start' 'bj_resume'>>
 					<</actCLA>>
@@ -1624,7 +1624,7 @@
 						You give his cock another lick.
 						"I'm not really in the mood to fuck right now."
 					<</if>>
-					<p>"Well... if that's what you want I guess," <<=$npcs.get($sex.npcId,'firstname')>> says leaning back as you go back to work.</p>
+					<p>"Well... if that's what you want I guess," <<npc $sex.npcId>><</npc>> says leaning back as you go back to work.</p>
 					<<actCLA 'Get back to it'>>
 						<<gt 'booty_call_start' 'bj_resume'>>
 					<</actCLA>>
@@ -1633,7 +1633,7 @@
 					<<actCLA 'My pussy needs a break'>>
 						<<video "shared/sex/blowjob/play1.mp4">>
 						"My pussy needs a break," you smile gently. "I need a little more time to rest before you fuck me again."
-						<p>"Well... if that's what you want I guess," <<=$npcs.get($sex.npcId,'firstname')>> shrugs back.</p>
+						<p>"Well... if that's what you want I guess," <<npc $sex.npcId>><</npc>> shrugs back.</p>
 						<<actCLA 'Get back to it'>>
 							<<gt 'booty_call_start' 'bj_resume'>>
 						<</actCLA>>
@@ -1646,7 +1646,7 @@
 <<if $location_var[$here][0] == 'bj_resume'>>
 	<<arouse 'bj' `rand(5,10)` `['no_orgasm_msg']`>>
 	<<video "shared/sex/blowjob/bj47.mp4">>
-	<p>You go back to blowing <<=$npcs.get($sex.npcId,'firstname')>>, humming to yourself as you relax while bobbing your head up and down the length of his cock.</p>
+	<p>You go back to blowing <<npc $sex.npcId>><</npc>>, humming to yourself as you relax while bobbing your head up and down the length of his cock.</p>
 <</if>>
 <<if $location_var[$here][0] == 'bj_cum_sort'>>
 	<<setinit $booty_call['bj_cum_choice'] = rand(1,20)>>
@@ -1745,11 +1745,11 @@
 				<<video "shared/sex/foreplay/grope1.mp4">>
 			<</if>>
 			<<if getvar("$booty_call['foreplay_change']") >= 1>>
-				<p>You crawl over <<=$npcs.get($sex.npcId,'firstname')>> kissing him passionately while his hands roam all over your body.</p>
+				<p>You crawl over <<npc $sex.npcId>><</npc>> kissing him passionately while his hands roam all over your body.</p>
 				<<setinit $booty_call['foreplay_change'] = 2>>
 			<<else>>
 				<<setinit $booty_call['foreplay_change'] += 1>>
-				<p>You push <<=$npcs.get($sex.npcId,'firstname')>> onto the bed, crawling over him and plunge your tongue into his mouth, kissing him with everything you've got while his hands roam all over your body.</p>
+				<p>You push <<npc $sex.npcId>><</npc>> onto the bed, crawling over him and plunge your tongue into his mouth, kissing him with everything you've got while his hands roam all over your body.</p>
 			<</if>>
 			<<actCLA 'Move your hand to his cock'>>
 				<<arouse 'kiss' `rand(2,4)` `['no_orgasm_msg']`>>
@@ -1773,11 +1773,11 @@
 	<<arouse 'kiss' `rand(2,4)` `['no_orgasm_msg']`>>
 	<<if rand(0,1) == 1>>
 		<<video "shared/sex/foreplay/makeout1.mp4">>
-		<p>You continue making out with <<=$npcs.get($sex.npcId,'firstname')>>, loving the taste of his lips and the feel of his tongue against yours.</p>
+		<p>You continue making out with <<npc $sex.npcId>><</npc>>, loving the taste of his lips and the feel of his tongue against yours.</p>
 	<<else>>
 		<<video "shared/sex/foreplay/grope1.mp4">>
 		<<arouse 'foreplay' -10 `['no_orgasm_msg']`>>
-		<p>You continue making out with <<=$npcs.get($sex.npcId,'firstname')>>, loving the taste of his lips. <<=$npcs.get($sex.npcId,'firstname')>> can't keep his hands off of you, endlessly groping your breasts while he continues to plunge his tongue down your throat.</p>
+		<p>You continue making out with <<npc $sex.npcId>><</npc>>, loving the taste of his lips. <<npc $sex.npcId>><</npc>> can't keep his hands off of you, endlessly groping your breasts while he continues to plunge his tongue down your throat.</p>
 	<</if>>
 	<<actCLA 'Keep making out'>>
 		<<gt 'booty_call_start' 'makeout_dom2'>>
@@ -1793,11 +1793,11 @@
 	<<arouse 'hj' -rand(2,4) `['no_orgasm_msg']`>>
 	<<if rand(0,1) == 1>>
 		<<video "shared/sex/foreplay/makeout2.mp4">>
-		<p>You continue making out with <<=$npcs.get($sex.npcId,'firstname')>> while jerking him off, loving the taste of his lips and the feel of his tongue against yours and the hard swell of his cock in your hand.</p>
+		<p>You continue making out with <<npc $sex.npcId>><</npc>> while jerking him off, loving the taste of his lips and the feel of his tongue against yours and the hard swell of his cock in your hand.</p>
 	<<else>>
 		<<arouse 'foreplay' -5 `['no_orgasm_msg']`>>
 		<<video "shared/sex/foreplay/grope1.mp4">>
-		<p>You continue making out with <<=$npcs.get($sex.npcId,'firstname')>> while jerking him off, loving the taste of his lips and the hard swell of his cock in your hand. In return, <<=$npcs.get($sex.npcId,'firstname')>> can't keep his hands off of you, endlessly groping your breasts while he continues to plunge his tongue down your throat.</p>
+		<p>You continue making out with <<npc $sex.npcId>><</npc>> while jerking him off, loving the taste of his lips and the hard swell of his cock in your hand. In return, <<npc $sex.npcId>><</npc>> can't keep his hands off of you, endlessly groping your breasts while he continues to plunge his tongue down your throat.</p>
 	<</if>>
 	<<actCLA 'Keep making out'>>
 		<<gt 'booty_call_start' 'makeout_dom2'>>
@@ -1818,7 +1818,7 @@
 			<<setinit $booty_call['foreplay_change'] = 2>>
 		<<else>>
 			<<setinit $booty_call['foreplay_change'] += 1>>
-			<p>You lay down beside <<=$npcs.get($sex.npcId,'firstname')>>, taking his shaft in your hand and working it with sensual tugs. He's rock hard in your grip and he moans under your touch.</p>
+			<p>You lay down beside <<npc $sex.npcId>><</npc>>, taking his shaft in your hand and working it with sensual tugs. He's rock hard in your grip and he moans under your touch.</p>
 		<</if>>
 		<<actCLA 'Make him come in your hand'>>
 			<<gt 'booty_call_start' 'hj_cum1'>>
@@ -1838,9 +1838,9 @@
 		<p>"Hang on, wai-"</p>
 		But before he can finish his sentence, you squeeze harder and speed up. Thick cum erupts from his cock, wads of it flying through the air, streams of it running down your fingers. A dirty grin is plastered across your face as you continue working his cock with your hand, milking him for every drop.
 	<<elseif $booty_call['position'] == 'blowjob'>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> groans loudly and cum erupts from the tip of his cock. The thick liquid dribbles down your fingers, mixing with your saliva, making his shaft even more slippery in your hand. A dirty grin is plastered across your face the whole time as you work his cock, determined to milk him for every drop.</p>
+		<p><<npc $sex.npcId>><</npc>> groans loudly and cum erupts from the tip of his cock. The thick liquid dribbles down your fingers, mixing with your saliva, making his shaft even more slippery in your hand. A dirty grin is plastered across your face the whole time as you work his cock, determined to milk him for every drop.</p>
 	<<else>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> groans loudly and cum erupts from the tip of his cock. The thick liquid dribbles down your fingers, making his shaft incredibly slippery in your hand. A dirty grin is plastered across your face the whole time as you work his cock, determined to milk him for every drop.</p>
+		<p><<npc $sex.npcId>><</npc>> groans loudly and cum erupts from the tip of his cock. The thick liquid dribbles down your fingers, making his shaft incredibly slippery in your hand. A dirty grin is plastered across your face the whole time as you work his cock, determined to milk him for every drop.</p>
 	<</if>>
 	<<gs 'booty_call_sex' 'sex_end'>>
 <</if>>
@@ -1851,23 +1851,23 @@
 		<<arouse 'bj' `rand(2,3)` `['no_orgasm_msg']`>>
 		<<video "shared/sex/blowjob/play1.mp4">>
 		<<if getvar("$booty_call['foreplay_change']") >= 1 and getvar("$booty_call['bj_count']") >= 1>>
-			<p>You move down between <<=$npcs.get($sex.npcId,'firstname')>>'s legs, dipping your head and using your mouth to play with his cock, licking it, sucking it, kissing it, teasing it, enjoying every little twitch and reaction it elicits from him.</p>
+			<p>You move down between <<npc $sex.npcId>><</npc>>'s legs, dipping your head and using your mouth to play with his cock, licking it, sucking it, kissing it, teasing it, enjoying every little twitch and reaction it elicits from him.</p>
 			<<setinit $booty_call['foreplay_change'] = 2>>
 		<<else>>
 			<<setinit $booty_call['foreplay_change'] += 1>>
-			<p>You move down between <<=$npcs.get($sex.npcId,'firstname')>>'s legs, dipping your head and using your mouth to play with his cock, licking it, sucking it, kissing it, teasing it, enjoying every little twitch and reaction it elicits from him.</p>
+			<p>You move down between <<npc $sex.npcId>><</npc>>'s legs, dipping your head and using your mouth to play with his cock, licking it, sucking it, kissing it, teasing it, enjoying every little twitch and reaction it elicits from him.</p>
 		<</if>>
 		<<actCLA 'Keep teasing'>>
 			<<arouse 'bj' `rand(1,3)` `['no_orgasm_msg']`>>
 			<<video "shared/sex/blowjob/play1.mp4">>
 			<<if $npcs.get($sex.npcId,'fav_pos') == 'blowjob'>>
-				<p>"Ungh-!" <<=$npcs.get($sex.npcId,'firstname')>> moans. "Stop teasing me! I want you to blow me for real."</p>
+				<p>"Ungh-!" <<npc $sex.npcId>><</npc>> moans. "Stop teasing me! I want you to blow me for real."</p>
 			<<else>>
-				<p>"Hey-!" <<=$npcs.get($sex.npcId,'firstname')>> grunts. "I'm gonna come if you keep that up."</p>
+				<p>"Hey-!" <<npc $sex.npcId>><</npc>> grunts. "I'm gonna come if you keep that up."</p>
 			<</if>>
 			<<actCLA 'Make him come'>>
 				<<video "shared/sex/handjob/hj3.mp4">>
-				<p><<=$npcs.get($sex.npcId,'firstname')>>'s warning only makes you want to force him to come even more and you begin rapidly jerking him off and he writhes under your touch. You feel a pulse run through his dick and you know he's going to come right now.</p>
+				<p><<npc $sex.npcId>><</npc>>'s warning only makes you want to force him to come even more and you begin rapidly jerking him off and he writhes under your touch. You feel a pulse run through his dick and you know he's going to come right now.</p>
 				<<actCLA 'Tease him to completion'>>
 					<<gs 'booty_call_start' 'bj_dom_tease_cum'>>
 					<<gs 'booty_call_sex' 'sex_end'>>
@@ -1903,10 +1903,10 @@
 	<<arouse 'bj' `rand(2,7)` `['no_orgasm_msg']`>>
 	<<video "shared/sex/blowjob/bj#.mp4" 46 50>>
 	<<if $booty_call['position'] == 'blowjob_tease'>>
-		<p>Deciding he's had enough teasing, you take <<=$npcs.get($sex.npcId,'firstname')>> between your lips and begin blowing him in earnest.</p>
+		<p>Deciding he's had enough teasing, you take <<npc $sex.npcId>><</npc>> between your lips and begin blowing him in earnest.</p>
 	<</if>>
 	<<setinit $booty_call['position'] = 'blowjob'>>
-	<p>You give him your best head, taking pride in your work, bobbing up and down his shaft and doing your best to make <<=$npcs.get($sex.npcId,'firstname')>> feel good.</p>
+	<p>You give him your best head, taking pride in your work, bobbing up and down his shaft and doing your best to make <<npc $sex.npcId>><</npc>> feel good.</p>
 	<<if rand(1,3) == 1>>
 		<<gs 'booty_call_start' 'bj_sub_cum_surprise'>>
 	<<elseif rand(1,2) == 1>>
@@ -1981,13 +1981,13 @@
 	<<setinit $booty_call['cum_choice'] = 'mouth'>>
 	<<setinit $booty_call['cum_count'] += 1>>
 	<<video "shared/sex/cum/mouth/swallow5.mp4">>
-	<p>You quickly wrap your lips around his cock and plunge down as far as you can go. Not even a second later, he explodes in your mouth, shaft pulsing between your lips, warm liquid splashing against your tonsils. You hold yourself there, humming as <<=$npcs.get($sex.npcId,'firstname')>> buckles beneath you, waiting until he's ridden his orgasm to completion.</p>
+	<p>You quickly wrap your lips around his cock and plunge down as far as you can go. Not even a second later, he explodes in your mouth, shaft pulsing between your lips, warm liquid splashing against your tonsils. You hold yourself there, humming as <<npc $sex.npcId>><</npc>> buckles beneath you, waiting until he's ridden his orgasm to completion.</p>
 	<<gs 'booty_call_start' 'bj_dom_spit2'>>
 <</if>>
 <<if $location_var[$here][0] == 'bj_dom_spit2'>>
 	<<actCLA 'Spit'>>
 		<<video "shared/sex/cum/mouth/spit6.mp4">>
-		<p>Once you're pretty sure he's done, you draw your head back up <<=$npcs.get($sex.npcId,'firstname')>>'s cock, letting his cum spill from your lips along the way. You watch it run back down his shaft and look up at <<=$npcs.get($sex.npcId,'firstname')>>, giving him a cum drip smile.</p>
+		<p>Once you're pretty sure he's done, you draw your head back up <<npc $sex.npcId>><</npc>>'s cock, letting his cum spill from your lips along the way. You watch it run back down his shaft and look up at <<npc $sex.npcId>><</npc>>, giving him a cum drip smile.</p>
 		<<gs 'booty_call_sex' 'sex_end'>>
 	<</actCLA>>
 <</if>>
@@ -2002,7 +2002,7 @@
 		<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 		<<setinit $booty_call['cum_count'] += 1>>
 		<<video "shared/sex/cum/mouth/deep2.mp4">>
-		<p>Carefully, very carefully, you slowly draw your lips back up <<=$npcs.get($sex.npcId,'firstname')>>'s cock, sucking the whole time to make sure not a single drop of his cum spills around your lips. It's really difficult to keep sucking and not choke on the cum pooling at the back of your throat. The effort makes your eyes water, but you still manage to draw all the way back up to his tip where you finally swallow his load and get your first gasp of clean air.</p>
+		<p>Carefully, very carefully, you slowly draw your lips back up <<npc $sex.npcId>><</npc>>'s cock, sucking the whole time to make sure not a single drop of his cum spills around your lips. It's really difficult to keep sucking and not choke on the cum pooling at the back of your throat. The effort makes your eyes water, but you still manage to draw all the way back up to his tip where you finally swallow his load and get your first gasp of clean air.</p>
 		<<actCLA 'Continue'>>
 			<<gt 'booty_call_start' 'bj_dom_swallow_react'>>
 		<</actCLA>>
@@ -2011,7 +2011,7 @@
 <<if $location_var[$here][0] == 'bj_dom_swallow_react'>>
 	<<video "shared/sex/blowjob/play1.mp4">>
 	<<if $npcs.get($sex.npcId,'cum_pref') == 2 and $npcs.get($sex.npcId,'cum_pref_know') == 0>>
-		<p>"Holy..." <<=$npcs.get($sex.npcId,'firstname')>> lets his head fall back onto his pillow, his mind seemingly blown by your blowjob skills. Taking satisfaction in a job well done, you continue teasing his cock, running your lips up and down its shaft, peppering it with kisses. "That was incredible..."</p>
+		<p>"Holy..." <<npc $sex.npcId>><</npc>> lets his head fall back onto his pillow, his mind seemingly blown by your blowjob skills. Taking satisfaction in a job well done, you continue teasing his cock, running your lips up and down its shaft, peppering it with kisses. "That was incredible..."</p>
 		<p>"Mmmm?" you hum pleasantly. "You liked it that much?"</p>
 		"Like you sucked the soul outta me," he smiles tiredly. "I love the feeling of blowing a load in a girl''s mouth like that, but that was something else."
 		<<actCLA 'You like oral creampies?'>>
@@ -2027,7 +2027,7 @@
 				<<gs 'booty_call_sex' 'sex_end'>>
 			<</actCLA>>
 			<<actCLA 'I`ll keep it in mind'>>
-				<p>"I'll keep that in mind then," giving <<=$npcs.get($sex.npcId,'firstname')>> a mischievous smirk and running your tongue across his tip.</p>
+				<p>"I'll keep that in mind then," giving <<npc $sex.npcId>><</npc>> a mischievous smirk and running your tongue across his tip.</p>
 				<<gs 'booty_call_sex' 'sex_end'>>
 			<</actCLA>>
 		<</actCLA>>
@@ -2041,7 +2041,7 @@
 		<</actCLA>>
 	<<else>>
 		<<if $npcs.get($sex.npcId,'cum_pref') == 2 and $npcs.get($sex.npcId,'cum_pref_know') == $npcs.get($sex.npcId,'cum_pref')>>
-			<p>"Woah," <<=$npcs.get($sex.npcId,'firstname')>>'s head flops onto the pillow, while you continue to play with his cock, still twitching in the throes of post-orgasm bliss. "Your mouth is so fucking good."</p>
+			<p>"Woah," <<npc $sex.npcId>><</npc>>'s head flops onto the pillow, while you continue to play with his cock, still twitching in the throes of post-orgasm bliss. "Your mouth is so fucking good."</p>
 			<<actCLA 'I know you love oral creampies'>>
 				"I know how much you love coming in my mouth," you smirk, peppering his shaft with kisses. "Thought I''d give you a treat and suck you dry."
 				"You're the best," he pants.
@@ -2049,7 +2049,7 @@
 				<<gs 'booty_call_sex' 'sex_end'>>
 			<</actCLA>>
 		<<else>>
-			<p>"Woah," <<=$npcs.get($sex.npcId,'firstname')>>'s head flops onto the pillow, while you continue to play with his cock, still twitching in the throes of post-orgasm bliss. "That was great."</p>
+			<p>"Woah," <<npc $sex.npcId>><</npc>>'s head flops onto the pillow, while you continue to play with his cock, still twitching in the throes of post-orgasm bliss. "That was great."</p>
 		<</if>>
 		<<actCLA 'I know'>>
 			"Don't need to tell me how good I am at giving head," you smirk, giving his shaft another lick. "I already know I'm the best."
@@ -2126,11 +2126,11 @@
 	'<<image `'shared/sex/69/pre1.jpg'`>>'
 	$booty_call['position'] = '69'
 	if booty_call['foreplay_change'] >= 1:
-	'You crawl towards <<<<=$npcs.get($sex.npcId,'firstname')>>>>, throwing your legs over his head and scooching your ass over his head. Grinning, you lower your hips down to his face while simultaneously grabbing his cock and preparing it for your mouth.'
+	'You crawl towards <<<<npc $sex.npcId>><</npc>>>>, throwing your legs over his head and scooching your ass over his head. Grinning, you lower your hips down to his face while simultaneously grabbing his cock and preparing it for your mouth.'
 	booty_call['foreplay_change'] = 2
 	else
 	booty_call['foreplay_change'] += 1
-	'You push <<<<=$npcs.get($sex.npcId,'firstname')>>>> back onto the bed and throw your legs over him, reversing yourself in the process, and scooch your ass back towards him. Grinning, you lower your hips down to his face while simultaneously grabbing his cock and preparing it for your mouth.'
+	'You push <<<<npc $sex.npcId>><</npc>>>> back onto the bed and throw your legs over him, reversing yourself in the process, and scooch your ass back towards him. Grinning, you lower your hips down to his face while simultaneously grabbing his cock and preparing it for your mouth.'
 	end
 	end} -->
 <</if>>
@@ -2140,12 +2140,12 @@
 		<<setinit $booty_call['position'] = 'facesit'>>
 		<<setinit $booty_call['facesit_count'] += 1>>
 		<<if getvar("$booty_call['foreplay_change']") >= 1>>
-			<p>You pull away from <<=$npcs.get($sex.npcId,'firstname')>>'s cock, crawling forward until your legs are over his head. You lower your pussy down onto his mouth with a dirty grin.</p>
+			<p>You pull away from <<npc $sex.npcId>><</npc>>'s cock, crawling forward until your legs are over his head. You lower your pussy down onto his mouth with a dirty grin.</p>
 			"I think it's time for me to get a little tender loving care."
 			<<setinit $booty_call['foreplay_change'] = 2>>
 		<<else>>
 			<<setinit $booty_call['foreplay_change'] += 1>>
-			<p>You push <<=$npcs.get($sex.npcId,'firstname')>> back onto the bed and throw your legs over his head. You lower your pussy down onto his mouth with a dirty grin.</p>
+			<p>You push <<npc $sex.npcId>><</npc>> back onto the bed and throw your legs over his head. You lower your pussy down onto his mouth with a dirty grin.</p>
 			"I think it's time for me to go for a ride."
 		<</if>>
 		<<actCLA 'Make him eat you out'>>
@@ -2156,15 +2156,15 @@
 <<if $location_var[$here][0] == 'facesit_2'>>
 	<<arouse 'cuni' `rand(4,8)` `['no_orgasm_msg']`>>
 	<<video "shared/sex/facesit/1.mp4">>
-	<p>You press your pussy right onto <<=$npcs.get($sex.npcId,'firstname')>>'s face, forcing it between his lips. He immediately complies, sucking gently on your sex while running his tongue through the folds of your pussy to caress your clit.</p>
+	<p>You press your pussy right onto <<npc $sex.npcId>><</npc>>'s face, forcing it between his lips. He immediately complies, sucking gently on your sex while running his tongue through the folds of your pussy to caress your clit.</p>
 	It feels so good, your eyes roll back in your skull and you can't help but grab him by the hair, trying to force his face harder into your pussy. Heat courses through your hips and somewhere in the back of your mind, you wonder if it's possible to drown a man with girl cum.
 	<<if $orgasm > $booty_call['orgasm']>>
 		<<setinit $booty_call['orgasm'] = $orgasm>>
 		<<actCLA 'Continue'>>
 			<<video "shared/sex/facesit/orgasm1.mp4">>
-			<p>Euphoric pressure builds and builds inside you until you can't contain it anymore. All it takes is <<=$npcs.get($sex.npcId,'firstname')>>'s tongue brushing against your clit in <i>just</i> the right way, and suddenly you're coming, body racked with spasms as you claw the bedsheets uncontrollably while you ride out your orgasm.</p>
+			<p>Euphoric pressure builds and builds inside you until you can't contain it anymore. All it takes is <<npc $sex.npcId>><</npc>>'s tongue brushing against your clit in <i>just</i> the right way, and suddenly you're coming, body racked with spasms as you claw the bedsheets uncontrollably while you ride out your orgasm.</p>
 			<<if $npcs.get($sex.npcId,'pussyeater') > 0>>
-				<p>After a short time, you feel the waves of climax subsiding but without warning, permission, or invitation, <<=$npcs.get($sex.npcId,'firstname')>> begins working your pussy with his tongue again, diving in deep and sending goosebumps across your skin.</p>
+				<p>After a short time, you feel the waves of climax subsiding but without warning, permission, or invitation, <<npc $sex.npcId>><</npc>> begins working your pussy with his tongue again, diving in deep and sending goosebumps across your skin.</p>
 				<<actCLA 'Let him keep going'>>
 					<<gt 'booty_call_start' 'facesit_3'>>
 				<</actCLA>>
@@ -2210,19 +2210,19 @@
 	<<video "shared/sex/facesit/1.mp4">>
 	<<if $orgasm > $booty_call['orgasm_limit']>>
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>>'s tongue caresses your pussy again, but this time instead of pleasure, the shocks it sends through you are like needles through your clit. You cry out, caught between pain and ecstasy but much further towards pain. His tongue touches you again and you reflexively buck your hips away from his face. <<=$npcs.get($sex.npcId,'firstname')>> looks up at you from between your legs, confused.</p>
+		<p><<npc $sex.npcId>><</npc>>'s tongue caresses your pussy again, but this time instead of pleasure, the shocks it sends through you are like needles through your clit. You cry out, caught between pain and ecstasy but much further towards pain. His tongue touches you again and you reflexively buck your hips away from his face. <<npc $sex.npcId>><</npc>> looks up at you from between your legs, confused.</p>
 		<p>"What's wrong?" he asks. "I thought you were enjoying that."</p>
 		<p>"I- I was..." you pant. "But my pussy is too sensitive now." You manage a smile down at him. "You made me come too many times in a row. I don't think I can take it any more. I need a break."</p>
 		<<gs 'booty_call_sex' 'sex_end'>>
 	<<else>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>>'s tongue keeps going like a pussy-eating machine, never stopping, and always making sure to give the little man in the boat the attention he deserves.</p>
+		<p><<npc $sex.npcId>><</npc>>'s tongue keeps going like a pussy-eating machine, never stopping, and always making sure to give the little man in the boat the attention he deserves.</p>
 		<<actCLA 'Come again'>>
 			<<set $orgasm_or = 'yes'>>
 			<<arouse 'cuni' `rand(2,5)` `['no_orgasm_msg']`>>
 			<<video "shared/sex/facesit/orgasm1.mp4">>
-			<p>Within minutes, <<=$npcs.get($sex.npcId,'firstname')>> has you spasming around his mouth again.</p>
+			<p>Within minutes, <<npc $sex.npcId>><</npc>> has you spasming around his mouth again.</p>
 			<<if $npcs.get($sex.npcId,'pussyeater') > 0>>
-				<p>But <<=$npcs.get($sex.npcId,'firstname')>> still doesn't stop, and continues to lap up your juices like he's dying of thirst.</p>
+				<p>But <<npc $sex.npcId>><</npc>> still doesn't stop, and continues to lap up your juices like he's dying of thirst.</p>
 				<<if getvar("$booty_call['cuni_orgasm']") < 5>>
 					<<actCLA 'Let him keep going'>>
 						<<gt 'booty_call_start' 'facesit_3'>>
@@ -2237,7 +2237,7 @@
 				<</actCLA>>
 				<<gs 'booty_call_sex' 'sex_start'>>
 			<<else>>
-				<p>"How about we do something else now?" <<=$npcs.get($sex.npcId,'firstname')>>asks as your orgasm winds down.</p>
+				<p>"How about we do something else now?" <<npc $sex.npcId>><</npc>>asks as your orgasm winds down.</p>
 				<<gs 'booty_call_start' 'foreplay_choose'>>
 				<<gs 'booty_call_sex' 'sex_start'>>
 			<</if>>
@@ -2250,7 +2250,7 @@
 <<if $location_var[$here][0] == 'transition1'>>
 	<<actCLA 'Continue'>>
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-		<p>You breathe heavily on <<=$npcs.get($sex.npcId,'firstname')>>'s bed, as your orgasm begins to wind down. As you lay there, you see <<=$npcs.get($sex.npcId,'firstname')>>'s cock dangling above your head and he bends over you, trying to push it into your panting mouth.</p>
+		<p>You breathe heavily on <<npc $sex.npcId>><</npc>>'s bed, as your orgasm begins to wind down. As you lay there, you see <<npc $sex.npcId>><</npc>>'s cock dangling above your head and he bends over you, trying to push it into your panting mouth.</p>
 		<<actCLA 'Let him'>>
 			<<video "shared/sex/blowjob/bj51.mp4">>
 			Relaxing your jaw, you let his cock part your lips and slowly slip into inside your mouth.
@@ -2265,7 +2265,7 @@
 		<<else>>
 			<<actCLA 'Fuck instead?'>>
 				<p>"Uhh, no," you say, turning your head away with a smirk. "How about we fuck instead?"</p>
-				<p>"I won't say no to that," <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
+				<p>"I won't say no to that," <<npc $sex.npcId>><</npc>> grins back.</p>
 				<<gs 'booty_call_sex' 'reset'>>
 				<<gs 'booty_call_condoms' 'condoms'>>
 				<<gs 'booty_call_sex' 'position_change'>>
@@ -2277,7 +2277,7 @@
 	<<actCLA 'End it there'>>
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		"I think I'm done there," you pant.
-		<p>"What the hell?" <<=$npcs.get($sex.npcId,'firstname')>> protests. "How is that fair? Only you got off!"</p>
+		<p>"What the hell?" <<npc $sex.npcId>><</npc>> protests. "How is that fair? Only you got off!"</p>
 		<<actCLA 'Ugh, fine (blowjob)'>>
 			"Ugh," you moan irately. "<i>Fine</i>. Come here," you say rolling over and bending your head down towards his cock.
 			<<gs 'booty_call_start' 'bj_dom1'>>

+ 54 - 54
sugarcube/src/activities/bootycall/booty_call_talk.tw

@@ -10,16 +10,16 @@
 	end} -->
 	<<if $npcs.get($sex.npcId,'childfree') == 1 and getvar("$WIP_enabled") == 1>>
 		<<if getvar("$cum_loc['vagina']") > 0>>
-			<p>"Speaking of which..." <<=$npcs.get($sex.npcId,'firstname')>> says, looking intently at the cum slowly draining from your pussy. "You're going to get a morning after pill, right?"</p>
+			<p>"Speaking of which..." <<npc $sex.npcId>><</npc>> says, looking intently at the cum slowly draining from your pussy. "You're going to get a morning after pill, right?"</p>
 		<<else>>
-			<p>"Speaking of which..." <<=$npcs.get($sex.npcId,'firstname')>> asks, looking intently at your pussy, clearly thinking about when he came inside you earlier. "You're going to get a morning after pill, right?"</p>
+			<p>"Speaking of which..." <<npc $sex.npcId>><</npc>> asks, looking intently at your pussy, clearly thinking about when he came inside you earlier. "You're going to get a morning after pill, right?"</p>
 		<</if>>
 		<<gs 'booty_call_talk' 'childfree_accidental_creampie1'>>
 	<<else>>
 		<<if getvar("$cum_loc['vagina']") > 0>>
-			<p>"Speaking of which..." <<=$npcs.get($sex.npcId,'firstname')>> says, looking intently at the cum slowly draining from your pussy. "Are you gonna be okay...?"</p>
+			<p>"Speaking of which..." <<npc $sex.npcId>><</npc>> says, looking intently at the cum slowly draining from your pussy. "Are you gonna be okay...?"</p>
 		<<else>>
-			<p>"Speaking of which..." <<=$npcs.get($sex.npcId,'firstname')>> asks, looking intently at your pussy, clearly thinking about when he came inside you earlier. "Are you gonna be okay...?"</p>
+			<p>"Speaking of which..." <<npc $sex.npcId>><</npc>> asks, looking intently at your pussy, clearly thinking about when he came inside you earlier. "Are you gonna be okay...?"</p>
 		<</if>>
 		<<gs 'booty_call_talk' 'boy_accidental_creampie2'>>
 	<</if>>
@@ -149,7 +149,7 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'morning_after_money'>>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> looks at you for a moment before reaching down into his discarded trousers to grab his wallet, pulling 800<b>₽</b> out.</p>
+	<p><<npc $sex.npcId>><</npc>> looks at you for a moment before reaching down into his discarded trousers to grab his wallet, pulling 800<b>₽</b> out.</p>
 	"Here," he says, offering the cash to you. "Get a morning after pill tomorrow.
 	<<actCLA 'No, you don`t have to'>>
 		"No," you shake your head. "I can't ask you to do that."
@@ -162,10 +162,10 @@
 			$npc_apt_bedroom
 			"No, I don't want your money," you say, shaking your head and pushing the money away.
 			<<if $npcs.get($sex.npcId,'childfree') == 1>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> stares at you for a moment, looking almost angry.</p>
+				<p><<npc $sex.npcId>><</npc>> stares at you for a moment, looking almost angry.</p>
 				<p>"Just don't fucking get pregnant, okay?" he says, tossing the cash onto his bedside table.</p>
 			<<else>>
-				<p>"If you're sure..." <<=$npcs.get($sex.npcId,'firstname')>> says hesitantly, withdrawing his hand.</p>
+				<p>"If you're sure..." <<npc $sex.npcId>><</npc>> says hesitantly, withdrawing his hand.</p>
 			<</if>>
 			<<gs 'booty_call_pillow_talk' 'topics'>>
 		<</actCLA>>
@@ -174,7 +174,7 @@
 			You take the money from him, warmed by the gesture.
 			"Thanks," you say, giving him the most grateful smile you can.
 			<<if $npcs.get($sex.npcId,'childfree') == 1>>
-				<p>"Seriously," <<=$npcs.get($sex.npcId,'firstname')>> says. "Take that pill."</p>
+				<p>"Seriously," <<npc $sex.npcId>><</npc>> says. "Take that pill."</p>
 			<<else>>
 				He just nods back in return
 			<</if>>
@@ -200,7 +200,7 @@
 			<<if $npcs.get($sex.npcId,'childfree') == 1>>
 				"Just make sure you do," he replies. "I don't want any kids running around."
 			<<else>>
-				<p>"If you're sure..." <<=$npcs.get($sex.npcId,'firstname')>> says hesitantly, withdrawing his hand.</p>
+				<p>"If you're sure..." <<npc $sex.npcId>><</npc>> says hesitantly, withdrawing his hand.</p>
 			<</if>>
 			<<gs 'booty_call_pillow_talk' 'topics'>>
 		<</actCLA>>
@@ -289,7 +289,7 @@
 					<<run $npcs.set($sex.npcId,'free_creampies',1)>>
 					$booty_call['temp_pic']
 					"You don't need to ask to come inside me y''know," you murmur. "Not <i>every</i> time. I'll let you know when it's a safe day," you smile gently. "And then you can come inside me as much as you want."
-					<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> smiles back, beaming at you.</p>
+					<p>"Okay." <<npc $sex.npcId>><</npc>> smiles back, beaming at you.</p>
 					<<gs 'booty_call_talk' 'free_creampies_exit'>>
 				<</actCLA>>
 			<</if>>
@@ -301,7 +301,7 @@
 		cla & *clr
 		$booty_call['temp_pic']
 		'"Don't worry," you smile. "It's a safe day for me. You can come inside me as much as you want today."'
-		if npc_childfree[$sex.npcId] = 1: '<<<<=$npcs.get($sex.npcId,'firstname')>>>> lets out a sigh of relief.'
+		if npc_childfree[$sex.npcId] = 1: '<<<<npc $sex.npcId>><</npc>>>> lets out a sigh of relief.'
 		gs'booty_call_sex', 'sex_end'
 		end
 		elseif stat['probably_safe_day'] = 1:
@@ -310,7 +310,7 @@
 		cla & *clr
 		$booty_call['temp_pic']
 		'"Don't worry," you smile. "I'm probably safe. It's okay for you to come inside me today."'
-		if npc_childfree[$sex.npcId] = 1: '<<<<=$npcs.get($sex.npcId,'firstname')>>>> lets out a sigh of relief.'
+		if npc_childfree[$sex.npcId] = 1: '<<<<npc $sex.npcId>><</npc>>>> lets out a sigh of relief.'
 		*nl
 		'<i>Probably...</i> you quietly reiterate to yourself.'
 		gs'booty_call_sex', 'sex_end'
@@ -328,7 +328,7 @@
 		end
 		act'<i>I hope I get pregnant</i>':
 		cla & *nl
-		'<i>I really hope this gets me pregnant,</i> you think giddily to yourself. <i>I want <<<<=$npcs.get($sex.npcId,'firstname')>>>>''s babies swimming around inside me...</i>'
+		'<i>I really hope this gets me pregnant,</i> you think giddily to yourself. <i>I want <<<<npc $sex.npcId>><</npc>>>>''s babies swimming around inside me...</i>'
 		gs'booty_call_sex', 'sex_end'
 		end
 		end
@@ -341,7 +341,7 @@
 	<<if $npcs.get($sex.npcId,'abusive') == 1 and $npcs.get($sex.npcId,'childfree') != 1>>
 		<<run $npcs.set($sex.npcId,'free_creampies',2)>>
 		<<if $npcs.get($sex.npcId,'cum_pref') == 'creampie'>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> gives you a predatory grin, so full of desire that it makes you involuntarily swallow.</p>
+			<p><<npc $sex.npcId>><</npc>> gives you a predatory grin, so full of desire that it makes you involuntarily swallow.</p>
 			"Good to know..."
 		<<else>>
 			"Good to know," he smirks amusedly.
@@ -350,7 +350,7 @@
 	<<elseif ($npcs.get($sex.npcId,'selfish') == 1 or $npcs.get($sex.npcId,'know_bc') == 1) and ($npcs.get($sex.npcId,'childfree') != 1 or $npcs.get($sex.npcId,'know_bc') == 1)>>
 		<<run $npcs.set($sex.npcId,'free_creampies',2)>>
 		<<if $npcs.get($sex.npcId,'cum_pref') == 'creampie'>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> gives you a look like he might just burst inside you again before giving you a delighted grin.</p>
+			<p><<npc $sex.npcId>><</npc>> gives you a look like he might just burst inside you again before giving you a delighted grin.</p>
 			"I'm gonna pump you full of so much cum, you're going to still be dripping next week," he says excitedly and you can't help but giggle at his boyish glee.
 		<<else>>
 			"Good to know," he smirks amusedly.
@@ -358,19 +358,19 @@
 		<<gs 'booty_call_talk' 'free_creampies_exit'>>
 	<<else>>
 		<<if $npcs.get($sex.npcId,'childfree') == 1 and $npcs.get($sex.npcId,'know_bc') != 1>>
-			<p>"Are you sure...?" <<=$npcs.get($sex.npcId,'firstname')>> asks hesitantly. "You're not worried you're going to get pregnant? I'm... I'm not really up for having kids..."</p>
+			<p>"Are you sure...?" <<npc $sex.npcId>><</npc>> asks hesitantly. "You're not worried you're going to get pregnant? I'm... I'm not really up for having kids..."</p>
 			<!-- !! add more options later-->
 		<<else>>
-			<p>"Is that really okay?" <<=$npcs.get($sex.npcId,'firstname')>> asks, wide-eyed.</p>
+			<p>"Is that really okay?" <<npc $sex.npcId>><</npc>> asks, wide-eyed.</p>
 		<</if>>
 		<<actCLA 'I`ll be fine'>>
 			<p>"I'll be fine," you insist, smiling gently. "What could go wrong?"</p>
 			<<if $npcs.get($sex.npcId,'childfree') == 1 or rand(1,4) == 1>>
 				<<run $npcs.set($sex.npcId,'free_creampies',-1)>>
-				<p>"I'm not comfortable with it," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head. "Maybe if you started birth control..."</p>
+				<p>"I'm not comfortable with it," <<npc $sex.npcId>><</npc>> says, shaking his head. "Maybe if you started birth control..."</p>
 			<<else>>
 				<<run $npcs.set($sex.npcId,'free_creampies',2)>>
-				<p>"Okay..." <<=$npcs.get($sex.npcId,'firstname')>> says hesitantly, but smiles back at you anyways.</p>
+				<p>"Okay..." <<npc $sex.npcId>><</npc>> says hesitantly, but smiles back at you anyways.</p>
 			<</if>>
 			<<gs 'booty_call_talk' 'free_creampies_exit'>>
 		<</actCLA>>
@@ -378,15 +378,15 @@
 			"It feels so good," you coo gently. "I <i>want</i> you to come inside me. I want you to fill me with your cum..."
 			<<if ($npcs.get($sex.npcId,'cum_pref') == 'creampie' and $npcs.get($sex.npcId,'childfree') == 1 and rand(npc_willpwr[$sex.npcId],100) <= pcs_persuas) or ($npcs.get($sex.npcId,'cum_pref') == 'creampie' and $npcs.get($sex.npcId,'childfree') != 1)>>
 				<<run $npcs.set($sex.npcId,'free_creampies',2)>>
-				<p>Desire wars with willpower within <<=$npcs.get($sex.npcId,'firstname')>>. You watch as he struggles back and forth until he leers at you with a hungry stare and you know which one won out.</p>
-				<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> says. "I won't ask anymore."</p>
+				<p>Desire wars with willpower within <<npc $sex.npcId>><</npc>>. You watch as he struggles back and forth until he leers at you with a hungry stare and you know which one won out.</p>
+				<p>"Okay." <<npc $sex.npcId>><</npc>> says. "I won't ask anymore."</p>
 			<<elseif $npcs.get($sex.npcId,'childfree') == 1>>
 				<<run $npcs.set($sex.npcId,'free_creampies',-1)>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> hesitates for a moment before shaking his head.</p>
+				<p><<npc $sex.npcId>><</npc>> hesitates for a moment before shaking his head.</p>
 				"I'm not comfortable with it," he says. "Maybe if you started birth control..."
 			<<else>>
 				<<run $npcs.set($sex.npcId,'free_creampies',2)>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> hesitates for a moment before nodding slowly.</p>
+				<p><<npc $sex.npcId>><</npc>> hesitates for a moment before nodding slowly.</p>
 				"Okay," he says, smiling. "I won''t ask anymore."
 			<</if>>
 			<<gs 'booty_call_talk' 'free_creampies_exit'>>
@@ -394,7 +394,7 @@
 		<<actCLA 'I'll tell you when it's safe'>>
 			<<run $npcs.set($sex.npcId,'free_creampies',1)>>
 			"I'll let you know when it's a safe day," you smile gently. "And then you can come inside me as much as you want."
-			<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> smiles back, beaming at you.</p>
+			<p>"Okay." <<npc $sex.npcId>><</npc>> smiles back, beaming at you.</p>
 			<<gs 'booty_call_talk' 'free_creampies_exit'>>
 		<</actCLA>>
 		<<if getvar("$birth_control['think_safe']") == 1>>
@@ -408,7 +408,7 @@
 					<<gs 'booty_call_stats' 'birth_control_know'>>
 					"I'm on birth control," you smile gently. "So you can come inside me as much as you want."
 				<</if>>
-				<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> smiles back, beaming at you.</p>
+				<p>"Okay." <<npc $sex.npcId>><</npc>> smiles back, beaming at you.</p>
 				<<gs 'booty_call_talk' 'free_creampies_exit'>>
 			<</actCLA>>
 		<<elseif getvar("$pillcon2") >= 20000>>
@@ -421,7 +421,7 @@
 					<<gs 'booty_call_stats' 'birth_control_know'>>
 					"I'm on birth control," you smile gently. "So you can come inside me as much as you want."
 				<</if>>
-				<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> smiles back, beaming at you.</p>
+				<p>"Okay." <<npc $sex.npcId>><</npc>> smiles back, beaming at you.</p>
 				<<gs 'booty_call_talk' 'free_creampies_exit'>>
 			<</actCLA>>
 		<<else>>
@@ -434,7 +434,7 @@
 					<<gs 'booty_call_stats' 'birth_control_know'>>
 					"I'm on birth control," you lie with a seductively gentle smile. "So you can come inside me as much as you want."
 				<</if>>
-				<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> smiles back, beaming at you.</p>
+				<p>"Okay." <<npc $sex.npcId>><</npc>> smiles back, beaming at you.</p>
 				<<gs 'booty_call_talk' 'free_creampies_exit'>>
 			<</actCLA>>
 		<</if>>
@@ -451,7 +451,7 @@
 	<<setinit $booty_call['forgot_bc_chat'] = 1>>
 	<<if $npcs.get($sex.npcId,'childfree') > 0 and ($npcs.get($sex.npcId,'argumentative') > 0 or $npcs.get($sex.npcId,'abusive') > 0) and getvar("$booty_call['creampie_count']") > 0>>
 		<<run $npcs.dec($sex.npcId,'rel',10)>>
-		<p>"What the fuck?!" <<=$npcs.get($sex.npcId,'firstname')>> exclaims. "Are you fucking kidding me? How could you forget? You better not get pregnant on me. I am <i>not</i> having your fucking kids."</p>
+		<p>"What the fuck?!" <<npc $sex.npcId>><</npc>> exclaims. "Are you fucking kidding me? How could you forget? You better not get pregnant on me. I am <i>not</i> having your fucking kids."</p>
 		<<actCLA 'Wallow'>>
 			<p>"I know, I know!" you moan miserably, berating yourself as much as he's berating you. "I'm a fucking idiot. I'm sorry, I'm so sorry."</p>
 			<<gs 'booty_call_morning' 'wakeup1'>>
@@ -480,7 +480,7 @@
 			<</actCLA>>
 		<</if>>
 	<<elseif getvar("$booty_call['creampie_count']") == 0>>
-		<p>"So what? I didn't come inside you last night," <<=$npcs.get($sex.npcId,'firstname')>> says, looking confused.</p>
+		<p>"So what? I didn't come inside you last night," <<npc $sex.npcId>><</npc>> says, looking confused.</p>
 		<<if $npcs.get($sex.npcId,'bareback') > 0>>
 			"Yeah but it may mean we need to start using condoms again for a while," you sigh.
 		<<else>>
@@ -489,7 +489,7 @@
 		<<gs 'booty_call_talk' 'forgot_bc_exit'>>
 	<<else>>
 		<!-- !!		if npc_childfree[$sex.npcId] > 0:-->
-		<p>"Shit," <<=$npcs.get($sex.npcId,'firstname')>> says, looking concerned. "What are you gonna do?"</p>
+		<p>"Shit," <<npc $sex.npcId>><</npc>> says, looking concerned. "What are you gonna do?"</p>
 		<<actCLA 'I don`t know'>>
 			<p>"I don't know," you say, looking back at him apologetically. "Hope we get lucky I guess?"</p>
 			<<gs 'booty_call_talk' 'forgot_bc_exit'>>
@@ -506,7 +506,7 @@
 		<<else>>
 			<<actCLA 'Buy some plan B?'>>
 				<p>"Buy a morning after pill?" you say, shrugging. "I don't know. Does it still work when you're already sort of on birth control?"</p>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> shrugs back. Great help.</p>
+				<p><<npc $sex.npcId>><</npc>> shrugs back. Great help.</p>
 				<<gs 'booty_call_talk' 'forgot_bc_exit'>>
 			<</actCLA>>
 		<</if>>
@@ -538,10 +538,10 @@
 			<<else>>
 				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			<</if>>
-			<p>"Hey, can I borrow some money?" you ask <<=$npcs.get($sex.npcId,'firstname')>>. "I need it for the morning after pill."</p>
+			<p>"Hey, can I borrow some money?" you ask <<npc $sex.npcId>><</npc>>. "I need it for the morning after pill."</p>
 			<<if rand(1,4) == 1 and $npcs.get($sex.npcId,'finance') == 0>>
 				<<if $npcs.get($sex.npcId,'selfish') == 1>>
-					<p>"Are you kidding? I barely have any money myself," <<=$npcs.get($sex.npcId,'firstname')>> scowls. "I got nothing to give to you."</p>
+					<p>"Are you kidding? I barely have any money myself," <<npc $sex.npcId>><</npc>> scowls. "I got nothing to give to you."</p>
 				<<else>>
 					"Actually, I'm a little strapped for cash myself," he mumbles embarrassedly. "I need every ruble right now. Sorry."
 				<</if>>
@@ -560,7 +560,7 @@
 					<<gs 'booty_call_talk' 'borrow_money_exit'>>
 				<<elseif $npcs.get($sex.npcId,'childfree') == 1>>
 					<<if $npcs.get($sex.npcId,'selfish') == 1>>
-						<p>"Ugh, how much do you need?" <<=$npcs.get($sex.npcId,'firstname')>> grumbles reaching for his wallet.</p>
+						<p>"Ugh, how much do you need?" <<npc $sex.npcId>><</npc>> grumbles reaching for his wallet.</p>
 					<<else>>
 						<p>"How much do you need?" he asks.</p>
 					<</if>>
@@ -580,7 +580,7 @@
 		<<set $finances.cash += 740>>
 		<p>"I don't have any money right now," you admit. "So I need the full 740 <b>₽</b> </p>
 		<<if $npcs.get($sex.npcId,'selfish') == 1>>
-			<p>"Seriously?" <<=$npcs.get($sex.npcId,'firstname')>> scowls as hands over the bills. "You don't have <i>any</i> money? Get a job or something."</p>
+			<p>"Seriously?" <<npc $sex.npcId>><</npc>> scowls as hands over the bills. "You don't have <i>any</i> money? Get a job or something."</p>
 			"Thanks," you say a little stiffly. It's hard to be grateful when someone''s being such an ass about it...
 		<<else>>
 			<p></p>
@@ -599,7 +599,7 @@
 	<<actCLA 'Done'>>
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		"Those are the rules," you say. "So as long as we follow those, we can keep doing this."
-		<p>"I can agree to that," <<=$npcs.get($sex.npcId,'firstname')>> smiles.</p>
+		<p>"I can agree to that," <<npc $sex.npcId>><</npc>> smiles.</p>
 		<<gs 'booty_call_after' 'after_sex_dressed'>>
 	<</actCLA>>
 	<<if $npcs.get($sex.npcId,'no_kiss') != 1>>
@@ -607,7 +607,7 @@
 			<<run $npcs.set($sex.npcId,'no_kiss',1)>>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			"No kissing," you say.
-			<p>"That's fine," <<=$npcs.get($sex.npcId,'firstname')>> nods.</p>
+			<p>"That's fine," <<npc $sex.npcId>><</npc>> nods.</p>
 			<<gs 'booty_call_talk' 'cheating_rules'>>
 		<</actCLA>>
 	<</if>>
@@ -617,18 +617,18 @@
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			"You can't come inside me," you say. "That's too far."
 			<<if $npcs.get($sex.npcId,'condom_conscious') > 0>>
-				<p>"We always use condoms anyways," <<=$npcs.get($sex.npcId,'firstname')>> shrugs.</p>
+				<p>"We always use condoms anyways," <<npc $sex.npcId>><</npc>> shrugs.</p>
 			<<elseif $npcs.get($npclastgenerated,'cum_pref') == 'creampie'>>
-				<p>"But that's the best part about fucking you," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+				<p>"But that's the best part about fucking you," <<npc $sex.npcId>><</npc>> grins.</p>
 				"I'm serious," you say sternly. "No creampies."
 			<<elseif $npcs.get($npclastgenerated,'cum_pref') == 'mouth'>>
-				<p>"So long as I can watch you swallow," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+				<p>"So long as I can watch you swallow," <<npc $sex.npcId>><</npc>> grins.</p>
 			<<elseif $npcs.get($npclastgenerated,'cum_pref') == 'facial'>>
-				<p>"So long as I can come all over your pretty face," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+				<p>"So long as I can come all over your pretty face," <<npc $sex.npcId>><</npc>> grins.</p>
 			<<elseif $npcs.get($npclastgenerated,'cum_pref') == 'tits'>>
-				<p>"So long as I can come all over your beautiful tits," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+				<p>"So long as I can come all over your beautiful tits," <<npc $sex.npcId>><</npc>> grins.</p>
 			<<elseif $npcs.get($npclastgenerated,'cum_pref') == 'pullout'>>
-				<p>"I prefer the pullout method anyways," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+				<p>"I prefer the pullout method anyways," <<npc $sex.npcId>><</npc>> grins.</p>
 			<</if>>
 			<<gs 'booty_call_talk' 'cheating_rules'>>
 		<</actCLA>>
@@ -642,11 +642,11 @@
 				<p>"Oh, come on. We don-"</p>
 				<p>"I'm serious!" you say sternly. "No condoms, no deal."</p>
 			<<elseif $npcs.get($sex.npcId,'condom_conscious') > 0>>
-				<p>"We already do," <<=$npcs.get($sex.npcId,'firstname')>> smiles.</p>
+				<p>"We already do," <<npc $sex.npcId>><</npc>> smiles.</p>
 			<<elseif $npcs.get($sex.npcId,'boyfriend_creampie_rule') > 0>>
-				<p>"A little redundant, don't you think?" <<=$npcs.get($sex.npcId,'firstname')>> smirks.</p>
+				<p>"A little redundant, don't you think?" <<npc $sex.npcId>><</npc>> smirks.</p>
 			<<else>>
-				<p>"I guess that's fair," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+				<p>"I guess that's fair," <<npc $sex.npcId>><</npc>> says.</p>
 			<</if>>
 			<<gs 'booty_call_talk' 'cheating_rules'>>
 		<</actCLA>>
@@ -678,22 +678,22 @@
 <<if $location_var[$here][0] == 'rape_explain'>>
 	<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 	<<if $pc.sexStat('rape_count') == 1>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. The images and sensations of that time come flooding back to you, invading your mind. It's as if you're back in that moment, being violated all over again.</p>
+		<p><<npc $sex.npcId>><</npc>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. The images and sensations of that time come flooding back to you, invading your mind. It's as if you're back in that moment, being violated all over again.</p>
 	<<elseif $pc.sexStat('rape_count') < 5>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. The images and sensations come flooding back to you, invading your mind. The memories of your various attackers won't stop flashing before your eyes, memories of your body being violated like a montage you can't escape.</p>
+		<p><<npc $sex.npcId>><</npc>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. The images and sensations come flooding back to you, invading your mind. The memories of your various attackers won't stop flashing before your eyes, memories of your body being violated like a montage you can't escape.</p>
 	<<elseif $pc.sexStat('rape_count') < 10>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. Images and sensations flood through you, invading your mind. The memories of your attackers all blur together, combining into one horrible sensation like they're all violating you at once.</p>
+		<p><<npc $sex.npcId>><</npc>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. Images and sensations flood through you, invading your mind. The memories of your attackers all blur together, combining into one horrible sensation like they're all violating you at once.</p>
 	<<else>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. Images and sensations flood through you, invading your mind. Your countless rapes leave you a shuddering mess as the trauma threatens to overwhelm you.</p>
+		<p><<npc $sex.npcId>><</npc>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. Images and sensations flood through you, invading your mind. Your countless rapes leave you a shuddering mess as the trauma threatens to overwhelm you.</p>
 	<</if>>
-	<p>"What just...?" <<=$npcs.get($sex.npcId,'firstname')>> stammers confusedly.</p>
+	<p>"What just...?" <<npc $sex.npcId>><</npc>> stammers confusedly.</p>
 	<<actCLA 'Try to hide it'>>
 		"I... I just don't like it rough," you whimper, tears running down your cheeks as you sniff, pathetically trying to wipe them away with the back of your hand.
 	<</actCLA>>
 	<<actCLA 'Tell him what happened'>>
 		<<run $npcs.set($sex.npcId,'knows_rape_victim',1)>>
 		<<image "shared/sex/after/pillow_talk1.jpg">>
-		<p>You crawl up beside <<=$npcs.get($sex.npcId,'firstname')>>, still shivering as you wipe the tears from your eyes that won't stop flowing.</p>
+		<p>You crawl up beside <<npc $sex.npcId>><</npc>>, still shivering as you wipe the tears from your eyes that won't stop flowing.</p>
 		<<if $pc.sexStat('rape_count') == 1>>
 			"Listen," you sniff, rubbing your hand across your cheek again. "I was raped once... It was awful and horrible and I... well I... I had a flashback about it just now..."
 		<<elseif $pc.sexStat('rape_count') < 5>>
@@ -703,12 +703,12 @@
 		<<else>>
 			"I've never told you this but..." you sniff, rubbing your hand across your cheek again. "I've been raped... A lot... I don't know why it keeps happening but I've been raped so many times I've lost count... And sometimes the trauma just comes out..."
 		<</if>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> is taken aback and goes quiet. Its several minutes before he finally speaks again.</p>
+		<p><<npc $sex.npcId>><</npc>> is taken aback and goes quiet. Its several minutes before he finally speaks again.</p>
 		<<actCLA 'Continue'>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
 			"I'm... I'm so sorry for what happened to you," he says. "I had no idea."
 			"It's not your fault," you sniff again. "You couldn''t have known. I never told you. Until now."
-			<p>"So... I should lay off the rough sex in the future?" <<=$npcs.get($sex.npcId,'firstname')>> asks hesitantly.</p>
+			<p>"So... I should lay off the rough sex in the future?" <<npc $sex.npcId>><</npc>> asks hesitantly.</p>
 			<<actCLA 'Just tonight'>>
 				"You don't have to stop getting rough," you say, rubbing your eyes again. "I just... it doesn''t always happen to me during this kind of sex, but I guess something triggered me. I like it rough sometimes, I promise. Just not... tonight..."
 				The conversation trails off.

+ 116 - 116
sugarcube/src/activities/bootycall/booty_call_virgin.tw

@@ -5,8 +5,8 @@
 	<!-- !! player initiated-->
 	<<setinit $booty_call['virgin'] = 1>>
 	<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-	<p>With a fast beating heart, you turn to look at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
-	<p>"<<=$npcs.get($sex.npcId,'firstname')>>... I want you to take my virginity."</p>
+	<p>With a fast beating heart, you turn to look at <<npc $sex.npcId>><</npc>>.</p>
+	<p>"<<npc $sex.npcId>><</npc>>... I want you to take my virginity."</p>
 	<<gs 'booty_call_virgin' 'start_flavor'>>
 	<<gs 'booty_call_virgin' 'start_options'>>
 <</if>>
@@ -21,7 +21,7 @@
 <<if $location_var[$here][0] == 'start3'>>
 	<!-- !! NPC initiated, player doesn''t stop them-->
 	<<setinit $booty_call['virgin'] = 1>>
-	<p>Your breath catches in your throat as <<=$npcs.get($sex.npcId,'firstname')>> moves closer and closer. Your pussy feels like it's on fire. You want it so badly that it <i>hurts</i>.</p>
+	<p>Your breath catches in your throat as <<npc $sex.npcId>><</npc>> moves closer and closer. Your pussy feels like it's on fire. You want it so badly that it <i>hurts</i>.</p>
 	"Okay," you whisper, spreading your legs, gasping when his fingers find your dripping lips. "You can have it. Take my virginity."
 	<<gs 'booty_call_virgin' 'start_flavor'>>
 	<<gs 'booty_call_virgin' 'start_options'>>
@@ -31,7 +31,7 @@
 	<<setinit $booty_call['virgin'] = 1>>
 	<<set $pc.horny += 20>>
 	<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-	<p>Your breath catches in your throat as <<=$npcs.get($sex.npcId,'firstname')>> moves closer and closer. You know what you told him before. You know that you want to save it. But right now, you just can't hold yourself back. Your pussy feels like it's on fire. You want it so badly that it <i>hurts</i>.</p>
+	<p>Your breath catches in your throat as <<npc $sex.npcId>><</npc>> moves closer and closer. You know what you told him before. You know that you want to save it. But right now, you just can't hold yourself back. Your pussy feels like it's on fire. You want it so badly that it <i>hurts</i>.</p>
 	"Okay," you whisper, spreading your legs, gasping when his fingers find your dripping lips. "You can have me."
 	<<gs 'booty_call_virgin' 'start_flavor'>>
 	<<gs 'booty_call_virgin' 'start_options'>>
@@ -108,19 +108,19 @@
 <<if $location_var[$here][0] == 'start_with_condom'>>
 	<<gs 'booty_call_condoms' 'npc_condom_use_stats'>>
 	<<if $npcs.get($sex.npcId,'caregiver') == 1 or $npcs.get($sex.npcId,'generous') == 1 or (rand(1,2) == 1 and $npcs.get($sex.npcId,'selfish') != 1 and $npcs.get($sex.npcId,'abusive') != 1)>>
-		<p>With the condom securely wrapped around <<=$npcs.get($sex.npcId,'firstname')>>'s cock, he moves back in between your legs before he stops, hesitating.</p>
+		<p>With the condom securely wrapped around <<npc $sex.npcId>><</npc>>'s cock, he moves back in between your legs before he stops, hesitating.</p>
 		<<gs 'booty_call_virgin' 'start_options2'>>
 	<<else>>
-		<p>With the condom securely wrapped around <<=$npcs.get($sex.npcId,'firstname')>>'s cock, he moves back in between your legs. Moments later, he takes your virginity.</p>
+		<p>With the condom securely wrapped around <<npc $sex.npcId>><</npc>>'s cock, he moves back in between your legs. Moments later, he takes your virginity.</p>
 		<<gs 'booty_call_virgin' 'miss_virg_start'>>
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'start_without_condom'>>
 	<<if $npcs.get($sex.npcId,'caregiver') == 1 or $npcs.get($sex.npcId,'generous') == 1 or (rand(1,3) == 1 and $npcs.get($sex.npcId,'selfish') != 1 and $npcs.get($sex.npcId,'abusive') != 1)>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> moves back in between your legs before he stops, hesitating.</p>
+		<p><<npc $sex.npcId>><</npc>> moves back in between your legs before he stops, hesitating.</p>
 		<<gs 'booty_call_virgin' 'start_options2'>>
 	<<else>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> moves back in, lining his naked cock up with your pussy. Moments later, he takes your virginity.</p>
+		<p><<npc $sex.npcId>><</npc>> moves back in, lining his naked cock up with your pussy. Moments later, he takes your virginity.</p>
 		<<gs 'booty_call_virgin' 'miss_virg_start'>>
 	<</if>>
 <</if>>
@@ -150,7 +150,7 @@
 		<<image "shared/sex/vag/miss/3.jpg">>
 		<<if getvar("$know_virgin["+$sex.npcId+"]") == 1>>
 			<p>"Wait!" you yelp. "Knock it off! You know I'm saving my virg-!"</p>
-			<p>Your protests cut off in a choked scream as <<=$npcs.get($sex.npcId,'firstname')>> rams his cock full force into you, stabbing it through your hymen and sending waves of agony through you. Tears well up in your eyes as you look up at <<=$npcs.get($sex.npcId,'firstname')>>, horrified at what he's done.</p>
+			<p>Your protests cut off in a choked scream as <<npc $sex.npcId>><</npc>> rams his cock full force into you, stabbing it through your hymen and sending waves of agony through you. Tears well up in your eyes as you look up at <<npc $sex.npcId>><</npc>>, horrified at what he's done.</p>
 			<<if getvar("$booty_call['virgin_deny']") >= 10>>
 				"I'm so fucking sick of you blueballing me," he says. "So we're gonna fuck today, whether you like it or not."
 			<<elseif getvar("$booty_call['virgin_deny']") > 0>>
@@ -160,7 +160,7 @@
 			<</if>>
 		<<else>>
 			<p>"Wait!" you yelp. "I'm a-"</p>
-			<p>Your protests cut off in a choked scream as <<=$npcs.get($sex.npcId,'firstname')>> rams his cock full force into you, stabbing it through your hymen and sending waves of agony through you.</p>
+			<p>Your protests cut off in a choked scream as <<npc $sex.npcId>><</npc>> rams his cock full force into you, stabbing it through your hymen and sending waves of agony through you.</p>
 			"... virgin..." you whimper helplessly, tears running down your cheeks.
 		<</if>>
 	<<elseif rand(1,10) > $npcs.get($sex.npcId,'sexdrive')>>
@@ -185,7 +185,7 @@
 			<p>"Wait!" you yelp. "I'm a virgin! You can't!"</p>
 		<</if>>
 		<<arouse 'foreplay' -5 >>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> can't stop moving, rubbing his cock against your pussy lips.</p>
+		<p><<npc $sex.npcId>><</npc>> can't stop moving, rubbing his cock against your pussy lips.</p>
 		<<if $npcs.get($sex.npcId,'selfish') == 1>>
 			"Come on," he whispers. "I'm so fucking hard right now... Just let me fuck you already..."
 		<<elseif $npcs.get($sex.npcId,'gentle_lover') == 1 or $npcs.get($sex.npcId,'caretaker') == 1>>
@@ -205,14 +205,14 @@
 			<<setinit $booty_call['orgasm'] = $orgasm>>
 			<<video "shared/sex/vag/miss/pussyhump.mp4">>
 			<i>Well...</i> You moan softly under his touch. It feels <i>so good.</i> What if... you just... let him...
-			<p><<=$npcs.get($sex.npcId,'firstname')>> gently pushes your legs open. You can feel his hardon rubbing right against your clit.</p>
+			<p><<npc $sex.npcId>><</npc>> gently pushes your legs open. You can feel his hardon rubbing right against your clit.</p>
 			<<actCLA 'Let $npcs.get('+$sex.npcId,'firstname')+' take your virginity'>>
 				"Okay," you whisper. "Put it in."
 				<<if $npcs.get($sex.npcId,'condom_conscious') > 0>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> grabs a condom off his nightstand.</p>
+					<p><<npc $sex.npcId>><</npc>> grabs a condom off his nightstand.</p>
 					<<gs 'booty_call_condoms' 'virgin_condom1'>>
 				<<else>>
-					<p>You spread your legs for him and moments later, <<=$npcs.get($sex.npcId,'firstname')>> takes your virginity.</p>
+					<p>You spread your legs for him and moments later, <<npc $sex.npcId>><</npc>> takes your virginity.</p>
 					<<gs 'booty_call_virgin' 'miss_virg_start'>>
 				<</if>>
 			<</actCLA>>
@@ -333,7 +333,7 @@
 	<<arouse 'vaginal' 1 `['no_orgasm_msg']`>>
 	<<setinit $booty_call['position'] = 'miss'>>
 	<<video "shared/sex/vag/miss/enter1.mp4">>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> presses his cock inside you slowly, centimeter by centimeter. It fills you up, stretching your walls until you feel it bump against your hymen. He doesn't stop though, and keeps pushing until you feel him tear straight through your maidenhood, eliciting a gasp from your mouth. Whether in excitement or pain, you aren't really sure.</p>
+	<p><<npc $sex.npcId>><</npc>> presses his cock inside you slowly, centimeter by centimeter. It fills you up, stretching your walls until you feel it bump against your hymen. He doesn't stop though, and keeps pushing until you feel him tear straight through your maidenhood, eliciting a gasp from your mouth. Whether in excitement or pain, you aren't really sure.</p>
 	<p>"You okay?"</p>
 	<<actCLA 'It hurts'>>
 		<<setinit $booty_call['virgin_react'] = 'hurt'>>
@@ -363,7 +363,7 @@
 			<<setinit $booty_call['pos_speed'] = 'miss1'>>
 			<<setinit $booty_call['virgin_media'] = '<<video "shared/sex/vag/miss/slow1.mp4">>'>>
 			$booty_call['virgin_media']
-			<p>As promised, <<=$npcs.get($sex.npcId,'firstname')>> fucks you very gently, slowly pumping his cock in and out of you. He displays what you can only imagine is incredible patience, as he maintains this slow and gentle pace for several minutes, at which point you think...</p>
+			<p>As promised, <<npc $sex.npcId>><</npc>> fucks you very gently, slowly pumping his cock in and out of you. He displays what you can only imagine is incredible patience, as he maintains this slow and gentle pace for several minutes, at which point you think...</p>
 			<<gs 'booty_call_virgin' 'virgin_enjoyment'>>
 		<</actCLA>>
 	<</actCLA>>
@@ -375,9 +375,9 @@
 	<<arouse 'kiss' -10 `['no_orgasm_msg']`>>
 	<<setinit $booty_call['kiss'] = 1>>
 	<<if $npcs.get($sex.npcId,'no_kiss') == 1>>
-		<p>Unable to contain yourself, you forget your rules and reach up, pulling <<=$npcs.get($sex.npcId,'firstname')>>'s face down to press it against yours. Your eyes roll back in your head, feeling the thrust of his cock in your pussy and the invasion of his tongue in your mouth. You moan into his mouth and he moans back.</p>
+		<p>Unable to contain yourself, you forget your rules and reach up, pulling <<npc $sex.npcId>><</npc>>'s face down to press it against yours. Your eyes roll back in your head, feeling the thrust of his cock in your pussy and the invasion of his tongue in your mouth. You moan into his mouth and he moans back.</p>
 	<<else>>
-		<p>Caught up in the moment, you reach up and grab <<=$npcs.get($sex.npcId,'firstname')>>'s face, pulling it down to kiss him. Your eyes roll back in your head, feeling the thrust of his cock in your pussy and the invasion of his tongue in your mouth. You moan into his mouth and he moans back.</p>
+		<p>Caught up in the moment, you reach up and grab <<npc $sex.npcId>><</npc>>'s face, pulling it down to kiss him. Your eyes roll back in your head, feeling the thrust of his cock in your pussy and the invasion of his tongue in your mouth. You moan into his mouth and he moans back.</p>
 	<</if>>
 	<<actCLA 'Continue'>>
 		 <<gs 'booty_call_cum' 'fuck_cum'>>
@@ -385,7 +385,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'miss_virg_norm2'>>
 	<<video "shared/sex/vag/miss/slow1.mp4">>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> slows down and you sigh in relief.</p>
+	<p><<npc $sex.npcId>><</npc>> slows down and you sigh in relief.</p>
 	Now that he isn''t trying to tear you in half, you close your eyes, trying to focus on the sensations and you...
 	<<gs 'booty_call_virgin' 'virgin_enjoyment'>>
 <</if>>
@@ -405,17 +405,17 @@
 	<<else>>
 		<<image "shared/sex/vag/miss/blood1.jpg">>
 	<</if>>
-	<p>You half gasp half shriek as <<=$npcs.get($sex.npcId,'firstname')>> slams his cock inside you, tearing straight through your hymen in one thrust and your eyes water at the intense stab of pain.</p>
+	<p>You half gasp half shriek as <<npc $sex.npcId>><</npc>> slams his cock inside you, tearing straight through your hymen in one thrust and your eyes water at the intense stab of pain.</p>
 	<<if getvar("$know_virgin["+$sex.npcId+"]") == 1>>
-		<p>Despite telling <<=$npcs.get($sex.npcId,'firstname')>> how important your first time is to you, he doesn't seem to care about taking it easy on you. You scream in pain as he rams his cock in and out of you with tremendous force, pistoning with jackhammer like intensity.</p>
+		<p>Despite telling <<npc $sex.npcId>><</npc>> how important your first time is to you, he doesn't seem to care about taking it easy on you. You scream in pain as he rams his cock in and out of you with tremendous force, pistoning with jackhammer like intensity.</p>
 	<<else>>
-		<p>If you thought that <<=$npcs.get($sex.npcId,'firstname')>> was going to take it easy on you for your first time, you were sorely mistaken. Literally. You scream in pain as he rams his cock in and out of you with tremendous force, pistoning with jackhammer like intensity.</p>
+		<p>If you thought that <<npc $sex.npcId>><</npc>> was going to take it easy on you for your first time, you were sorely mistaken. Literally. You scream in pain as he rams his cock in and out of you with tremendous force, pistoning with jackhammer like intensity.</p>
 	<</if>>
 	<<actCLA 'Scream'>>
 		<<arouse 'vaginal' `rand(4,8)` `['rough','no_orgasm_msg']`>>
 		<<video "shared/sex/vag/miss/hard2.mp4">>
 		<i>"Ahh! Ahh!! AH! AHH!!"</i>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> fucks you roughly and with high intensity. It hurts so much. Every time his cock stabs into you, you wonder if you're going to die. The force of his thrusts bounce your breasts so violently they hurt. It feels like your pussy is being fucked into an open wound and you question if you're going to have internal bruises tomorrow morning.</p>
+		<p><<npc $sex.npcId>><</npc>> fucks you roughly and with high intensity. It hurts so much. Every time his cock stabs into you, you wonder if you're going to die. The force of his thrusts bounce your breasts so violently they hurt. It feels like your pussy is being fucked into an open wound and you question if you're going to have internal bruises tomorrow morning.</p>
 		<<actCLA 'Endure it'>>
 			<<set $orgasm_or = 'no'>>
 			<<arouse 'vaginal' `rand(4,8)` `['rough','no_orgasm_msg']`>>
@@ -425,7 +425,7 @@
 			<</actCLA>>
 		<</actCLA>>
 		<<actCLA 'Can we slow down?'>>
-			<p>"Can we-! Slow down-! A little-?" you whimper under <<=$npcs.get($sex.npcId,'firstname')>>'s relentless pounding. "This is-! A bit-! Rough-!"</p>
+			<p>"Can we-! Slow down-! A little-?" you whimper under <<npc $sex.npcId>><</npc>>'s relentless pounding. "This is-! A bit-! Rough-!"</p>
 			<<if (rand(1,10) >= 7 or $npcs.get($sex.npcId,'selfish') == 1 or $npcs.get($sex.npcId,'abusive') == 1) and $npcs.get($sex.npcId,'generous') != 1>>
 				<<set $orgasm_or = 'no'>>
 				"This is what sex is like," he grins. "You'll get used to it soon, then it'll feel really good."
@@ -450,9 +450,9 @@
 	<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 	<<arouse 'vaginal' -15 `['no_orgasm_msg']`>>
 	<<video "shared/sex/vag/miss/med1.mp4">>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> picks up the pace as you command and you instinctively arch your back, getting him to thrust deeper into you. The heightened pace feels even better than it did when he was being gentle and you moan loudly with intense pleasure.</p>
+	<p><<npc $sex.npcId>><</npc>> picks up the pace as you command and you instinctively arch your back, getting him to thrust deeper into you. The heightened pace feels even better than it did when he was being gentle and you moan loudly with intense pleasure.</p>
 	<<if $booty_call['orgasm'] < $orgasm>>
-		<p>You're so caught up in the enjoyment of it that your orgasm catches you by surprise. The pressure inside you builds and builds with each time <<=$npcs.get($sex.npcId,'firstname')>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut and you realize you're about to come.</p>
+		<p>You're so caught up in the enjoyment of it that your orgasm catches you by surprise. The pressure inside you builds and builds with each time <<npc $sex.npcId>><</npc>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut and you realize you're about to come.</p>
 	<<else>>
 		<p>It's your first time having sex, but it's mindblowingly good. Why didn't you do this sooner?!</p>
 	<</if>>
@@ -465,7 +465,7 @@
 	<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 	<<arouse 'vaginal' -15 `['no_orgasm_msg']`>>
 	<<video "shared/sex/vag/miss/rough1.mp4">>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> picks up the pace as you command and you groan loudly, face contorting in a mixture of pain and pleasure. Maybe sensing something within you, he reaches up and grabs a fistful of your hair, using it to pull himself into you even harder.</p>
+	<p><<npc $sex.npcId>><</npc>> picks up the pace as you command and you groan loudly, face contorting in a mixture of pain and pleasure. Maybe sensing something within you, he reaches up and grabs a fistful of your hair, using it to pull himself into you even harder.</p>
 	It hurts. But that makes it feel even better.
 	<<actCLA 'Continue'>>
 		 <<gs 'booty_call_cum' 'fuck_cum'>>
@@ -483,7 +483,7 @@
 	<<setinit $booty_call['position'] = 'doggy'>>
 	<<setinit $booty_call['pos_speed'] = 'doggy1'>>
 	<<image "shared/sex/vag/doggy/blood1.jpg">>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> slowly presses his cock inside you from behind. It fills you up, stretching your walls before bumping against your hymen. After a brief pause, he pushes through, tearing your maidenhood and causing you to gasp. Whether in excitement or pain, you aren't really sure yet.</p>
+	<p><<npc $sex.npcId>><</npc>> slowly presses his cock inside you from behind. It fills you up, stretching your walls before bumping against your hymen. After a brief pause, he pushes through, tearing your maidenhood and causing you to gasp. Whether in excitement or pain, you aren't really sure yet.</p>
 	<p>"You okay?"</p>
 	<<actCLA 'It hurts'>>
 		<<setinit $booty_call['virgin_react'] = 'hurt'>>
@@ -509,7 +509,7 @@
 			<<setinit $booty_call['pos_speed'] = 'doggy1'>>
 			<<setinit $booty_call['virgin_media'] = '<<video "shared/sex/vag/doggy/slow1.mp4">>'>>
 			$booty_call['virgin_media']
-			<p>As promised, <<=$npcs.get($sex.npcId,'firstname')>> fucks you very gently, slowly pumping his cock in and out of you. He displays what you can only imagine is incredible patience, as he maintains this slow and gentle pace for several minutes, at which point you think...</p>
+			<p>As promised, <<npc $sex.npcId>><</npc>> fucks you very gently, slowly pumping his cock in and out of you. He displays what you can only imagine is incredible patience, as he maintains this slow and gentle pace for several minutes, at which point you think...</p>
 			<<gs 'booty_call_virgin' 'virgin_enjoyment'>>
 		<</actCLA>>
 	<</actCLA>>
@@ -517,7 +517,7 @@
 <<if $location_var[$here][0] == 'doggy_virg_norm2'>>
 	<<setinit $booty_call['pos_speed'] = 'doggy1'>>
 	<<video "shared/sex/vag/doggy/slow1.mp4">>
-	<p>As <<=$npcs.get($sex.npcId,'firstname')>> changes his pace, you sigh deeply, feeling like you can breathe again.</p>
+	<p>As <<npc $sex.npcId>><</npc>> changes his pace, you sigh deeply, feeling like you can breathe again.</p>
 	Now that you aren''t worried about being literally fucked to death, you feel like you can focus on the sensations of your first time and you...
 	<<gs 'booty_call_virgin' 'virgin_enjoyment'>>
 <</if>>
@@ -534,18 +534,18 @@
 	<<setinit $booty_call['virgin_enjoyment'] = -1>>
 	<<image "shared/sex/vag/doggy/blood2.jpg">>
 	<<if getvar("$know_virgin["+$sex.npcId+"]") == 1>>
-		<p>Without warning, <<=$npcs.get($sex.npcId,'firstname')>> plunges his entire cock all the way inside you. He tears straight through your hymen, eliciting a uncontainable shriek of pain from your lips and tears immediately filling your eyes. If he understood how much saving your virginity meant to you, then he doesn't show it as he throws his full weight against you and bears you down onto the bed. Your arms and legs buckle beneath you, and his cock drives all the way inside you. </p>
+		<p>Without warning, <<npc $sex.npcId>><</npc>> plunges his entire cock all the way inside you. He tears straight through your hymen, eliciting a uncontainable shriek of pain from your lips and tears immediately filling your eyes. If he understood how much saving your virginity meant to you, then he doesn't show it as he throws his full weight against you and bears you down onto the bed. Your arms and legs buckle beneath you, and his cock drives all the way inside you. </p>
 		He doesn''t give you even a moment to adjust and begins fucking you full force, absolutely <i>pounding</i> your pussy.
 	<<else>>
-		<p>Without warning, <<=$npcs.get($sex.npcId,'firstname')>> plunges his entire cock all the way inside you. He tears straight through your hymen, eliciting a uncontainable shriek of pain from your lips and tears immediately filling your eyes. If he understood how much saving your virginity meant to you, then he doesn't show it as he throws his full weight against you and bears you down onto the bed. Your arms and legs buckle beneath you, and his cock drives all the way inside you.</p>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't stop for even a second and begins fucking you <i>hard</i>.</p>
+		<p>Without warning, <<npc $sex.npcId>><</npc>> plunges his entire cock all the way inside you. He tears straight through your hymen, eliciting a uncontainable shriek of pain from your lips and tears immediately filling your eyes. If he understood how much saving your virginity meant to you, then he doesn't show it as he throws his full weight against you and bears you down onto the bed. Your arms and legs buckle beneath you, and his cock drives all the way inside you.</p>
+		<p><<npc $sex.npcId>><</npc>> doesn't stop for even a second and begins fucking you <i>hard</i>.</p>
 	<</if>>
 	<<actCLA 'Scream'>>
 		<<arouse 'vaginal' `rand(4,8)` `['rough','no_orgasm_msg']`>>
 		<!-- !!		gs 'pain', 2, 'breasts', 'stretch'-->
 		<<video "shared/sex/vag/doggy/laying_down1.mp4">>
 		<i>"Mmmm! Mmm!! MM!! MMM!!"</i>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> fucks you roughly and without mercy or restraint. It hurts so much. Every time his cock slams back in to you, you feel like you're going to die. It's like your pussy is being torn in half and you wonder if you're going to piss blood after this. He lets all of his weight rest on top of you, driving the breath from your lungs. You can't even scream. All you can do is squirm beneath <<=$npcs.get($sex.npcId,'firstname')>> as he pounds your virgin pussy over and over again.</p>
+		<p><<npc $sex.npcId>><</npc>> fucks you roughly and without mercy or restraint. It hurts so much. Every time his cock slams back in to you, you feel like you're going to die. It's like your pussy is being torn in half and you wonder if you're going to piss blood after this. He lets all of his weight rest on top of you, driving the breath from your lungs. You can't even scream. All you can do is squirm beneath <<npc $sex.npcId>><</npc>> as he pounds your virgin pussy over and over again.</p>
 		<<actCLA 'Endure it'>>
 			<<set $orgasm_or = 'no'>>
 			<<arouse 'vaginal' `rand(4,8)` `['rough','no_orgasm_msg']`>>
@@ -555,7 +555,7 @@
 			<</actCLA>>
 		<</actCLA>>
 		<<actCLA 'Can we slow down?'>>
-			<p>"Can we-! Slow down-! A little-?" you manage to gasp under <<=$npcs.get($sex.npcId,'firstname')>>'s relentless pounding. "This is-! Too-! Rough-!"</p>
+			<p>"Can we-! Slow down-! A little-?" you manage to gasp under <<npc $sex.npcId>><</npc>>'s relentless pounding. "This is-! Too-! Rough-!"</p>
 			<<if (rand(1,10) >= 7 or $npcs.get($sex.npcId,'selfish') == 1 or getvar("$npc_abusive") == 1) and $npcs.get($sex.npcId,'generous') != 1>>
 				<<set $orgasm_or = 'no'>>
 				"This is what sex is like," he grins. "You'll get used to it soon, then it'll feel really good."
@@ -567,7 +567,7 @@
 			<<else>>
 				<<setinit $booty_call['speed_change'] = 1>>
 				<p>"Oh! Sorry! I just... I thought it would make you feel good..."</p>
-				<p>He stops and pulls back for a moment. You take a breath of relief, pulling yourself back up to your arms and knees again and <<=$npcs.get($sex.npcId,'firstname')>> re-enters you. Slowly this time, and much more gently.</p>
+				<p>He stops and pulls back for a moment. You take a breath of relief, pulling yourself back up to your arms and knees again and <<npc $sex.npcId>><</npc>> re-enters you. Slowly this time, and much more gently.</p>
 				<<actCLA 'Continue'>>
 					<<gt 'booty_call_virgin' 'doggy_virg_norm2'>>
 				<</actCLA>>
@@ -580,9 +580,9 @@
 	<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 	<<arouse 'vaginal' -15 `['no_orgasm_msg']`>>
 	<<video "shared/sex/vag/doggy/med2.mp4">>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> picks up the pace as you command and you start to push your hips back in times with his. The sound of your ass being clapped echos off the walls. The heightened pace feels even better than it did when he was being gentle and you moan loudly with intense pleasure.</p>
+	<p><<npc $sex.npcId>><</npc>> picks up the pace as you command and you start to push your hips back in times with his. The sound of your ass being clapped echos off the walls. The heightened pace feels even better than it did when he was being gentle and you moan loudly with intense pleasure.</p>
 	<<if $booty_call['orgasm'] < $orgasm>>
-		<p>You're so caught up in the enjoyment of it that your orgasm catches you by surprise. The pressure inside you builds and builds with each time <<=$npcs.get($sex.npcId,'firstname')>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut and you realize you're about to come.</p>
+		<p>You're so caught up in the enjoyment of it that your orgasm catches you by surprise. The pressure inside you builds and builds with each time <<npc $sex.npcId>><</npc>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut and you realize you're about to come.</p>
 	<<else>>
 		<p>It's your first time having sex, but it's mindblowingly good. Why didn't you do this sooner?!</p>
 	<</if>>
@@ -595,7 +595,7 @@
 	<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 	<<arouse 'vaginal' -15 `['no_orgasm_msg']`>>
 	<<video "shared/sex/vag/doggy/rough1.mp4">>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> picks up the pace as you command and you groan loudly, face contorting in a mixture of pain and pleasure. Maybe sensing something within you, he reaches up and grabs a fistful of your hair, using it to pull himself into you even harder.</p>
+	<p><<npc $sex.npcId>><</npc>> picks up the pace as you command and you groan loudly, face contorting in a mixture of pain and pleasure. Maybe sensing something within you, he reaches up and grabs a fistful of your hair, using it to pull himself into you even harder.</p>
 	It hurts. But that makes it feel even better.
 	<<actCLA 'Continue'>>
 		 <<gs 'booty_call_cum' 'fuck_cum'>>
@@ -612,25 +612,25 @@
 	<<setinit $booty_call['position'] = 'cowgirl'>>
 	<<setinit $booty_call['pos_speed'] = 'cowgirl1'>>
 	<<video "shared/sex/vag/cowgirl/enter1.mp4">>
-	<p>Grabbing hold of <<=$npcs.get($sex.npcId,'firstname')>>'s cock, you try to guide it in with your hand as you ease yourself down onto it. It's kind of awkward to do and you have a lot of difficulty getting it to enter your pussy straight.</p>
+	<p>Grabbing hold of <<npc $sex.npcId>><</npc>>'s cock, you try to guide it in with your hand as you ease yourself down onto it. It's kind of awkward to do and you have a lot of difficulty getting it to enter your pussy straight.</p>
 	<<if $npcs.get($sex.npcId,'generous') == 1>>
-		<p>"It's okay, take your time," <<=$npcs.get($sex.npcId,'firstname')>> assures you. "Hard to get it in, isn't it?"</p>
+		<p>"It's okay, take your time," <<npc $sex.npcId>><</npc>> assures you. "Hard to get it in, isn't it?"</p>
 		<p>"Y-yeah," you blush, embarrassed at your obvious lack of experience.</p>
 		Finally, you manage to get the tip inside your pussy and carefully lower yourself down. You feel your walls stretch slowly and keep going lower until you feel yourself bump into something, some kind of resistance. It takes a moment, but then you realize it's your hymen.
-		<p>"Ready?" <<=$npcs.get($sex.npcId,'firstname')>> asks gently.</p>
+		<p>"Ready?" <<npc $sex.npcId>><</npc>> asks gently.</p>
 		"Mhmm," you nod. With a deep breath, you lift yourself up slightly and bounce straight down, tearing through your virginity.
 		<<actCLA '<b>!!!!</b>'>>
 			<<arouse 'vaginal' 1 `['no_orgasm_msg']`>>
 			<<image "shared/sex/vag/cowgirl/blood1.jpg">>
-			<p>The pain of <<=$npcs.get($sex.npcId,'firstname')>>'s cock ripping through your hymen is enough to make your eyes water.</p>
+			<p>The pain of <<npc $sex.npcId>><</npc>>'s cock ripping through your hymen is enough to make your eyes water.</p>
 			<p>"Fuck!" you involuntarily squeak. "Fuckfuckfuckfuckfuckfuckfuck! That hurts!"</p>
-			<p>"It's okay," <<=$npcs.get($sex.npcId,'firstname')>> says, assuring you, putting his hands on your hips. "Take it slow, alright?"</p>
+			<p>"It's okay," <<npc $sex.npcId>><</npc>> says, assuring you, putting his hands on your hips. "Take it slow, alright?"</p>
 			<<actCLA 'Take his advice'>>
 				<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 				<<video "shared/sex/vag/cowgirl/slow1.mp4">>
 				You nod in response, taking deep breaths trying to adjust to feeling this... <i>thing</i> impaling you, filling you up, stretching you to your limits. Once you feel ready, you start to move.
 				<p>Clenching your jaw, you slowly lift yourself up before sliding back down on his cock. And then again. And again. And again. Your legs feel slick with something running down your thighs, but it doesn't feel like your juices. In fact it's hard to feel aroused at all right now. Suddenly you realize; it's blood. You did just pop your cherry after all...</p>
-				<p>You soldier onwards, continuing to ride <<=$npcs.get($sex.npcId,'firstname')>>. A few minutes pass and you work yourself up to a slow but steady rhythm, bouncing up and down on his cock. And soon, you realize you...</p>
+				<p>You soldier onwards, continuing to ride <<npc $sex.npcId>><</npc>>. A few minutes pass and you work yourself up to a slow but steady rhythm, bouncing up and down on his cock. And soon, you realize you...</p>
 				<<gs 'booty_call_virgin' 'virgin_enjoyment'>>
 			<</actCLA>>
 			<<actCLA 'Go hard, power through'>>
@@ -645,19 +645,19 @@
 				<p>"AHH! FUCK!" you shout, leaning back and bouncing again.</p>
 				<p>"Hey! Slow down! I-!"</p>
 				<p>"SHUT THE FUCK UP!" you scream. "I'M GONNA FUCK YOU AND I'M GONNA LIKE IT!"</p>
-				<p>You soldier onwards, continuing to fuck <<=$npcs.get($sex.npcId,'firstname')>> with relentless fervor, riding him like your life depends on it. Soon, you realize...</p>
+				<p>You soldier onwards, continuing to fuck <<npc $sex.npcId>><</npc>> with relentless fervor, riding him like your life depends on it. Soon, you realize...</p>
 				<<gs 'booty_call_virgin' 'virgin_enjoyment'>>
 			<</actCLA>>
 		<</actCLA>>
 	<<elseif $npcs.get($sex.npcId,'selfish') == 1>>
-		<p>"Come on, hurry up," <<=$npcs.get($sex.npcId,'firstname')>> complains loudly.</p>
+		<p>"Come on, hurry up," <<npc $sex.npcId>><</npc>> complains loudly.</p>
 		<p>"I'm <i>trying!</i>" you yelp, blushing hard at your obvious lack of experience.</p>
 		Finally, you manage to get the tip inside your pussy and carefully lower yourself down. You feel your walls stretch slowly and keep going lower until you feel yourself bump into something, some kind of resistance. It takes a moment, but then you realize it's your hymen and you sit there for a moment, pausing.
-		<p>"Come on already!" <<=$npcs.get($sex.npcId,'firstname')>> doesn't wait for a response and thrusts his hips up, sending his cock tearing through your virginity.</p>
+		<p>"Come on already!" <<npc $sex.npcId>><</npc>> doesn't wait for a response and thrusts his hips up, sending his cock tearing through your virginity.</p>
 		<<actCLA '<b>!!!!</b>'>>
 			<<arouse 'vaginal' 1 `['no_orgasm_msg']`>>
 			<<image "shared/sex/vag/cowgirl/blood1.jpg">>
-			<p>The pain of <<=$npcs.get($sex.npcId,'firstname')>>'s cock ripping through your hymen is enough to make your eyes water.</p>
+			<p>The pain of <<npc $sex.npcId>><</npc>>'s cock ripping through your hymen is enough to make your eyes water.</p>
 			<p>"<i><b>FUCK!</b></i>" you shout. "Cocksucker! Motherfuck! Piece of shit, <i>bastard!</i>"</p>
 			You continue to scream obscenities at him even as he grabs your hips.
 			"You were taking too long, decided to help you take the plunge," he grins, trying to guide you back up again.
@@ -668,7 +668,7 @@
 				<<else>>
 					<<video "shared/sex/vag/cowgirl/slow1.mp4">>
 				<</if>>
-				<p>Deciding you're already this far, you let him, slowly lifting yourself up and sliding back down on his cock. And then again. And again. And again. A few minutes pass and you've worked yourself up to a steady rhythm, bouncing up and down on <<=$npcs.get($sex.npcId,'firstname')>>'s cock. And soon, you realize you...</p>
+				<p>Deciding you're already this far, you let him, slowly lifting yourself up and sliding back down on his cock. And then again. And again. And again. A few minutes pass and you've worked yourself up to a steady rhythm, bouncing up and down on <<npc $sex.npcId>><</npc>>'s cock. And soon, you realize you...</p>
 				<<gs 'booty_call_virgin' 'virgin_enjoyment'>>
 			<</actCLA>>
 			<<actCLA 'Fuck him angrily'>>
@@ -680,27 +680,27 @@
 					<<video "shared/sex/vag/cowgirl/hard2.mp4">>
 				<</if>>
 				<p>"FINE!" you shout, leaning back and bouncing again. "You want me to take the plunge?! I'LL FUCKING PLUNGE THEN!"</p>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> grins back at you and pulls you back down with equal eagerness, and soon you're riding <<=$npcs.get($sex.npcId,'firstname')>> with relentless fervor, fucking him like there's no tomorrow. Somewhere in the back of your mind, you realize your first time is turning into some kind of hate fuck but the anger that burns within refuses to let you back down. Soon, you realize...</p>
+				<p><<npc $sex.npcId>><</npc>> grins back at you and pulls you back down with equal eagerness, and soon you're riding <<npc $sex.npcId>><</npc>> with relentless fervor, fucking him like there's no tomorrow. Somewhere in the back of your mind, you realize your first time is turning into some kind of hate fuck but the anger that burns within refuses to let you back down. Soon, you realize...</p>
 				<<gs 'booty_call_virgin' 'virgin_enjoyment'>>
 			<</actCLA>>
 		<</actCLA>>
 	<<else>>
-		<p>"You okay up there?" <<=$npcs.get($sex.npcId,'firstname')>> asks, a quizzical look on his face.</p>
+		<p>"You okay up there?" <<npc $sex.npcId>><</npc>> asks, a quizzical look on his face.</p>
 		<p>"Y-yeah," you stammer. "I'm just having a hard time... getting it in..." You blush hard, embarrassed at your obvious lack of experience.</p>
 		Finally, you manage to get the tip inside your pussy and carefully lower yourself down. You feel your walls stretch slowly and keep going lower until you feel yourself bump into something, some kind of resistance. It takes a moment, but then you realize it's your hymen.
-		<p>"Whenever you're ready," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+		<p>"Whenever you're ready," <<npc $sex.npcId>><</npc>> says.</p>
 		You nod back at him and take a deep breath. You lift yourself up slightly, and then force yourself straight down, tearing through your virginity.
 		<<actCLA '<b>!!!!</b>'>>
 			<<arouse 'vaginal' 1 `['no_orgasm_msg']`>>
 			<<image "shared/sex/vag/cowgirl/blood1.jpg">>
-			<p>The pain of <<=$npcs.get($sex.npcId,'firstname')>>'s cock ripping through your hymen is enough to make your eyes water.</p>
+			<p>The pain of <<npc $sex.npcId>><</npc>>'s cock ripping through your hymen is enough to make your eyes water.</p>
 			<p>"Fuck!" you involuntarily squeak. "Fuckfuckfuckfuckfuckfuckfuck! That hurts!"</p>
-			<p>"Keep moving, it'll get better," <<=$npcs.get($sex.npcId,'firstname')>> says, assuring you, putting his hands on your hips.</p>
+			<p>"Keep moving, it'll get better," <<npc $sex.npcId>><</npc>> says, assuring you, putting his hands on your hips.</p>
 			<<actCLA 'Take his advice'>>
 				<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 				<<video "shared/sex/vag/cowgirl/slow1.mp4">>
 				<p>You nod in response and clench your jaw, slowly lifting yourself up before sliding back down on his cock. You slowly go up and down a few more times when you feel something running down your thighs. It takes you a moment, as you don't feel very aroused right now so you figure it can't be your juices. And then you realize; it's blood. The last mark of your virginity.</p>
-				<p>You soldier onwards, continuing to ride <<=$npcs.get($sex.npcId,'firstname')>>. A few minutes pass and you work yourself up to a slow but steady rhythm, bouncing up and down on his cock. And soon, you realize you...</p>
+				<p>You soldier onwards, continuing to ride <<npc $sex.npcId>><</npc>>. A few minutes pass and you work yourself up to a slow but steady rhythm, bouncing up and down on his cock. And soon, you realize you...</p>
 				<<gs 'booty_call_virgin' 'virgin_enjoyment'>>
 			<</actCLA>>
 			<<actCLA 'Go hard, power through'>>
@@ -715,7 +715,7 @@
 				<p>"AHH! FUCK!" you shout, leaning back and bouncing again.</p>
 				<p>"Hey!" he grunts in surprise. "You don't have to do it like-</p>
 				<p>"SHUT THE FUCK UP!" you scream. "You said it'll get better if I keep moving right?! So I'm gonna fucking keep moving!"</p>
-				<p>You pound yourself down on <<=$npcs.get($sex.npcId,'firstname')>>'s cock, fucking him with reckless abandon, riding him like your life depends on it, trying to plow your way past the hard part to the "good part." <i>Whatever that's supposed to feel like,</i> you think to yourself with gritted teeth. Soon, you realize...</p>
+				<p>You pound yourself down on <<npc $sex.npcId>><</npc>>'s cock, fucking him with reckless abandon, riding him like your life depends on it, trying to plow your way past the hard part to the "good part." <i>Whatever that's supposed to feel like,</i> you think to yourself with gritted teeth. Soon, you realize...</p>
 				<<gs 'booty_call_virgin' 'virgin_enjoyment'>>
 			<</actCLA>>
 		<</actCLA>>
@@ -726,7 +726,7 @@
 	<<arouse 'vaginal' -10 `['no_orgasm_msg']`>>
 	<<setinit $booty_call['pos_speed'] = 'cowgirl2'>>
 	<<video "shared/sex/vag/cowgirl/med3.mp4">>
-	<p>Feeling good, you pick up the pace, bouncing up and down on <<=$npcs.get($sex.npcId,'firstname')>>'s cock with giddy excitement. Going a little harder feels even better than before and without warning you begin bursting into giggles.</p>
+	<p>Feeling good, you pick up the pace, bouncing up and down on <<npc $sex.npcId>><</npc>>'s cock with giddy excitement. Going a little harder feels even better than before and without warning you begin bursting into giggles.</p>
 	<p>Who knew that sex was so much fun?</p>
 	<<actCLA 'Continue'>>
 		 <<gs 'booty_call_cum' 'fuck_cum'>>
@@ -738,7 +738,7 @@
 	<<arouse 'vaginal' `rand(4,8)` `['rough','no_orgasm_msg']`>>
 	<<arouse 'vaginal' -10 `['no_orgasm_msg']`>>
 	<<video "shared/sex/vag/cowgirl/hard2.mp4">>
-	<p>With no warning other than a sudden cry, you throw yourself down on <<=$npcs.get($sex.npcId,'firstname')>>'s cock with as much force as you can. The impact reverberates through you flaring both the pain and the pleasure inside of your cunt. You raise yourself up and impale yourself again and again and again until you're riding him like a bucking stallion. Tears stream down your face and protracted groans of exertion escape from behind your teeth, clenched in a fierce grin. Your pussy hurts so much, and you never want this pain to end.</p>
+	<p>With no warning other than a sudden cry, you throw yourself down on <<npc $sex.npcId>><</npc>>'s cock with as much force as you can. The impact reverberates through you flaring both the pain and the pleasure inside of your cunt. You raise yourself up and impale yourself again and again and again until you're riding him like a bucking stallion. Tears stream down your face and protracted groans of exertion escape from behind your teeth, clenched in a fierce grin. Your pussy hurts so much, and you never want this pain to end.</p>
 	<<actCLA 'Continue'>>
 		 <<gs 'booty_call_cum' 'fuck_cum'>>
 	<</actCLA>>
@@ -776,21 +776,21 @@
 	<<if $booty_call['cum_choice'] == 'warn'>>
 		<<if getvar("$booty_call['boy_cum']") == 2 and getvar("$booty_call['kiss']") == 1>>
 			$booty_call['virgin_media']
-			<p>A short while later, <<=$npcs.get($sex.npcId,'firstname')>> reaches his limit.</p>
+			<p>A short while later, <<npc $sex.npcId>><</npc>> reaches his limit.</p>
 			<p>"I'm-! Almost there!" he says, breaking away from your lips, panting heavily.</p>
 		<<elseif getvar("$booty_call['boy_cum']") == 2>>
 			$booty_call['virgin_media']
-			<p>A short while later, <<=$npcs.get($sex.npcId,'firstname')>> reaches his limit.</p>
+			<p>A short while later, <<npc $sex.npcId>><</npc>> reaches his limit.</p>
 			<p>"I'm-! Almost there!" he says, panting heavily.</p>
 		<<elseif getvar("$booty_call['kiss']") == 1>>
-			<p>A short while later, <<=$npcs.get($sex.npcId,'firstname')>> reaches his limit.</p>
+			<p>A short while later, <<npc $sex.npcId>><</npc>> reaches his limit.</p>
 			<p>"I'm-! Almost there!" he says, breaking away from your lips, panting heavily.</p>
 			<<if $booty_call['orgasm'] < $orgasm>>
 				You barely register what he's saying. The feeling of his cock stretching your walls, the tension that keeps tightening and tightening inside you. You feel like you're about to burst. It's all so new to you that when you realize what''s happening, it startles you.
 				"I think am too," you whisper, on the verge of orgasming from your first time, barely able to speak.
 			<</if>>
 		<<else>>
-			<p>A short while later, <<=$npcs.get($sex.npcId,'firstname')>> reaches his limit.</p>
+			<p>A short while later, <<npc $sex.npcId>><</npc>> reaches his limit.</p>
 			<p>"I'm-! Almost there!"</p>
 			<<if $booty_call['orgasm'] < $orgasm>>
 				You barely register what he's saying. The feeling of his cock stretching your walls, the tension that keeps tightening and tightening inside you. You feel like you're about to burst. It's all so new to you that when you realize what''s happening, it startles you.
@@ -802,19 +802,19 @@
 			<<if $npcs.get($sex.npcId,'cum_pref') == 'creampie'>>
 				<<setinit $booty_call['he_ask_creampie'] = 1>>
 				<<if $booty_call['orgasm'] < $orgasm>>
-					<p>"Let's come together," <<=$npcs.get($sex.npcId,'firstname')>> says, smiling at you.</p>
+					<p>"Let's come together," <<npc $sex.npcId>><</npc>> says, smiling at you.</p>
 				<<else>>
-					<p>"I wanna come inside you so bad," <<=$npcs.get($sex.npcId,'firstname')>> says, grunting with the effort of holding himself back from blowing his load inside you right now.</p>
+					<p>"I wanna come inside you so bad," <<npc $sex.npcId>><</npc>> says, grunting with the effort of holding himself back from blowing his load inside you right now.</p>
 				<</if>>
 			<<elseif $npcs.get($sex.npcId,'cum_pref') == 'mouth'>>
 				<<setinit $booty_call['he_ask_mouth'] = 1>>
-				<p>"Let me come in your mouth," <<=$npcs.get($sex.npcId,'firstname')>> says, grunting with the effort of holding himself back from blowing his load right now.</p>
+				<p>"Let me come in your mouth," <<npc $sex.npcId>><</npc>> says, grunting with the effort of holding himself back from blowing his load right now.</p>
 			<<elseif $npcs.get($sex.npcId,'cum_pref') == 'face'>>
 				<<setinit $booty_call['he_ask_facial'] = 1>>
-				<p>"I wanna come on your face," <<=$npcs.get($sex.npcId,'firstname')>> says, grunting with the effort of holding himself back from blowing his load right now. "I want to see my cum all over you."</p>
+				<p>"I wanna come on your face," <<npc $sex.npcId>><</npc>> says, grunting with the effort of holding himself back from blowing his load right now. "I want to see my cum all over you."</p>
 			<<elseif $npcs.get($sex.npcId,'cum_pref') == 'tits'>>
 				<<setinit $booty_call['he_ask_tits'] = 1>>
-				<p>"I wanna come on your tits," <<=$npcs.get($sex.npcId,'firstname')>> says, grunting with the effort of holding himself back from blowing his load right now.</p>
+				<p>"I wanna come on your tits," <<npc $sex.npcId>><</npc>> says, grunting with the effort of holding himself back from blowing his load right now.</p>
 			<</if>>
 		<</if>>
 		<<actCLA 'Come wherever you want'>>
@@ -825,7 +825,7 @@
 				"Come wherever you want," you grunt, still numbly going along with the motion of his thrusting.
 			<<elseif getvar("$booty_call['virgin_enjoyment']") >= 2>>
 				<<if $booty_call['position'] == 'doggy'>>
-					<p>You turn your head over your shoulder to look at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+					<p>You turn your head over your shoulder to look at <<npc $sex.npcId>><</npc>>.</p>
 				<</if>>
 				"Come wherever you want," you smile.
 			<</if>>
@@ -924,12 +924,12 @@
 			<<video "shared/sex/vag/miss/slow2.mp4">>
 			<p>"Ugh! Ugh! Ugh! <i>Ughhhh!!</i>"</p>
 			<<if $pc.horny >= 80>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> is doing a good job, even if he's not quite getting you off. You don't think you'll manage to come this time, but you don't want him to feel bad about it either. So...</p>
+				<p><<npc $sex.npcId>><</npc>> is doing a good job, even if he's not quite getting you off. You don't think you'll manage to come this time, but you don't want him to feel bad about it either. So...</p>
 			<<elseif $pc.horny >= 40>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> isn't doing bad, but he's nowhere near to really getting you off. But you also don't want him to feel bad, so...</p>
+				<p><<npc $sex.npcId>><</npc>> isn't doing bad, but he's nowhere near to really getting you off. But you also don't want him to feel bad, so...</p>
 			<</if>>
-			<p>You moan loudly despite the distinct <i>lack</i> of pleasure you feel right now before crying out and clenching down on <<=$npcs.get($sex.npcId,'firstname')>>'s cock with your pussy as hard as you can, dramatically tensing all your muscles as hard as you can, forcing your body to quiver.</p>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> slows down even more for a beat.</p>
+			<p>You moan loudly despite the distinct <i>lack</i> of pleasure you feel right now before crying out and clenching down on <<npc $sex.npcId>><</npc>>'s cock with your pussy as hard as you can, dramatically tensing all your muscles as hard as you can, forcing your body to quiver.</p>
+			<p><<npc $sex.npcId>><</npc>> slows down even more for a beat.</p>
 			<p>"Did you just...?"</p>
 			"Yeah," you pant with feigned breathlessness and smile at him. "You're incredible."
 			He smiles back and gets right on back to fucking you.
@@ -956,7 +956,7 @@
 		<<video "shared/sex/vag/miss/med1.mp4">>
 	<<else>>
 		<<video "shared/sex/vag/miss/med1.mp4">>
-		<p>The feeling of <<=$npcs.get($sex.npcId,'firstname')>>'s cock inside you is so wonderful, your pussy tightens on him with every gentle thrust. The feeling is so sublime and the experience is so new, you don't realize you're about to orgasm until right before it happens. The pleasure that was building inside you suddenly releases and you find yourself caught in the throes of it, shuddering uncontrollably beneath <<=$npcs.get($sex.npcId,'firstname')>> with his cock in a vice grip inside you.</p>
+		<p>The feeling of <<npc $sex.npcId>><</npc>>'s cock inside you is so wonderful, your pussy tightens on him with every gentle thrust. The feeling is so sublime and the experience is so new, you don't realize you're about to orgasm until right before it happens. The pleasure that was building inside you suddenly releases and you find yourself caught in the throes of it, shuddering uncontrollably beneath <<npc $sex.npcId>><</npc>> with his cock in a vice grip inside you.</p>
 	<</if>>
 	<<actCLA 'Continue'>>
 		<<if $booty_call['pos_speed'] == 'miss3'>>
@@ -971,7 +971,7 @@
 			Eventually, your orgasm fades and you're left panting heavily, trying to catch your breath.
 			<<setinit $booty_call['virgin_media'] = '<<video "shared/sex/vag/miss/slow2.mp4">>'>>
 		<</if>>
-		<p><i>Woah... Orgasming from real sex is... really different...</i> you think, groans coming from your mouth as <<=$npcs.get($sex.npcId,'firstname')>> continues fucking your still-sensitive pussy.</p>
+		<p><i>Woah... Orgasming from real sex is... really different...</i> you think, groans coming from your mouth as <<npc $sex.npcId>><</npc>> continues fucking your still-sensitive pussy.</p>
 		<<actCLA 'Continue'>>
 			<<gt 'booty_call_virgin' 'fuck_cum'>>
 		<</actCLA>>
@@ -1014,8 +1014,8 @@ end} -->
 <</if>>
 <<if $location_var[$here][0] == 'hurt_react2'>>
 	He keeps pushing inside, eliciting more grunts of discomfort from you, until he finally stops moving. You wriggle uncomfortably beneath him. Having a penis inside you is <i>not</i> what you expected. It fills you completely and you can feel it pressing against the walls of your pussy, straining against them and forcing them to stretch. That feeling leaves you like you're being torn in half and you wonder why any girl would ever say she enjoys sex.
-	<p>"Let's just take a minute. Give you some time to adjust," <<=$npcs.get($sex.npcId,'firstname')>> says. Just after he says that, you feel something running down the curve of your thigh. <i>What is tha-</i> you start to wonder before it hits you; it's blood. The final sign of the loss of your virginity.</p>
-	<p>After a minute or two of letting <<=$npcs.get($sex.npcId,'firstname')>>'s cock stretch your pussy, you nod for him to move again.</p>
+	<p>"Let's just take a minute. Give you some time to adjust," <<npc $sex.npcId>><</npc>> says. Just after he says that, you feel something running down the curve of your thigh. <i>What is tha-</i> you start to wonder before it hits you; it's blood. The final sign of the loss of your virginity.</p>
+	<p>After a minute or two of letting <<npc $sex.npcId>><</npc>>'s cock stretch your pussy, you nod for him to move again.</p>
 	"Okay. You can keep going," you grimance, hoping this horrible experience ends soon.
 <</if>>
 <<if $location_var[$here][0] == 'fine_react1'>>
@@ -1024,8 +1024,8 @@ end} -->
 <</if>>
 <<if $location_var[$here][0] == 'fine_react2'>>
 	He keeps pushing inside, eliciting more grunts of discomfort from you, until he finally stops moving and you think he's fully inside you. Having a penis inside you is a decidedly strange experience. You can feel his cock pressing against your pussy, stretching it to its limits and straining against them. You feel "full", and you can't think of another way to describe it at the moment.
-	<p>"Let's just take a minute. Give you some time to adjust," <<=$npcs.get($sex.npcId,'firstname')>> says. Just after he says that, you feel something running down the curve of your thigh. <i>What is tha-</i> you start to wonder before it hits you; it's blood. The final sign of the loss of your virginity.</p>
-	<p>After a minute or two of letting <<=$npcs.get($sex.npcId,'firstname')>>'s cock stretch your pussy, you nod for him to move again.</p>
+	<p>"Let's just take a minute. Give you some time to adjust," <<npc $sex.npcId>><</npc>> says. Just after he says that, you feel something running down the curve of your thigh. <i>What is tha-</i> you start to wonder before it hits you; it's blood. The final sign of the loss of your virginity.</p>
+	<p>After a minute or two of letting <<npc $sex.npcId>><</npc>>'s cock stretch your pussy, you nod for him to move again.</p>
 	"Okay. You can keep going," you nod.
 <</if>>
 <<if $location_var[$here][0] == 'mmm_react1'>>
@@ -1034,8 +1034,8 @@ end} -->
 <</if>>
 <<if $location_var[$here][0] == 'mmm_react2'>>
 	He keeps pushing inside, eliciting more grunts of discomfort from you, until he finally stops moving and you think he's fully inside you. Having a penis inside you is a decidedly strange experience. You can feel his cock pressing against your pussy, stretching it to its limits and straining against them. You feel "full", and you can't think of another way to describe it at the moment.
-	<p>"Let's just take a minute. Give you some time to adjust," <<=$npcs.get($sex.npcId,'firstname')>> says. Just after he says that, you feel something running down the curve of your thigh. <i>What is tha-</i> you start to wonder before it hits you; it's blood. The final sign of the loss of your virginity.</p>
-	<p>After a minute or two of letting <<=$npcs.get($sex.npcId,'firstname')>>'s cock stretch your pussy, you nod for him to move again.</p>
+	<p>"Let's just take a minute. Give you some time to adjust," <<npc $sex.npcId>><</npc>> says. Just after he says that, you feel something running down the curve of your thigh. <i>What is tha-</i> you start to wonder before it hits you; it's blood. The final sign of the loss of your virginity.</p>
+	<p>After a minute or two of letting <<npc $sex.npcId>><</npc>>'s cock stretch your pussy, you nod for him to move again.</p>
 	"Okay. You can keep going," you nod.
 <</if>>
 <<if $location_var[$here][0] == 'virgin_enjoyment'>>
@@ -1047,7 +1047,7 @@ end} -->
 			<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 			<<set $pc.horny -= 50>>
 			... still find it really painful.
-			<p>Maybe it's just the after effect of being too rough with you before carrying over, but this <i>really fucking hurts!</i> Every time <<=$npcs.get($sex.npcId,'firstname')>> thrusts into you, it feels like your vagina is going to split in half. Everything about it hurts. Your insides hurt, your vulva hurts, your cervix hurts, it feels like your pussy is literally being stabbed. You keep expecting it to get better, for the pain to go away and the enjoyment to start, but it never does. All you can do is clench your teeth, squeeze your eyes shut, and keep enduring until it's over.</p>
+			<p>Maybe it's just the after effect of being too rough with you before carrying over, but this <i>really fucking hurts!</i> Every time <<npc $sex.npcId>><</npc>> thrusts into you, it feels like your vagina is going to split in half. Everything about it hurts. Your insides hurt, your vulva hurts, your cervix hurts, it feels like your pussy is literally being stabbed. You keep expecting it to get better, for the pain to go away and the enjoyment to start, but it never does. All you can do is clench your teeth, squeeze your eyes shut, and keep enduring until it's over.</p>
 			<<actCLA 'Continue'>>
 				 <<gs 'booty_call_cum' 'fuck_cum'>>
 			<</actCLA>>
@@ -1059,7 +1059,7 @@ end} -->
 			<<arouse 'vaginal' 1 `['no_orgasm_msg']`>>
 			<<set $time.minutes += rand(3,4)>>
 			... still don't really enjoy it...
-			<p>It hurt when <<=$npcs.get($sex.npcId,'firstname')>> first entered you and when he was just pounding on you with no regard for your comfort, but now that he's slowed down, it's just a sort of pressure you feel inside you. The sensation isn't painful but it you're not getting any pleasure from it either. After his previous speed, maybe your pussy just went numb...?</p>
+			<p>It hurt when <<npc $sex.npcId>><</npc>> first entered you and when he was just pounding on you with no regard for your comfort, but now that he's slowed down, it's just a sort of pressure you feel inside you. The sensation isn't painful but it you're not getting any pleasure from it either. After his previous speed, maybe your pussy just went numb...?</p>
 			<<actCLA 'Continue'>>
 				 <<gs 'booty_call_cum' 'fuck_cum'>>
 			<</actCLA>>
@@ -1071,7 +1071,7 @@ end} -->
 			... start to feel really good...
 			The pain of the previous form of fucking begins to fade and pleasure takes its place. Like an itch you've never been able to scratch or a "fullness" you've never experienced, you can feel his cock deep inside you and it feels <i>so good</i>, causing you to openly moan as he fucks you.
 			<<if $booty_call['orgasm'] < $orgasm>>
-				<p>You're so caught up in the enjoyment of it, you almost don't realize when you're about to come. The pressure inside you building and building with each time <<=$npcs.get($sex.npcId,'firstname')>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut as you cum hard on <<=$npcs.get($sex.npcId,'firstname')>>'s dick.</p>
+				<p>You're so caught up in the enjoyment of it, you almost don't realize when you're about to come. The pressure inside you building and building with each time <<npc $sex.npcId>><</npc>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut as you cum hard on <<npc $sex.npcId>><</npc>>'s dick.</p>
 			<<else>>
 				<p>You spend the next several minutes fucking joyously, wondering why you waited so long to feel this good!</p>
 			<</if>>
@@ -1089,13 +1089,13 @@ end} -->
 			<<set $time.minutes += rand(3,4)>>
 			<i>... this is really painful.</i>
 			<<if $booty_call['pos_speed'] == 'cowgirl3'>>
-				<p>This was a fucking terrible idea! Why did you think that you could lose your virginity like this? Why are you even trying? Tears well up in your eyes as you continue to impale yourself on <<=$npcs.get($sex.npcId,'firstname')>>'s cock, wondering to yourself why you're so fucking stupid.</p>
+				<p>This was a fucking terrible idea! Why did you think that you could lose your virginity like this? Why are you even trying? Tears well up in your eyes as you continue to impale yourself on <<npc $sex.npcId>><</npc>>'s cock, wondering to yourself why you're so fucking stupid.</p>
 			<<elseif $booty_call['virgin_react'] == 'hurt'>>
-				<p>What initially started as a painful experience continues to be one. Every time <<=$npcs.get($sex.npcId,'firstname')>>'s cock moves inside you, it feels like your vagina is going to split in half. Everything about it hurts. Your insides hurt, your vulva hurts, your cervix hurts, it feels like your pussy is literally being stabbed. You spend each moment praying he'll just cum already and your agony can end.</p>
+				<p>What initially started as a painful experience continues to be one. Every time <<npc $sex.npcId>><</npc>>'s cock moves inside you, it feels like your vagina is going to split in half. Everything about it hurts. Your insides hurt, your vulva hurts, your cervix hurts, it feels like your pussy is literally being stabbed. You spend each moment praying he'll just cum already and your agony can end.</p>
 			<<elseif $booty_call['virgin_react'] == 'fine'>>
-				<p>It wasn't so bad when he first entered you, but what started as mild discomfort has become full blown agony. Every time <<=$npcs.get($sex.npcId,'firstname')>>'s cock moves inside you, it feels like your vagina is going to split in half. Everything about it hurts. Your insides hurt, your vulva hurts, your cervix hurts, it feels like your pussy is literally being stabbed. You keep expecting it to get better, for the pain to go away and the enjoyment to start, but it never does. All you can do is clench your teeth, squeeze your eyes shut, and keep enduring until it's over.</p>
+				<p>It wasn't so bad when he first entered you, but what started as mild discomfort has become full blown agony. Every time <<npc $sex.npcId>><</npc>>'s cock moves inside you, it feels like your vagina is going to split in half. Everything about it hurts. Your insides hurt, your vulva hurts, your cervix hurts, it feels like your pussy is literally being stabbed. You keep expecting it to get better, for the pain to go away and the enjoyment to start, but it never does. All you can do is clench your teeth, squeeze your eyes shut, and keep enduring until it's over.</p>
 			<<elseif $booty_call['virgin_react'] == 'mmm'>>
-				<p>It wasn't so bad when he first entered you, but what started as mild discomfort has become full blown agony. Every time <<=$npcs.get($sex.npcId,'firstname')>>'s cock moves inside you, it feels like your vagina is going to split in half. Everything about it hurts. Your insides hurt, your vulva hurts, your cervix hurts, it feels like your pussy is literally being stabbed. You keep expecting it to get better, for the pain to go away and the enjoyment to start, but it never does. All you can do is clench your teeth, squeeze your eyes shut, and keep enduring until it's over.</p>
+				<p>It wasn't so bad when he first entered you, but what started as mild discomfort has become full blown agony. Every time <<npc $sex.npcId>><</npc>>'s cock moves inside you, it feels like your vagina is going to split in half. Everything about it hurts. Your insides hurt, your vulva hurts, your cervix hurts, it feels like your pussy is literally being stabbed. You keep expecting it to get better, for the pain to go away and the enjoyment to start, but it never does. All you can do is clench your teeth, squeeze your eyes shut, and keep enduring until it's over.</p>
 			<</if>>
 			<<actCLA 'Continue'>>
 				 <<gs 'booty_call_cum' 'fuck_cum'>>
@@ -1109,9 +1109,9 @@ end} -->
 			<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 			<i>... you aren''t really enjoying this...</i>
 			<<if $booty_call['pos_speed'] == 'cowgirl3'>>
-				<p>It takes you a few minutes, but at some point you realize it doesn't really hurt anymore. Actually, you don't really feel anything. You keep slamming your hips down on <<=$npcs.get($sex.npcId,'firstname')>>, expecting to feel something pleasurable, but all you really feel is a vague pressure inside you that ebbs and flows with the motions of your hips. Despite how hard you're riding him, you can't help but feel the experience is... boring?</p>
+				<p>It takes you a few minutes, but at some point you realize it doesn't really hurt anymore. Actually, you don't really feel anything. You keep slamming your hips down on <<npc $sex.npcId>><</npc>>, expecting to feel something pleasurable, but all you really feel is a vague pressure inside you that ebbs and flows with the motions of your hips. Despite how hard you're riding him, you can't help but feel the experience is... boring?</p>
 			<<else>>
-				<p>It hurt when <<=$npcs.get($sex.npcId,'firstname')>> first entered you, but now that your pussy has adjusted but that pain has taken a back seat and become nothing more than a dull throb. But other than that, it's just a sort of pressure you feel inside you that comes and goes with the motions of his cock. The sensation isn't painful but it you're not getting any pleasure from it either. The experience is just sort of... bland.</p>
+				<p>It hurt when <<npc $sex.npcId>><</npc>> first entered you, but now that your pussy has adjusted but that pain has taken a back seat and become nothing more than a dull throb. But other than that, it's just a sort of pressure you feel inside you that comes and goes with the motions of his cock. The sensation isn't painful but it you're not getting any pleasure from it either. The experience is just sort of... bland.</p>
 			<</if>>
 			<<actCLA 'Continue'>>
 				 <<gs 'booty_call_cum' 'fuck_cum'>>
@@ -1126,14 +1126,14 @@ end} -->
 			<<if $booty_call['virgin_react'] == 'hurt'>>
 				The initial pain you felt is still there, but now there''s something else that's going along with it. Like an itch you've never been able to scratch or a "fullness" you've never experienced. Your arousal flows like water from your pussy and his cock is slick with your blood and juices. It reaches deep inside you and it feels <i>so good</i>, causing you to openly moan.
 			<<elseif $booty_call['virgin_react'] == 'fine'>>
-				<p>That "fullness" you remarked upon earlier has somehow become even more full as <<=$npcs.get($sex.npcId,'firstname')>> has continued to fuck you. Your arousal flows like water from your pussy and his cock is slick with your blood and juices. It reaches deep inside you and it feels <i>so good</i>, causing you to openly moan.</p>
+				<p>That "fullness" you remarked upon earlier has somehow become even more full as <<npc $sex.npcId>><</npc>> has continued to fuck you. Your arousal flows like water from your pussy and his cock is slick with your blood and juices. It reaches deep inside you and it feels <i>so good</i>, causing you to openly moan.</p>
 			<<elseif $booty_call['virgin_react'] == 'mmm'>>
-				<p>That "fullness" you remarked upon earlier has somehow become even more full as <<=$npcs.get($sex.npcId,'firstname')>> has continued to fuck you. Your arousal flows like water from your pussy and his cock is slick with your blood and juices. It reaches deep inside you and it feels <i>so good</i>, causing you to openly moan.</p>
+				<p>That "fullness" you remarked upon earlier has somehow become even more full as <<npc $sex.npcId>><</npc>> has continued to fuck you. Your arousal flows like water from your pussy and his cock is slick with your blood and juices. It reaches deep inside you and it feels <i>so good</i>, causing you to openly moan.</p>
 			<</if>>
 			<<actCLA 'Continue at this pace'>>
 				$booty_call['virgin_media']
 				<<if $booty_call['orgasm'] < $orgasm>>
-					<p>You're so caught up in the enjoyment of it that your orgasm catches you by surprise. The pressure inside you builds and builds with each time <<=$npcs.get($sex.npcId,'firstname')>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut and you realize you're about to come.</p>
+					<p>You're so caught up in the enjoyment of it that your orgasm catches you by surprise. The pressure inside you builds and builds with each time <<npc $sex.npcId>><</npc>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut and you realize you're about to come.</p>
 				<<else>>
 					<p>You spend the next several minutes fucking joyously, wondering why you waited so long to feel this good!</p>
 				<</if>>
@@ -1144,7 +1144,7 @@ end} -->
 			<<if $booty_call['position'] != 'cowgirl'>>
 				<<actCLA '"Fuck me harder"'>>
 					$booty_call['virgin_media']
-					<p>"<<=$npcs.get($sex.npcId,'firstname')>>," you say. "I want you to fuck me harder."</p>
+					<p>"<<npc $sex.npcId>><</npc>>," you say. "I want you to fuck me harder."</p>
 					<p>"You're sure?" he asks.</p>
 					<p>"Yeah, I'm sure," you grin lustfully. "I can take it. I <i>want</i> it. Give me your dick!"</p>
 					<<actCLA 'Continue'>>
@@ -1169,12 +1169,12 @@ end} -->
 			<<setinit $booty_call['virgin_pain_good'] = 1>>
 			<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 			<<arouse 'vaginal' -15 `['no_orgasm_msg']`>>
-			<p>The initial pain you felt is still there, but somehhow it's evolved. <<=$npcs.get($sex.npcId,'firstname')>>'s cock is slick with your blood cock and every time moves inside you, it feels like your vagina is going to split in half. It reaches deep inside you, like a knife stabbing into your cervix. And it feels <i>so good</i>.</p>
+			<p>The initial pain you felt is still there, but somehhow it's evolved. <<npc $sex.npcId>><</npc>>'s cock is slick with your blood cock and every time moves inside you, it feels like your vagina is going to split in half. It reaches deep inside you, like a knife stabbing into your cervix. And it feels <i>so good</i>.</p>
 			It hurts like fire, but somehow it burns you in all the best ways. And you want nothing more than for it to continue. There are tears in your eyes, but you honestly can't tell anymore if they're tears of pain or tears of joy.
 			<<actCLA 'Continue at this pace'>>
 				$booty_call['virgin_media']
 				<<if $booty_call['orgasm'] < $orgasm>>
-					<p>You're so caught up in the enjoyment of it that your orgasm catches you by surprise. The pressure inside you builds and builds with each time <<=$npcs.get($sex.npcId,'firstname')>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut and you realize you're about to come.</p>
+					<p>You're so caught up in the enjoyment of it that your orgasm catches you by surprise. The pressure inside you builds and builds with each time <<npc $sex.npcId>><</npc>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut and you realize you're about to come.</p>
 				<<else>>
 					<p>You spend the next several minutes fucking joyously, wondering why you waited so long to feel this good!</p>
 				<</if>>
@@ -1185,7 +1185,7 @@ end} -->
 			<<if $booty_call['position'] != 'cowgirl'>>
 				<<actCLA '"Fuck me harder"'>>
 					$booty_call['virgin_media']
-					<p>"<<=$npcs.get($sex.npcId,'firstname')>>," you say, tears now streaming down your face. "I want you to fuck me harder."</p>
+					<p>"<<npc $sex.npcId>><</npc>>," you say, tears now streaming down your face. "I want you to fuck me harder."</p>
 					<p>"You're sure?" he asks hesitantly.</p>
 					<p>"Yes! I'm sure!" you cry even harder. "I <i>want</i> it. Give me your dick. Split me in half!"</p>
 					<<actCLA 'Continue'>>
@@ -1211,21 +1211,21 @@ end} -->
 			"It gets better. You were probably too tight because you were a virgin."
 			<<actCLA 'Really?'>>
 				<p>"Really?" you ask, voice heavy with sketicism.</p>
-				<p>"Yeah, really," <<=$npcs.get($sex.npcId,'firstname')>> laughs back. "Some girls I know said their first time hurt. But those same girls love it now."</p>
+				<p>"Yeah, really," <<npc $sex.npcId>><</npc>> laughs back. "Some girls I know said their first time hurt. But those same girls love it now."</p>
 				"Wish you could''ve warned me."
 				"If it's any consolation, your pussy felt great."
 				"It's not," you harumph, crossing your arms and he laughs again.
 				<<gs 'booty_call_pillow_talk' 'topics'>>
 			<</actCLA>>
 			<<actCLA 'I hope so'>>
-				<p>"I hope so," you groan, throwing your head back as <<=$npcs.get($sex.npcId,'firstname')>> laughs.</p>
+				<p>"I hope so," you groan, throwing your head back as <<npc $sex.npcId>><</npc>> laughs.</p>
 				"If it's any consolation, your pussy felt great."
 				"It's not," you harumph, crossing your arms and he laughs again.
 				<<gs 'booty_call_pillow_talk' 'topics'>>
 			<</actCLA>>
 			<<actCLA 'How would you know?'>>
 				<p>"How would you know?" you ask, giving him a dirty look. "Have you ever taken a cock inside you?"</p>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> laughs in reply but holds his hands up in surrender.</p>
+				<p><<npc $sex.npcId>><</npc>> laughs in reply but holds his hands up in surrender.</p>
 				<<gs 'booty_call_pillow_talk' 'topics'>>
 			<</actCLA>>
 		<</actCLA>>
@@ -1268,7 +1268,7 @@ end} -->
 			<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
 			"It was... nice," you say, giving a genuine smile. "Felt really good. I just felt... <i>full</i>. Like my insides were getting massaged but like, better than a massage."
 			<<if $npcs.get($sex.npcId,'generous') == 1>>
-				<p>"I'm glad I was able to give you a good first time," <<=$npcs.get($sex.npcId,'firstname')>> smiles back, leaning in to kiss you.</p>
+				<p>"I'm glad I was able to give you a good first time," <<npc $sex.npcId>><</npc>> smiles back, leaning in to kiss you.</p>
 				<<gs 'booty_call_virgin' 'kiss_turn_head'>>
 				<<actCLA 'Kiss him back'>>
 					You smile and let him press his lips against yours, leaning in to steal another one when he pulls away.
@@ -1276,7 +1276,7 @@ end} -->
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<</actCLA>>
 			<<else>>
-				<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
+				<p>"Yeah," <<npc $sex.npcId>><</npc>> grins. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
 				<<gs 'booty_call_pillow_talk' 'topics'>>
 			<</if>>
 		<</actCLA>>
@@ -1285,7 +1285,7 @@ end} -->
 			<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
 			<p>"It was amazing!" you gush with a shameless grin. "It was like I've been missing something this entire time. And you being inside me made me feel <i>full</i>. I can't believe I waited this long to have sex! I need to be careful or I could get addicted to this!"</p>
 			<<if $npcs.get($sex.npcId,'generous') == 1>>
-				<p>Perhaps spurred by your words, <<=$npcs.get($sex.npcId,'firstname')>> quickly moves in to kiss you.</p>
+				<p>Perhaps spurred by your words, <<npc $sex.npcId>><</npc>> quickly moves in to kiss you.</p>
 				<<gs 'booty_call_virgin' 'kiss_turn_head'>>
 				<<actCLA 'Kiss him back'>>
 					You smile and let him. He presses his lips against you passionately and your eyes go wide in surprise when you feel his tongue snake between your lips and press against yours. You push back with your own, enjoying the way it feels, savoring the taste of his mouth. It's not as good as the sex you just experienced, but it feels <i>damn</i> nice. You even lean in to steal another kiss when he pulls away.
@@ -1295,7 +1295,7 @@ end} -->
 					<<gs 'booty_call_pillow_talk' 'topics'>>
 				<</actCLA>>
 			<<else>>
-				<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
+				<p>"Yeah," <<npc $sex.npcId>><</npc>> grins. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
 				<<actCLA 'Thought: Really?!'>>
 					<i>Fuck, really?!</i> you think to yourself. <i>This isn''t how it always feels? Shit!</i>
 					<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -1332,7 +1332,7 @@ end} -->
 			"It was... nice," you say, giving a forced smile. Actually, it didn''t feel like very much at all. All you really felt was a weird pressure moving inside you. Didn''t feel bad, but it didn''t feel good either. But you don't want to hurt his feelings so you just lie instead. "Felt really good."
 		<</if>>
 		<<if $npcs.get($sex.npcId,'generous') == 1>>
-			<p>"I'm glad I was able to give you a good first time," <<=$npcs.get($sex.npcId,'firstname')>> smiles back, leaning in to kiss you.</p>
+			<p>"I'm glad I was able to give you a good first time," <<npc $sex.npcId>><</npc>> smiles back, leaning in to kiss you.</p>
 			<<gs 'booty_call_virgin' 'kiss_turn_head'>>
 			<<actCLA 'Kiss him back'>>
 				You smile and let him press his lips against yours, leaning in to steal another one when he pulls away. Unlike the experience you just had, this <i>does</i> feel nice.
@@ -1344,7 +1344,7 @@ end} -->
 				<<gs 'booty_call_pillow_talk' 'topics'>>
 			<</actCLA>>
 		<<else>>
-			<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
+			<p>"Yeah," <<npc $sex.npcId>><</npc>> grins. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
 			<<if getvar("$booty_call['virgin_enjoyment']") == -1>>
 				<i>Fuck, I hope so,</i> you think to yourself. <i>That was fucking torture!</i>
 			<<elseif getvar("$booty_call['virgin_enjoyment']") == 1>>
@@ -1366,10 +1366,10 @@ end} -->
 			"It was... nice," you say, giving a forced smile, boredly ignoring his hand between your legs. Actually, it didn''t feel like very much at all. All you really felt was a weird pressure moving inside you. Didn''t feel bad, but it didn''t feel good either. But you don't want to hurt his feelings so you just lie instead. "Felt really good."
 		<</if>>
 		<<if $npcs.get($sex.npcId,'generous') == 1>>
-			<p>"I'm glad I was able to give you a good first time," <<=$npcs.get($sex.npcId,'firstname')>> smiles back, leaning in to kiss you.</p>
+			<p>"I'm glad I was able to give you a good first time," <<npc $sex.npcId>><</npc>> smiles back, leaning in to kiss you.</p>
 			<<gs 'booty_call_virgin' 'kiss_turn_head'>>
 			<<actCLA 'Kiss him back'>>
-				<p>You smile and let <<=$npcs.get($sex.npcId,'firstname')>> press his lips against yours, gasping into his mouth when you feel his fingers thumb over your clit again before pulling away. Unlike the experience you just had, this <i>does</i> feel nice.</p>
+				<p>You smile and let <<npc $sex.npcId>><</npc>> press his lips against yours, gasping into his mouth when you feel his fingers thumb over your clit again before pulling away. Unlike the experience you just had, this <i>does</i> feel nice.</p>
 				<<if getvar("$booty_call['virgin_enjoyment']") == -1>>
 					Losing your virginity was painful, but at least he's sweet.
 				<<elseif getvar("$booty_call['virgin_enjoyment']") == 1>>
@@ -1378,7 +1378,7 @@ end} -->
 				<<gs 'booty_call_pillow_talk' 'topics'>>
 			<</actCLA>>
 		<<else>>
-			<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> grins, giving your clit a hard rub before pulling away. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
+			<p>"Yeah," <<npc $sex.npcId>><</npc>> grins, giving your clit a hard rub before pulling away. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
 			<<if getvar("$booty_call['virgin_enjoyment']") == -1>>
 				<i>Fuck, I hope so,</i> you think to yourself. <i>That was fucking torture!</i>
 			<<elseif getvar("$booty_call['virgin_enjoyment']") == 1>>
@@ -1400,7 +1400,7 @@ end} -->
 			<p>"It was amazing!" you say, giving a fake smile. Actually, it didn't feel like very much at all. All you really felt was a weird pressure moving inside you. Didn't feel bad, but it didn't feel good either. But you don't want to hurt his feelings so you just lie instead. "I loved the way it felt when you were inside me. I could get addicted to this if I'm not careful."</p>
 		<</if>>
 		<<if $npcs.get($sex.npcId,'generous') == 1>>
-			<p>Perhaps spurred by your words, <<=$npcs.get($sex.npcId,'firstname')>> quickly moves in to kiss you.</p>
+			<p>Perhaps spurred by your words, <<npc $sex.npcId>><</npc>> quickly moves in to kiss you.</p>
 			<<gs 'booty_call_virgin' 'kiss_turn_head'>>
 			<<actCLA 'Kiss him back'>>
 				You smile and let him. He presses his lips against you passionately and your eyes go wide in surprise when you feel his tongue snake between your lips and press against yours. You push back with your own, enjoying the way it feels, savoring the taste of his mouth. Unlike the experience you just had, this <i>does</i> feel nice. You even lean in to steal another kiss when he pulls away.
@@ -1408,12 +1408,12 @@ end} -->
 				<<if getvar("$booty_call['virgin_enjoyment']") == -1>>
 					Losing your virginity was painful, but at least he's sweet.
 				<<elseif getvar("$booty_call['virgin_enjoyment']") == 1>>
-					<p>Losing your virginity didn't feel like much in the end, but at least <<=$npcs.get($sex.npcId,'firstname')>> is sweet.</p>
+					<p>Losing your virginity didn't feel like much in the end, but at least <<npc $sex.npcId>><</npc>> is sweet.</p>
 				<</if>>
 				<<gs 'booty_call_pillow_talk' 'topics'>>
 			<</actCLA>>
 		<<else>>
-			<p>"Better hope you don't," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Not every guy's as good a lay as I am. Could be hard for you to get your fix."</p>
+			<p>"Better hope you don't," <<npc $sex.npcId>><</npc>> grins. "Not every guy's as good a lay as I am. Could be hard for you to get your fix."</p>
 			<<if getvar("$booty_call['virgin_enjoyment']") == -1>>
 				<i>Fuck, I hope so,</i> you think to yourself. <i>That was fucking torture!</i>
 			<<elseif getvar("$booty_call['virgin_enjoyment']") == 1>>
@@ -1435,7 +1435,7 @@ end} -->
 			<p>"It was amazing!" you say, giving a forced grin, boredly ignoring hand between your legs. Actually, it didn't feel like very much at all. All in all, the experience was pretty boring. Practically numb. But you don't want to hurt his feelings so you just lie instead. "I loved the way it felt when you were inside me. I could get addicted to this if I'm not careful."</p>
 		<</if>>
 		<<if $npcs.get($sex.npcId,'generous') == 1>>
-			<p>Perhaps spurred by your words, <<=$npcs.get($sex.npcId,'firstname')>> quickly moves in to kiss you.</p>
+			<p>Perhaps spurred by your words, <<npc $sex.npcId>><</npc>> quickly moves in to kiss you.</p>
 			<<gs 'booty_call_virgin' 'kiss_turn_head'>>
 			<<actCLA 'Kiss him back'>>
 				You smile and let him. He presses his lips against you passionately and your eyes go wide in surprise when you feel his tongue snake between your lips and press against yours. You push back with your own, enjoying the way it feels, savoring the taste of his mouth. Then you feel his fingers give your clit another good rub, making you moan directly into his mouth. Unlike the experience you just had, this <i>does</i> feel nice. You bite your lip, letting the pleasure roll through you.
@@ -1443,12 +1443,12 @@ end} -->
 				<<if getvar("$booty_call['virgin_enjoyment']") == -1>>
 					Losing your virginity was painful, but at least he's sweet.
 				<<elseif getvar("$booty_call['virgin_enjoyment']") == 1>>
-					<p>Losing your virginity didn't feel like much in the end, but at least <<=$npcs.get($sex.npcId,'firstname')>> is sweet.</p>
+					<p>Losing your virginity didn't feel like much in the end, but at least <<npc $sex.npcId>><</npc>> is sweet.</p>
 				<</if>>
 				<<gs 'booty_call_pillow_talk' 'topics'>>
 			<</actCLA>>
 		<<else>>
-			<p>"Better hope you don't," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Not every guy's as good a lay as I am. Could be hard for you to get your fix."</p>
+			<p>"Better hope you don't," <<npc $sex.npcId>><</npc>> grins. "Not every guy's as good a lay as I am. Could be hard for you to get your fix."</p>
 			<<if getvar("$booty_call['virgin_enjoyment']") == -1>>
 				<i>Fuck, I hope so,</i> you think to yourself. <i>That was fucking torture!</i>
 			<<elseif getvar("$booty_call['virgin_enjoyment']") == 1>>
@@ -1482,7 +1482,7 @@ end} -->
 			<<actCLA 'It took a while to feel good'>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				"It didn''t actually feel like much at first," you confess. "A little bit of pain when you put it in, and then my pussy went almost numb for a while. I couldn''t really feel anything. But after a while I started feeling really good. Thanks for keeping it up until then."
-				<p>You smile gratefully at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+				<p>You smile gratefully at <<npc $sex.npcId>><</npc>>.</p>
 				<<gs 'booty_call_pillow_talk' 'topics'>>
 			<</actCLA>>
 		<</if>>

+ 29 - 29
sugarcube/src/activities/bootycall/booty_call_work_talk1.tw

@@ -20,7 +20,7 @@
 		<<image "shared/sex/after/pillow_talk1.jpg">>
 		<p>"Hey, I never asked," you muse. "What is it you do for work again?"</p>
 		<<if $npcs.get($sex.npcId,'occupation') == 'cashier_supermarket'>>
-			<p>"Nothing special, just a cashier at a generic supermarket," <<=$npcs.get($sex.npcId,'firstname')>> shrugs.</p>
+			<p>"Nothing special, just a cashier at a generic supermarket," <<npc $sex.npcId>><</npc>> shrugs.</p>
 			<p>"Pyaterochka?" you ask and he nods.</p>
 			"That's the one."
 			<<if $region == 'pav'>>
@@ -28,27 +28,27 @@
 			<</if>>
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'cashier_liquor'>>
-			<p>"Cashier at a liquor store," <<=$npcs.get($sex.npcId,'firstname')>> shrugs. "Pretty boring."</p>
+			<p>"Cashier at a liquor store," <<npc $sex.npcId>><</npc>> shrugs. "Pretty boring."</p>
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'cashier_coffee'>>
-			<p>"I work the register at a coffee shop," <<=$npcs.get($sex.npcId,'firstname')>> says. "It gets pretty hectic in there sometimes. Especially mornings."</p>
+			<p>"I work the register at a coffee shop," <<npc $sex.npcId>><</npc>> says. "It gets pretty hectic in there sometimes. Especially mornings."</p>
 			<p>"That's cool. Is the coffee any good?"</p>
 			"It's fine I guess," he shrugs. "Nothing special. Just generic shit."
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'barista'>>
-			<p>"I work as a barista at a coffee shop," <<=$npcs.get($sex.npcId,'firstname')>> says. "It gets pretty hectic in there sometimes. Especially mornings.</p>
+			<p>"I work as a barista at a coffee shop," <<npc $sex.npcId>><</npc>> says. "It gets pretty hectic in there sometimes. Especially mornings.</p>
 			<p>"That's cool. Is the coffee any good?"</p>
 			"It is when I make it," he smirks.
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'fast_food'>>
-			<p>"I flip burgers at this chain fast food joint," <<=$npcs.get($sex.npcId,'firstname')>> says. " Pay sucks and customers are all assholes. Service industry is shit."</p>
+			<p>"I flip burgers at this chain fast food joint," <<npc $sex.npcId>><</npc>> says. " Pay sucks and customers are all assholes. Service industry is shit."</p>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'taxi_driver'>>
-			<p>"I drive a cab in the city," <<=$npcs.get($sex.npcId,'firstname')>> says. "Not much, but it pays the bills.</p>
+			<p>"I drive a cab in the city," <<npc $sex.npcId>><</npc>> says. "Not much, but it pays the bills.</p>
 			<!-- !! if taxi_bj > 10:-->
 			<!-- !! '"I like giving taxi guys blowjobs," you smirk mischievously.'-->
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'masseuse'>>
-			<p>"I work as a masseuse in the city," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+			<p>"I work as a masseuse in the city," <<npc $sex.npcId>><</npc>> says.</p>
 			<<actCLA 'That`s cool'>>
 				"That's cool. You'll have to show me your skills sometime," you smile.
 				<<gs 'booty_call_pillow_talk2' 'small_talk'>>
@@ -57,7 +57,7 @@
 				<p>"That's cool. So, you give happy endings to dirty old guys?" you smirk, making a jerk-off motion with your hand.</p>
 				<<if $npcs.get($sex.npcId,'insecure') == 1>>
 					<<run $npcs.dec($sex.npcId,'rel',5)>>
-					<p>"What the fuck?" <<=$npcs.get($sex.npcId,'firstname')>> gives you a deep frown of disgust. "What do you think I am, some kind of faggot?"</p>
+					<p>"What the fuck?" <<npc $sex.npcId>><</npc>> gives you a deep frown of disgust. "What do you think I am, some kind of faggot?"</p>
 					"I was just joking," you say.
 					"Jokes are supposed to be funny."
 				<<elseif getvar("$npc_humor") == 2>>
@@ -70,7 +70,7 @@
 				<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 			<</actCLA>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'masseuse_sexual'>>
-			<p>"I work as a masseuse in the city," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+			<p>"I work as a masseuse in the city," <<npc $sex.npcId>><</npc>> says.</p>
 			<<actCLA 'That`s cool'>>
 				"That's cool. You'll have to show me your skills sometime," you smile.
 				<<gs 'booty_call_pillow_talk2' 'small_talk'>>
@@ -102,9 +102,9 @@
 			<</actCLA>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'factory'>>
 			<<if $region == 'pav'>>
-				<p>"I work at the textile factory," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+				<p>"I work at the textile factory," <<npc $sex.npcId>><</npc>> says.</p>
 			<<else>>
-				<p>"I work at the textile factory in the next town over," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+				<p>"I work at the textile factory in the next town over," <<npc $sex.npcId>><</npc>> says.</p>
 				<<if mid($start_type,1,2) == 'sg'>>
 					<p>"The one in Pavlovsk?"</p>
 					<p>"Yeah, how'd you know?"</p>
@@ -114,25 +114,25 @@
 			<</if>>
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'bartender'>>
-			<p>"Bartender," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+			<p>"Bartender," <<npc $sex.npcId>><</npc>> says.</p>
 			<p>"That's pretty cool. So you have to know how to make a lot of fancy drinks?"</p>
 			"Yeah, but everyone just orders vodka anyways," he snickers.
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'mechanic'>>
-			<p>"I work on cars," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+			<p>"I work on cars," <<npc $sex.npcId>><</npc>> says.</p>
 			<p>"Oh cool, like a mechanic?"</p>
 			"Yeah, exactly."
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'line_cook'>>
-			<p>"I work in a kitchen," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+			<p>"I work in a kitchen," <<npc $sex.npcId>><</npc>> says.</p>
 			<p>"Oh, cool. Like a chef?"</p>
 			"No, I'm just a line cook. Nothing fancy."
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'waiter'>>
-			<p>"I wait tables," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+			<p>"I wait tables," <<npc $sex.npcId>><</npc>> says.</p>
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'personal_trainer'>>
-			<p>"I work at a gym as a personal trainer," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+			<p>"I work at a gym as a personal trainer," <<npc $sex.npcId>><</npc>> says.</p>
 			<<actCLA 'That`s cool'>>
 				<p>"Oh, that's cool. So you know how to get people in shape? Got any tips to keep a girl's figure?"</p>
 				<<if $npcs.get($sex.npcId,'humor') == 2>>
@@ -148,7 +148,7 @@
 				<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 			<</actCLA>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'programmer'>>
-			<p>"I work in tech," <<=$npcs.get($sex.npcId,'firstname')>> says. "Do the programming for an IT company in the city."</p>
+			<p>"I work in tech," <<npc $sex.npcId>><</npc>> says. "Do the programming for an IT company in the city."</p>
 			<p>"So you can fix my computer if I have a problem?"</p>
 			"Oh fuck," he groans. "Not you too."
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
@@ -156,7 +156,7 @@
 			<<if $npcs.get($sex.npcId,'criminal_open') == 1>>
 				<<run $npcs.set($sex.npcId,'criminal_known',1)>>
 				<<if $npcs.get($sex.npcId,'crime_type') == 'drug_dealer'>>
-					<p>"I sell drugs," <<=$npcs.get($sex.npcId,'firstname')>> says blatantly.</p>
+					<p>"I sell drugs," <<npc $sex.npcId>><</npc>> says blatantly.</p>
 					<<actCLA 'Uncomfortable'>>
 						<<run $npcs.set($sex.npcId,'criminal_discomfort',1)>>
 						"Oh." You gulp uncomfortably, unsure of what else to say.
@@ -178,7 +178,7 @@
 						<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 					<</actCLA>>
 				<<elseif $npcs.get($sex.npcId,'crime_type') == 'enforcer'>>
-					<p>"I'm an enforcer for a gang," <<=$npcs.get($sex.npcId,'firstname')>> says blatantly.</p>
+					<p>"I'm an enforcer for a gang," <<npc $sex.npcId>><</npc>> says blatantly.</p>
 					<<actCLA 'Uncomfortable'>>
 						<<run $npcs.set($sex.npcId,'criminal_discomfort',1)>>
 						"Oh." You gulp uncomfortably, unsure of what else to say.
@@ -201,7 +201,7 @@
 					<</actCLA>>
 				<<else>>
 					<!-- !!<<=$npcs.get($sex.npcId,'crime_type')>> = 'thief'-->
-					<p>"I steal things," <<=$npcs.get($sex.npcId,'firstname')>> says blatantly.</p>
+					<p>"I steal things," <<npc $sex.npcId>><</npc>> says blatantly.</p>
 					<<actCLA 'Uncomfortable'>>
 						<<run $npcs.set($sex.npcId,'criminal_discomfort',1)>>
 						"Oh." You gulp uncomfortably, unsure of what else to say.
@@ -225,7 +225,7 @@
 				<</if>>
 			<<else>>
 				<<if $npcs.get($sex.npcId,'crime_type') == 'drug_dealer'>>
-					<p>"I work in pharmaceuticals," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+					<p>"I work in pharmaceuticals," <<npc $sex.npcId>><</npc>> says.</p>
 					<<if mid($start_type,1,2) == 'sg'>>
 						"That's cool. My aunt is a pharmacist too."
 						"Oh. Good to know."
@@ -234,42 +234,42 @@
 						"Like being a drug dealer," he snickers.
 					<</if>>
 				<<elseif $npcs.get($sex.npcId,'crime_type') == 'enforcer'>>
-					<p>"I'm a sort of fixer," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+					<p>"I'm a sort of fixer," <<npc $sex.npcId>><</npc>> says.</p>
 					<p>"Fixer? You mean like a handyman?"</p>
 					"Not really," he shrugs. "It's more like I'm on call to help people out. When someone calls me, I head over and give them a hand."
 					"Sounds... chaotic."
 					"Yeah, a little. Never know exactly what the problem is until I get there."
 				<<else>>
 					<!-- !!<<=$npcs.get($sex.npcId,'crime_type')>> = 'thief'-->
-					<p>"I work in acquisitions and sales," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+					<p>"I work in acquisitions and sales," <<npc $sex.npcId>><</npc>> says.</p>
 					<p>"So... like a salesman?"</p>
 					<p>"Sort of? I'm kind of a middle man. I get things from people and then sell them to other people."</p>
 				<</if>>
 				<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 			<</if>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'businessman'>>
-			<p>"I run a company I founded," <<=$npcs.get($sex.npcId,'firstname')>> says casually.</p>
+			<p>"I run a company I founded," <<npc $sex.npcId>><</npc>> says casually.</p>
 			<p>"Oh wow. Explains the apartment. What do you sell?"</p>
 			"Imported cars from China. Everybody needs cars."
 			"Very practical," you nod."
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'lawyer'>>
-			<p>"I'm the partner at a law firm here in the city," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+			<p>"I'm the partner at a law firm here in the city," <<npc $sex.npcId>><</npc>> says.</p>
 			"Oh wow. Impressive. Explains the condo."
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'investment_banker'>>
 			<<if $booty_call['loc'] != 'pc_home'>>
-				<p>"I work for one of the big banks here in the city," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+				<p>"I work for one of the big banks here in the city," <<npc $sex.npcId>><</npc>> says.</p>
 				<p>"Oh wow. Impressive. Explains the condo," you smirk. "So if I'm looking to start a career in finance I should come to you?"</p>
 			<<elseif $booty_call['loc'] == 'pc_home'>>
-				<p>"I work for one of the big banks here in the city," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+				<p>"I work for one of the big banks here in the city," <<npc $sex.npcId>><</npc>> says.</p>
 				<p>"And you come over to my place instead of inviting me over to yours?" you smirk. "So if I'm looking to start a career in finance I should come to you?"</p>
 			<<elseif $booty_call['loc'] == 'hotel'>>
 				<<if $region == 'pav'>>
-					<p>"I work for one of the big banks in the city," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+					<p>"I work for one of the big banks in the city," <<npc $sex.npcId>><</npc>> says.</p>
 					<p>"Oh wow. Impressive. Explains this fancy hotel room," you smirk sarcastically at the cheap decor of the motel. "So if I'm looking to start a career in finance I should come to you?"</p>
 				<<else>>
-					<p>"I work for one of the big banks here in the city," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+					<p>"I work for one of the big banks here in the city," <<npc $sex.npcId>><</npc>> says.</p>
 					<p>"Oh wow. Impressive. Explains this fancy hotel room," you smirk. "So if I'm looking to start a career in finance I should come to you?"</p>
 				<</if>>
 			<</if>>

+ 102 - 102
sugarcube/src/activities/dating/dateM.tw

@@ -53,14 +53,14 @@
 	<!-- !!1) Sveta in a school uniform-->
 	<<if $q.school.func('isWearingSchoolUniform')>>
 		<!-- !!		'You notice a guy of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair approaching you. He is wearing <<$boyClo>>.'-->
-		<!-- !!		'As he nears you, he presents himself; "Hi. My name is <<<<=$npcs.get($sex.npcId,'firstname')>>>>. What are you doing here all by yourself?"'-->
+		<!-- !!		'As he nears you, he presents himself; "Hi. My name is <<<<npc $sex.npcId>><</npc>>>>. What are you doing here all by yourself?"'-->
 		<p>"Hi. My name is <<=$npcs.get($dateNPCId,'firstname')>>. What are you doing here all by yourself?"</p>
 		<<actCLA 'Greet him'>>
 			<<set $time.minutes += 5>>
 
 			<<image $npcs.get($dateNPCId,'image')>>
 			<p>"Hi! My name is $pc.name_nick." you answer. "School just ended so I was trying to figure out what to do for the rest of the day."</p>
-			<p>"Oh really." After a moment of silence <<=$npcs.get($sex.npcId,'firstname')>> finally speaks up; "Don't take this the wrong way but what school do you attend?" he asks.</p>
+			<p>"Oh really." After a moment of silence <<npc $sex.npcId>><</npc>> finally speaks up; "Don't take this the wrong way but what school do you attend?" he asks.</p>
 			<<actCLA 'Don`t tell him which school'>>
 				<<image $npcs.get($dateNPCId,'image')>>
 				<p>You break out into laughter, "Why would I tell you that, for all I know you could be a rapist."</p>
@@ -106,7 +106,7 @@
 				<<actCLA 'Decline'>>
 					<<image $npcs.get($dateNPCId,'image')>>
 					As you're talking you get a creepy feeling about this guy, "I'm sorry but I just remembered I was supposed to meet a friend."
-					<p><<=$npcs.get($sex.npcId,'firstname')>> looks at you disappointed. "Oh, that's a shame. Could I get-..."</p>
+					<p><<npc $sex.npcId>><</npc>> looks at you disappointed. "Oh, that's a shame. Could I get-..."</p>
 					You're already moving away from him before he even finished his sentence not hearing what he wanted.
 					<<actCLA 'Continue'>>
 						<<gt $location>>
@@ -172,7 +172,7 @@
 					<<datingStart $dateNPCId>>
 					<<image $npcs.get($dateNPCId,'image')>>
 					"I'm busy right now." You tell him and watch him become disappointed. "But maybe I will get bored out of my skull and you will seem like a better open, so take my number and maybe I will answer if you call."
-					<p>He laughs at your response. "Thanks. I'll try to make sure to call you when you're really bored." <<=$npcs.get($sex.npcId,'firstname')>> adds your number to his contact list.</p>
+					<p>He laughs at your response. "Thanks. I'll try to make sure to call you when you're really bored." <<npc $sex.npcId>><</npc>> adds your number to his contact list.</p>
 					"Don't count on it loser." you answer.
 					<<actCLA 'Continue'>>
 						<<gt $location>>
@@ -181,8 +181,8 @@
 				<<actCLA 'Fuck off!'>>
 					<<image "pc/reactions/fuckoff1.jpg">>
 					<p>"Fuck off loser, I only date real men, the kinda that would kick your ass just for laughs!" you answer.</p>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> looks at you in shock as he was not ready for you to react that way. "Well, I thought we could just have a little fun together..."</p>
-					<p>As you're getting more annoyed you give him a shove making him back up a couple of steps. "Get the fuck out of here before I kick your ass!" <<=$npcs.get($sex.npcId,'firstname')>> seeing he's getting nowhere moves away quickly.</p>
+					<p><<npc $sex.npcId>><</npc>> looks at you in shock as he was not ready for you to react that way. "Well, I thought we could just have a little fun together..."</p>
+					<p>As you're getting more annoyed you give him a shove making him back up a couple of steps. "Get the fuck out of here before I kick your ass!" <<npc $sex.npcId>><</npc>> seeing he's getting nowhere moves away quickly.</p>
 					<<actCLA 'Continue'>>
 						<<gt $location>>
 					<</actCLA>>
@@ -213,7 +213,7 @@
 		<!-- !!3 - unattractive or average Sveta-->
 	<<elseif $pc.hotcat < 6>>
 		<!-- !!		'You notice a guy of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair approaching you. He is wearing <<$boyClo>>.'-->
-		<!-- !!		'As he nears you, he reaches out his hand for a handshake. "Hi. My name is <<<<=$npcs.get($sex.npcId,'firstname')>>>>."'-->
+		<!-- !!		'As he nears you, he reaches out his hand for a handshake. "Hi. My name is <<<<npc $sex.npcId>><</npc>>>>."'-->
 		<p>As he nears you, he reaches out his hand for a handshake. "Hi. My name is <<npc $dateNPCId>><</npc>>."</p>
 		<<actCLA 'Give him a fake number'>>
 			<<image $npcs.get($dateNPCId,'image')>>
@@ -246,14 +246,14 @@
 				<<actCLA 'I would love to'>>
 					<<image $npcs.get($dateNPCId,'image')>>
 					You think about it a moment and figure why not "Sure I would love to out with you."
-					<p>"Great!" answers <<=$npcs.get($sex.npcId,'firstname')>> "So, what do you want to do?".</p>
+					<p>"Great!" answers <<npc $sex.npcId>><</npc>> "So, what do you want to do?".</p>
 					<<gs 'dateM' 'date_choice'>>
 				<</actCLA>>
 				<<actCLA 'I would love to but can`t right now'>>
 					<<datingStart $dateNPCId>>
 					<<image $npcs.get($dateNPCId,'image')>>
 					<p>"I'm sorry, I would love to go on a date with you but I'm busy right. What if I give you my number so you can call me?"</p>
-					<p>"I say that's a great idea. I'll be in touch." <<=$npcs.get($sex.npcId,'firstname')>> adds your number to his contact list.</p>
+					<p>"I say that's a great idea. I'll be in touch." <<npc $sex.npcId>><</npc>> adds your number to his contact list.</p>
 					"You better be." you say teasingly.
 					<<actCLA 'Continue'>>
 						<<gt $location>>
@@ -285,22 +285,22 @@
 			<<set $time.minutes += 5>>
 
 			<<image $npcs.get($dateNPCId,'image')>>
-			<p>"Yeah, you heard me." said <<=$npcs.get($sex.npcId,'firstname')>>. "Don't act all that surprised, you're good-looking, I'm good-looking we would be the perfect couple, so what do you say?"</p>
+			<p>"Yeah, you heard me." said <<npc $sex.npcId>><</npc>>. "Don't act all that surprised, you're good-looking, I'm good-looking we would be the perfect couple, so what do you say?"</p>
 			"Isn''t someone full of confidence," you comment, seizing control of the conversation, as you contemplate your next move...
 			<<actCLA 'Remain silent'>>
 				<<image $npcs.get($dateNPCId,'image')>>
 				"Come on, gorgeous, don't give me the silent treatment."
 				As you hear the word gorgeous you melt straight away. You blush and mumble thanks, stammering like a buffoon.
-				<p><<=$npcs.get($sex.npcId,'firstname')>> noticing that you're having some trouble, smiles and tells you, "I'll ask you one more time, I don't want to come off as desperate." he says laughing.</p>
+				<p><<npc $sex.npcId>><</npc>> noticing that you're having some trouble, smiles and tells you, "I'll ask you one more time, I don't want to come off as desperate." he says laughing.</p>
 				"Someone not desperate would have introduced themselves first and told me their name first. I don't want to talk to a complete stranger."
-				<p>"<<=$npcs.get($sex.npcId,'firstname')>>! And yours?" he asks you confidently, seeing a glimmer of hope.</p>
+				<p>"<<npc $sex.npcId>><</npc>>! And yours?" he asks you confidently, seeing a glimmer of hope.</p>
 				<p>"$pc.name_nick." you answer.</p>
-				<p>"Just as I expected a beautiful name for a beautiful girl..." <<=$npcs.get($sex.npcId,'firstname')>> quickly replies.</p>
+				<p>"Just as I expected a beautiful name for a beautiful girl..." <<npc $sex.npcId>><</npc>> quickly replies.</p>
 				<!-- !!Go on date, same answer no matter what time of day or weather-->
 				<<actCLA 'Decline'>>
 					<<image $npcs.get($dateNPCId,'image')>>
 					"I'm sorry but I don't feel myself attracted to you enough and I don't want to lead you on."
-					<p><<=$npcs.get($sex.npcId,'firstname')>> looks at you disappointed. "Oh well, I didn't think I had a chance but you can't blame me for trying."</p>
+					<p><<npc $sex.npcId>><</npc>> looks at you disappointed. "Oh well, I didn't think I had a chance but you can't blame me for trying."</p>
 					The two of you say goodbye to each other.
 					<<actCLA 'Continue'>>
 						<<gt $location>>
@@ -317,14 +317,14 @@
 				<<actCLA 'Agree to a date'>>
 					<<image $npcs.get($dateNPCId,'image')>>
 					"Stop, you're making me blush again. Sure, sounds like fun, I would love to."
-					<p>"Great!" answers <<=$npcs.get($sex.npcId,'firstname')>> "So, what do you want to do gorgeous?".</p>
+					<p>"Great!" answers <<npc $sex.npcId>><</npc>> "So, what do you want to do gorgeous?".</p>
 					<<gs 'dateM' 'date_choice'>>
 				<</actCLA>>
 				<<actCLA 'I would love to but can`t right now'>>
 					<<datingStart $dateNPCId>>
 					<<image $npcs.get($dateNPCId,'image')>>
 					<p>"I'm sorry, I would love to go on a date with you but I'm busy right. What if I give you my number so you can call me?"</p>
-					<p>"I say that's a great idea. I'll be in touch." <<=$npcs.get($sex.npcId,'firstname')>> adds your number to his contact list.</p>
+					<p>"I say that's a great idea. I'll be in touch." <<npc $sex.npcId>><</npc>> adds your number to his contact list.</p>
 					"You better be." you say teasingly.
 					<<actCLA 'Continue'>>
 						<<gt $location>>
@@ -387,30 +387,30 @@
 	<<set $time.minutes += 30>>
 	<<image "locations/shared/park/walk_#.jpg" 1 2>>
 	"Since it's such a beautiful day today, let's go for a walk in the park." you suggest.
-	<p>"Sounds great. Lets go." <<=$npcs.get($sex.npcId,'firstname')>> walks with you towards the park.</p>
+	<p>"Sounds great. Lets go." <<npc $sex.npcId>><</npc>> walks with you towards the park.</p>
 	The two of you walk in the park for a while causally talking, getting knowing each other. After a while he suggests sitting down.
 	<!-- !!Jump to park-->
 	<<actCLA 'Watch people'>>
 		<<set $time.minutes += 45>>
 		<<image "locations/shared/date/parkwatch.jpg">>
-		<p>The two of you sit down and begin commenting on the people walking by. You laugh while <<=$npcs.get($sex.npcId,'firstname')>> makes up stories about their backgrounds and quirks.</p>
-		<p>There are a few times you almost get caught as you point and laugh. As you're sitting down an ice cream pushcart appears, generating quite a buzz around it. <<=$npcs.get($sex.npcId,'firstname')>> asks you, "I sure could go for some ice cream. Would you also like some ice cream?"</p>
+		<p>The two of you sit down and begin commenting on the people walking by. You laugh while <<npc $sex.npcId>><</npc>> makes up stories about their backgrounds and quirks.</p>
+		<p>There are a few times you almost get caught as you point and laugh. As you're sitting down an ice cream pushcart appears, generating quite a buzz around it. <<npc $sex.npcId>><</npc>> asks you, "I sure could go for some ice cream. Would you also like some ice cream?"</p>
 		<<actCLA 'Yeah'>>
 			<<set $time.minutes += 15>>
 			<<image "locations/shared/date/parkice.jpg">>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> runs away to the pushcart and comes back with two ice creams. "Here you go, $pc.name_nick I hope you'll enjoy it."</p>
-			<p>You nod and thank him. The two of you continue talking while eating the ice cream. As you finish <<=$npcs.get($sex.npcId,'firstname')>> asks, "Shall we move on?"</p>
+			<p><<npc $sex.npcId>><</npc>> runs away to the pushcart and comes back with two ice creams. "Here you go, $pc.name_nick I hope you'll enjoy it."</p>
+			<p>You nod and thank him. The two of you continue talking while eating the ice cream. As you finish <<npc $sex.npcId>><</npc>> asks, "Shall we move on?"</p>
 			<<actCLA 'Nod'>>
 				<<set $time.minutes += 15>>
 				<<image "locations/shared/date/parkholding.jpg">>
 				As you continue walking the two of you begin holding hands. You're really enjoying yourself by now everything is going really well.
-				<p>You don't even notice that the two of you strayed off the beaten path, all of a sudden <<=$npcs.get($sex.npcId,'firstname')>> stops and whispers in your ear, "Now that we're at a secluded spot, you know what would make this date even better?"</p>
+				<p>You don't even notice that the two of you strayed off the beaten path, all of a sudden <<npc $sex.npcId>><</npc>> stops and whispers in your ear, "Now that we're at a secluded spot, you know what would make this date even better?"</p>
 				<<actCLA 'What?'>>
 					<<image "locations/shared/date/parklean.jpg">>
-					<p>Before you're even able to respond <<=$npcs.get($sex.npcId,'firstname')>> leans in and kisses you on the lips.</p>
+					<p>Before you're even able to respond <<npc $sex.npcId>><</npc>> leans in and kisses you on the lips.</p>
 					<<actCLA 'Make out'>>
 						<<image "locations/shared/date/parkmake.jpg">>
-						<p>Feeling frisky you kiss <<=$npcs.get($sex.npcId,'firstname')>> back. Not before long the two of you are having a make out session, french kissing each other.</p>
+						<p>Feeling frisky you kiss <<npc $sex.npcId>><</npc>> back. Not before long the two of you are having a make out session, french kissing each other.</p>
 						You feel yourself getting more and more aroused, maybe you should stop before the situation escalates too much...
 						<<arouse 'kiss' 3 `['exhibitionism']`>>
 						<<actCLA 'Stop him'>>
@@ -425,15 +425,15 @@
 						<<actCLA 'Who cares'>>
 							<<image "locations/shared/date/parkkiss.jpg">>
 							You decide to ignore the little voice in your back head and continue on the make out session.
-							<p><<=$npcs.get($sex.npcId,'firstname')>> pulls you in closer and slowly begins rubbing your wet slit through your clothes. You let out a soft whimper as he's touching you.</p>
+							<p><<npc $sex.npcId>><</npc>> pulls you in closer and slowly begins rubbing your wet slit through your clothes. You let out a soft whimper as he's touching you.</p>
 							<<arouse 'kiss' 4 `['exhibitionism']`>>
-							<p>As you're pressed against <<=$npcs.get($sex.npcId,'firstname')>> you feel his bulge through his pants. The two of you quickly remove your clothes, playing with each other's sensitive parts.</p>
+							<p>As you're pressed against <<npc $sex.npcId>><</npc>> you feel his bulge through his pants. The two of you quickly remove your clothes, playing with each other's sensitive parts.</p>
 							<<actCLA 'On your knees'>>
 								<<image "locations/shared/date/parkhj.jpg">>
 								<p>You give him a lustful smirk and get down on your knees. You quickly unbutton his pants and let his semi-grown cock hang loose.</p>
 								Looking at it you say, "Let me help you get ready for what''s to come." as you grab it with your hand and start jerking him off.
-								<p><<=$npcs.get($sex.npcId,'firstname')>> lets out a groan and you feel his cock growing bigger and bigger. After a minute or so his cock is pulsating and you're ready to move on.</p>
-								<p>You keep teasing him on as you lick his penis head and penis shaft. <<=$npcs.get($sex.npcId,'firstname')>>'s cock twitches as you keep licking him.</p>
+								<p><<npc $sex.npcId>><</npc>> lets out a groan and you feel his cock growing bigger and bigger. After a minute or so his cock is pulsating and you're ready to move on.</p>
+								<p>You keep teasing him on as you lick his penis head and penis shaft. <<npc $sex.npcId>><</npc>>'s cock twitches as you keep licking him.</p>
 								<<arouse 'hj' 4 `['exhibitionism']`>>
 								<<arouse 'bj' 4 `['exhibitionism']`>>
 								<<actCLA 'Give blowjob'>>
@@ -444,17 +444,17 @@
 									<p>"Damn, $pc.name_nick, you're really a good little cocksucker. How about you get on all fours so I can enjoy that little pussy of yours?"</p>
 									<<actCLA 'Doggy'>>
 										<<image "locations/shared/date/parkdoggy.jpg">>
-										<p>You're already wet and ready for him as you spread your legs as he bends down. <<=$npcs.get($sex.npcId,'firstname')>> slowly runs his shaft along your wet pussy teasing you right back as a payback for before.</p>
-										<p>You let out a sigh as he slowly enters you. Holding your waist, <<=$npcs.get($sex.npcId,'firstname')>> slowly increases his pace. It doesn't take long for him to be at full pace. You feel great as his strong member alternately fills and pleasantly stretches your pussy.</p>
+										<p>You're already wet and ready for him as you spread your legs as he bends down. <<npc $sex.npcId>><</npc>> slowly runs his shaft along your wet pussy teasing you right back as a payback for before.</p>
+										<p>You let out a sigh as he slowly enters you. Holding your waist, <<npc $sex.npcId>><</npc>> slowly increases his pace. It doesn't take long for him to be at full pace. You feel great as his strong member alternately fills and pleasantly stretches your pussy.</p>
 										<<set $orgasm_or = 'custom'>>
 										<<set $orgasm_txt = 'Suddenly, $npcs.get($sex.npcId,'firstname') pounds you at just the right pace and your whole body starts to shiver in orgasm. The intensity of the orgasm nearly makes you scream, but you bite down on your lip and do your best to stifle down the moans so no one hears you.'>>
 										<<arouse 'vaginal' 6 `['exhibitionism']`>>
-										<p>Even <<=$npcs.get($sex.npcId,'firstname')>> is groaning and grimacing badly by now ready to cum.</p>
+										<p>Even <<npc $sex.npcId>><</npc>> is groaning and grimacing badly by now ready to cum.</p>
 										<<actCLA 'Finish'>>
 											<<set $time.minutes += 10>>
 											<<gs 'cum_call' 'labia' $boydesc>>
 											<<image "locations/shared/date/parkfinish.jpg">>
-											<p><<=$npcs.get($sex.npcId,'firstname')>> can't contain himself anymore, he's loudly groaning and as soon he pulls out of you he cums coating your pussy lips.</p>
+											<p><<npc $sex.npcId>><</npc>> can't contain himself anymore, he's loudly groaning and as soon he pulls out of you he cums coating your pussy lips.</p>
 											Both of you fall down to the ground, breathing heavily, trying to come to your senses. After a while you into his eyes and start laughing.
 											<p>"That was great $pc.name_nick. We'll have to do this again." You get up and clean yourself, straightening out your clothes the best you can. "Shall we head back?" you ask.</p>
 											<<actCLA 'Walk back'>>
@@ -470,7 +470,7 @@
 						<<set $time.minutes += 5>>
 						<<image "locations/shared/date/parkback.jpg">>
 						At first you are surprised by the kiss and return it but quickly you pull back as you push him away. "Stop, I'm enjoying the date but I'm not that kind of girl if you thought otherwise."
-						<p>He shakes his head. "No, not at all. I'm not going to make you do something you don't want." <<=$npcs.get($sex.npcId,'firstname')>> answers.</p>
+						<p>He shakes his head. "No, not at all. I'm not going to make you do something you don't want." <<npc $sex.npcId>><</npc>> answers.</p>
 						<<actCLA 'Walk back'>>
 							<<gt 'dateM' 'walk_back'>>
 						<</actCLA>>
@@ -484,11 +484,11 @@
 	<<set $time.minutes += 10>>
 	<<image "locations/shared/date/parkholding.jpg">>
 	As you finish up the two still holding hands walk all the way back to the park entrance. You stand there for a while feeling that awkward silence creeping up as neither of you know how to end the date.
-	<p>"I've had a great time." you say smiling. "Yeah, me too..." <<=$npcs.get($sex.npcId,'firstname')>> says quietly. "Could I get your number so I can call you?"</p>
+	<p>"I've had a great time." you say smiling. "Yeah, me too..." <<npc $sex.npcId>><</npc>> says quietly. "Could I get your number so I can call you?"</p>
 	<<actCLA 'Sure'>>
 		<<datingStart $dateNPCId>>
 		<<image "locations/shared/date/givenumber.jpg">>
-		<p>You give <<=$npcs.get($sex.npcId,'firstname')>> your number. "Now I really hope you don't forget to call me." you tell him. "Oh, don't worry about that I'll be in touch." he says.</p>
+		<p>You give <<npc $sex.npcId>><</npc>> your number. "Now I really hope you don't forget to call me." you tell him. "Oh, don't worry about that I'll be in touch." he says.</p>
 		You end the date by him giving you a kiss on the cheek.
 		<<actCLA 'Leave'>>
 			<<gt $location>>
@@ -498,7 +498,7 @@
 		<<image "locations/shared/date/datereject.jpg">>
 		"I've really enjoyed the date but I'm sorry I can't give you my number..."
 		"But why, I thought..." Before he continues you stop him telling him that you're sorry once again but that it won''t work out between the two of you.
-		<p><<=$npcs.get($sex.npcId,'firstname')>> disappointingly looks at you, "Well at least I gave it my best shot who knows maybe I'll meet you once again."</p>
+		<p><<npc $sex.npcId>><</npc>> disappointingly looks at you, "Well at least I gave it my best shot who knows maybe I'll meet you once again."</p>
 		<<actCLA 'Leave'>>
 			<<gt $location>>
 		<</actCLA>>
@@ -511,20 +511,20 @@
 	<<set $location_type = 'public_indoors'>>
 	<<set $time.minutes += 15>>
 	<<image "locations/pavlovsk/park/theater/kinoteatr.jpg">>
-	<p>"How about we go and see a movie?" you ask <<=$npcs.get($sex.npcId,'firstname')>></p>
+	<p>"How about we go and see a movie?" you ask <<npc $sex.npcId>><</npc>></p>
 	"Sounds like a great idea. There''s a movie theater nearby."
 	You arrive at the movie theater and look at the display showing what movies are playing right now.
 	<<actCLA 'Decide on a movie'>>
 		<<set $time.minutes += 5>>
 		<<image "locations/pavlovsk/park/theater/cinema.jpg">>
-		<p>"How about this one?" <<=$npcs.get($sex.npcId,'firstname')>> points at a movie.</p>
+		<p>"How about this one?" <<npc $sex.npcId>><</npc>> points at a movie.</p>
 		<p>You shake your head, "No, I'm not in the mood for that. How about this one?" you point at a comedy.</p>
 		"Perfect, I love comedies." he comments.
 		<<actCLA 'Buy tickets'>>
 			<<set $time.minutes += 5>>
 			<<image "locations/shared/cinema/theaterbuy.jpg">>
-			<p>You and <<=$npcs.get($sex.npcId,'firstname')>> stand in line waiting to approach the box office.</p>
-			<p>As you've bought the tickets, <<=$npcs.get($sex.npcId,'firstname')>> asks, "Would you like something from the concession stand?"</p>
+			<p>You and <<npc $sex.npcId>><</npc>> stand in line waiting to approach the box office.</p>
+			<p>As you've bought the tickets, <<npc $sex.npcId>><</npc>> asks, "Would you like something from the concession stand?"</p>
 			<p>"Yeah, I would love some popcorn!" you answer excitingly.</p>
 			He smiles and walks over to the concession stand, returning with a big popcorn tub, handing it over to you.
 			You shine up immediately, thanking him for buying it for you.
@@ -537,55 +537,55 @@
 				<<actCLA 'Eat some popcorn'>>
 					<<set $time.minutes += 15>>
 					<<image "locations/shared/cinema/kino_#.jpg" 1 3>>
-					<p>As you're about to grab some popcorn from the tub, <<=$npcs.get($sex.npcId,'firstname')>> unknowingly goes to grab some popcorn too, touching your hand.</p>
+					<p>As you're about to grab some popcorn from the tub, <<npc $sex.npcId>><</npc>> unknowingly goes to grab some popcorn too, touching your hand.</p>
 					<p>He's startled as he didn't expect your hand to be there either. You acknowledge his touch by teasingly whispering, "Are you trying to make a move on me?"</p>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> nervously smiles at you. "Sorry it wasn't my intentions to make you feel uncomfortable."</p>
+					<p><<npc $sex.npcId>><</npc>> nervously smiles at you. "Sorry it wasn't my intentions to make you feel uncomfortable."</p>
 					<<actCLA 'Tease him' undefined `{willpower:['exhib','self']}`>>
 
 							<<set $time.minutes += 5>>
 							<<image "locations/shared/date/theatertease.jpg">>
 							Feeling frisky and not wanting to let go of the opportunity you tell him, "Come on, no need to get so defensive. Let me show you a thing."
-							<p>You look around checking if everyone else is concentrating on the movie and then quickly remove your top. <<=$npcs.get($sex.npcId,'firstname')>> not knowing how to respond looks in awe. Not wanting to wait on him anymore you decide to take action.</p>
+							<p>You look around checking if everyone else is concentrating on the movie and then quickly remove your top. <<npc $sex.npcId>><</npc>> not knowing how to respond looks in awe. Not wanting to wait on him anymore you decide to take action.</p>
 							"Let me show you a great time." you slyly tell him. "Just relax and enjoy yourself."
 							<<actCLA 'Get on your knees'>>
 								<<image "locations/shared/date/theaterbj.jpg">>
-								<p>You go down on your knees removing your shirt and bra showing your body to <<=$npcs.get($sex.npcId,'firstname')>>. You begin playing with his rock hard penis through the pants.</p>
-								<p><<=$npcs.get($sex.npcId,'firstname')>> looks at you with lust. His eyes are quite revealing, he wants you to please him with your mouth and he wants it now.</p>
-								<p>You unbutton his pants and pull down his briefs. The rock hard cock pops out while you look at <<=$npcs.get($sex.npcId,'firstname')>> smiling. "Keep quiet now we don't want to get caught."</p>
-								<p>You grab <<=$npcs.get($sex.npcId,'firstname')>> by the shaft and your lips embrace the top of his cock. After a while you pick up the pace moving the head up and down while <<=$npcs.get($sex.npcId,'firstname')>> is trying his best to keep quiet.</p>
+								<p>You go down on your knees removing your shirt and bra showing your body to <<npc $sex.npcId>><</npc>>. You begin playing with his rock hard penis through the pants.</p>
+								<p><<npc $sex.npcId>><</npc>> looks at you with lust. His eyes are quite revealing, he wants you to please him with your mouth and he wants it now.</p>
+								<p>You unbutton his pants and pull down his briefs. The rock hard cock pops out while you look at <<npc $sex.npcId>><</npc>> smiling. "Keep quiet now we don't want to get caught."</p>
+								<p>You grab <<npc $sex.npcId>><</npc>> by the shaft and your lips embrace the top of his cock. After a while you pick up the pace moving the head up and down while <<npc $sex.npcId>><</npc>> is trying his best to keep quiet.</p>
 								<<arouse 'bj' 5 `['dom','exhibitionism']`>>
 								<<actCLA 'Lay down on the seat'>>
 									<<image "locations/shared/date/theatercuni.jpg">>
 									After a few minutes you stop and get up, lean into him telling him that it's his turn to impress you.
-									<p>You lay down on the empty seats next to you and spread your legs. <<=$npcs.get($sex.npcId,'firstname')>> by now very aroused dives in and begins playing with your wet clit.</p>
+									<p>You lay down on the empty seats next to you and spread your legs. <<npc $sex.npcId>><</npc>> by now very aroused dives in and begins playing with your wet clit.</p>
 									His tongue does wonders to your clit and there are a few times you can't contain yourself just wanting to scream out loud in pleasure.
 									<<arouse 'cuni' 5 `['dom','exhibitionism']`>>
 									<<actCLA 'Reverse cowgirl'>>
 										<<image "locations/shared/date/theatercow.jpg">>
 										He stops to let you rest just as you're nearing the orgasm, feeling irritated you decide to get even.
-										<p>You make <<=$npcs.get($sex.npcId,'firstname')>> sit down again and plant yourself on top of his cock, letting out a quiet whimper as you don't want the guy in front of you to find out what the two of you are doing.</p>
-										<p>As you control the pace you switch it up multiple times bouncing up and down as you see this as a payback for not letting you orgasm before. <<=$npcs.get($sex.npcId,'firstname')>> is clearly having some trouble holding himself as his cock is growing inside you.</p>
+										<p>You make <<npc $sex.npcId>><</npc>> sit down again and plant yourself on top of his cock, letting out a quiet whimper as you don't want the guy in front of you to find out what the two of you are doing.</p>
+										<p>As you control the pace you switch it up multiple times bouncing up and down as you see this as a payback for not letting you orgasm before. <<npc $sex.npcId>><</npc>> is clearly having some trouble holding himself as his cock is growing inside you.</p>
 										<<arouse 'vaginal' 5 `['dom','exhibitionism']`>>
 										<<actCLA 'Back to laying down'>>
 											<<gs 'cum_call' 'stomach' $boydesc>>
 											<<gs 'cum_call' 'breasts' $boydesc>>
 											<<image "locations/shared/date/theatervag.jpg">>
-											<p>By now <<=$npcs.get($sex.npcId,'firstname')>> is almost drained and the smallest touch would make him cum. You decide to give him a breather as you once again lay down spreading your legs once again while your pussy juice drips all over the seat.</p>
-											<p>As soon as <<=$npcs.get($sex.npcId,'firstname')>> enters you he's already heavily panting. You whisper angrily to him "Don't you dare cum yet. I'm still not pleased." <<=$npcs.get($sex.npcId,'firstname')>> does his best and keeps thrusting for a minute or two not being able to hold on anymore.</p>
+											<p>By now <<npc $sex.npcId>><</npc>> is almost drained and the smallest touch would make him cum. You decide to give him a breather as you once again lay down spreading your legs once again while your pussy juice drips all over the seat.</p>
+											<p>As soon as <<npc $sex.npcId>><</npc>> enters you he's already heavily panting. You whisper angrily to him "Don't you dare cum yet. I'm still not pleased." <<npc $sex.npcId>><</npc>> does his best and keeps thrusting for a minute or two not being able to hold on anymore.</p>
 											<<arouse 'vaginal' 5 `['dom','exhibitionism']`>>
 											He starts groaning pulling out his cock out of you and shoots the load all over you. His warm spunk hits your stomach and breast as he jerks out the last drips. You take your finger and swipe a small sample off your stomach putting it in your mouth. It tastes great.
 											<<actCLA 'Caught'>>
 												<<set $time.minutes += 10>>
 												<<image "locations/shared/date/theatercaught.jpg">>
-												<p>While the two of you are returning to your senses all of a sudden someone flashes a light at you. It's the usher... You're totally caught as you're still laying down naked with <<=$npcs.get($sex.npcId,'firstname')>> cum splattered all over you.</p>
-												<p>"What the hell are you two doing!" the usher yells. The guy that sat in front of you stands up noticing you laying naked quickly picks up the phone and tries taking some pictures. <<=$npcs.get($sex.npcId,'firstname')>> pulls up his pants and gets dressed, leaving you all naked to fend for yourself.</p>
+												<p>While the two of you are returning to your senses all of a sudden someone flashes a light at you. It's the usher... You're totally caught as you're still laying down naked with <<npc $sex.npcId>><</npc>> cum splattered all over you.</p>
+												<p>"What the hell are you two doing!" the usher yells. The guy that sat in front of you stands up noticing you laying naked quickly picks up the phone and tries taking some pictures. <<npc $sex.npcId>><</npc>> pulls up his pants and gets dressed, leaving you all naked to fend for yourself.</p>
 												"Kids these days. It's the third time I catch couples doing this shit this week. Pick up your stuff and get the hell out of here, you're lucky I don't have the time to call the cops."
-												<p>You're blemishing red as you quickly get dressed, grabbing your stuff, running out of the theater. You can hear some of the other people commenting on the situation as you walk past them. <<=$npcs.get($sex.npcId,'firstname')>> is walking besides you and also has his head down looking at the ground as ashamed as you.</p>
+												<p>You're blemishing red as you quickly get dressed, grabbing your stuff, running out of the theater. You can hear some of the other people commenting on the situation as you walk past them. <<npc $sex.npcId>><</npc>> is walking besides you and also has his head down looking at the ground as ashamed as you.</p>
 												<<actCLA 'Outside'>>
 													<<set $location_type = 'public_outdoors'>>
 													<<set $time.minutes += 5>>
 													<<image "locations/pavlovsk/park/theater/kinoteatr.jpg">>
-													<p>"Wow, that's never happened to me before." <<=$npcs.get($sex.npcId,'firstname')>> tells you.</p>
+													<p>"Wow, that's never happened to me before." <<npc $sex.npcId>><</npc>> tells you.</p>
 													"I only regret us getting caught. If we've only been able to keep quiet. Nothing do anything about that now." you say smiling.
 													<p>"I guess I should ask for your for your number now that we've got to know each other really well?"</p>
 													<<actCLA 'Sure'>>
@@ -605,13 +605,13 @@
 					<<actCLA 'Keep watching the movie'>>
 						<<set $time.minutes += 45>>
 						<<image "locations/shared/cinema/kino_#.jpg" 1 3>>
-						<p>After a while <<=$npcs.get($sex.npcId,'firstname')>> leans towards you and whispers if you're enjoying yourself.</p>
+						<p>After a while <<npc $sex.npcId>><</npc>> leans towards you and whispers if you're enjoying yourself.</p>
 						You turn to him nodding, as you're nodding he leans in once again and gives you a kiss. The two of you hold hands for the rest of the movie.
 						<<actCLA 'Outside'>>
 							<<set $location_type = 'public_outdoors'>>
 							<<set $time.minutes += 5>>
 							<<image "locations/pavlovsk/park/theater/kinoteatr.jpg">>
-							<p>The movie finishes and the lights get turned on. You and <<=$npcs.get($sex.npcId,'firstname')>> walk outside where you talk about how funny the movie was.</p>
+							<p>The movie finishes and the lights get turned on. You and <<npc $sex.npcId>><</npc>> walk outside where you talk about how funny the movie was.</p>
 							"I enjoyed the kissing part more." you say to him. He blushes a bit as you compliment him.
 							<p>"Glad to hear that. I guess then I'm not coming on to strong asking you for your number?"</p>
 							<<actCLA 'Sure'>>
@@ -630,7 +630,7 @@
 <<if $location_var[$here][0] == 'cinema_sure'>>
 	<<datingStart $dateNPCId>>
 	<<image "locations/shared/date/givenumber.jpg">>
-	<p>You give <<=$npcs.get($sex.npcId,'firstname')>> your number. "Now I really hope you don't forget to call me." you tell him. "Oh, don't worry about that I'll be in touch." he says.</p>
+	<p>You give <<npc $sex.npcId>><</npc>> your number. "Now I really hope you don't forget to call me." you tell him. "Oh, don't worry about that I'll be in touch." he says.</p>
 	You end the date by him giving you a kiss on the cheek.
 	<<actCLA 'Leave'>>
 		<<gt $location>>
@@ -640,7 +640,7 @@
 	<<image "locations/shared/date/datereject.jpg">>
 	"I've really enjoyed the date but I'm sorry I can't give you my number..."
 	"But why, I thought..." Before he continues you stop him telling him that you're sorry once again but that it won''t work out between the two of you.
-	<p><<=$npcs.get($sex.npcId,'firstname')>> disappointingly looks at you, "Well at least I gave it my best shot who knows maybe I'll meet you once again."</p>
+	<p><<npc $sex.npcId>><</npc>> disappointingly looks at you, "Well at least I gave it my best shot who knows maybe I'll meet you once again."</p>
 	<<actCLA 'Leave'>>
 		<<gt $location>>
 	<</actCLA>>
@@ -653,21 +653,21 @@
 	<<set $location_type = 'public_indoors'>>
 	<<set $time.minutes += 15>>
 	<<image "locations/shared/date/cafe.jpg">>
-	<p>"How about a coffee?" you ask <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+	<p>"How about a coffee?" you ask <<npc $sex.npcId>><</npc>>.</p>
 	<p>"Great idea $pc.name_nick I know a great place."</p>
 	The two of you enter the café and find a secluded spot where you can be left alone.
 	<<actCLA 'Interact'>>
 		<<set $time.minutes += 10>>
 		<<image "locations/shared/date/cafetalk.jpg">>
-		<p>"This is a nice spot. So tell me about yourself $pc.name_nick?" <<=$npcs.get($sex.npcId,'firstname')>> asks as soon as you sit down.</p>
-		<p>You tell him a little about your family, where you're from and the likes. All while <<=$npcs.get($sex.npcId,'firstname')>> carefully listens to your every word just like he's analyzing you in his head.</p>
+		<p>"This is a nice spot. So tell me about yourself $pc.name_nick?" <<npc $sex.npcId>><</npc>> asks as soon as you sit down.</p>
+		<p>You tell him a little about your family, where you're from and the likes. All while <<npc $sex.npcId>><</npc>> carefully listens to your every word just like he's analyzing you in his head.</p>
 		The conversation takes a deeper meaning as he keeps probing you with more serious questions about you.
 		<<actCLA 'Order'>>
 			<<set $time.minutes += 5>>
 			<<image "locations/shared/date/cafewaitress.jpg">>
 			As you prepare yourself to answer another one of his questions the waitress comes over, asking nervously if you're ready to order. "Poor girl..." you think "she's probably just started working here."
-			<p>She scribbles down your order, as she re-reads the order, she manages to stammer through your order but when it comes to <<=$npcs.get($sex.npcId,'firstname')>> she messes up.</p>
-			<p>"What is wrong with you? Can't you write down a simple order?" <<=$npcs.get($sex.npcId,'firstname')>> reacts.</p>
+			<p>She scribbles down your order, as she re-reads the order, she manages to stammer through your order but when it comes to <<npc $sex.npcId>><</npc>> she messes up.</p>
+			<p>"What is wrong with you? Can't you write down a simple order?" <<npc $sex.npcId>><</npc>> reacts.</p>
 			You sit there looking in shock wondering what you should do...
 			<<actCLA 'React' undefined `{willpower:['misc','self']}`>>
 
@@ -675,8 +675,8 @@
 					<<set $time.minutes += 10>>
 					<<image "locations/shared/date/cafereact.jpg">>
 					The poor waitress returns after a while with your order. You look at her with an apologetic look.
-					<p>"Hope everything is in order." <<=$npcs.get($sex.npcId,'firstname')>> says. Feeling a bit irritated you kick him under the table, while thanking her.</p>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> looks at you in dispair, "What? Did I do anything wrong?"</p>
+					<p>"Hope everything is in order." <<npc $sex.npcId>><</npc>> says. Feeling a bit irritated you kick him under the table, while thanking her.</p>
+					<p><<npc $sex.npcId>><</npc>> looks at you in dispair, "What? Did I do anything wrong?"</p>
 					"Well, first off, you don't need to be a jerk to the waitress." you angrily tell him.
 					"I'm sorry but I'm just really nervous being on a date with you so I acted out." You can see that he's remorseful but you still don't want to carry on a conversation with him.
 					<<actCLA 'Continue date'>>
@@ -688,9 +688,9 @@
 
 
 					<<image "locations/shared/date/cafetelloff.jpg">>
-					<p>Not liking the way <<=$npcs.get($sex.npcId,'firstname')>> treated the waitress you go on the attack against <<=$npcs.get($sex.npcId,'firstname')>>. You're appalled by how he behaves. With such poor first-impression you decide you don't ever want to see this bottom-feeder again.</p>
+					<p>Not liking the way <<npc $sex.npcId>><</npc>> treated the waitress you go on the attack against <<npc $sex.npcId>><</npc>>. You're appalled by how he behaves. With such poor first-impression you decide you don't ever want to see this bottom-feeder again.</p>
 					"You should really learn some manners. To treat a human being like that is despicable. You should be ashamed of yourself."
-					<p><<=$npcs.get($sex.npcId,'firstname')>> looks at you in fear as he wasn't expecting you to react like that.</p>
+					<p><<npc $sex.npcId>><</npc>> looks at you in fear as he wasn't expecting you to react like that.</p>
 					<p>"Nothing to say? No need to, I'm done. Enjoy the date alone you loser." You quickly get up and walk out of the café.</p>
 					<<actCLA 'Rush out'>>
 						<<gt $location>>
@@ -701,8 +701,8 @@
 				<<set $time.minutes += 10>>
 				<<image "locations/shared/date/cafequiet.jpg">>
 				The poor waitress returns after a while with your order. You look at her with an apologetic look.
-				<p>"Hope everything is in order." <<=$npcs.get($sex.npcId,'firstname')>> says. You're not confident enough commenting on how an unknown person is behaving so you keep your mouth shut.</p>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> looks at with confidence, "What? She had it coming. I get irritated by weak people."</p>
+				<p>"Hope everything is in order." <<npc $sex.npcId>><</npc>> says. You're not confident enough commenting on how an unknown person is behaving so you keep your mouth shut.</p>
+				<p><<npc $sex.npcId>><</npc>> looks at with confidence, "What? She had it coming. I get irritated by weak people."</p>
 				You nod in agreement not wanting egging him on.
 				<<actCLA 'Continue date'>>
 					<<gt 'dateM' 'cafepeople'>>
@@ -713,8 +713,8 @@
 				<<image "locations/shared/date/cafemad.jpg">>
 				"Yeah, I can't believe this place hired someone this bad."
 				The waitress returns after a while with your order. You look at her angrily.
-				<p>"Hope everything is in order." <<=$npcs.get($sex.npcId,'firstname')>> says. "Yeah, it would be a shame if we needed to talk with the manager." you sourly tell her.</p>
-				<p>The waitress asks for forgiveness once again before going away. <<=$npcs.get($sex.npcId,'firstname')>> looks at you impressed, "I must say, the way you handled her was perfect. I'm getting so turned on."</p>
+				<p>"Hope everything is in order." <<npc $sex.npcId>><</npc>> says. "Yeah, it would be a shame if we needed to talk with the manager." you sourly tell her.</p>
+				<p>The waitress asks for forgiveness once again before going away. <<npc $sex.npcId>><</npc>> looks at you impressed, "I must say, the way you handled her was perfect. I'm getting so turned on."</p>
 				"Thanks, one should not be accepting bad service no matter who you are."
 				<<actCLA 'Continue date'>>
 					<<gt 'dateM' 'cafepeople'>>
@@ -726,7 +726,7 @@
 <<if $location_var[$here][0] == 'cafepeople'>>
 	<<set $time.minutes += 15>>
 	<<image "locations/shared/date/cafewatching.jpg">>
-	<p>The two of you sit there awkwardly in silence for a while when all of a sudden both of you react to a man sitting a bit further away. You begin laughing while <<=$npcs.get($sex.npcId,'firstname')>> makes up stories about his background and quirks.</p>
+	<p>The two of you sit there awkwardly in silence for a while when all of a sudden both of you react to a man sitting a bit further away. You begin laughing while <<npc $sex.npcId>><</npc>> makes up stories about his background and quirks.</p>
 	There are a few times you almost get caught by the man as you point and laugh.
 	<<actCLA 'Finish the date'>>
 		<<gt 'dateM' 'cafeend'>>
@@ -735,12 +735,12 @@
 <<if $location_var[$here][0] == 'cafeend'>>
 	<<set $time.minutes += 5>>
 	<<image "locations/shared/date/cafefinish.jpg">>
-	<p>After a while you end observing the man and tell <<=$npcs.get($sex.npcId,'firstname')>>, "Well, thanks for the coffee but I should be on my way."</p>
-	<p>"I had a great time, you're really fun to hang out with." <<=$npcs.get($sex.npcId,'firstname')>> tells you. "Could I get your number?"</p>
+	<p>After a while you end observing the man and tell <<npc $sex.npcId>><</npc>>, "Well, thanks for the coffee but I should be on my way."</p>
+	<p>"I had a great time, you're really fun to hang out with." <<npc $sex.npcId>><</npc>> tells you. "Could I get your number?"</p>
 	<<actCLA 'Sure'>>
 		<<datingStart $dateNPCId>>
 		<<image "locations/shared/date/givenumber.jpg">>
-		<p>You give <<=$npcs.get($sex.npcId,'firstname')>> your number. "Now I really hope you don't forget to call me." you tell him. "Oh, don't worry about that I'll be in touch." he says.</p>
+		<p>You give <<npc $sex.npcId>><</npc>> your number. "Now I really hope you don't forget to call me." you tell him. "Oh, don't worry about that I'll be in touch." he says.</p>
 		You end the date by him giving you a kiss on the cheek.
 		<<actCLA 'Leave'>>
 			<<gt $location>>
@@ -750,7 +750,7 @@
 		<<image "locations/shared/date/datereject.jpg">>
 		<p>"I've really enjoyed the date but I'm not impressed by your first-impression, you were too harsh to that waitress..."</p>
 		"But why, I thought..." Before he continues you stop him telling him that you're sorry once again but that it won''t work out between the two of you.
-		<p><<=$npcs.get($sex.npcId,'firstname')>> disappointingly looks at you, "Well at least I gave it my best shot who knows maybe I'll meet you once again."</p>
+		<p><<npc $sex.npcId>><</npc>> disappointingly looks at you, "Well at least I gave it my best shot who knows maybe I'll meet you once again."</p>
 		<<actCLA 'Leave'>>
 			<<gt $location>>
 		<</actCLA>>
@@ -763,16 +763,16 @@
 	<<set $location_type = 'public_indoors'>>
 	<<set $time.minutes += 20>>
 	<<image "locations/shared/date/barinside.jpg">>
-	<p>"How about going to a bar?" you ask <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+	<p>"How about going to a bar?" you ask <<npc $sex.npcId>><</npc>>.</p>
 	<p>"Great idea $pc.name_nick I know a great bar with great drinks and lightning."</p>
 	The two of you enter this buzzing hip bar and find a spot where you have a great overview over the place.
 	<<actCLA 'Order'>>
 		<<image "locations/shared/date/bardrink1.jpg">>
-		<p>As you sit down <<=$npcs.get($sex.npcId,'firstname')>> asks you, "Would you like to drink something?"</p>
+		<p>As you sit down <<npc $sex.npcId>><</npc>> asks you, "Would you like to drink something?"</p>
 		<<actCLA 'I`ll have a beer, thanks'>>
 			<<gs 'drugs' 'alcohol' 'beer'>>
 			<<image "locations/shared/date/barorder_#.jpg" 1 2>>
-			<p>"My kind of girl." <<=$npcs.get($sex.npcId,'firstname')>> tells you.</p>
+			<p>"My kind of girl." <<npc $sex.npcId>><</npc>> tells you.</p>
 			<<actCLA 'Talk'>>
 				<<gt 'dateM' 'bartalk'>>
 			<</actCLA>>
@@ -780,7 +780,7 @@
 		<<actCLA 'I`ll have some hard liquor, thanks'>>
 			<<gs 'drugs' 'alcohol' 'vodka'>>
 			<<image "locations/shared/date/barorder_#.jpg" 1 2>>
-			<p>"My kind of girl." <<=$npcs.get($sex.npcId,'firstname')>> tells you.</p>
+			<p>"My kind of girl." <<npc $sex.npcId>><</npc>> tells you.</p>
 			<<actCLA 'Talk'>>
 				<<gt 'dateM' 'bartalk'>>
 			<</actCLA>>
@@ -790,15 +790,15 @@
 <<if $location_var[$here][0] == 'bartalk'>>
 	<<set $time.minutes += 15>>
 	<<image "locations/shared/date/barinside.jpg">>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> goes to the bar counter and after a while returns with the drinks.</p>
-	<p>"This place is packed." you say to <<=$npcs.get($sex.npcId,'firstname')>></p>
+	<p><<npc $sex.npcId>><</npc>> goes to the bar counter and after a while returns with the drinks.</p>
+	<p>"This place is packed." you say to <<npc $sex.npcId>><</npc>></p>
 	"Yeah, it's pretty cool, I think it's the night when there is a band playing live here, so I guess that's why it's so packed."
 	<<actCLA 'Continue on'>>
 		<<set $time.minutes += 10>>
 		<<image "locations/shared/date/barband.jpg">>
 		As you sit there talking to each other, the lights suddenly go dim and you hear a guitar riff playing.
-		<p>The band steps out and starts playing. You're amazed over how well they play and turn to <<=$npcs.get($sex.npcId,'firstname')>> "They are pretty good don't you think?"</p>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> nods his head. "Yeah they are, do you want another drink?"</p>
+		<p>The band steps out and starts playing. You're amazed over how well they play and turn to <<npc $sex.npcId>><</npc>> "They are pretty good don't you think?"</p>
+		<p><<npc $sex.npcId>><</npc>> nods his head. "Yeah they are, do you want another drink?"</p>
 		<!-- !!add to buzz-->
 		<<actCLA 'Sure'>>
 			<<gs 'drugs' 'alcohol' 'vodka'>>
@@ -806,15 +806,15 @@
 			<<image "locations/shared/date/bardiscuss.jpg">>
 			<p>"Are you trying to get me drunk?" you say winking towards him.</p>
 			"No comments." he responds smiling.
-			<p>"Well, I'm having a great time so why not." <<=$npcs.get($sex.npcId,'firstname')>> goes over to the counter and returns with two new drinks.</p>
+			<p>"Well, I'm having a great time so why not." <<npc $sex.npcId>><</npc>> goes over to the counter and returns with two new drinks.</p>
 			<<if $pc.skillLevel("dance") > 30>>
 				<<actCLA 'Dance'>>
 					<<set $time.minutes += 10>>
 					<<image "locations/shared/date/bardancing.jpg">>
 					Some time goes by and you're not able to contain yourself anymore, you got to dance.
-					<p>"Would you like to dance?" you ask <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+					<p>"Would you like to dance?" you ask <<npc $sex.npcId>><</npc>>.</p>
 					He shakes his head. "I am no dancer, but you should if you want to dance." He says indicating you should get out on the dance floor yourself.
-					<p>You get up from the chair and walk up near the stage and begin moving sensually, teasing <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+					<p>You get up from the chair and walk up near the stage and begin moving sensually, teasing <<npc $sex.npcId>><</npc>>.</p>
 					<<actCLA 'Return to your date'>>
 						<<set $time.minutes += 15>>
 						<!-- !!add buzz-->
@@ -828,11 +828,11 @@
 							<<image "locations/shared/date/barrestroom.jpg">>
 							You excuse yourself by saying you need to visit the restroom. You walk off and lock the door behind you, looking in the mirror as everything begins to spin.
 							<p>You don't know how long you've been in the restroom but all of a sudden you hear a knock on the door, "Are you alright? You've been in there for a while now."</p>
-							<p>Recognizing <<=$npcs.get($sex.npcId,'firstname')>> voice, you come to your senses and open the door, quickly pulling him in.</p>
+							<p>Recognizing <<npc $sex.npcId>><</npc>> voice, you come to your senses and open the door, quickly pulling him in.</p>
 							<p>"What's happening?" he asks as you lean into him and begin kissing him.</p>
 							<<actCLA 'Make out'>>
 								<<image "locations/shared/date/barmakeout.jpg">>
-								<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't seem to mind your brashness. He begins grabbing you all over your body, adding even more to your arousal.</p>
+								<p><<npc $sex.npcId>><</npc>> doesn't seem to mind your brashness. He begins grabbing you all over your body, adding even more to your arousal.</p>
 								As you're kissing you feel his fingers playing with your wet clit through the panties.
 								<p>"Get down on your knees $pc.name_nick."</p>
 								<<arouse 'foreplay' 2 >>
@@ -841,7 +841,7 @@
 										<<arousalEnd>>
 										<<image "locations/shared/date/barinside.jpg">>
 										You can't get yourself to go through this. Excusing yourself you walk back to the table and sit down.
-										<p><<=$npcs.get($sex.npcId,'firstname')>> arrives shortly after you to the table. The whole situation is too awkward now and you begin to blush as you're really ashamed of your actions. You're starting to panic a bit...</p>
+										<p><<npc $sex.npcId>><</npc>> arrives shortly after you to the table. The whole situation is too awkward now and you begin to blush as you're really ashamed of your actions. You're starting to panic a bit...</p>
 										<<actCLA 'Finish the date'>>
 											<<gt 'dateM' 'barend'>>
 										<</actCLA>>
@@ -851,25 +851,25 @@
 									<<image "locations/shared/date/barbj.jpg">>
 									You're too aroused to do anything else. You quickly drop down on your knees, grabbing hold of his pants, ripping them open.
 									<p>His erect penis pops out and you can clearly see some pre-cum around the foreskin.</p>
-									<p>You devour his flaccid penis with your mouth, swallowing it whole with ease. <<=$npcs.get($sex.npcId,'firstname')>> is all warmed up, his cock is twitching and he's right at the edge as you stop, "Oh, no we're not done yet."</p>
+									<p>You devour his flaccid penis with your mouth, swallowing it whole with ease. <<npc $sex.npcId>><</npc>> is all warmed up, his cock is twitching and he's right at the edge as you stop, "Oh, no we're not done yet."</p>
 									<<arouse 'bj' 3 `['deepthroat']`>>
 									<<actCLA 'Stand up'>>
 										<<image "locations/shared/date/barfuck.jpg">>
-										<p>You tell him to rest for a moment while you get ready. You pull down your panties exposing your wet cunt, you play with yourself as <<=$npcs.get($sex.npcId,'firstname')>> catches his breath. "That's enough rest." you tell him.</p>
+										<p>You tell him to rest for a moment while you get ready. You pull down your panties exposing your wet cunt, you play with yourself as <<npc $sex.npcId>><</npc>> catches his breath. "That's enough rest." you tell him.</p>
 										You have him stand behind you as you grab hold of the sink. "Come on, fuck me good." you tell him.
-										<p><<=$npcs.get($sex.npcId,'firstname')>> grabs his cock and enters you. You moan as he begins thrusting. You feel your pussy walls getting stretched and it's a great feeling. He's picking up the pace and you feel his cock twitching once again.</p>
+										<p><<npc $sex.npcId>><</npc>> grabs his cock and enters you. You moan as he begins thrusting. You feel your pussy walls getting stretched and it's a great feeling. He's picking up the pace and you feel his cock twitching once again.</p>
 										<<set $orgasm_or = 'custom'>>
 										<<set $orgasm_txt = 'Even though he's edging $npcs.get($sex.npcId,'firstname') doesn't slow down. He keeps on fucking you balls deep and you can't hold on anymore. You begin loudly moaning, your pussy tensing with you orgasming all over his cock.'>>
 										<<arouse 'vaginal' 3 >>
 										<<arousalEnd>>
 										<<gs 'cum_call' '' $boydesc>>
-										<p>It doesn't take long before <<=$npcs.get($sex.npcId,'firstname')>> is panting heavily and just as you're about to say not to cum inside you, you feel a warm stream shoot up deep inside of you.</p>
+										<p>It doesn't take long before <<npc $sex.npcId>><</npc>> is panting heavily and just as you're about to say not to cum inside you, you feel a warm stream shoot up deep inside of you.</p>
 										<<actCLA 'Clean up'>>
 											<<set $cumspclnt = 15>>
 											<<gs 'cum_cleanup'>>
 											<<image "locations/shared/date/barcream.jpg">>
 											Your knees are still shaking as he finishes, you don't even care that he has cum inside of you. You grab some toilet paper and begin wiping the cum dripping out of your pussy.
-											<p>"That was great $pc.name_nick." <<=$npcs.get($sex.npcId,'firstname')>> compliments you. "You were not bad yourself" you tell him.</p>
+											<p>"That was great $pc.name_nick." <<npc $sex.npcId>><</npc>> compliments you. "You were not bad yourself" you tell him.</p>
 											<<actCLA 'Finish the date'>>
 												<<gt 'dateM' 'barend'>>
 											<</actCLA>>
@@ -884,7 +884,7 @@
 			<<actCLA 'Keep talking'>>
 				<<set $time.minutes += 20>>
 				<<image "locations/shared/date/bardiscuss_#.jpg" 1 4>>
-				<p>You and <<=$npcs.get($sex.npcId,'firstname')>> continue talking even if it's hard to hear what he says at some times because of the loud music.</p>
+				<p>You and <<npc $sex.npcId>><</npc>> continue talking even if it's hard to hear what he says at some times because of the loud music.</p>
 				Mostly you talk about yours and his backgrounds and future plans.
 				You're so into the conversation that you don't even notice that the band left and that the bar is half empty.
 				<<actCLA 'Finish the date'>>
@@ -897,12 +897,12 @@
 <<if $location_var[$here][0] == 'barend'>>
 	<<set $time.minutes += 5>>
 	<<image "locations/shared/date/bardiscuss_#.jpg" 1 4>>
-	<p>You tell <<=$npcs.get($sex.npcId,'firstname')>>, "I've had a great time but we should be on our way."</p>
-	<p>"I had a great time, you're really fun to hang out with." <<=$npcs.get($sex.npcId,'firstname')>> tells you. "Could I get your number?"</p>
+	<p>You tell <<npc $sex.npcId>><</npc>>, "I've had a great time but we should be on our way."</p>
+	<p>"I had a great time, you're really fun to hang out with." <<npc $sex.npcId>><</npc>> tells you. "Could I get your number?"</p>
 	<<actCLA 'Sure'>>
 		<<datingStart $dateNPCId>>
 		<<image "locations/shared/date/givenumber.jpg">>
-		<p>You give <<=$npcs.get($sex.npcId,'firstname')>> your number. "Now I really hope you don't forget to call me." you tell him. "Oh, don't worry about that I'll be in touch." he says.</p>
+		<p>You give <<npc $sex.npcId>><</npc>> your number. "Now I really hope you don't forget to call me." you tell him. "Oh, don't worry about that I'll be in touch." he says.</p>
 		You end the date by him giving you a kiss on the cheek.
 		<<actCLA 'Leave'>>
 			<<gt $location>>
@@ -912,7 +912,7 @@
 		<<image "locations/shared/date/barreject.jpg">>
 		"I've really enjoyed the date but I just can't I've made a fool of myself..."
 		"No you didn''t, I understand..." Before he continues you stop him telling him that you're sorry once again but you're too ashamed to see him again.
-		<p><<=$npcs.get($sex.npcId,'firstname')>> disappointingly looks at you, "Well at least I gave it my best shot who knows maybe I'll meet you once again."</p>
+		<p><<npc $sex.npcId>><</npc>> disappointingly looks at you, "Well at least I gave it my best shot who knows maybe I'll meet you once again."</p>
 		<<actCLA 'Leave'>>
 			<<gt $location>>
 		<</actCLA>>

+ 7 - 1
sugarcube/src/activities/sex/sex.tw

@@ -1,7 +1,13 @@
 :: sex_test[event]
 	<<act 'Test'>><<gt 'sex' 'A41'>><</act>>
 
-	<<act 'Test2'>><<gt 'sex_ev_foreplay' 'undress'>><</act>>
+	<<act 'Test2'>>
+		<<set $sex = new setup.Sex({
+			npcId: 'A41'
+		})>>
+
+		<<gt 'sex_ev_foreplay' 'undress'>>
+	<</act>>
 
 :: sex[event]
 	<<set $settings.sex ??= {

+ 121 - 121
sugarcube/src/autogenerated/unsorted/hookup.tw

@@ -29,7 +29,7 @@
 	<<arouse 'foreplay' 2 >>
 	<<arouse 'foreplay_give' -2 >>
 	<<video "shared/sex/misc/undress1.mp4">>
-	<p>You and <<=$npcs.get($sex.npcId,'firstname')>> rush through the door of his apartment, stumbling through the hallway as you desperately tear each other's clothes off on the way to the bedroom.</p>
+	<p>You and <<npc $sex.npcId>><</npc>> rush through the door of his apartment, stumbling through the hallway as you desperately tear each other's clothes off on the way to the bedroom.</p>
 	<<if $npcs.get($sex.npcId,'dick_desc') == 'tiny'>>
 		<p>By the time you reach it, both of you are completely naked and his tiny npc_dick[$sex.npcId]cm dick is already erect.</p>
 	<<elseif $npcs.get($sex.npcId,'dick_desc') == 'short'>>
@@ -62,10 +62,10 @@
 			<<arouse 'hj' 1 >>
 			<<arouse 'hj' -10 >>
 			<<video "shared/sex/foreplay/jerk.mp4">>
-			<p>You push <<=$npcs.get($sex.npcId,'firstname')>> down onto the bed and kneel in front of him. With a lusty smirk, you grab hold of his cock, wrapping your fingers around his shaft and give it slow sensual tugs, hardening even more underneath your touch.</p>
+			<p>You push <<npc $sex.npcId>><</npc>> down onto the bed and kneel in front of him. With a lusty smirk, you grab hold of his cock, wrapping your fingers around his shaft and give it slow sensual tugs, hardening even more underneath your touch.</p>
 			<<setinit $hookup['bj_want'] = rand(0,1)>>
 			<<if getvar("$hookup['bj_want']") == 1>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> gives a groan of satisfaction, looking down at you.</p>
+				<p><<npc $sex.npcId>><</npc>> gives a groan of satisfaction, looking down at you.</p>
 				"You're so hot. Now suck it. I want to feel your lips around my cock."
 				<<actCLA 'Give him what he wants'>>
 					Your smirk turns into a full blown grin and you give him just a few more jerks to make sure he's as erect as possible before dipping your head down and doing as he asks.
@@ -98,7 +98,7 @@
 		<</actCLA>>
 		<<actCLA 'Skip the foreplay'>>
 			"Let''s skip the foreplay," you say, heading towards the bed. "I wanna fuck <i>now</i>."
-			<p><<=$npcs.get($sex.npcId,'firstname')>> eagerly follows you over.</p>
+			<p><<npc $sex.npcId>><</npc>> eagerly follows you over.</p>
 			<<gs 'hookup' 'condoms'>>
 			<<gs 'hookup' 'position_choose'>>
 		<</actCLA>>
@@ -180,7 +180,7 @@
 					<<gs 'hookup' 'bj_cum'>>
 				<<else>>
 					<<video "shared/sex/blowjob/bj47.mp4">>
-					<p>You continue to dutifully blow <<=$npcs.get($sex.npcId,'firstname')>> until he finally taps you on the head, causing you to pull off.</p>
+					<p>You continue to dutifully blow <<npc $sex.npcId>><</npc>> until he finally taps you on the head, causing you to pull off.</p>
 					"You're doing great babe, but I want to fuck you before I cum," he grins.
 					<span class="innerThought">Finally...</span>
 					<<gs 'hookup' 'condoms'>>
@@ -212,7 +212,7 @@
 	<<if getvar("$hookup['cum_choice']") == 1>>
 		<<setinit $hookup['cum_choice'] = 'mouth'>>
 		<<video "shared/sex/blowjob/bj47.mp4">>
-		<p>Suddenly, thick salty liquid begins spurting into your mouth as <<=$npcs.get($sex.npcId,'firstname')>> cums without warning.</p>
+		<p>Suddenly, thick salty liquid begins spurting into your mouth as <<npc $sex.npcId>><</npc>> cums without warning.</p>
 		<<actCLA 'Take it in stride (swallow)'>>
 			<<setinit $hookup['swallow'] = 1>>
 			<<setinit $hookup['bj_cum'] = 1>>
@@ -276,7 +276,7 @@
 			<<gs 'hookup' 'bj_react1.2'>>
 		<</actCLA>>
 		<<actCLA 'Trade places'>>
-			<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+			<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			"Hang on there big boy, can't have you blowing your load on me just yet," you smile. You lay back and spread your legs, baring your pussy. "Your turn to show me what you're made of."
 			<<actCLA 'Get licked'>>
@@ -284,7 +284,7 @@
 			<</actCLA>>
 		<</actCLA>>
 		<<actCLA 'Let`s fuck'>>
-			<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+			<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			"Hang on there big boy, can't have you blowing your load on me just yet," you smile, jerking his hardon gently.
 			"We haven''t fucked yet."
@@ -293,9 +293,9 @@
 		<</actCLA>>
 	<<elseif getvar("$hookup['cum_choice']") == 3>>
 		<<if $time.dayStage == 1 or $time.dayStage == 4>>
-			<p>"Wait!" You feel <<=$npcs.get($sex.npcId,'firstname')>>'s hand on your head. "Keep that up and I'm gonna cum. I want to fuck you tonight."</p>
+			<p>"Wait!" You feel <<npc $sex.npcId>><</npc>>'s hand on your head. "Keep that up and I'm gonna cum. I want to fuck you tonight."</p>
 		<<else>>
-			<p>"Wait!" You feel <<=$npcs.get($sex.npcId,'firstname')>>'s hand on your head. "Keep that up and I'm gonna cum. I want to fuck you."</p>
+			<p>"Wait!" You feel <<npc $sex.npcId>><</npc>>'s hand on your head. "Keep that up and I'm gonna cum. I want to fuck you."</p>
 		<</if>>
 		<<actCLA 'Redouble your efforts'>>
 			<<video "shared/sex/blowjob/bj49.mp4">>
@@ -325,7 +325,7 @@
 			<</actCLA>>
 		<</actCLA>>
 		<<actCLA 'Then let`s fuck'>>
-			<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+			<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			"Then we should get to fucking then," you grin back, sitting up on the bed and drawing your lips away from his cock.
 			<<gs 'hookup' 'condoms'>>
@@ -335,7 +335,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'bj_react1.1'>>
 	<<actCLA 'A little warning?'>>
-		<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+		<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		<<if getvar("$hookup['bj_cum']") == 1>>
 			<p>"A little warning next time?" you smile, wiping a loose drop of cum from your lip. "I barely had time to swallow."</p>
@@ -347,13 +347,13 @@
 		<</if>>
 		<p>"You saying there's going to be a next time?"</p>
 		<<actCLA 'Maybe'>>
-			<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+			<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			"Maybe," you say, giving him a dirty smile.
 			<<gs 'hookup' 'bj2'>>
 		<</actCLA>>
 		<<actCLA 'Sure'>>
-			<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+			<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			<p>"Sure," you say with a dirty smirk. "I had a good time blowing you. Didn't you have a good time getting blown?"</p>
 			He returns your grin.
@@ -369,7 +369,7 @@
 
 					<</if>>
 					<<actCLA 'Oh well'>>
-						<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+						<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 						<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 						"Damn. Guess I'm too skilled at sucking dick for my own good," you complain, sitting up and stretching your arms behind your head. You flash him a smile to know you're just kidding around and aren''t too upset about the result.
 						<<if $pc.horny >= 65>>
@@ -384,7 +384,7 @@
 						<<gs 'hookup_after' 'pre'>>
 					<</actCLA>>
 					<<actCLA 'Disappointing'>>
-						<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+						<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 						<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 						"Damn," you frown. You sit back on your legs, thoroughly disappointed with this turn of events.
 						<<if $pc.horny >= 70>>
@@ -410,7 +410,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'bj_react1.2'>>
 	<<actCLA 'Thanks for the warning'>>
-		<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+		<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		<<if getvar("$hookup['cum_choice']") == 3>>
 			"Thanks for the warning," you smile, licking your lips.
@@ -422,7 +422,7 @@
 			<<if $pc.thinksIsVirgin>>
 				<<actCLA 'Sorry, saving myself for marriage'>>
 					<<setinit $hookup['virgin'] = 1>>
-					<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+					<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					"Sorry, but I'm saving myself for marriage," you smile apologetically.
 					<<if $npcs.get($sex.npcId,'generous') == 1 or $npcs.get($sex.npcId,'pussyeater') == 1>>
@@ -444,13 +444,13 @@
 				<<gs 'hookup_after' 'start'>>
 			<</actCLA>>
 			<<actCLA 'We could keep going'>>
-				<p>"Well, we could just keep going," you suggest, crawling over to <<=$npcs.get($sex.npcId,'firstname')>>. "Think you can get it up again for me?" Grabbing hold of his semi-flaccid cock, you lean into his ear.</p>
+				<p>"Well, we could just keep going," you suggest, crawling over to <<npc $sex.npcId>><</npc>>. "Think you can get it up again for me?" Grabbing hold of his semi-flaccid cock, you lean into his ear.</p>
 				"I want to feel you inside me," you whisper. You instantly feel his cock stiffen up at your words. "Atta boy," you grin, giving it a few tugs.
 				<<gs 'hookup' 'condoms'>>
 				<<gs 'hookup' 'position_choose'>>
 			<</actCLA>>
 		<<elseif getvar("$hookup['bj_cum']") == 1>>
-			<p>"Thanks for the warning," you smile, licking your lips. <<=$npcs.get($sex.npcId,'firstname')>> just looks back at you blissfully, almost like he can't believe you swallowed it all.</p>
+			<p>"Thanks for the warning," you smile, licking your lips. <<npc $sex.npcId>><</npc>> just looks back at you blissfully, almost like he can't believe you swallowed it all.</p>
 			<<gs 'hookup' 'bj2'>>
 		<<elseif getvar("$hookup['bj_cum']") == 2>>
 			"Thanks for the warning," you say, cum still dripping from your smile.
@@ -467,7 +467,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'bj_react2'>>
 	<<actCLA 'Tasty'>>
-		<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+		<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		"Mmmm. Tasty."
 		<<if rand(0,1) == 0 and getvar("$hookup['fuck']") != 1>>
@@ -475,7 +475,7 @@
 			<<if $pc.thinksIsVirgin>>
 				<<actCLA 'Sorry, saving myself for marriage'>>
 					<<setinit $hookup['virgin'] = 1>>
-					<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+					<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					"Sorry, but I'm saving myself for marriage," you smile apologetically.
 					<<if $npcs.get($sex.npcId,'generous') == 1 or $npcs.get($sex.npcId,'pussyeater') == 1>>
@@ -492,20 +492,20 @@
 				<</actCLA>>
 			<</if>>
 			<<actCLA 'We could keep going'>>
-				<p>"Well, we could just keep going," you suggest, crawling over to <<=$npcs.get($sex.npcId,'firstname')>>. "Think you can get it up again for me?" Grabbing hold of his semi-flaccid cock, you lean into his ear.</p>
+				<p>"Well, we could just keep going," you suggest, crawling over to <<npc $sex.npcId>><</npc>>. "Think you can get it up again for me?" Grabbing hold of his semi-flaccid cock, you lean into his ear.</p>
 				"I want to feel you inside me," you whisper. You instantly feel his cock stiffen up at your words. "Atta boy," you grin, giving it a few tugs.
 				<<gs 'hookup' 'condoms'>>
 				<<gs 'hookup' 'position_choose'>>
 			<</actCLA>>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>>'s jaw drops as you lick your lips.</p>
+			<p><<npc $sex.npcId>><</npc>>'s jaw drops as you lick your lips.</p>
 			<<gs 'hookup' 'bj2'>>
 		<</if>>
 	<</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'bj_react3'>>
 	<<actCLA 'Already?'>>
-		<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+		<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		<<if getvar("$hookup['bj_cum']") == 1>>
 			<p>"Seriously?" you ask, gulping again as you draw back from his cock. "You came already?"</p>
@@ -524,7 +524,7 @@
 				<<gs 'hookup' 'bj2'>>
 			<</actCLA>>
 			<<actCLA 'Fuck you!'>>
-				<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+				<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				<p>"Fuck you!" you snap, springing from the bed and rushing for your clothes.</p>
 				<p>"Yeah, I think that's what you wanted you fucking slut!"</p>
@@ -546,7 +546,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'bj_react4'>>
 	<<actCLA 'Gross'>>
-		<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+		<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		"Ugh, I hate swallowing," you say, shaking your head as if that would somehow get rid of the taste.
 		"But you still did it," he says back, grin widening across his face.
@@ -560,13 +560,13 @@
 	<<elseif ($npcs.get($sex.npcId,'generous') == 1 or $npcs.get($sex.npcId,'pussyeater') == 1) and getvar("$hookup['cuni']") < 1>>
 		<p>"So, did you want a turn?"</p>
 		<p>"A turn what?"</p>
-		<p>"Getting head." <<=$npcs.get($sex.npcId,'firstname')>> begins creeping down towards your legs, kissing them all along the way until he's between them.</p>
+		<p>"Getting head." <<npc $sex.npcId>><</npc>> begins creeping down towards your legs, kissing them all along the way until he's between them.</p>
 		<<actCLA 'Get eaten out'>>
 			<<gt 'hookup' 'lick_pussy'>>
 		<</actCLA>>
 		<<actCLA 'I`d rather just fuck'>>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> gets all the way down to your pussy and you open your legs, but when he tries to move in you put your hand on his head and stop him in his tracks.</p>
+			<p><<npc $sex.npcId>><</npc>> gets all the way down to your pussy and you open your legs, but when he tries to move in you put your hand on his head and stop him in his tracks.</p>
 			"Actually, I''d rather just fuck instead," you grin.
 			"Well, shit. Hang on, gimme a minute to get hard again."
 			<<actCLA 'Wait'>>
@@ -575,7 +575,7 @@
 		<</actCLA>>
 		<<actCLA 'I`m okay (stop here)'>>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> gets all the way down to your pussy, but when he tries to move in you put your hand on his head and stop him in his tracks, closing your legs in front of him.</p>
+			<p><<npc $sex.npcId>><</npc>> gets all the way down to your pussy, but when he tries to move in you put your hand on his head and stop him in his tracks, closing your legs in front of him.</p>
 			"Nah, I'm okay."
 			<p>"Really?" He looks up at you in confusion.</p>
 			"Yeah. No need for that."
@@ -611,7 +611,7 @@
 			<<else>>
 				<<setinit $hookup['tonight_or_today'] = 'today'>>
 			<</if>>
-			<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+			<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			"Well, that was fun, but I should get going," you say, standing up.
 			<<if rand(0,1) == 0>>
@@ -628,7 +628,7 @@
 								<p>You shrug. "I'm still a virgin aren't I?"</p>
 							<</if>>
 							<<actCLA 'Get dressed and leave'>>
-								<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+								<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 								<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 								You quickly throw your clothes on and see yourself out, not even leaving your number behind for him.
 								<<actCLA 'Leave'>>
@@ -636,7 +636,7 @@
 								<</actCLA>>
 							<</actCLA>>
 							<<actCLA 'Leave your number'>>
-								<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+								<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 								<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 								<<setinit $hookup['contact_info'] = 1>>
 								<p>"But... I did have a good time $hookup['tonight_or_today']," you say, still holding your clothes. You drop them for a minute moving over to his clothes instead. You dig through them, pulling out his phone. You tap your number into his contacts list.</p>
@@ -658,23 +658,23 @@
 							<</actCLA>>
 							<<actCLA 'Call me sometime?'>>
 								<<setinit $hookup['contact_info'] = 1>>
-								<p>"Sorry, I really don't have time $hookup['tonight_or_today']. But..." You find a pen and scrap of paper in <<=$npcs.get($sex.npcId,'firstname')>>'s room and scribble down your number.</p>
+								<p>"Sorry, I really don't have time $hookup['tonight_or_today']. But..." You find a pen and scrap of paper in <<npc $sex.npcId>><</npc>>'s room and scribble down your number.</p>
 								<p>"Call me sometime?" you smile. "We can... have fun."</p>
 								<p>"Like another blowjob?" he asks shamelessly.</p>
 								<<actCLA 'Maybe'>>
-									<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+									<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 									<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 									"Maybe," you reply, twisting your mouth into a smirk.
-									<p>You say your goodbyes and leaving <<=$npcs.get($sex.npcId,'firstname')>>'s place behind with the possibility of another "date" in the future.</p>
+									<p>You say your goodbyes and leaving <<npc $sex.npcId>><</npc>>'s place behind with the possibility of another "date" in the future.</p>
 									<<actCLA 'Leave'>>
 										<<gt 'hookup_after' 'exit'>>
 									<</actCLA>>
 								<</actCLA>>
 								<<actCLA 'Sure'>>
-									<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+									<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 									<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 									"Sure," you grin. "Whatever blows your hair back."
-									<p>With a wink, you start picking up your clothes and getting dressed. Once you're finished, you blow <<=$npcs.get($sex.npcId,'firstname')>> a kiss, closing the door to his place behind you.</p>
+									<p>With a wink, you start picking up your clothes and getting dressed. Once you're finished, you blow <<npc $sex.npcId>><</npc>> a kiss, closing the door to his place behind you.</p>
 									<<actCLA 'Leave'>>
 										<<gt 'hookup_after' 'exit'>>
 									<</actCLA>>
@@ -695,7 +695,7 @@
 									<</actCLA>>
 								<</actCLA>>
 								<<actCLA 'That sounds nice'>>
-									<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+									<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 									<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 									"That sounds really nice," you sigh under his touch. You let him lead you back to the bed where you lay back, spreading your legs as he puts his head between them.
 									<<actCLA 'Get eaten out'>>
@@ -710,7 +710,7 @@
 					<</actCLA>>
 				<</if>>
 				<<actCLA 'Got stuff to do tomorrow'>>
-					<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+					<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					"Sorry, I got stuff to do tomorrow," you say, picking up your clothes and checking the time on your phone. "Can't stick around."
 					You get dressed in silence and give an awkward goodbye, seeing yourself out.
@@ -719,7 +719,7 @@
 					<</actCLA>>
 				<</actCLA>>
 				<<actCLA 'Leave your number'>>
-					<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+					<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					<<setinit $hookup['contact_info'] = 1>>
 					"Sorry, I got stuff to do tomorrow," you say, picking up your clothes and checking the time on your phone. "Can't stick around. But..."
@@ -733,15 +733,15 @@
 			<<else>>
 				"I'm not going to complain after a blowjob like that," he grins at you, laying back in bed.
 				<<actCLA 'Get dressed and leave'>>
-					<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+					<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-					<p>"Well I'm glad you enjoyed yourself," you smirk, throwing your clothes on while <<=$npcs.get($sex.npcId,'firstname')>> watches you get dressed from his bed. Once you're finished, you see yourself out, waving goodbye just before you shut the door behind you.</p>
+					<p>"Well I'm glad you enjoyed yourself," you smirk, throwing your clothes on while <<npc $sex.npcId>><</npc>> watches you get dressed from his bed. Once you're finished, you see yourself out, waving goodbye just before you shut the door behind you.</p>
 					<<actCLA 'Leave'>>
 						<<gt 'hookup_after' 'exit'>>
 					<</actCLA>>
 				<</actCLA>>
 				<<actCLA 'Leave your number'>>
-					<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+					<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					"Still, I had a nice time," you say. Instead of moving towards your own clothes, you begin riffling through his until you find his phone. You tap your number into his contact list and save it.
 					"Call me sometime," you smile as you hand his phone over. "I''d hate for this to be the last time I see you." With that, you get dressed and see yourself out, blowing him a kiss as you shut the door behind you.
@@ -757,7 +757,7 @@
 			<<else>>
 				<<setinit $hookup['tonight_or_today'] = 'right now'>>
 			<</if>>
-			<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+			<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			<p>"So, wanna fuck now?" you ask.</p>
 			<<if rand(0,1) == 0>>
@@ -767,7 +767,7 @@
 
 				<</if>>
 				<<actCLA 'Oh well'>>
-					<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+					<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					"Damn. Guess I'm too skilled at sucking dick for my own good," you complain, sitting up and stretching your arms behind your head. You flash him a smile to know you're just kidding around and aren''t too upset about the result.
 					<<if $pc.horny >= 65>>
@@ -778,7 +778,7 @@
 					<<gs 'hookup_after' 'pre'>>
 				<</actCLA>>
 				<<actCLA 'Disappointing'>>
-					<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+					<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					"Damn," you frown. You sit back on your legs, thoroughly disappointed with this turn of events.
 					<<if $pc.horny >= 70>>
@@ -798,11 +798,11 @@
 			<</if>>
 		<</actCLA>>
 		<<actCLA 'Ask him to return the favor'>>
-			<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+			<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			<p>"So..." you lick your lips seductively at him. "I think I gave your pipe a good cleaning there... Want to return the favor?" You lay back, opening your legs and spreading your cunt, grinning expectantly.</p>
 			<<if $npcs.get($sex.npcId,'selfish') == 1>>
-				<p>"Nah, I'm good here," <<=$npcs.get($sex.npcId,'firstname')>> yawns, stretching back. "The blowjob was enough for me."</p>
+				<p>"Nah, I'm good here," <<npc $sex.npcId>><</npc>> yawns, stretching back. "The blowjob was enough for me."</p>
 				<<actCLA 'Ugh, whatever'>>
 					<<setinit $hookup['selfish'] = 1>>
 					<p>Your grin melts into a slack-jawed stare and you can't believe he just said that. You give a blowjob and he can't even be bothered to eat you out in return? You aren't so much offended as you are just shocked that he could be that selfish.</p>
@@ -823,11 +823,11 @@
 					<p>"I go down on you, let you cum in my mouth, and you're <i>not</i> going to return the favor?"</p>
 					<p>"<i>What?</i> he asks again bewildered. "You asked if I <i>wanted</i> to. I didn't think it was a selfish order or something."</p>
 					<p>"<i>SELFISH?!</i>" Your voice cracks when the word comes out. "Oh I am so fucking done here."</p>
-					<p>You practically leap off the bed, grabbing your clothes and throwing them on as fast as you can while <<=$npcs.get($sex.npcId,'firstname')>> doesn't seem to understand what's going on.</p>
+					<p>You practically leap off the bed, grabbing your clothes and throwing them on as fast as you can while <<npc $sex.npcId>><</npc>> doesn't seem to understand what's going on.</p>
 					<<actCLA 'Continue'>>
 						<<gs 'clothing' 'wear_last_worn'>>
 						<<gs 'underwear' 'wear'>>
-						<p>"What the hell are you so upset about?" <<=$npcs.get($sex.npcId,'firstname')>> continues to ask.</p>
+						<p>"What the hell are you so upset about?" <<npc $sex.npcId>><</npc>> continues to ask.</p>
 						<p>"You really don't know what you did wrong here? You have got to be KIDDING ME!"</p>
 						Your clothes in place, you grab your bag and walk straight out of the apartment, slamming the door behind you.
 						<p><i>Fucking ridiculous!</i> you fume to yourself on your way out the door.</p>
@@ -844,10 +844,10 @@
 						<p>"Ehhhh," he inhales slowly. "I don't think so. I probably can't get it up again after cumming like that. Refactory period and all that. Dicks have it rough, girls wanting to do all kinds of things to them. You get don't you?"</p>
 						He smiles back at you.
 						<<actCLA 'Well, <i>I`m leaving</i>'>>
-							<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+							<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 							<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 							"Well," you say, standing up. "<i>I'm leaving</i>."
-							<p>You bend down, grabbing your clothes and throwing them on while <<=$npcs.get($sex.npcId,'firstname')>> sits up in his bed.</p>
+							<p>You bend down, grabbing your clothes and throwing them on while <<npc $sex.npcId>><</npc>> sits up in his bed.</p>
 							<p>"What? How come?"</p>
 							<p>"How come," you roll your eyes. "You really can't guess? Maybe it's cause I came here to get laid and all I got was blue balls and cum in my mouth."</p>
 							<p>"What? It's not my fault. I told you, I can't get it up so quick after the first time."</p>
@@ -867,7 +867,7 @@
 					<</if>>
 				<</actCLA>>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> crawls over to you and gives your clit a kiss, causing you to hiss in pleasure.</p>
+				<p><<npc $sex.npcId>><</npc>> crawls over to you and gives your clit a kiss, causing you to hiss in pleasure.</p>
 				"Sure, I''d love to eat you out. It's only polite after all," he mumbles before getting to work on your pussy.
 				<<actCLA 'Continue'>>
 					<<gt 'hookup' 'lick_pussy'>>
@@ -880,11 +880,11 @@
 			<<else>>
 				<<setinit $hookup['tonight_or_today'] = 'now'>>
 			<</if>>
-			<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+			<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			<p>"Mind if we call it here?" you ask. "I think I'm done for $hookup['tonight_or_today']."</p>
 			<<if $npcs.get($sex.npcId,'generous') == 1>>
-				<p>"Really?" <<=$npcs.get($sex.npcId,'firstname')>> raises an eyebrow at you. "But you didn't get to cum. You only blew me."</p>
+				<p>"Really?" <<npc $sex.npcId>><</npc>> raises an eyebrow at you. "But you didn't get to cum. You only blew me."</p>
 				<<if $pc.pcs_vag > 0>>
 					<<actCLA 'I`m saving myself for marriage'>>
 						<<setinit $hookup['save_marriage'] = 1>>
@@ -892,7 +892,7 @@
 						"Well," he crawls over. "That doesn''t mean we can't get you off."
 						<p>He gives you a look. "You went down on me, I could return the favor?"</p>
 						<<actCLA 'No need'>>
-							<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+							<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 							<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 							"No that's okay," you shake your head. "I'm fine just getting you off."
 							<p>"Seriously?" The look on his face is one of pure confusion.</p>
@@ -901,12 +901,12 @@
 							<<gs 'hookup_after' 'pre'>>
 						<</actCLA>>
 						<<actCLA 'I like giving head better anyways'>>
-							<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+							<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 							<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 							"No that's okay," you shake your head. "I prefer giving than receiving anyways."
 							<p>"Seriously?" He seems skepitcal.</p>
 							"I can't get out of my own head when someone''s going down on me," you shrug. "Can't enjoy myself. I have a better time going down on other people."
-							<p>"Well, if you're really okay..." <<=$npcs.get($sex.npcId,'firstname')>> returns your smile, laying back in bed and relaxing.</p>
+							<p>"Well, if you're really okay..." <<npc $sex.npcId>><</npc>> returns your smile, laying back in bed and relaxing.</p>
 							<<gs 'hookup_after' 'pre'>>
 						<</actCLA>>
 						<<actCLA 'Well, if you`re offering'>>
@@ -930,17 +930,17 @@
 	<<setinit $hookup['cuni'] += 1>>
 	<<arouse 'cuni' `rand(5,10)` `['no_orgasm_msg']`>>
 	<<if $hookup['orgasm'] < $orgasm>>
-		<p>Chills ripple across your skin as <<=$npcs.get($sex.npcId,'firstname')>> goes down on you. Kissing, licking, teasing every part of your pussy. It leaves you squirming and your nipples quivering in time with your hitching breath.</p>
-		<p>In no time at all, you're about to cum. You hold it back, trying to enjoy <<=$npcs.get($sex.npcId,'firstname')>>'s tongue for as long as possible, but eventually you can't take it anymore.</p>
+		<p>Chills ripple across your skin as <<npc $sex.npcId>><</npc>> goes down on you. Kissing, licking, teasing every part of your pussy. It leaves you squirming and your nipples quivering in time with your hitching breath.</p>
+		<p>In no time at all, you're about to cum. You hold it back, trying to enjoy <<npc $sex.npcId>><</npc>>'s tongue for as long as possible, but eventually you can't take it anymore.</p>
 		<<actCLA 'Orgasm'>>
 			<<video "shared/sex/kuni/pussylickorgasm2.mp4">>
 			Your entire body goes taut as your orgasm washes through you. Your back arches while your pussy clenches hard, completely unable to control your muscles in the face of ecstatic pleasure.
-			<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't let up for a moment, relentlessly teasing your clit and lapping up your pussy juices, drawing out every last spasm from you until you're left breathing raggedly in a post orgasmic high.</p>
+			<p><<npc $sex.npcId>><</npc>> doesn't let up for a moment, relentlessly teasing your clit and lapping up your pussy juices, drawing out every last spasm from you until you're left breathing raggedly in a post orgasmic high.</p>
 			<<if getvar("$hookup['bj_cum']") > 0 or getvar("$hookup['fuck']") > 0>>
 				<<actCLA 'Thanks'>>
-					<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+					<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-					<p>Tiredly, you roll your head to the side to smile at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+					<p>Tiredly, you roll your head to the side to smile at <<npc $sex.npcId>><</npc>>.</p>
 					"Thanks for returning the favor."
 					<<if $npcs.get($sex.npcId,'generous') == 1>>
 						"My pleasure," he smiles back.
@@ -948,12 +948,12 @@
 						"You're welcome," he grins back.
 					<</if>>
 					<<if rand(0,1) == 1>>
-						<p>You can't help but notice the return of <<=$npcs.get($sex.npcId,'firstname')>>'s hardon. Seems he's managed to get it up again while eating you out.</p>
+						<p>You can't help but notice the return of <<npc $sex.npcId>><</npc>>'s hardon. Seems he's managed to get it up again while eating you out.</p>
 						<<actCLA 'I`m tired'>>
-							<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+							<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 							<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 							Regardless, you elect to ignore it.
-							<p>"That worked for me, how about you?" you ask. <<=$npcs.get($sex.npcId,'firstname')>> grins, leering eagerly at your body.</p>
+							<p>"That worked for me, how about you?" you ask. <<npc $sex.npcId>><</npc>> grins, leering eagerly at your body.</p>
 							"Well, I've got something here that you could take care of..."
 							"Actually, I'm kinda worn out," you yawn, stretching your arms behind you. "I don't think I can keep going."
 							"Oh... I guess that's enough for now then..."
@@ -972,10 +972,10 @@
 							<<gs 'hookup_virgin' 'virginity_take'>>
 						<<elseif $pc.thinksIsVirgin>>
 							<<actCLA 'Ask him to fuck you'>>
-								<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+								<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 								<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 								<<gs 'willpower' 'pay' 'self'>>
-								<p>In your post orgasmic high, you find yourself staring at <<=$npcs.get($sex.npcId,'firstname')>>'s cock. You're so wet right now and looking at his erection makes you realize just how badly you want to be <i>filled.</i></p>
+								<p>In your post orgasmic high, you find yourself staring at <<npc $sex.npcId>><</npc>>'s cock. You're so wet right now and looking at his erection makes you realize just how badly you want to be <i>filled.</i></p>
 								<p>"Like what you see?" You glance up and realize he's noticed your stare.</p>
 								"I want you to fuck me," you whisper.
 								"I think I can manage that," he replies, moving towards you.
@@ -997,12 +997,12 @@
 							<<setinit $hookup['tonight_or_today'] = 'today'>>
 						<</if>>
 						<<setinit $hookup['virgin'] = 1>>
-						<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+						<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 						<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 						<p>"Sorry," you say. "No fucking $hookup['tonight_or_today']. I'm saving myself for marriage."</p>
 						<<if getvar("$hookup['bj_cum']") == 0>>
 							<<if $npcs.get($sex.npcId,'generous') == 1 or $npcs.get($sex.npcId,'pussyeater') == 1>>
-								<p>"Oh. Well, how about I just keep doing this?" <<=$npcs.get($sex.npcId,'firstname')>> kneels his head again and before you can respond you feel his tongue glide across your pussy again, sending shivers through you.</p>
+								<p>"Oh. Well, how about I just keep doing this?" <<npc $sex.npcId>><</npc>> kneels his head again and before you can respond you feel his tongue glide across your pussy again, sending shivers through you.</p>
 								<<actCLA 'I want to... but I can`t'>>
 									It feels great. And his next lick feels just as good as the last one. It's so tempting... but you push his head away anyways.
 									<p>"I want to, I really do. I just... can't $hookup['tonight_or_today']."</p>
@@ -1042,7 +1042,7 @@
 				<</if>>
 				<!-- !! {act'End here':-->
 				"Nah, I think I'm good here," you sigh contently.
-				<p>"You... you sure...?" <<=$npcs.get($sex.npcId,'firstname')>> looks down at his hardon as if contemplating</p>
+				<p>"You... you sure...?" <<npc $sex.npcId>><</npc>> looks down at his hardon as if contemplating</p>
 				<<gs 'hookup_after' 'pre'>>
 				<!-- FAILED TO CONVERT
 					end}
@@ -1056,21 +1056,21 @@
 			<</if>>
 		<</actCLA>>
 	<<else>>
-		<p>You lay back on <<=$npcs.get($sex.npcId,'firstname')>>'s bed, stretching out while he goes down on you. His tongue on your pussy feels nice, the occasional kiss on your clit causes you to reflexively twitch. You breathe deeply, feeling the warmth spreading through your hips, and letting yourself enjoy the lip service.</p>
+		<p>You lay back on <<npc $sex.npcId>><</npc>>'s bed, stretching out while he goes down on you. His tongue on your pussy feels nice, the occasional kiss on your clit causes you to reflexively twitch. You breathe deeply, feeling the warmth spreading through your hips, and letting yourself enjoy the lip service.</p>
 		<<actCLA 'Don`t stop!'>>
 			<<set $orgasm_or = 'yes'>>
 			<<arouse 'cuni' `rand(5,10)` `['no_orgasm_msg']`>>
 			<<video "shared/sex/kuni/pussylickorgasm2.mp4">>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> continues to eat you out until you're right at the edge of climax.</p>
+			<p><<npc $sex.npcId>><</npc>> continues to eat you out until you're right at the edge of climax.</p>
 			<p>"Don't stop! Don't stop! Don't stop!" you cry out. He dutifully continues until your orgasm breaks. It washes through you, forcing your back to arch and every muscle in your body tense up.</p>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't let up for a moment, relentlessly teasing your clit and lapping up your pussy juices, drawing out every last spasm from you until you're left breathing raggedly in a post orgasmic high.</p>
+			<p><<npc $sex.npcId>><</npc>> doesn't let up for a moment, relentlessly teasing your clit and lapping up your pussy juices, drawing out every last spasm from you until you're left breathing raggedly in a post orgasmic high.</p>
 			<<if getvar("$hookup['bj_cum']") > 0>>
 				<<if rand(0,1) == 1>>
-					<p>You can't help but notice the return of <<=$npcs.get($sex.npcId,'firstname')>>'s hardon. Seems he's managed to get it up again while eating you out.</p>
+					<p>You can't help but notice the return of <<npc $sex.npcId>><</npc>>'s hardon. Seems he's managed to get it up again while eating you out.</p>
 					<<actCLA 'Finish'>>
-						<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+						<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 						<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-						<p>"Thanks for returning the favor," you smile at <<=$npcs.get($sex.npcId,'firstname')>> tiredly.</p>
+						<p>"Thanks for returning the favor," you smile at <<npc $sex.npcId>><</npc>> tiredly.</p>
 						"Happy to do it."
 						"I can certainly tell," you say, looking pointedly at his erection.
 						<<gs 'hookup_after' 'pre'>>
@@ -1093,17 +1093,17 @@
 						<<else>>
 							<<setinit $hookup['tonight_or_today'] = 'today'>>
 						<</if>>
-						<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+						<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 						<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-						<p>"Thanks for returning the favor," you smile at <<=$npcs.get($sex.npcId,'firstname')>> tiredly. "You good? Cause I think I'm done for $hookup['tonight_or_today']."</p>
+						<p>"Thanks for returning the favor," you smile at <<npc $sex.npcId>><</npc>> tiredly. "You good? Cause I think I'm done for $hookup['tonight_or_today']."</p>
 						"Yeah, I think I'm done too. My tongue is tired."
 						<<gs 'hookup_after' 'pre'>>
 					<</actCLA>>
 					<<if ($pc.pcs_vag > 0 and $pc.thinksIsVirgin) and getvar("$hookup['bj']") < 2>>
 						<<actCLA 'Round 2?'>>
-							<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+							<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 							<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-							<p>"Thanks for returning the favor," you smile at <<=$npcs.get($sex.npcId,'firstname')>> tiredly, eyeing his rejuvenated hardon. "But we still haven't fucked yet. How 'bout it? Ready for round 2?"</p>
+							<p>"Thanks for returning the favor," you smile at <<npc $sex.npcId>><</npc>> tiredly, eyeing his rejuvenated hardon. "But we still haven't fucked yet. How 'bout it? Ready for round 2?"</p>
 							"I think I can manage that," he smiles back.
 							<<gs 'hookup' 'condoms'>>
 							<<gs 'hookup' 'position_choose'>>
@@ -1114,12 +1114,12 @@
 				<</if>>
 			<<else>>
 				<<actCLA 'Finish'>>
-					<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+					<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					"That was great," you huff, breathing heavily. "I don't think I can keep going after that..."
 					<p>"Seriously?! I didn't even get off!"</p>
 					<<actCLA 'I`m too tired'>>
-						<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+						<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 						<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 						"Sorry babe, I'm too tired to even think about that right now."
 						"What a bunch of fuckin'' bullshit," he grumbles. "You should go."
@@ -1127,7 +1127,7 @@
 						You sit up in bed.
 						"If you're just gonna come to my place to get off and blue ball me, then you need to get the fuck out. Now."
 						<<actCLA 'Fine then'>>
-							<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+							<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 							<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 							"Well, fine then," you huff.
 							You get up, quickly grabbing your things and getting dressed before hussling out the door. At least you got off before he kicked you out though.
@@ -1138,7 +1138,7 @@
 						<!-- !! act'Make a scene':-->
 					<</actCLA>>
 					<<actCLA 'Guys do it all the time'>>
-						<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+						<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 						<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 						<p>"And?" you ask. "Guys end sex without the girl getting off all the time. You saying a girl can't do the same if she doesn't feel like it?"</p>
 						"What a bunch of fuckin'' bullshit," he grumbles. "You should go."
@@ -1146,7 +1146,7 @@
 						You sit up in bed.
 						"If you're just gonna come to my place to get off and blue ball me, then you need to get the fuck out. Now."
 						<<actCLA 'Fine then'>>
-							<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+							<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 							<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 							"Well, fine then," you huff.
 							You get up, quickly grabbing your things and getting dressed before hussling out the door. "Sexist pig," you mutter, walking away.
@@ -1158,7 +1158,7 @@
 					<</actCLA>>
 					<<actCLA 'Well... I guess I could return the favor...'>>
 						<<setinit $hookup['return_bj'] = 1>>
-						<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+						<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 						<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 						"Well... I guess it's only fair," you say. You motion for him to join you on the bed. Then taking his cock in your hand, you bend down to give him some head.
 						<<actCLA 'Blow him'>>
@@ -1172,10 +1172,10 @@
 					<</actCLA>>
 				<</actCLA>>
 				<<actCLA 'Want to fuck now?'>>
-					<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+					<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					<p>"That was great," you huff, breathing heavily. "So... did you want to fuck me now? I think I'm more than wet enough."</p>
-					<p>"Fuck yeah," <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
+					<p>"Fuck yeah," <<npc $sex.npcId>><</npc>> grins back.</p>
 					<<gs 'hookup' 'condoms'>>
 					<<gs 'hookup' 'position_choose'>>
 				<</actCLA>>
@@ -1186,10 +1186,10 @@
 				<<gs 'hookup_virgin' 'virginity_take2'>>
 			<<else>>
 				<<actCLA 'See if he`s hard again'>>
-					<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+					<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					<p>"Hey," you call out between gasps. "How's your cock? You hard again yet?</p>
-					<p>Looking down between your legs, you can see <<=$npcs.get($sex.npcId,'firstname')>> grinning back at you, a glisten on his lips. "More than hard enough."</p>
+					<p>Looking down between your legs, you can see <<npc $sex.npcId>><</npc>> grinning back at you, a glisten on his lips. "More than hard enough."</p>
 					"Well, I think it's time to put it to use then." Scooting back up further onto the bed, you motion for him to join you.
 					<<gs 'hookup' 'condoms'>>
 					<<gs 'hookup' 'position_choose'>>
@@ -1197,10 +1197,10 @@
 			<</if>>
 		<<else>>
 			<<actCLA 'Move on to sex'>>
-				<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+				<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				<p>"Hey," you call out between gasps. "I think I'm more than wet enough. How about you get up here and fuck me?"</p>
-				<p>"Glad to." <<=$npcs.get($sex.npcId,'firstname')>> eagerly joins you on the bed as you decide how you want to get fucked.</p>
+				<p>"Glad to." <<npc $sex.npcId>><</npc>> eagerly joins you on the bed as you decide how you want to get fucked.</p>
 				<<gs 'hookup' 'condoms'>>
 				<<gs 'hookup' 'position_choose'>>
 			<</actCLA>>
@@ -1208,13 +1208,13 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'generous_lick'>>
-	<p>"Well, then how about I do this instead?" <<=$npcs.get($sex.npcId,'firstname')>> begins creeping downward, leaving a trail of kisses all along the way until he's between them your legs.</p>
+	<p>"Well, then how about I do this instead?" <<npc $sex.npcId>><</npc>> begins creeping downward, leaving a trail of kisses all along the way until he's between them your legs.</p>
 	<<actCLA 'Get eaten out'>>
 		<<gt 'hookup' 'lick_pussy'>>
 	<</actCLA>>
 	<<actCLA 'I`m okay (stop here)'>>
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> gets all the way down to your pussy, but when he tries to move in you put your hand on his head and stop him in his tracks, closing your legs in front of him.</p>
+		<p><<npc $sex.npcId>><</npc>> gets all the way down to your pussy, but when he tries to move in you put your hand on his head and stop him in his tracks, closing your legs in front of him.</p>
 		"Nah, I'm okay."
 		<p>"Really?" He looks up at you in confusion.</p>
 		"Yeah. No need for that."
@@ -1258,13 +1258,13 @@
 	<<if $hookup['orgasm'] == $orgasm - 1>>
 		<<video "shared/sex/kuni/pussylickorgasm2.mp4">>
 		It feels too good and you can't resist him. You lay back, enjoying his tongue rolling across your pussy, teasing your clit, lapping up your juices. You feel your orgasm building up and up and up until it crescendos and your whole body goes taut, the heat of your climax washing through you all the way from your groin to goosebumps prickling across your skin.
-		<p>Your climax starts to fade when you feel <<=$npcs.get($sex.npcId,'firstname')>>'s tongue on your pussy again and it's drives you crazy. The sensory overload from your previous orgasms left your clit so sensitive that it hurts. You urgently push his head away, scooting backwards away from him.</p>
+		<p>Your climax starts to fade when you feel <<npc $sex.npcId>><</npc>>'s tongue on your pussy again and it's drives you crazy. The sensory overload from your previous orgasms left your clit so sensitive that it hurts. You urgently push his head away, scooting backwards away from him.</p>
 		<p>"I can't!" you gasp. "Too much! Too sensitive!"</p>
 		You snap your legs closed, one of your hands between them, shuddering as you wait for your sensitivity to die down.
 	<<elseif $orgasm >= $hookup['orgasm'] + 2>>
 		<<video "shared/sex/kuni/pussylick4.mp4">>
 		It feels too good and you can't resist him. You lay back, enjoying his tongue rolling across your pussy, teasing your clit, lapping up your juices. You feel your orgasm building up and up and up until it crescendos and your whole body goes taut, the heat of your climax washing through you all the way from your groin to goosebumps prickling across your skin.
-		<p>Your climax starts to fade when you feel <<=$npcs.get($sex.npcId,'firstname')>>'s tongue on your pussy again and it's drives you crazy. It immediately begins to build again and in no time, you cum again.</p>
+		<p>Your climax starts to fade when you feel <<npc $sex.npcId>><</npc>>'s tongue on your pussy again and it's drives you crazy. It immediately begins to build again and in no time, you cum again.</p>
 		He keeps going, giving you orgasm after orgasm until every part of your body is taut with energy. You can feel your nipples quivering in the cool air. Your pussy is so sensitive it hurts. When his tongue touches your clit again the sensory overload from your repeated climaxes is too much. You urgently push his head away, scooting backwards away from him.
 		<p>"I can't!" you gasp. "Too much! Too sensitive!"</p>
 		You snap your legs closed, one of your hands between them, shuddering as you wait for your sensitivity to die down.
@@ -1326,7 +1326,7 @@
 hookup['orgasm'] = orgasm
 gs'arousal','cuni', 5
 gs'arousal','bj', -5
-'You bob your head up and down, enjoying the taste and feel of <<<<=$npcs.get($sex.npcId,'firstname')>>>>''s cock in your mouth while his tongue plays with your dripping pussy. There are a couple moments where he makes your whole body squirm and you have to pull off lest you bite his dick off. Just the same, there are a few moments you hear him gasp instead of feel his tongue. All the same, it gives you the same satisfaction.'
+'You bob your head up and down, enjoying the taste and feel of <<<<npc $sex.npcId>><</npc>>>>''s cock in your mouth while his tongue plays with your dripping pussy. There are a couple moments where he makes your whole body squirm and you have to pull off lest you bite his dick off. Just the same, there are a few moments you hear him gasp instead of feel his tongue. All the same, it gives you the same satisfaction.'
 *nl
 if hookup['orgasm'] < orgasm:
 'After a few minutes, you feel yourself arrive right at the edge of climax.'
@@ -1335,13 +1335,13 @@ cla & *clr
 '<<video "shared/sex/69/kotovsex70.mp4">>'
 '"Oh ffffffff-FFFFFFUCK!"'
 *nl
-'Your orgasm crashes over the edge and you can't help but release <<<<=$npcs.get($sex.npcId,'firstname')>>>>''s cock out of your mouth and cry out. Your muscles clench and it's all you can do to not crush his head between your knees.'
+'Your orgasm crashes over the edge and you can't help but release <<<<npc $sex.npcId>><</npc>>>>''s cock out of your mouth and cry out. Your muscles clench and it's all you can do to not crush his head between your knees.'
 *nl
 'Finally, it subsides and you're left tired but satisfied.'
 *nl
 if rand(0,1) = 1:
-'"Want to keep going?" <<<<=$npcs.get($sex.npcId,'firstname')>>>> asks. "Still got something you can take care of here."'
-'<<<<=$npcs.get($sex.npcId,'firstname')>>>> rolls his hips, waggling his cock below your face.'
+'"Want to keep going?" <<<<npc $sex.npcId>><</npc>>>> asks. "Still got something you can take care of here."'
+'<<<<npc $sex.npcId>><</npc>>>> rolls his hips, waggling his cock below your face.'
 act'Yeah let''s keep going':
 cla & *clr
 '<<image `'shared/sex/69/1.jpg'`>>'
@@ -1352,7 +1352,7 @@ end
 act'Why don't we fuck instead?':
 end
 else
-'"Ready to fuck now?" <<<<=$npcs.get($sex.npcId,'firstname')>>>> asks. "I'm done licking this pussy out, I want to see you stuffed with my cock instead."'
+'"Ready to fuck now?" <<<<npc $sex.npcId>><</npc>>>> asks. "I'm done licking this pussy out, I want to see you stuffed with my cock instead."'
 end
 end
 else
@@ -1392,7 +1392,7 @@ end} -->
 <<if $location_var[$here][0] == 'condoms'>>
 	<<if $npcs.get($sex.npcId,'condom_conscious') == 1>>
 		<<setinit $hookup['condom'] = 1>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> grabs a condom off his nightstand and starts to put it on.</p>
+		<p><<npc $sex.npcId>><</npc>> grabs a condom off his nightstand and starts to put it on.</p>
 		<<gs 'hookup' 'condoms2'>>
 	<<elseif getvar("$hookup['condom']") == 0>>
 		<<actCLA 'Wait, condom first'>>
@@ -1486,7 +1486,7 @@ end} -->
 <<if $location_var[$here][0] == 'condoms2'>>
 	<<actCLA 'Wait for him'>>
 		<<video "shared/sex/misc/wait.mp4">>
-		<p>You wait patiently for <<=$npcs.get($sex.npcId,'firstname')>> to roll the rubber onto his cock.</p>
+		<p>You wait patiently for <<npc $sex.npcId>><</npc>> to roll the rubber onto his cock.</p>
 		<<if getvar("$hookup['sex_jump']") == 0>>
 			<<gs 'hookup' 'position_choose'>>
 		<<else>>
@@ -1496,7 +1496,7 @@ end} -->
 	<<actCLA 'Put it on for him'>>
 		<<arouse 'foreplay_give' -2 >>
 		<<image "shared/sex/misc/condom_put.jpg">>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> tears open the packaging when you swiftly reach over and pluck the condom out of the wrapper.</p>
+		<p><<npc $sex.npcId>><</npc>> tears open the packaging when you swiftly reach over and pluck the condom out of the wrapper.</p>
 		"Let me take care of this for you," you say with a sexy smile. You gently roll the rubber sleeve down his shaft, squeezing just hard enough to make him twitch under your touch.
 		<<if getvar("$hookup['sex_jump']") == 0>>
 			<<gs 'hookup' 'position_choose'>>
@@ -1506,7 +1506,7 @@ end} -->
 	<</actCLA>>
 	<<actCLA 'Put it on with your mouth'>>
 		<<video "shared/sex/misc/condom_mouth.mp4">>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> tears open the packaging when you swiftly reach over and pluck the condom out of the wrapper.</p>
+		<p><<npc $sex.npcId>><</npc>> tears open the packaging when you swiftly reach over and pluck the condom out of the wrapper.</p>
 		"Let me take care of this for you," you say with a sexy smile. Placing it on the tip of his cock, you lean over and put your lips over both. Then, using both hands, you roll the sleeve down his shaft, following with your head, lips pressed tight against the rubber. Even through the rubber, you can feel the heat of his member against your tongue.
 		You bob your head up and down a few times for good measure before coming up, flashing a grin.
 		<<if getvar("$hookup['sex_jump']") == 0>>
@@ -1529,7 +1529,7 @@ end} -->
 				You glare at him, furious that he's trying to bargain his way into your pussy.
 				<p><i>Fuck</i> you!"</p>
 				<p>"I'm trying to but you won't let me!"</p>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> continues to complain at you while you grab all of your belongings and rush your way out the door, slamming it behind you.</p>
+				<p><<npc $sex.npcId>><</npc>> continues to complain at you while you grab all of your belongings and rush your way out the door, slamming it behind you.</p>
 				The nerve of some people.
 				<<actCLA 'Leave'>>
 					<<gt 'hookup_after' 'exit'>>
@@ -1545,7 +1545,7 @@ end} -->
 			<p>"What the fuck!" he complains. "It's just a condom, this isn't a big deal."</p>
 			<p>"Not a big deal??? Do you have any ide- You know what? <i>Fuck</i> you!"</p>
 			<p>"I'm trying to but you won't let me!"</p>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> continues to complain at you while you grab all of your belongings and rush your way out the door, slamming it behind you.</p>
+			<p><<npc $sex.npcId>><</npc>> continues to complain at you while you grab all of your belongings and rush your way out the door, slamming it behind you.</p>
 			The nerve of some people.
 			<<actCLA 'Leave'>>
 				<<gt 'hookup_after' 'exit'>>
@@ -1571,10 +1571,10 @@ end} -->
 			<<image "shared/sex/misc/condom_put.jpg">>
 			"That's okay, I've got one right here," you say, pulling a rubber from your bag and tearing it open.
 			<<if rand(1,3) > 2>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> seems a little disappointed as you roll it onto his cock for him. You think maybe he was just trying to weasel out of it so he could go bareback.</p>
+				<p><<npc $sex.npcId>><</npc>> seems a little disappointed as you roll it onto his cock for him. You think maybe he was just trying to weasel out of it so he could go bareback.</p>
 
 			<</if>>
-			<p>You smile at <<=$npcs.get($sex.npcId,'firstname')>> as you roll it onto his cock for him.</p>
+			<p>You smile at <<npc $sex.npcId>><</npc>> as you roll it onto his cock for him.</p>
 			<<gs 'hookup' 'position_choose'>>
 		<</actCLA>>
 	<</if>>
@@ -1590,14 +1590,14 @@ end} -->
 				<!-- !! he lied, he just wanted to go bareback-->
 				<p>"Wait! Wait!" You turn as he jumps towards his nightstand, digging through it. Moments later, he pulls out a rubber. "I have one after all! We can still have sex, right?"</p>
 				<<actCLA 'Wrong'>>
-					<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+					<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					"Wrong."
 					You ignore him and continue picking up your clothes and putting them on.
 					<p>"What? Why not?"</p>
 					<p>"Because I'm not going to sleep with a guy who just tried to trick me into going bareback with him because he 'doesn't have any condoms left'. Fuck you!"</p>
 					<p>"I'm trying to! I don't see what the problem is!"</p>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> continues to complain at you while you grab all of your belongings and stalk your way out the door, slamming it behind you.</p>
+					<p><<npc $sex.npcId>><</npc>> continues to complain at you while you grab all of your belongings and stalk your way out the door, slamming it behind you.</p>
 					The nerve of some people.
 					<<actCLA 'Leave'>>
 						<<gt 'hookup_after' 'exit'>>
@@ -1620,7 +1620,7 @@ end} -->
 						<!-- !! put in chance he rapes you-->
 						<!-- !!else-->
 						<p>"Nuh uh, no way! I'm not taking any chances!"</p>
-						<p>You throw your clothes on and rush out of <<=$npcs.get($sex.npcId,'firstname')>>'s apartment.</p>
+						<p>You throw your clothes on and rush out of <<npc $sex.npcId>><</npc>>'s apartment.</p>
 						<<actCLA 'Leave'>>
 							<<gt 'hookup_after' 'exit'>>
 						<</actCLA>>
@@ -1634,7 +1634,7 @@ end} -->
 					<</actCLA>>
 				<</actCLA>>
 				<<actCLA '... fine'>>
-					<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+					<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					<<setinit $hookup['condom'] = 4>>
 					You hesitate, thinking about it. You really don't want to get pregnant, but you also <i>really</i> want to get laid. Finally, you give him an answer.
@@ -1740,9 +1740,9 @@ end} -->
 		<<else>>
 			<<if $npcs.get($sex.npcId,'condom_conscious') == 1>>
 				<<setinit $hookup['condom'] = 1>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> pushes you back onto the bed, opening your legs and crawls on top of you. He takes a moment to roll a condom onto his cock before placing it just above your pussy.</p>
+				<p><<npc $sex.npcId>><</npc>> pushes you back onto the bed, opening your legs and crawls on top of you. He takes a moment to roll a condom onto his cock before placing it just above your pussy.</p>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> pushes you back onto the bed, opening your legs and crawls on top of you, placing his cock just above your pussy.</p>
+				<p><<npc $sex.npcId>><</npc>> pushes you back onto the bed, opening your legs and crawls on top of you, placing his cock just above your pussy.</p>
 				<<setinit $hookup['sex_jump'] = 1>>
 				<<gs 'hookup' 'condoms'>>
 			<</if>>
@@ -1767,9 +1767,9 @@ end} -->
 		<<else>>
 			<<if $npcs.get($sex.npcId,'condom_conscious') == 1>>
 				<<setinit $hookup['condom'] = 1>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> turns you around and pushes you onto the bed before pulling you up to your knees. You see him grab a condom from his nightstand and hear the sound of the package tearing. A few moments later, you feel his cock pressing against your pussy.</p>
+				<p><<npc $sex.npcId>><</npc>> turns you around and pushes you onto the bed before pulling you up to your knees. You see him grab a condom from his nightstand and hear the sound of the package tearing. A few moments later, you feel his cock pressing against your pussy.</p>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> turns you around and pushes you onto the bed before pulling you up to your knees. A few moments later, you feel his cock pressing against your pussy</p>
+				<p><<npc $sex.npcId>><</npc>> turns you around and pushes you onto the bed before pulling you up to your knees. A few moments later, you feel his cock pressing against your pussy</p>
 				<<setinit $hookup['sex_jump'] = 2>>
 				<<gs 'hookup' 'condoms'>>
 			<</if>>
@@ -1794,9 +1794,9 @@ end} -->
 		<<else>>
 			<<if $npcs.get($sex.npcId,'condom_conscious') == 1>>
 				<<setinit $hookup['condom'] = 1>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> rolls a condom onto his cock and pulls you onto the bed with him, making you straddle him. It seems like he wants you to be on top.</p>
+				<p><<npc $sex.npcId>><</npc>> rolls a condom onto his cock and pulls you onto the bed with him, making you straddle him. It seems like he wants you to be on top.</p>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> pulls you onto the bed with him, making you straddle him. It seems like he wants you to be on top.</p>
+				<p><<npc $sex.npcId>><</npc>> pulls you onto the bed with him, making you straddle him. It seems like he wants you to be on top.</p>
 				<<setinit $hookup['sex_jump'] = 3>>
 				<<gs 'hookup' 'condoms'>>
 			<</if>>

+ 115 - 115
sugarcube/src/autogenerated/unsorted/hookup_after.tw

@@ -78,14 +78,14 @@
 		<i>What the fuck was he thinking?!</i>
 	<</if>>
 	<<actCLA 'Cool off'>>
-		<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+		<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-		<p>After your initial tirade, you take a few deep breaths, calming down while <<=$npcs.get($sex.npcId,'firstname')>> tries to apologize to you.</p>
+		<p>After your initial tirade, you take a few deep breaths, calming down while <<npc $sex.npcId>><</npc>> tries to apologize to you.</p>
 		"Listen, I'm really sorry about that. It was a mistake, honest."
 		<<actCLA 'Whatever, it`s fine'>>
 			"Whatever, it's fine," you huff, waving your hand dismissively. "A mistake, like you said..." You say it's fine, but you're still pretty pissed. More than anything, you're...
 			<<actCLA '... angry with $npcs.get('+$sex.npcId,'firstname')+''>>
-				<p>... angry with <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+				<p>... angry with <<npc $sex.npcId>><</npc>>.</p>
 				<i>Fine? How could it be fine?!</i> you fume internally. <i>What part of you blowing your load inside me is "fine"?!</i>
 				<<gs 'hookup_after' 'pre'>>
 			<</actCLA>>
@@ -156,11 +156,11 @@
 	else
 	'<i>What was I thinking? What if I get an STD? What if I get pregnant?! Why didn''t I insist on a condom...</i>'
 	end} -->
-	<p>"Jeez, I didn't know you were going to freak out like this," <<=$npcs.get($sex.npcId,'firstname')>> says, holding his hands up defensively. "Just chill out! You can buy a morning after pill tomorrow, it'll be fine."</p>
+	<p>"Jeez, I didn't know you were going to freak out like this," <<npc $sex.npcId>><</npc>> says, holding his hands up defensively. "Just chill out! You can buy a morning after pill tomorrow, it'll be fine."</p>
 	<<actCLA 'Calm down'>>
-		<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+		<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-		<p>Trying to focus on his words, you force yoruself to take deep, slow breaths, calming down while <<=$npcs.get($sex.npcId,'firstname')>> tries to apologize to you.</p>
+		<p>Trying to focus on his words, you force yoruself to take deep, slow breaths, calming down while <<npc $sex.npcId>><</npc>> tries to apologize to you.</p>
 		<p>"See? It's all gonna be fine."</p>
 		<<actCLA 'He's right, it'll be fine'>>
 			<<if getvar("$birth_control['think_safe']") < 1>>
@@ -205,7 +205,7 @@
 		<</actCLA>>
 	<</actCLA>>
 	<<actCLA 'That's not what I'm concerned about! (STDs)'>>
-		<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+		<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		<p>"That's not what I'm concerned about!" you say, your hyperventilating getting worse.</p>
 		<p>"Then wha- Wait, you think I have an STD???"</p>
@@ -218,9 +218,9 @@
 		<</if>>
 		<p>"Well I'm fucking clean, alright?! I promise!"</p>
 		<<actCLA 'Calm down'>>
-			<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+			<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-			<p>Trying to focus on his words, you force yoruself to take deep, slow breaths, calming down while <<=$npcs.get($sex.npcId,'firstname')>> tries to reassure you.</p>
+			<p>Trying to focus on his words, you force yoruself to take deep, slow breaths, calming down while <<npc $sex.npcId>><</npc>> tries to reassure you.</p>
 			<i>He's right, it'll be okay. You're on birth control and he came inside you so it's okay! He's not going to have an STD. Can't have one! Because if he did that would... Nope! I'm not gonna think about that! Because I'm not getting an STD tonight! Everything is going to be fine! <b>It's going to be fine!</b></i>
 			After running through this thought process several more times accompanied by many more breaths, you finally begin to calm down.
 			<<gs 'hookup_after' 'pre'>>
@@ -291,7 +291,7 @@
 						A few moments later he pulls his cock from your pussy and you feel a thick liquid immediately dribble out after it.
 					<<elseif $hookup['position'] == 'cowgirl'>>
 						<<video "shared/sex/cum/vagcreampie/cowgirl3.mp4">>
-						<p>Carefully, you raise yourself off of <<=$npcs.get($sex.npcId,'firstname')>>. The moment his cock is free of your pussy, you feel a thick glob of cum begin to leak out of you.</p>
+						<p>Carefully, you raise yourself off of <<npc $sex.npcId>><</npc>>. The moment his cock is free of your pussy, you feel a thick glob of cum begin to leak out of you.</p>
 					<</if>>
 					<<if $npcs.get($sex.npcId,'selfish') > 0 or $npcs.get($sex.npcId,'abusive') > 0>>
 						"Ahh yeah. Cumming inside is the best."
@@ -324,8 +324,8 @@
 				<<elseif $hookup['position'] == 'cowgirl'>>
 					<<video "shared/sex/cum/vagcreampie/cumvaginal.mp4">>
 				<</if>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>>'s cock pulses inside you, pumping more heat into your insides. It fills you up, making you feel euphoric, and sends you right over the edge.</p>
-				<p>Orgasmic tremors quake through your body, covering your skin in goosebumps as your eyes roll back in your skull and moan incoherrently. You tremble, unable to do anything except quiver around <<=$npcs.get($sex.npcId,'firstname')>>'s cock, even long after it finishes twitching inside you.</p>
+				<p><<npc $sex.npcId>><</npc>>'s cock pulses inside you, pumping more heat into your insides. It fills you up, making you feel euphoric, and sends you right over the edge.</p>
+				<p>Orgasmic tremors quake through your body, covering your skin in goosebumps as your eyes roll back in your skull and moan incoherrently. You tremble, unable to do anything except quiver around <<npc $sex.npcId>><</npc>>'s cock, even long after it finishes twitching inside you.</p>
 				<<actCLA 'Continue'>>
 					<<gt 'hookup_after' 'creampie_surprise_cum'>>
 				<</actCLA>>
@@ -338,7 +338,7 @@
 	if $hookup['position'] = 'miss':
 	cla & *clr
 	'<<image `'shared/sex/cum/vagcreampie/oops.jpg'`>>'
-	'"Did you just..." <<<<=$npcs.get($sex.npcId,'firstname')>>>> pulls out of you. You feel something trickle from your pussy and your eyes go wide. "... come inside me?"'
+	'"Did you just..." <<<<npc $sex.npcId>><</npc>>>> pulls out of you. You feel something trickle from your pussy and your eyes go wide. "... come inside me?"'
 	elseif $hookup['position'] = 'doggy':
 	cla & *clr
 	'<<video "shared/sex/cum/vagcreampie/drip1.mp4">>'
@@ -350,7 +350,7 @@
 	else
 	cla & *clr
 	'<<video "shared/sex/cum/vagcreampie/creampie2.mp4">>'
-	'A bit stunned, you carefully pull yourself off of <<<<=$npcs.get($sex.npcId,'firstname')>>>>''s cock. As it pops from your pussy, you feel a glob of something leak out. Wiping with your hand, it comes back with white liquid smeared across it.'
+	'A bit stunned, you carefully pull yourself off of <<<<npc $sex.npcId>><</npc>>>>''s cock. As it pops from your pussy, you feel a glob of something leak out. Wiping with your hand, it comes back with white liquid smeared across it.'
 	end
 	end
 	if hookup['not_inside'] = 1 or hookup['condom'] > 2:
@@ -418,7 +418,7 @@
 	act'Premature ejaculation is hot':
 	cla & *nl
 	'"It's not that," you shake your head. It's premature ejaculation."'
-	'<<<<=$npcs.get($sex.npcId,'firstname')>>>> gives you a look.'
+	'<<<<npc $sex.npcId>><</npc>>>> gives you a look.'
 	'"Seriously."'
 	'You nod in satisfaction, feeling a glob of cum leak out of you.'
 	'"I'm so sexy and desirable that a guy can't hold his load? Can't help but nut inside of me? <i>So</i> fucking hot!"'
@@ -449,7 +449,7 @@
 			<<setinit $hookup['did_you_cum_inside'] = 1>>
 			<<if $hookup['position'] == 'miss'>>
 				<<image "shared/sex/cum/vagcreampie/oops.jpg">>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> pulls out of you and you feel something trickle from your pussy.</p>
+				<p><<npc $sex.npcId>><</npc>> pulls out of you and you feel something trickle from your pussy.</p>
 				<p>"Did you just... cum inside me?"</p>
 			<<elseif $hookup['position'] == 'doggy'>>
 				<<video "shared/sex/cum/vagcreampie/drip1.mp4">>
@@ -461,7 +461,7 @@
 					<p>"Did you just... cum inside me?"</p>
 				<<else>>
 					<<video "shared/sex/cum/vagcreampie/creampie2.mp4">>
-					<p>A bit stunned, you carefully pull yourself off of <<=$npcs.get($sex.npcId,'firstname')>>'s cock. As it pops from your pussy, you feel a glob of something leak out.</p>
+					<p>A bit stunned, you carefully pull yourself off of <<npc $sex.npcId>><</npc>>'s cock. As it pops from your pussy, you feel a glob of something leak out.</p>
 					<p>"Did you just... cum inside me?"</p>
 				<</if>>
 			<</if>>
@@ -529,7 +529,7 @@
 				<<if getvar("$hookup['creampie_surprise']") == 1>>
 					<<actCLA 'Premature ejaculation is hot'>>
 						"It's not that," you shake your head. It's premature ejaculation."
-						<p><<=$npcs.get($sex.npcId,'firstname')>> gives you a look.</p>
+						<p><<npc $sex.npcId>><</npc>> gives you a look.</p>
 						"Seriously."
 						You nod in satisfaction, feeling a glob of cum leak out of you.
 						<p>"I'm so sexy and desirable that a guy can't hold his load? Can't help but nut inside of me? <i>So</i> fucking hot!"</p>
@@ -589,7 +589,7 @@
 		<<actCLA 'It was hot'>>
 			<<video "shared/sex/after/pillow_talk1.mp4">>
 			"It <i>was</i> pretty hot," you smile wryly.
-			<p>"I knew I liked you," <<=$npcs.get($sex.npcId,'firstname')>> grins back at you</p>
+			<p>"I knew I liked you," <<npc $sex.npcId>><</npc>> grins back at you</p>
 			<<gs 'hookup_after' 'pre'>>
 			<<gs 'hookup_talk' 'pillow_talk1'>>
 		<</actCLA>>
@@ -611,7 +611,7 @@
 			"It was cute," you laugh gently.
 			<p>"... cute...?"</p>
 			"It's kind of... sweet, that you can't hold it while you're inside me. I thought it was adorable."
-			<p>You shrug, a bit embarrassed, but it seems to have reassured <<=$npcs.get($sex.npcId,'firstname')>> and he settles down.</p>
+			<p>You shrug, a bit embarrassed, but it seems to have reassured <<npc $sex.npcId>><</npc>> and he settles down.</p>
 			<<gs 'hookup_after' 'pre'>>
 			<<gs 'hookup_talk' 'pillow_talk1'>>
 		<</actCLA>>
@@ -629,23 +629,23 @@
 <<if $location_var[$here][0] == 'creampie_surprise_cum'>>
 	<<if $hookup['position'] == 'miss'>>
 		<<video "shared/sex/cum/vagcreampie/miss1.mp4">>
-		<p>You as you lay there, breathing heavily, as <<=$npcs.get($sex.npcId,'firstname')>> slowly begins to pull himself out of you. His cock slips from your pussy, eliciting a whimper from you. A stream of liquid trickles out after it, running from the valley of your sore snatch, and leaves you feeling empty.</p>
+		<p>You as you lay there, breathing heavily, as <<npc $sex.npcId>><</npc>> slowly begins to pull himself out of you. His cock slips from your pussy, eliciting a whimper from you. A stream of liquid trickles out after it, running from the valley of your sore snatch, and leaves you feeling empty.</p>
 	<<elseif $hookup['position'] == 'doggy'>>
 		<<image "shared/sex/cum/vagcreampie/doggy1.jpg">>
-		<p>You let your arms collapse under you, leaving you ass up and head down as <<=$npcs.get($sex.npcId,'firstname')>> slips his cock from inside you. Its vacation of your snatch elicits a whimer from you, exacerbated further when you feel something trickle out after it, leaving you feeling sore and truly empty.</p>
+		<p>You let your arms collapse under you, leaving you ass up and head down as <<npc $sex.npcId>><</npc>> slips his cock from inside you. Its vacation of your snatch elicits a whimer from you, exacerbated further when you feel something trickle out after it, leaving you feeling sore and truly empty.</p>
 	<<elseif $hookup['position'] == 'cowgirl'>>
 		<<video "shared/sex/cum/vagcreampie/cowgirl3.mp4">>
-		<p>You sit on top of <<=$npcs.get($sex.npcId,'firstname')>>, breathing heavily, still impaled by his manhood. Seeming exhausted himself, he lifts your hips up with one hand and just barely manages to slip his cock from your pussy. The feeling elicits a whimper from you and thick liquid trails from the tip, already oozing from your sore snatch.</p>
+		<p>You sit on top of <<npc $sex.npcId>><</npc>>, breathing heavily, still impaled by his manhood. Seeming exhausted himself, he lifts your hips up with one hand and just barely manages to slip his cock from your pussy. The feeling elicits a whimper from you and thick liquid trails from the tip, already oozing from your sore snatch.</p>
 	<</if>>
 	"That..." you pant. "That was..."
 	<<if (getvar("$hookup['not_inside']") == 1 or getvar("$hookup['condom']") > 2) and $npcs.get($sex.npcId,'abusive') != 1>>
-		<p>"I'm so sorry!" <<=$npcs.get($sex.npcId,'firstname')>> quickly says. "I didn't mean to! I know you told me not to, I just-! Really! I didn't mean to!" He looks at you anxiously and seeming to be genuinely apologetic.</p>
+		<p>"I'm so sorry!" <<npc $sex.npcId>><</npc>> quickly says. "I didn't mean to! I know you told me not to, I just-! Really! I didn't mean to!" He looks at you anxiously and seeming to be genuinely apologetic.</p>
 		<<gs 'hookup_talk' 'creampie_surprise_cum_react1'>>
 	<<elseif rand(1,3) == 3 and $npcs.get($sex.npcId,'generous') == 1>>
-		<p>"I'm so sorry!" <<=$npcs.get($sex.npcId,'firstname')>> quickly says. "I didn't mean to! I thought I could hold on a little longer, but your pussy was so tight and suddenly-" He looks at you anxiously and seeming to be genuinely apologetic.</p>
+		<p>"I'm so sorry!" <<npc $sex.npcId>><</npc>> quickly says. "I didn't mean to! I thought I could hold on a little longer, but your pussy was so tight and suddenly-" He looks at you anxiously and seeming to be genuinely apologetic.</p>
 		<<gs 'hookup_talk' 'creampie_surprise_cum_react1'>>
 	<<else>>
-		<p>"Your pussy is amazing," <<=$npcs.get($sex.npcId,'firstname')>> says, rolling over next to you. breathing just as heavily as you are. "Squeezed the cum right out of me."</p>
+		<p>"Your pussy is amazing," <<npc $sex.npcId>><</npc>> says, rolling over next to you. breathing just as heavily as you are. "Squeezed the cum right out of me."</p>
 		<<gs 'hookup_talk' 'creampie_surprise_cum_react2'>>
 	<</if>>
 <</if>>
@@ -663,7 +663,7 @@
 				You lay back on the bed, letting the cum trickle from your pussy run down the curve of your ass.
 			<</if>>
 			<<if getvar("$hookup['not_inside']") == 1 or getvar("$hookup['condom']") == 2 or getvar("$hookup['condom']") == 3>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> looks at you expectantly, waiting for you to say something.</p>
+				<p><<npc $sex.npcId>><</npc>> looks at you expectantly, waiting for you to say something.</p>
 				<<if getvar("$tabletkishot") > 0>>
 					"I'm on the shot. I just wanted to be extra safe."
 				<<elseif getvar("$birth_control['think_safe']") == 1>>
@@ -695,7 +695,7 @@
 		<</if>>
 		<<if getvar("$hookup['not_inside']") == 1 or getvar("$hookup['condom']") == 2 or getvar("$hookup['condom']") == 3>>
 			"It's fine. I'm on birth control," you lie through your teeth.
-			<p><<=$npcs.get($sex.npcId,'firstname')>> seems to relax, reassured by your words and relieved that you're not upset.</p>
+			<p><<npc $sex.npcId>><</npc>> seems to relax, reassured by your words and relieved that you're not upset.</p>
 		<<else>>
 			"Don't worry. I'm on birth control," you smile at him gently, lying through your teeth.
 		<</if>>
@@ -745,13 +745,13 @@
 <<if $location_var[$here][0] == 'light_cigarette'>>
 	<<if getvar("$hookup['cigarette']") == 0>>
 		<<if $npcs.get($sex.npcId,'smoker') > 0>>
-			<p>The moment you pull away from each other, <<=$npcs.get($sex.npcId,'firstname')>> reaches over and pulls out a pack of cigarettes, lighting one for himself and inhaling deeply.</p>
+			<p>The moment you pull away from each other, <<npc $sex.npcId>><</npc>> reaches over and pulls out a pack of cigarettes, lighting one for himself and inhaling deeply.</p>
 			<<setinit $hookup['cigarette'] = -1>>
 			<<actCLA 'Ask to bum a cigarette'>>
 				<<setinit $hookup['cigarette'] = 5>>
 				<<image "shared/sex/after/bed_smoke2.jpg">>
 				<p>"Any chance I could get one of those?" you ask in the most sultry way you can.</p>
-				<p>"Cost is one fuck per," <<=$npcs.get($sex.npcId,'firstname')>> says, grinning.</p>
+				<p>"Cost is one fuck per," <<npc $sex.npcId>><</npc>> says, grinning.</p>
 				"Well it's a good thing I paid up front then," you smile back, plucking one from his pack.
 				<<actCLA 'Continue'>>
 					<<set $siga += 1>>
@@ -800,7 +800,7 @@
 		<<setinit $hookup['cigarette'] = 5>>
 		<<image "shared/sex/after/bed_smoke2.jpg">>
 		<p>"Any chance I could get one of those?" you ask in the most sultry way you can.</p>
-		<p>"Cost is one fuck per," <<=$npcs.get($sex.npcId,'firstname')>> says, grinning.</p>
+		<p>"Cost is one fuck per," <<npc $sex.npcId>><</npc>> says, grinning.</p>
 		"Well it's a good thing I paid up front then," you smile back, plucking one from his pack.
 		<<actCLA 'Continue'>>
 			<<set $siga += 1>>
@@ -831,14 +831,14 @@
 	<<gs 'hookup_after' 'light_cigarette'>>
 	<<if (rand(1,10) > 7 or getvar("$hookup['get_out']") == 1) and getvar("$hookup['get_out']") != 2>>
 		<<actCLA 'Continue'>>
-			<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+			<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			<<if getvar("$hookup['get_out']") == 1>>
 				"You should go," he says, glaring at you.
 			<<elseif $npcs.get($sex.npcId,'smoker') > 0>>
-				<p>"So uhh," <<=$npcs.get($sex.npcId,'firstname')>> says between puffs. "You should go."</p>
+				<p>"So uhh," <<npc $sex.npcId>><</npc>> says between puffs. "You should go."</p>
 			<<else>>
-				<p>"Hey so uhh," <<=$npcs.get($sex.npcId,'firstname')>> says, cracking his neck. "You should really go."</p>
+				<p>"Hey so uhh," <<npc $sex.npcId>><</npc>> says, cracking his neck. "You should really go."</p>
 			<</if>>
 			<<actCLA 'Yeah, I should'>>
 				"Yeah, I really ought to get going," you agree, hauling yourself out of bed.
@@ -853,14 +853,14 @@
 						<<if getvar("$cum_loc['vagina']") > 0 or $hookup['cum_choice'] == 'creampie'>>
 							<!-- !! vagina-->
 							<<if getvar("$q.therapist.hypnoAddict") > 0>>
-								<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+								<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 								<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 								<<if getvar("$hookup['wipes']") == 1>>
 									You reach down to your purse and pull out your bag of wipes before you stop, suddenly confused.
 									<p><i>Why did I get out my wipes?</i> you think to yourself. You frown at the packet, befuddled as to what you wanted to do with the,.</p>
 									<i>Meh. If it's important, it will come back to me later,</i> you think to yourself as you put it back into your purse, oblivious to the liquid dribbling down the inside of your thigh.
 								<<elseif getvar("$hookup['wipes']") == 2>>
-									<p>"Hey, do you-" you start and then suddenly lose track of what you were trying to say. You frown to yourself as <<=$npcs.get($sex.npcId,'firstname')>> looks at you quizically.</p>
+									<p>"Hey, do you-" you start and then suddenly lose track of what you were trying to say. You frown to yourself as <<npc $sex.npcId>><</npc>> looks at you quizically.</p>
 									<p>"Did you need something?"</p>
 									"I uhh..." Your frown deepens. "I wanted to ask you something... but I forgot what it was... I guess it doesn''t really matter..."
 									<i>Meh. If it's important, it will come back to me later,</i> you think to yourself, oblivious to the liquid dribbling down the inside of your thigh.
@@ -869,7 +869,7 @@
 								<<if getvar("$hookup['wipes']") == 2>>
 									<<video "shared/sex/cum/vagcreampie/after1.mp4">>
 									<p>"Hey, got anything I can use to clean up?" you say, holding your fingers over your pussy, trying to keep the cum from spilling out any further.</p>
-									<p>"Oh yeah, right here." <<=$npcs.get($sex.npcId,'firstname')>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.</p>
+									<p>"Oh yeah, right here." <<npc $sex.npcId>><</npc>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.</p>
 								<<else>>
 									<<image "shared/sex/cum/cum111.jpg">>
 									You really need to clean yourself after up after that. Reaching down to your purse, you pull some wipes out of your purse before reaching between your legs to wipe yourself up.
@@ -877,7 +877,7 @@
 								<</if>>
 							<</if>>
 						<<elseif getvar("$cum_loc['face']") > 0 or $hookup['cum_choice'] == 'face'>>
-							<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+							<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 							<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 							<<if $inventory.get("wipe") > 0>>
 								<<run $inventory.dec('wipe',1)>>
@@ -886,31 +886,31 @@
 							<</if>>
 							<<if getvar("$hookup['wipes']") == 2>>
 								<p>"Hey, got anything I can use to clean up?" you smirk, pointing at your sperm glazed face.</p>
-								<p>"Oh yeah, right here." <<=$npcs.get($sex.npcId,'firstname')>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.</p>
+								<p>"Oh yeah, right here." <<npc $sex.npcId>><</npc>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.</p>
 							<</if>>
 							<<if getvar("$cum_loc['hair']") > 0>>
 								<!-- !! hair-->
-								<p>You carefully wipe the cum from your face, making sure to get every last drop, including getting the tangled web that <<=$npcs.get($sex.npcId,'firstname')>> managed to get in your hair. About a minute later, you can still feel a faintly sticky layer over the top of your skin, but at least nobody is going to give you funny looks walking down the street.</p>
+								<p>You carefully wipe the cum from your face, making sure to get every last drop, including getting the tangled web that <<npc $sex.npcId>><</npc>> managed to get in your hair. About a minute later, you can still feel a faintly sticky layer over the top of your skin, but at least nobody is going to give you funny looks walking down the street.</p>
 							<<else>>
 								You carefully wipe the cum from your face, making sure to get every last drop. About a minute later, you can still feel a faintly sticky layer over the top of your skin, but at least nobody is going to give you funny looks walking down the street.
 							<</if>>
 						<<elseif getvar("$cum_loc['stomach']") > 0 or $hookup['cum_choice'] == 'stomach'>>
 							<!-- !! stomach-->
-							<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+							<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 							<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 							<<if getvar("$hookup['wipes']") == 2>>
 								<p>"Hey, got anything I can use to clean up?" you ask, looking at your belly, cum still spattered over it.</p>
-								<p>"Oh yeah, right here." <<=$npcs.get($sex.npcId,'firstname')>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and wipe the loose sperm from your stomach before reaching for your clothes.</p>
+								<p>"Oh yeah, right here." <<npc $sex.npcId>><</npc>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and wipe the loose sperm from your stomach before reaching for your clothes.</p>
 							<<else>>
 								Pulling a wipe from your purse, you wipe the sperm from your stomach before reaching for your clothes.
 							<</if>>
 						<<elseif getvar("$cum_loc['butt']") > 0 or $hookup['cum_choice'] == 'ass' or $hookup['cum_choice'] == 'back'>>
 							<!-- !! butt-->
-							<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+							<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 							<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 							<<if getvar("$hookup['wipes']") == 2>>
 								<p>"Hey, got anything I can use to clean up?" you ask, looking over your shoulder and wiggling your ass to emphasize the cum resting on it.</p>
-								<p>"Oh yeah, right here." <<=$npcs.get($sex.npcId,'firstname')>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.</p>
+								<p>"Oh yeah, right here." <<npc $sex.npcId>><</npc>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.</p>
 							<<else>>
 								You really need to clean yourself after up after that. Reaching down to your purse, you pull some wipes out of your purse.
 							<</if>>
@@ -937,7 +937,7 @@
 							<<actCLA 'Get dressed'>>
 								<<video "pc/activities/misc/dress_1.mp4">>
 								<<gs 'hookup_after' 'dress'>>
-								<p>"Sheezus. Who shat in your cereal?" you roll your eyes at him, reaching for your clothes. You get dressed quickly, <<=$npcs.get($sex.npcId,'firstname')>> grumpily ignoring you the whole time. Once finished, you head towards the door.</p>
+								<p>"Sheezus. Who shat in your cereal?" you roll your eyes at him, reaching for your clothes. You get dressed quickly, <<npc $sex.npcId>><</npc>> grumpily ignoring you the whole time. Once finished, you head towards the door.</p>
 								"Guess I'll just see myself out," you mumble, leaving his apartment and shutting the door behind you.
 								<<actCLA 'Leave'>>
 									<<gt 'hookup_after' 'exit'>>
@@ -965,12 +965,12 @@
 								<<video "shared/home/bathroom/dush.mp4">>
 								<<setinit $hookup['shower'] = 1>>
 								<<gs 'cleanBody'>>
-								<p>You turn on the faucet, relaxing as the hot water pours down over your skin. After a few minutes, you turn the tap off, and step out, walking back to <<=$npcs.get($sex.npcId,'firstname')>>'s room wet and dripping. <<=$npcs.get($sex.npcId,'firstname')>> is still there, relaxing in his bed.</p>
+								<p>You turn on the faucet, relaxing as the hot water pours down over your skin. After a few minutes, you turn the tap off, and step out, walking back to <<npc $sex.npcId>><</npc>>'s room wet and dripping. <<npc $sex.npcId>><</npc>> is still there, relaxing in his bed.</p>
 								<<actCLA 'Get dressed'>>
 									<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 									<<gs 'hookup_after' 'dress'>>
 									"Thanks," you smile. "I really needed that. Anyways, thanks for the hookup."
-									<p>"Yeah, you were a great lay too," <<=$npcs.get($sex.npcId,'firstname')>> replies, watching you pull your clothes over your still-moist body.</p>
+									<p>"Yeah, you were a great lay too," <<npc $sex.npcId>><</npc>> replies, watching you pull your clothes over your still-moist body.</p>
 									<p>"Maybe I'll see you around sometime?" you wink, giving them a last second adjustment before grabbbing the rest of your things.</p>
 									"Maybe," he smirks back. Taking that as your final goodbye, you give him a little wave and head out of his apartment, closing the door behind you.
 									<<actCLA 'Leave'>>
@@ -1012,7 +1012,7 @@
 					<<if $inventory.get("wipe") > 0>>
 						<p><i>Wow... Real class act this one... Great choice on this one $pc.name_nick,</i> you think to yourself as you pull your own wipes from your purse.</p>
 						<<actCLA 'Get cleaned up and go'>>
-							<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+							<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 							<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 							<<if getvar("$q.therapist.hypnoAddict") > 0>>
 								<<set $cumspclnt = 18>>
@@ -1022,23 +1022,23 @@
 							<<if getvar("$cum_loc['face']") > 0 or $hookup['cum_choice'] == 'face'>>
 								<<if getvar("$cum_loc['hair']") > 0>>
 									<!-- !! hair-->
-									<p>You carefully wipe the cum from your face, making sure to get every last drop, including getting the tangled web that <<=$npcs.get($sex.npcId,'firstname')>> managed to get in your hair. About a minute later, you can still feel a faintly sticky layer over the top of your skin, but at least nobody is going to give you funny looks walking down the street.</p>
+									<p>You carefully wipe the cum from your face, making sure to get every last drop, including getting the tangled web that <<npc $sex.npcId>><</npc>> managed to get in your hair. About a minute later, you can still feel a faintly sticky layer over the top of your skin, but at least nobody is going to give you funny looks walking down the street.</p>
 								<<else>>
 									You carefully wipe the cum from your face, making sure to get every last drop. About a minute later, you can still feel a faintly sticky layer over the top of your skin, but at least nobody is going to give you funny looks walking down the street.
 								<</if>>
 							<<elseif getvar("$cum_loc['stomach']") > 0 or $hookup['cum_choice'] == 'stomach'>>
 								<!-- !! stomach-->
-								<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+								<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 								<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 								Pulling a wipe from your purse, you wipe the sperm from your stomach before reaching for your clothes.
 							<<elseif getvar("$cum_loc['butt']") > 0 or $hookup['cum_choice'] == 'ass' or $hookup['cum_choice'] == 'back'>>
 								<!-- !! butt-->
-								<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+								<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 								<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 								You really need to clean yourself after up after that. Reaching down to your purse, you pull some wipes out of your purse.
 							<<elseif getvar("$cum_loc['vagina']") > 0 or $hookup['cum_choice'] == 'creampie'>>
 								<!-- !! vagina-->
-								<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+								<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 								<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 								<<if getvar("$q.therapist.hypnoAddict") > 0>>
 									You reach down to your purse and pull out your bag of wipes before you stop, suddenly confused.
@@ -1089,27 +1089,27 @@
 				 				<<if $hookup['cum_choice'] == 'face'>>
 					<!-- !! face-->
 					<<image "shared/sex/cum/facial/facial35.jpg">>
-					<p>Feeling tired, you stretch out on the bed, relaxing in the afterglow, letting the cum rest on your face as you glance over at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+					<p>Feeling tired, you stretch out on the bed, relaxing in the afterglow, letting the cum rest on your face as you glance over at <<npc $sex.npcId>><</npc>>.</p>
 				<<elseif $hookup['cum_choice'] == 'stomach'>>
 					<!-- !! stomach-->
 					<<image "shared/sex/cum/stomach/bellycum3.jpg">>
-					<p>Feeling tired, you stretch out on the bed, relaxing in the afterglow, cum still resting on your stomach as you glance over at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+					<p>Feeling tired, you stretch out on the bed, relaxing in the afterglow, cum still resting on your stomach as you glance over at <<npc $sex.npcId>><</npc>>.</p>
 				<<elseif $hookup['cum_choice'] == 'ass' or $hookup['cum_choice'] == 'back'>>
 					<!-- !! butt-->
 					<<image "shared/sex/cum/back1.jpg">>
-					<p>Feeling tired, you lay down on your belly, letting the cum sit on your back as you rest your head on your arm, glancing at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+					<p>Feeling tired, you lay down on your belly, letting the cum sit on your back as you rest your head on your arm, glancing at <<npc $sex.npcId>><</npc>>.</p>
 				<<elseif $hookup['cum_choice'] == 'creampie'>>
 					<!-- !! vagina-->
 					<<image "shared/sex/cum/vagcreampie/after1.jpg">>
-					<p>Tired, you stretch out on the bed and relax. Laying your head on one of <<=$npcs.get($sex.npcId,'firstname')>>'s pillows, passively aware of his cum continuing to leak from your pussy as you mindlessly stare at the ceiling.</p>
-					<!-- !!				'Tired, you curl up onto your side to face <<<<=$npcs.get($sex.npcId,'firstname')>>>>, passively aware that his cum is still leaking from your pussy, slowly dribbling down the curve of your thigh.'-->
+					<p>Tired, you stretch out on the bed and relax. Laying your head on one of <<npc $sex.npcId>><</npc>>'s pillows, passively aware of his cum continuing to leak from your pussy as you mindlessly stare at the ceiling.</p>
+					<!-- !!				'Tired, you curl up onto your side to face <<<<npc $sex.npcId>><</npc>>>>, passively aware that his cum is still leaking from your pussy, slowly dribbling down the curve of your thigh.'-->
 				<<else>>
-					<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+					<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					Feeling tired, you stretch out on the bed, relaxing in the afterglow.
 				<</if>>
 			<<else>>
-				 				<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+				 				<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				Feeling tired, you stretch out on the bed, relaxing in the afterglow.
 			<</if>>
@@ -1117,7 +1117,7 @@
 		<</actCLA>>
 		<<actCLA 'Get up'>>
 			<<setinit $hookup['get_up'] = 1>>
-			<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+			<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			<<gs 'hookup_after' 'start'>>
 			You swing your legs over the side and scooting forward until your feet touch the ground and allow you to stand up from the bed.
@@ -1130,14 +1130,14 @@
 				Ignoring the cum dripping from your face, roll over onto your stomach, reaching down to your purse. Pulling out your phone, you take a scroll through your feeds, zoning out in the mindless social media and relaxing as you wind down.
 			<<elseif $hookup['cum_choice'] == 'stomach'>>
 				<!-- !! stomach-->
-				<p>Rolling over onto your stomach, you feel <<=$npcs.get($sex.npcId,'firstname')>>'s cum smear across your stomach and the sheets as you reach down to your purse. Pulling out your phone, you take a scroll through your feeds, zoning out in the mindless social media and relaxing as you wind down.</p>
+				<p>Rolling over onto your stomach, you feel <<npc $sex.npcId>><</npc>>'s cum smear across your stomach and the sheets as you reach down to your purse. Pulling out your phone, you take a scroll through your feeds, zoning out in the mindless social media and relaxing as you wind down.</p>
 				<<setinit $hookup['wipes'] = 0>>
 			<<elseif $hookup['cum_choice'] == 'ass' or $hookup['cum_choice'] == 'back'>>
 				<!-- !! butt-->
 				Scooching over to the edge of the bed, you reach down to your purse, pulling out your phone. You scrolling through your feeds, zoning out in the mindless social media and relaxing as you wind down.
 			<<elseif $hookup['cum_choice'] == 'creampie'>>
 				<!-- !! vagina-->
-				<p>Rolling over the other way, you reach down from the bed and pull your phone from your purse. A few taps later, you're scrolling through social media feeds, zoning out for a few minutes while <<=$npcs.get($sex.npcId,'firstname')>>'s cum continues to leak from your pussy.</p>
+				<p>Rolling over the other way, you reach down from the bed and pull your phone from your purse. A few taps later, you're scrolling through social media feeds, zoning out for a few minutes while <<npc $sex.npcId>><</npc>>'s cum continues to leak from your pussy.</p>
 			<</if>>
 			<<gs 'hookup_after' 'start'>>
 		<</actCLA>>
@@ -1181,13 +1181,13 @@
 		<<image "shared/sex/cum/facial/facial36.jpg">>
 		<<if getvar("$hookup['wipes']") == 2>>
 			<p>"Hey, got anything I can use to clean up?" you trying not to smile under the spunk covering your face.</p>
-			<p>"Oh yeah, right here." <<=$npcs.get($sex.npcId,'firstname')>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.</p>
+			<p>"Oh yeah, right here." <<npc $sex.npcId>><</npc>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.</p>
 		<<else>>
 			You reach up and poke at the sperm coating your face. Ew. You really need to clean that up before you do anything else. Reaching down to your purse, you pull some wipes out of your purse.
 		<</if>>
 		<<if getvar("$cum_loc['hair']") > 0>>
 			<!-- !! hair-->
-			<p>You carefully wipe the cum from your face, making sure to get every last drop, including getting the tangled web that <<=$npcs.get($sex.npcId,'firstname')>> managed to get in your hair. About a minute later, you can still feel a faintly sticky layer over the top of your skin, but at least nobody is going to give you funny looks walking down the street.</p>
+			<p>You carefully wipe the cum from your face, making sure to get every last drop, including getting the tangled web that <<npc $sex.npcId>><</npc>> managed to get in your hair. About a minute later, you can still feel a faintly sticky layer over the top of your skin, but at least nobody is going to give you funny looks walking down the street.</p>
 		<<else>>
 			You carefully wipe the cum from your face, making sure to get every last drop. About a minute later, you can still feel a faintly sticky layer over the top of your skin, but at least nobody is going to give you funny looks walking down the street.
 		<</if>>
@@ -1197,7 +1197,7 @@
 		<<image "shared/sex/cum/stomach/bellycum3.jpg">>
 		<<if getvar("$hookup['wipes']") == 2>>
 			<p>"Hey, got anything I can use to clean up?" you ask, looking at your belly, cum still spattered over it.</p>
-			<p>"Oh yeah, right here." <<=$npcs.get($sex.npcId,'firstname')>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.</p>
+			<p>"Oh yeah, right here." <<npc $sex.npcId>><</npc>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.</p>
 		<<else>>
 			You really need to clean yourself after up after that. Reaching down to your purse, you pull some wipes out of your purse.
 		<</if>>
@@ -1207,7 +1207,7 @@
 		<<image "shared/sex/cum/back1.jpg">>
 		<<if getvar("$hookup['wipes']") == 2>>
 			<p>"Hey, got anything I can use to clean up?" you ask, looking over your shoulder and wiggling your ass to emphasize the cum resting on it.</p>
-			<p>"Oh yeah, right here." <<=$npcs.get($sex.npcId,'firstname')>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work awkwardly trying to wipe your ass and up your back.</p>
+			<p>"Oh yeah, right here." <<npc $sex.npcId>><</npc>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work awkwardly trying to wipe your ass and up your back.</p>
 		<<else>>
 			You really need to clean yourself after up after that. Reaching down to your purse, you pull some wipes out of your purse, awkwardly wiping your ass and back with it.
 		<</if>>
@@ -1215,14 +1215,14 @@
 	<<elseif getvar("$cum_loc['vagina']") > 0 or $hookup['cum_choice'] == 'creampie'>>
 		<!-- !! vagina-->
 		<<if getvar("$q.therapist.hypnoAddict") > 0>>
-			<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+			<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			<<if getvar("$hookup['wipes']") == 1>>
 				You reach down to your purse and pull out your bag of wipes before you stop, suddenly confused.
 				<p><i>Why did I get out my wipes?</i> you think to yourself. You frown at the packet, befuddled as to what you wanted to do with the,.</p>
 				<i>Meh. If it's important, it will come back to me later,</i> you think to yourself as you put it back into your purse, oblivious to the liquid dribbling down the inside of your thigh.
 			<<elseif getvar("$hookup['wipes']") == 2>>
-				<p>"Hey, do you-" you start and then suddenly lose track of what you were trying to say. You frown to yourself as <<=$npcs.get($sex.npcId,'firstname')>> looks at you quizically.</p>
+				<p>"Hey, do you-" you start and then suddenly lose track of what you were trying to say. You frown to yourself as <<npc $sex.npcId>><</npc>> looks at you quizically.</p>
 				<p>"Did you need something?"</p>
 				"I uhh..." Your frown deepens. "I wanted to ask you something... but I forgot what it was... I guess it doesn''t really matter..."
 				<i>Meh. If it's important, it will come back to me later,</i> you think to yourself, oblivious to the liquid dribbling down the inside of your thigh.
@@ -1231,7 +1231,7 @@
 			<<if getvar("$hookup['wipes']") == 2>>
 				<<video "shared/sex/cum/vagcreampie/after1.mp4">>
 				<p>"Hey, got anything I can use to clean up?" you say, holding your fingers over your pussy, trying to keep the cum from spilling out any further.</p>
-				<p>"Oh yeah, right here." <<=$npcs.get($sex.npcId,'firstname')>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.</p>
+				<p>"Oh yeah, right here." <<npc $sex.npcId>><</npc>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.</p>
 			<<else>>
 				<<image "shared/sex/cum/cum111.jpg">>
 				You really need to clean yourself after up after that. Reaching down to your purse, you pull some wipes out of your purse before reaching between your legs to wipe yourself up.
@@ -1262,7 +1262,7 @@
 		<<image "shared/sex/after/phone_smoke.jpg">>
 		<<gs 'drugs' 'smoke'>>
 		<<if $npcs.get($sex.npcId,'smoker') > 0>>
-			<p>Reaching down to your purse, you pull out your phone and a cigarette, sparking the latter and taking a long enjoyable drag from it. <<=$npcs.get($sex.npcId,'firstname')>> sees you light up and does the same, pulling his own smokes from his nightstand. The two of your relax, smoking together, while you unwind checking messages and scrolling through social media feeds.</p>
+			<p>Reaching down to your purse, you pull out your phone and a cigarette, sparking the latter and taking a long enjoyable drag from it. <<npc $sex.npcId>><</npc>> sees you light up and does the same, pulling his own smokes from his nightstand. The two of your relax, smoking together, while you unwind checking messages and scrolling through social media feeds.</p>
 		<<else>>
 			Reaching down to your purse, you pull out your phone and one of your cigarettes, sparking the latter and taking a long enjoyable drag from it. Sitting back up, you unlocking your phone and breathe out, relaxing with your cigarette while you unwind, checking messages and scrolling through social media feeds.
 		<</if>>
@@ -1275,17 +1275,17 @@
 	<<elseif $npcs.get($sex.npcId,'smoker') > 0 and getvar("$hookup['cigarette']") == 1>>
 		<<image "shared/sex/after/bed_smoke3.jpg">>
 		<<gs 'drugs' 'smoke'>>
-		<p>Seeing you light up, <<=$npcs.get($sex.npcId,'firstname')>> does as well, pulling a pack from his nightstand. You spark the end with your lighter and relax, taking a long drag, relishing the flavor as it fills your mouth and lungs. The two of you just sit there in silence for a few minutes, enjoying a post-fuck smoke together as you wind down.</p>
+		<p>Seeing you light up, <<npc $sex.npcId>><</npc>> does as well, pulling a pack from his nightstand. You spark the end with your lighter and relax, taking a long drag, relishing the flavor as it fills your mouth and lungs. The two of you just sit there in silence for a few minutes, enjoying a post-fuck smoke together as you wind down.</p>
 	<<elseif getvar("$hookup['cigarette']") == 1>>
 		<<gs 'drugs' 'smoke'>>
 		<<image "shared/sex/after/bed_smoke1.jpg">>
 		Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it's like all your stress goes with it and you sigh happily, relaxing into the bed.
 	<<elseif $npcs.get($sex.npcId,'smoker') > 0>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> reaches over to his nightstand and pulls out a pack of cigarettes. Removing one from the pack, he sparks it, taking a long drag and relaxing as he blows smoke from his nose.</p>
+		<p><<npc $sex.npcId>><</npc>> reaches over to his nightstand and pulls out a pack of cigarettes. Removing one from the pack, he sparks it, taking a long drag and relaxing as he blows smoke from his nose.</p>
 	<<elseif getvar("$hookup['get_out']") == 1>>
 		"Ugh, bitch..." he grumbles.
 	<<else>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> is just laying back on his bed, relaxing in the afterglow of your little encounter together.</p>
+		<p><<npc $sex.npcId>><</npc>> is just laying back on his bed, relaxing in the afterglow of your little encounter together.</p>
 	<</if>>
 	<<actCLA 'Can I borrow your shower?'>>
 		<<=$npcs.get($sex.npcId,'apt_bathroom')>>
@@ -1300,7 +1300,7 @@
 			<!-- !!	if perversity > rand(1,100):-->
 			<!-- !!	'Joins you in the shower'-->
 			<<gs 'cleanBody'>>
-			<p>You turn on the faucet, relaxing as the hot water pours down over your skin. After a few minutes, you turn the tap off, towelling off using what you can only assume to be <<=$npcs.get($sex.npcId,'firstname')>>'s towel and walk naked back into his room. <<=$npcs.get($sex.npcId,'firstname')>> is still there, relaxing in his bed</p>
+			<p>You turn on the faucet, relaxing as the hot water pours down over your skin. After a few minutes, you turn the tap off, towelling off using what you can only assume to be <<npc $sex.npcId>><</npc>>'s towel and walk naked back into his room. <<npc $sex.npcId>><</npc>> is still there, relaxing in his bed</p>
 			<<gs 'hookup_after' 'gotta_go'>>
 			<<actCLA 'Crawl back into bed'>>
 				<<gt 'hookup_after' 'cuddle'>>
@@ -1352,9 +1352,9 @@
 		Your vision begins to blur and your eyelids grow heavy. It's so hard to keep them open right now...
 		Curling onto your side, you let them fall, snuggling into the pillow. You should probably get up but... You just need to rest your eyes...
 		just... for... a minute...
-		<!-- !!				'Tired, you curl up onto your side to face <<<<=$npcs.get($sex.npcId,'firstname')>>>>, passively aware that his cum is still leaking from your pussy, slowly dribbling down the curve of your thigh.'-->
+		<!-- !!				'Tired, you curl up onto your side to face <<<<npc $sex.npcId>><</npc>>>>, passively aware that his cum is still leaking from your pussy, slowly dribbling down the curve of your thigh.'-->
 	<<else>>
-		<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+		<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 		<<if $pc.pubesLength < 4>>
 			<<image "shared/sex/after/sleep1.jpg">>
 		<<else>>
@@ -1378,7 +1378,7 @@
 		<<elseif $hookup['cum_choice'] == 'creampie'>>
 			<!-- !! vagina-->
 			<<image "shared/sex/cum/vagcreampie/after2.jpg">>
-			<!-- !!				'Tired, you curl up onto your side to face <<<<=$npcs.get($sex.npcId,'firstname')>>>>, passively aware that his cum is still leaking from your pussy, slowly dribbling down the curve of your thigh.'-->
+			<!-- !!				'Tired, you curl up onto your side to face <<<<npc $sex.npcId>><</npc>>>>, passively aware that his cum is still leaking from your pussy, slowly dribbling down the curve of your thigh.'-->
 		<<else>>
 			<<image "shared/home/bedroom/son.jpg">>
 		<</if>>
@@ -1400,9 +1400,9 @@
 	<<setinit $hookup['bed'] = 1>>
 	<<image "shared/sex/after/cuddle1.jpg">>
 	<<if getvar("$hookup['shower']") == 1>>
-		<p>Hair still wet from the shower, you crawl back into bed with <<=$npcs.get($sex.npcId,'firstname')>> and cuddle up, resting your naked body on top of his. He wraps his arms around you in return and the two of your relax, listening to the sound of each other's breathing.</p>
+		<p>Hair still wet from the shower, you crawl back into bed with <<npc $sex.npcId>><</npc>> and cuddle up, resting your naked body on top of his. He wraps his arms around you in return and the two of your relax, listening to the sound of each other's breathing.</p>
 	<<else>>
-		<p>Scootching over, you cuddle up with <<=$npcs.get($sex.npcId,'firstname')>>, resting your naked body on top of his. He wraps his arms around you in return and the two of your relax, listening to the sound of each other's breathing.</p>
+		<p>Scootching over, you cuddle up with <<npc $sex.npcId>><</npc>>, resting your naked body on top of his. He wraps his arms around you in return and the two of your relax, listening to the sound of each other's breathing.</p>
 	<</if>>
 	<<gs 'hookup_after' 'gotta_go'>>
 	<<if $time.hour > 20 or $time.hour < 2>>
@@ -1428,7 +1428,7 @@
 		<<setinit $hookup['i_should_go'] = 1>>
 		<<video "pc/activities/misc/dress_1.mp4">>
 		<<if getvar("$hookup['bed']") == 1>>
-			<p>As nice as this is, you really can't stay and you heave yourself up and away from <<=$npcs.get($sex.npcId,'firstname')>>, getting up from the bed.</p>
+			<p>As nice as this is, you really can't stay and you heave yourself up and away from <<npc $sex.npcId>><</npc>>, getting up from the bed.</p>
 			"I should go," you say, almost apologetically, picking your clothes up from where they were thrown.
 		<<else>>
 			"I should go," you say, padding over to where your clothes lay in a heap and beginning to pull them on.
@@ -1441,7 +1441,7 @@
 		<<gs 'hookup_after' 'dress_loop'>>
 		<<video "pc/activities/misc/dress_1.mp4">>
 		<<if getvar("$hookup['bed']") == 1>>
-			<p>You get up from the bed and pad across the floor, bending down to pick up your discarded apparel. "Thanks for the $hookup['fun']," you say, smirking over your shoulder at <<=$npcs.get($sex.npcId,'firstname')>> while you begin to pull your clothes on.</p>
+			<p>You get up from the bed and pad across the floor, bending down to pick up your discarded apparel. "Thanks for the $hookup['fun']," you say, smirking over your shoulder at <<npc $sex.npcId>><</npc>> while you begin to pull your clothes on.</p>
 		<<else>>
 			<p>"Well, thanks for the $hookup['fun']," you say, bending down to pick up your clothes.</p>
 		<</if>>
@@ -1459,7 +1459,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'hookup_continuation'>>
 	<<if rand(1,10) > 7 and ($time.hour > 20 or $time.hour < 2) and $npcs.get($sex.npcId,'caretaker') > 0 and $npcs.get($sex.npcId,'girlfriend') == 0 and getvar("$hookup['npc_can_spend_the_night']") == 0>>
-		<p>"Really?" <<=$npcs.get($sex.npcId,'firstname')>> sits up in bed. "You don't have to. Are you sure you don't want to spend the night?"</p>
+		<p>"Really?" <<npc $sex.npcId>><</npc>> sits up in bed. "You don't have to. Are you sure you don't want to spend the night?"</p>
 		<<gs 'hookup_after' 'spend_the_night'>>
 	<<elseif getvar("$hookup['continuation']") > 0>>
 		<<if $npcs.get($sex.npcId,'goal') == 1>>
@@ -1484,18 +1484,18 @@
 	<<actCLA 'Well...'>>
 		"Well..." you pause for a moment, considering. You <i>could</i> stay over tonight. Maybe you don't <i>have</i> to go...
 		<<actCLA 'No, I shouldn`t'>>
-			<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+			<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			"... no," you sigh. "I really shouldn''t. I want to, but I can't."
 			<<gs 'hookup_after' 'hookup_continuation'>>
 		<</actCLA>>
 		<<actCLA 'I guess I could...'>>
-			<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+			<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			"... I guess I could..." you relent, dropping the clothes you were holding.
 			<<actCLA 'Undress and get into bed with him'>>
 				<<image "shared/sex/after/cuddle1.jpg">>
-				<p>After pulling off your clothes again, you slip back into bed and cuddle up with <<=$npcs.get($sex.npcId,'firstname')>>, resting your naked body on top of his. He wraps his arms around you in return and the two of your relax, listening to the sound of each other's breathing.</p>
+				<p>After pulling off your clothes again, you slip back into bed and cuddle up with <<npc $sex.npcId>><</npc>>, resting your naked body on top of his. He wraps his arms around you in return and the two of your relax, listening to the sound of each other's breathing.</p>
 				<<actCLA 'Fall asleep'>>
 					As you lay there together, your eyelids slowly grow heavier until they close completely and your consciousness drifts slowly into darkness...
 					<<actCLA '. . .'>>
@@ -1527,7 +1527,7 @@
 			<p>You pause for a moment and give him a look. "Seriously?"</p>
 			<p>"Do I look like I'm kidding?" he grins back, clearly satisfied with himself.</p>
 			<i>Free access to pussy and you're just gonna turn it down. Whatever...</i> you think to yourself as you finished getting dressed.
-			<p>Once you're done, you grab your things and leave. <<=$npcs.get($sex.npcId,'firstname')>> doesn't say a word as you close the door behind you.</p>
+			<p>Once you're done, you grab your things and leave. <<npc $sex.npcId>><</npc>> doesn't say a word as you close the door behind you.</p>
 		<<else>>
 			<<setinit $hookup['fuckbuddy'] = 1>>
 			<p>"What, like fuckbuddies?"</p>
@@ -1553,7 +1553,7 @@
 			<p>You pause for a moment and give him a look. "Seriously?"</p>
 			<p>"Do I look like I'm kidding?" he grins back, clearly satisfied with himself.</p>
 			<i>Wow... You can really pick em, huh <<$pc.name_nick>>...</i> you think to yourself,. <i>Ugh. Whatever...</i>
-			<p>Once you're done, you grab your things and leave. <<=$npcs.get($sex.npcId,'firstname')>> doesn't say a word as you close the door behind you.</p>
+			<p>Once you're done, you grab your things and leave. <<npc $sex.npcId>><</npc>> doesn't say a word as you close the door behind you.</p>
 			<<actCLA 'Leave'>>
 				<<gt 'hookup_after' 'exit'>>
 			<</actCLA>>
@@ -1637,13 +1637,13 @@
 		<</actCLA>>
 	<</actCLA>>
 	<<actCLA 'I`m not up for anything serious'>>
-		<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+		<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		"I'm not looking for anything serious right now."
 		<<actCLA 'Sorry'>>
 			"Sorry..."
-			<p>"Oh. Uhh, well, it's fine I guess..." <<=$npcs.get($sex.npcId,'firstname')>> trails off and you're left in an extremely uncomfortable silence while you get dressed in front of him.</p>
-			<p><i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<=$npcs.get($sex.npcId,'firstname')>> a strained smile and wave goodbye, quickly striding towards the door to escape.</p>
+			<p>"Oh. Uhh, well, it's fine I guess..." <<npc $sex.npcId>><</npc>> trails off and you're left in an extremely uncomfortable silence while you get dressed in front of him.</p>
+			<p><i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<npc $sex.npcId>><</npc>> a strained smile and wave goodbye, quickly striding towards the door to escape.</p>
 			<<actCLA 'Leave'>>
 				<<gt 'hookup_after' 'exit'>>
 			<</actCLA>>
@@ -1652,28 +1652,28 @@
 			"If it were something purely physical, like fuckbuddies or something, I wouldn''t mind getting together for some fun, but I'm just not interested in dating."
 			<<if rand(1,10) > 7 and $npcs.get($sex.npcId,'goal') != 3>>
 				<<setinit $hookup['fuckbuddy'] = 1>>
-				<p>"Well... If it means I can see you again, then sure I guess." <<=$npcs.get($sex.npcId,'firstname')>> doesn't really seem satisfied with the results, but he still tells you his number while you tap it into your contact list.</p>
+				<p>"Well... If it means I can see you again, then sure I guess." <<npc $sex.npcId>><</npc>> doesn't really seem satisfied with the results, but he still tells you his number while you tap it into your contact list.</p>
 				<p>"So uhh, yeah... Call me sometime?"</p>
-				<p>With a shrug and an awkward wave goodbye, you head out the door and out of <<=$npcs.get($sex.npcId,'firstname')>>'s apartment.</p>
+				<p>With a shrug and an awkward wave goodbye, you head out the door and out of <<npc $sex.npcId>><</npc>>'s apartment.</p>
 				<<actCLA 'Leave'>>
 					<<gt 'hookup_after' 'exit'>>
 				<</actCLA>>
 			<<else>>
 				"No," he shakes his head. "I don't want to get led on by you if you're only interested in a fuck and not anything real. Guess this is just a one night stand."
 				<<actCLA 'Taken aback'>>
-					<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+					<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					<p>You blink in surprise, recoiling slightly at his words. That response really wasn't what you saw coming. After all, what guy just gives up free access to sex?</p>
-					<p>"Uhh well, uhh... Alright... Guess I won't see you later then..." you respond awkwardly. After giving yourself a once over, you give <<=$npcs.get($sex.npcId,'firstname')>> a strained smile and wave goodbye, quickly striding towards out the door.</p>
+					<p>"Uhh well, uhh... Alright... Guess I won't see you later then..." you respond awkwardly. After giving yourself a once over, you give <<npc $sex.npcId>><</npc>> a strained smile and wave goodbye, quickly striding towards out the door.</p>
 					<<actCLA 'Leave'>>
 						<<gt 'hookup_after' 'exit'>>
 					<</actCLA>>
 				<</actCLA>>
 				<<actCLA 'It`s to be expected'>>
-					<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+					<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					You nod to yourself, admittedly a little bit wistfully. It's to be expected from a guy like him. But if he wants something more, you just can't give it to him. You're only after pleasure, you don't want to get tangled up in a relationship.
-					<p>"Well, guess I won't see you around then so... Bye?" You wave <<=$npcs.get($sex.npcId,'firstname')>> goodbye and stride out the door, unable to feel that this little bit of fun took a bit of a damper turn right at the end.</p>
+					<p>"Well, guess I won't see you around then so... Bye?" You wave <<npc $sex.npcId>><</npc>> goodbye and stride out the door, unable to feel that this little bit of fun took a bit of a damper turn right at the end.</p>
 					<<actCLA 'Leave'>>
 						<<gt 'hookup_after' 'exit'>>
 					<</actCLA>>
@@ -1711,8 +1711,8 @@
 			"Whatever, your loss," he shrugs.
 			<p>"Pfft-! Yeah, sure," you snigger back, pulling on the rest of your clothes. You give yourself a once over, making sure everything's in place and wave goodbye as you head towards the door.</p>
 		<<elseif getvar("$hookup['continuation']") == 2>>
-			<p>"Oh. Uhh, well..." <<=$npcs.get($sex.npcId,'firstname')>> trails off and you're left in an extremely uncomfortable silence while you get dressed in front of him.</p>
-			<p><i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<=$npcs.get($sex.npcId,'firstname')>> a strained smile and wave goodbye, quickly striding towards the door to escape.</p>
+			<p>"Oh. Uhh, well..." <<npc $sex.npcId>><</npc>> trails off and you're left in an extremely uncomfortable silence while you get dressed in front of him.</p>
+			<p><i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<npc $sex.npcId>><</npc>> a strained smile and wave goodbye, quickly striding towards the door to escape.</p>
 		<</if>>
 		<<actCLA 'Leave'>>
 			<<gt 'hookup_after' 'exit'>>
@@ -1752,8 +1752,8 @@
 					<</actCLA>>
 				<</if>>
 			<<else>>
-				<p>"Oh. Uhh, well..." <<=$npcs.get($sex.npcId,'firstname')>> trails off and you're left in an extremely uncomfortable silence while you get dressed in front of him.</p>
-				<p><i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<=$npcs.get($sex.npcId,'firstname')>> a strained smile and wave goodbye, quickly striding towards the door to escape.</p>
+				<p>"Oh. Uhh, well..." <<npc $sex.npcId>><</npc>> trails off and you're left in an extremely uncomfortable silence while you get dressed in front of him.</p>
+				<p><i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<npc $sex.npcId>><</npc>> a strained smile and wave goodbye, quickly striding towards the door to escape.</p>
 				<<actCLA 'Leave'>>
 					<<gt 'hookup_after' 'exit'>>
 				<</actCLA>>
@@ -1794,8 +1794,8 @@
 					<</actCLA>>
 				<</if>>
 			<<else>>
-				<p>"Oh. Uhh, well..." <<=$npcs.get($sex.npcId,'firstname')>> trails off and you're left in an extremely uncomfortable silence while you get dressed in front of him.</p>
-				<p><i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<=$npcs.get($sex.npcId,'firstname')>> a strained smile and wave goodbye, quickly striding towards the door to escape.</p>
+				<p>"Oh. Uhh, well..." <<npc $sex.npcId>><</npc>> trails off and you're left in an extremely uncomfortable silence while you get dressed in front of him.</p>
+				<p><i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<npc $sex.npcId>><</npc>> a strained smile and wave goodbye, quickly striding towards the door to escape.</p>
 				<<actCLA 'Leave'>>
 					<<gt 'hookup_after' 'exit'>>
 				<</actCLA>>
@@ -1862,7 +1862,7 @@
 		<</if>>
 	<<else>>
 		<<actCLA 'Finish getting dressed'>>
-			<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+			<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			<<gs 'hookup_after' 'dress'>>
 			You quickly finish tugging your clothes on and waggle your fingers at him in goodbye before heading out the door.
@@ -1890,11 +1890,11 @@
 			Just after you put on your panties, a sexy thought pops into your head.
 			<p>"$hookup['panty_give_desc']," you say mischievously. "I have a gift for you."</p>
 			<<if $npcs.get($sex.npcId,'panty_give') == 1>>
-				<p>"A gift?" <<=$npcs.get($sex.npcId,'firstname')>> asks curiously.</p>
+				<p>"A gift?" <<npc $sex.npcId>><</npc>> asks curiously.</p>
 				In one smooth motion, you tug your panties down your legs and daintily toss them into the rumpled sheets of the bed you were just fucked in.
 				<<gs 'hookup_after' 'panty_gift2'>>
 			<<else>>
-				<p>"Another pair of your panties?" <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+				<p>"Another pair of your panties?" <<npc $sex.npcId>><</npc>> grins.</p>
 				<p>"You guessed correctly," you grin back. "And your prize is-!"</p>
 				In one smooth motion, you tug your panties down your legs and daintily toss them into the rumpled sheets of the bed you were just fucked in.
 				"Enjoy," you smirk.
@@ -1915,7 +1915,7 @@
 			<p>"And what am I supposed to do with these when my girlfriend comes home?" he asks, looking at them amusedly.</p>
 			<<gs 'hookup_after' 'panty_gift_girlfriend'>>
 		<<else>>
-			<p>"Ah yes, women's underwear," <<=$npcs.get($sex.npcId,'firstname')>> says, looking at them dryly. "Just what I've always wanted."</p>
+			<p>"Ah yes, women's underwear," <<npc $sex.npcId>><</npc>> says, looking at them dryly. "Just what I've always wanted."</p>
 			But despite his sarcasm, he seems pretty pleased.
 			<<gs 'hookup_after' 'later'>>
 		<</if>>
@@ -1935,7 +1935,7 @@
 			<p>"And what am I supposed to do with these when my girlfriend comes home?" he asks, looking at them amusedly.</p>
 			<<gs 'hookup_after' 'panty_gift_girlfriend'>>
 		<<else>>
-			<p>"Maybe I should frame it," <<=$npcs.get($sex.npcId,'firstname')>> snickers.</p>
+			<p>"Maybe I should frame it," <<npc $sex.npcId>><</npc>> snickers.</p>
 			<<gs 'hookup_after' 'later'>>
 		<</if>>
 	<</actCLA>>
@@ -1950,7 +1950,7 @@
 			<p>"And what am I supposed to do with these when my girlfriend comes home?" he asks, looking at them amusedly.</p>
 			<<gs 'hookup_after' 'panty_gift_girlfriend'>>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't say anything in response, but given the lustful glint in his eyes, he seems pretty pleased.</p>
+			<p><<npc $sex.npcId>><</npc>> doesn't say anything in response, but given the lustful glint in his eyes, he seems pretty pleased.</p>
 			<<gs 'hookup_after' 'later'>>
 		<</if>>
 	<</actCLA>>
@@ -1966,7 +1966,7 @@
 				<p>"And what am I supposed to do with these when my girlfriend comes home?" he asks, looking at them amusedly.</p>
 				<<gs 'hookup_after' 'panty_gift_girlfriend'>>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't say anything in response, but given the lustful glint in his eyes, he seems pretty pleased.</p>
+				<p><<npc $sex.npcId>><</npc>> doesn't say anything in response, but given the lustful glint in his eyes, he seems pretty pleased.</p>
 				<<gs 'hookup_after' 'later'>>
 			<</if>>
 		<</actCLA>>
@@ -1981,7 +1981,7 @@
 				<p>"And what am I supposed to do with these when my girlfriend comes home?" he asks, looking at them amusedly.</p>
 				<<gs 'hookup_after' 'panty_gift_girlfriend'>>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't say anything in response, but given the lustful glint in his eyes, he seems pretty pleased.</p>
+				<p><<npc $sex.npcId>><</npc>> doesn't say anything in response, but given the lustful glint in his eyes, he seems pretty pleased.</p>
 				<<gs 'hookup_after' 'later'>>
 			<</if>>
 		<</actCLA>>
@@ -2001,22 +2001,22 @@
 		<<gs 'hookup_after' 'dress_loop'>>
 		<p>"Tell her they're yours," you snicker, $hookup['dress_describe']. "A guy can't wear a cute pair of panties now and then?"</p>
 		<<if $npcs.get($sex.npcId,'insecure') == 1>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>>'s face immediately reddens and he looks at you with an angry glare.</p>
+			<p><<npc $sex.npcId>><</npc>>'s face immediately reddens and he looks at you with an angry glare.</p>
 			<p>"What the fuck? I'm not some twink who puts on girlie panties like a fucking faggot!"</p>
 			<<actCLA 'I was kidding (amused)'>>
 				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				"I was just kidding," you say, rolling your eyes. "Bad joke, sorry."
-				<p>You move to $hookup['dress_describe'] but <<=$npcs.get($sex.npcId,'firstname')>> continues to glare at you out of the corner of your eye for a few moments longer before looking away.</p>
+				<p>You move to $hookup['dress_describe'] but <<npc $sex.npcId>><</npc>> continues to glare at you out of the corner of your eye for a few moments longer before looking away.</p>
 				<<gs 'hookup_after' 'later'>>
 			<</actCLA>>
 			<<actCLA 'I was kidding (acerbic)'>>
 				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-				<p>"Christ, I was just kidding," you say, giving <<=$npcs.get($sex.npcId,'firstname')>> a look of exhasperation. "Of course I wasn't seriously suggesting that. Take a joke, dumbass."</p>
-				<p>You start $hookup['dress_describe'] but <<=$npcs.get($sex.npcId,'firstname')>> continues to glare at you out of the corner of your eye for a few moments longer before looking away.</p>
+				<p>"Christ, I was just kidding," you say, giving <<npc $sex.npcId>><</npc>> a look of exhasperation. "Of course I wasn't seriously suggesting that. Take a joke, dumbass."</p>
+				<p>You start $hookup['dress_describe'] but <<npc $sex.npcId>><</npc>> continues to glare at you out of the corner of your eye for a few moments longer before looking away.</p>
 				<<gs 'hookup_after' 'later'>>
 			<</actCLA>>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> laughs aloud.</p>
+			<p><<npc $sex.npcId>><</npc>> laughs aloud.</p>
 			"Yeah, I bet that''d get me off the hook."
 			<<gs 'hookup_after' 'later'>>
 		<</if>>

+ 78 - 78
sugarcube/src/autogenerated/unsorted/hookup_morning.tw

@@ -71,7 +71,7 @@
 	'You yawn softly and slowly realize that you're still tangled in the sheets with the guy from last night.'
 	else} -->
 	<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-	<p>Turning over, you see <<=$npcs.get($sex.npcId,'firstname')>> laying next to you. He stirs as well and rolls over to face you, prying open his eyes.</p>
+	<p>Turning over, you see <<npc $sex.npcId>><</npc>> laying next to you. He stirs as well and rolls over to face you, prying open his eyes.</p>
 	<p>"Mornin'," he mumbles. "You just wake up too?"</p>
 	"Yeah," you mumble back.
 	<!-- !!	end-->
@@ -108,9 +108,9 @@
 
 		<</if>>
 		<<if getvar("$hookup['continuation']") == 0>>
-			<p>"Hey, where're you going?" <<=$npcs.get($sex.npcId,'firstname')>> says, turning over and squinting at you with sleepy eyes. "What's the rush?"</p>
+			<p>"Hey, where're you going?" <<npc $sex.npcId>><</npc>> says, turning over and squinting at you with sleepy eyes. "What's the rush?"</p>
 			<<actCLA 'I need to be somewhere!'>>
-				<p>"I'm gonna be late for something!" you huff out. With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<=$npcs.get($sex.npcId,'firstname')>> and your night together behind you.</p>
+				<p>"I'm gonna be late for something!" you huff out. With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<npc $sex.npcId>><</npc>> and your night together behind you.</p>
 				<<actCLA 'Leave'>>
 					<<gs 'hookup_after' 'exit'>>
 				<</actCLA>>
@@ -118,9 +118,9 @@
 			<<actCLA 'I`m gonna be late for school!'>>
 				<<if $q.school.func('isWearingSchoolUniform')>>
 					<!-- !! you were wearing your school uniform last night-->
-					<p>"I need to go! I'm going to be late for school!" you huff out. You quickly check your uniform one last time, making sure everything's in place. It's a bit wrinkled from laying in a pile all night, but it'll do in a pinch. Not even saying goodbye, you rush out the door, leaving <<=$npcs.get($sex.npcId,'firstname')>> and your night together behind you.</p>
+					<p>"I need to go! I'm going to be late for school!" you huff out. You quickly check your uniform one last time, making sure everything's in place. It's a bit wrinkled from laying in a pile all night, but it'll do in a pinch. Not even saying goodbye, you rush out the door, leaving <<npc $sex.npcId>><</npc>> and your night together behind you.</p>
 				<<else>>
-					<p>"I need to go! I'm going to be late for school!" you huff out. With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<=$npcs.get($sex.npcId,'firstname')>> and your night together behind you.</p>
+					<p>"I need to go! I'm going to be late for school!" you huff out. With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<npc $sex.npcId>><</npc>> and your night together behind you.</p>
 				<</if>>
 				<<actCLA 'Leave'>>
 					<<gs 'hookup_after' 'exit'>>
@@ -145,9 +145,9 @@
 				<p>"I really don't have time for this right now! Gotta go!"</p>
 				<<if $q.school.func('isWearingSchoolUniform')>>
 					<!-- !! you were wearing your school uniform last night-->
-					<p>You quickly check your uniform one last time, making sure everything's in place. It's a bit wrinkled from laying in a pile all night, but it'll have to do in a pinch. Not even saying goodbye, you rush out the door, leaving <<=$npcs.get($sex.npcId,'firstname')>> and your night together behind you.</p>
+					<p>You quickly check your uniform one last time, making sure everything's in place. It's a bit wrinkled from laying in a pile all night, but it'll have to do in a pinch. Not even saying goodbye, you rush out the door, leaving <<npc $sex.npcId>><</npc>> and your night together behind you.</p>
 				<<else>>
-					<p>With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<=$npcs.get($sex.npcId,'firstname')>> and your night together behind you.</p>
+					<p>With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<npc $sex.npcId>><</npc>> and your night together behind you.</p>
 				<</if>>
 				<<actCLA 'Leave'>>
 					<<gt 'hookup_after' 'exit'>>
@@ -177,7 +177,7 @@
 	<<actCLA '... <i>his</i> bed...?'>>
 		<<video "shared/romance/misc/wakeup2.mp4">>
 		Wait... If you fell asleep in his bed, then...
-		<p>Turning over, you see <<=$npcs.get($sex.npcId,'firstname')>> laying next to you. He stirs as well and rolls over to face you, prying open his eyes.</p>
+		<p>Turning over, you see <<npc $sex.npcId>><</npc>> laying next to you. He stirs as well and rolls over to face you, prying open his eyes.</p>
 		<p>"Mornin'," he mumbles. "You just wake up too?"</p>
 		"Yeah," you mumble back.
 		<<gs 'hookup_morning' 'wakeup'>>
@@ -188,7 +188,7 @@
 	<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 	'You struggle to remember his name as you stare at the back of the still-sleeping man''s head beside you. It was... it was...'
 	*nl
-	'<<<<=$npcs.get($sex.npcId,'firstname')>>>>!'
+	'<<<<npc $sex.npcId>><</npc>>>>!'
 	*nl
 	'Right!'
 	gs'hookup_morning','late_wakeup'
@@ -263,7 +263,7 @@
 	<</actCLA>>
 	<<actCLA 'It`s just sex'>>
 		<<video "shared/sex/after/wakeup_shock2.mp4">>
-		<p><i>It's just sex,</i> you try to rationalize. <i>It's not like I'm falling in love with <<=$npcs.get($sex.npcId,'firstname')>> or anything. It's not cheating. It's just sex..</i>.</p>
+		<p><i>It's just sex,</i> you try to rationalize. <i>It's not like I'm falling in love with <<npc $sex.npcId>><</npc>> or anything. It's not cheating. It's just sex..</i>.</p>
 		<<gs 'hookup_morning' 'guilt2'>>
 	<</actCLA>>
 	<<actCLA 'You`re a whore'>>
@@ -290,9 +290,9 @@
 	'The bed next to you is empty. The man you were with last night, nowhere to be found.'
 	end
 	elseif npc_latesleeper[$sex.npcId] = 1:
-	'<<<<=$npcs.get($sex.npcId,'firstname')>>>>, the guy from last night, is still asleep next to you, completely ignorant to your internal strife, snoring softly.'
+	'<<<<npc $sex.npcId>><</npc>>>>, the guy from last night, is still asleep next to you, completely ignorant to your internal strife, snoring softly.'
 	else} -->
-	<p><<=$npcs.get($sex.npcId,'firstname')>> stirs next to you.</p>
+	<p><<npc $sex.npcId>><</npc>> stirs next to you.</p>
 	<<if $npcs.get($sex.npcId,'selfish') != 1 and $npcs.get($sex.npcId,'abusive') != 1 and rand(1,3) == 3>>
 		<p>"Hey." He yawns, glancing over at you before blinking, a look of concern on his face. "What's up? Something wrong?"</p>
 		<<actCLA 'It`s nothing'>>
@@ -326,7 +326,7 @@
 	<<actCLA 'Get dressed!'>>
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		<<if getvar("$npc_earlyriser") == 1>>
-			<p>You frantically haul yourself out of bed and start grabbing your clothes and throwing them on. The guy you slept with last night (<<=$npcs.get($sex.npcId,'firstname')>>? Was that his name?) isn't in the room but you can hear water running. He must be in the shower.</p>
+			<p>You frantically haul yourself out of bed and start grabbing your clothes and throwing them on. The guy you slept with last night (<<npc $sex.npcId>><</npc>>? Was that his name?) isn't in the room but you can hear water running. He must be in the shower.</p>
 			<<if getvar("$cum_loc['face']") > 0>>
 				<p>There's no time for that anywa- Wait, what's this crusty stuff on your ski- <i>FUCK!</i> You fell asleep with his cum on your face! <<=$npcs.get('A29','nickname')>> is going to <i>strangle</i> you if you don't clean this up before you get home!</p>
 			<</if>>
@@ -368,7 +368,7 @@
 				<</actCLA>>
 			<</actCLA>>
 		<<elseif getvar("$npc_latesleeper") == 1>>
-			<p>You frantically haul yourself out of bed and start grabbing your clothes and throwing them on. The guy you slept with last night (<<=$npcs.get($sex.npcId,'firstname')>>? Was that his name?) is still completely knocked out in his bed, your wild movements apparently not disturbing his sleep at all.</p>
+			<p>You frantically haul yourself out of bed and start grabbing your clothes and throwing them on. The guy you slept with last night (<<npc $sex.npcId>><</npc>>? Was that his name?) is still completely knocked out in his bed, your wild movements apparently not disturbing his sleep at all.</p>
 			<<if getvar("$cum_loc['face']") > 0>>
 				<p>Where the hell is your- Wait, what's this crusty stuff on your ski- <i>FUCK!</i> You fell asleep with his cum on your face! <<=$npcs.get('A29','nickname')>> is going to <i>strangle</i> you if you don't clean this up before you get home!</p>
 			<</if>>
@@ -410,7 +410,7 @@
 				<</actCLA>>
 			<</actCLA>>
 		<<else>>
-			<p>You frantically haul yourself out of bed and start grabbing clothing off the floor. The guy you slept with last night (<<=$npcs.get($sex.npcId,'firstname')>>? Was that his name?) starts awake, rapidly blinking in confusion at the noise you're making.</p>
+			<p>You frantically haul yourself out of bed and start grabbing clothing off the floor. The guy you slept with last night (<<npc $sex.npcId>><</npc>>? Was that his name?) starts awake, rapidly blinking in confusion at the noise you're making.</p>
 			<p>"Hey, what's going on?" he asks.</p>
 			<p>"I didn't mean to stay here last night!" you explain hastily, tugging your clothes on. "My <<=$npcs.get('A29','nickname')>> is gonna <i>kill</i> me for not coming home!"</p>
 			<<if getvar("$cum_loc['face']") > 0>>
@@ -491,7 +491,7 @@
 				<<actCLA 'I don`t have time for this!'>>
 					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					<p>"Sorry, I really don't have time for this right now and honestly, I'm just not interested," you say, finally finding your bag beneath the bed and yanking it out. "Gotta go!"</p>
-					<p>With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<=$npcs.get($sex.npcId,'firstname')>> and your night together behind you.</p>
+					<p>With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<npc $sex.npcId>><</npc>> and your night together behind you.</p>
 					<<actCLA 'Leave'>>
 						<<gt 'hookup_after' 'exit'>>
 					<</actCLA>>
@@ -522,7 +522,7 @@
 		<<gs 'hookup_morning' 'coffee_for_you'>>
 	<<else>>
 		<<if getvar("$hookup['sleep_accident']") == 1>>
-			<p>Turning over, you look for the the guy you were with last night (<<=$npcs.get($sex.npcId,'firstname')>>? Was that his name?) only to find that you're alone in the bed, no one else with you.</p>
+			<p>Turning over, you look for the the guy you were with last night (<<npc $sex.npcId>><</npc>>? Was that his name?) only to find that you're alone in the bed, no one else with you.</p>
 		<</if>>
 		<<if $npcs.get($sex.npcId,'apt_type') == 1>>
 			<p>It's a... dorm room...?</p>
@@ -541,11 +541,11 @@
 	<<setinit $hookup['b_i_b'] = 1>>
 	Turning over, you look around and realize that you're alone in the bed.
 	<<if $npcs.get($sex.npcId,'apt_type') == 2>>
-		<p>You blink, driving away the last blurs of sleep, and when your vision clears, you realize <<=$npcs.get($sex.npcId,'firstname')>> is standing in the corner, next to a small stove. He smiles at you over his shoulder.</p>
+		<p>You blink, driving away the last blurs of sleep, and when your vision clears, you realize <<npc $sex.npcId>><</npc>> is standing in the corner, next to a small stove. He smiles at you over his shoulder.</p>
 		"You're awake. I made us some coffee, here."
 		He walks over to you in bed holding a steaming mug.
 	<<else>>
-		<p>You start when the door opens and <<=$npcs.get($sex.npcId,'firstname')>> walks in holding a mug.</p>
+		<p>You start when the door opens and <<npc $sex.npcId>><</npc>> walks in holding a mug.</p>
 		"Sorry about that," he grins. "You were still sleeping so I didn''t want to wake you up. I made coffee."
 	<</if>>
 	<<actCLA 'I prefer tea (bitchy)'>>
@@ -662,7 +662,7 @@ end} -->
 				<p>You climb out of bed, not bothering to get dressed as you follow him. You already spent the night naked with him, what's a cup of coffee longer?</p>
 				Along the way, you can't help but peek into the other rooms as you pass by.
 				<<gs 'hookup_morning' 'spare_explore'>>
-				<p>After your snooping, you quickly continue onward into the kitchen where <<=$npcs.get($sex.npcId,'firstname')>> is already filling the pot with water.</p>
+				<p>After your snooping, you quickly continue onward into the kitchen where <<npc $sex.npcId>><</npc>> is already filling the pot with water.</p>
 				<<actCLA 'Wait'>>
 					<<gt 'hookup_morning' 'coffee'>>
 				<</actCLA>>
@@ -676,7 +676,7 @@ end} -->
 					<<video "pc/activities/misc/dress_1.mp4">>
 					<<gs 'clothing' 'wear_last_worn'>>
 					<<gs 'underwear' 'wear'>>
-					<p>Grabbing your own clothes, you pull them on, smoothing out the wrinkles as best you can from where they were strewn across the floor last night before leaving to join <<=$npcs.get($sex.npcId,'firstname')>> in the kitchen.</p>
+					<p>Grabbing your own clothes, you pull them on, smoothing out the wrinkles as best you can from where they were strewn across the floor last night before leaving to join <<npc $sex.npcId>><</npc>> in the kitchen.</p>
 					<<actCLA 'Continue'>>
 						<<gt 'hookup_morning' 'coffee'>>
 					<</actCLA>>
@@ -689,7 +689,7 @@ end} -->
 			"Me too. Let me just get the pot going." Getting up from the bed, he steps across his tiny room to his little kitchen and starts rifling through cupboards, pulling out various coffee paraphernalia.
 			<<actCLA 'Wait in bed'>>
 				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-				<p>You cuddle up in the sheets, savoring their warmth and waiting while the coffee brews. A few minutes later, <<=$npcs.get($sex.npcId,'firstname')>> pours two cups, bringing one over to you.</p>
+				<p>You cuddle up in the sheets, savoring their warmth and waiting while the coffee brews. A few minutes later, <<npc $sex.npcId>><</npc>> pours two cups, bringing one over to you.</p>
 				"Here you go."
 				"Thanks," you smile, taking the cup from him and bringing it to your lips.
 				<<actCLA 'Focus on the coffee'>>
@@ -729,7 +729,7 @@ end} -->
 				<<set $time.minutes += 1>>
 				<<video "pc/activities/misc/dress_1.mp4">>
 				While the coffee brews, you haul yourself out of bed and pick up your clothes from where you threw them last night. You frown, noticing they're a bit wrinkled, but it's not like you cared much about hanging it up last night or anything like that. Whatever, nothing you can do about it now.
-				<p>By the time you've pulled them on, the coffee is done and <<=$npcs.get($sex.npcId,'firstname')>> pours two cups, handing one to you.</p>
+				<p>By the time you've pulled them on, the coffee is done and <<npc $sex.npcId>><</npc>> pours two cups, handing one to you.</p>
 				"Thanks," you smile, taking it gratefully.
 				<<actCLA 'Drink'>>
 					<<set $time.minutes += 2>>
@@ -739,7 +739,7 @@ end} -->
 					<<actCLA 'Time to get going'>>
 						<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 						"That was great," you sigh. "But I should get going."
-						<p>You put the empty mug in <<=$npcs.get($sex.npcId,'firstname')>>'s sink and turn around to grab your stuff.</p>
+						<p>You put the empty mug in <<npc $sex.npcId>><</npc>>'s sink and turn around to grab your stuff.</p>
 						<<actCLA 'Gather your things'>>
 							<<gt 'hookup_morning' 'morning_leave'>>
 						<</actCLA>>
@@ -776,7 +776,7 @@ end} -->
 <<if $location_var[$here][0] == 'late_wakeup'>>
 	<<actCLA 'Continue'>>
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't stir in the slightest as you arise.</p>
+		<p><<npc $sex.npcId>><</npc>> doesn't stir in the slightest as you arise.</p>
 		<<if $npcs.get($sex.npcId,'apt_type') >= 3>>
 			<<actCLA 'Explore his apartment'>>
 				<<gt 'hookup_morning' 'explore'>>
@@ -789,7 +789,7 @@ end} -->
 <<if $location_var[$here][0] == 'late_sneakout'>>
 	<<actCLA 'Sneak out of bed'>>
 		<<video "shared/romance/misc/sneakout2.mp4">>
-		<p>Carefully, you untangle yourself from <<=$npcs.get($sex.npcId,'firstname')>> and the sheets and stealthily clamber out of bed.</p>
+		<p>Carefully, you untangle yourself from <<npc $sex.npcId>><</npc>> and the sheets and stealthily clamber out of bed.</p>
 		<<actCLA 'Get dressed'>>
 			<<gs 'clothing' 'wear_last_worn'>>
 			<<gs 'underwear' 'wear'>>
@@ -805,7 +805,7 @@ end} -->
 			<<actCLA 'Leave your number (fuckbuddy)'>>
 				<<setinit $hookup['fuckbuddy'] = rand(0,1)>>
 				<<video "shared/romance/misc/depart1.mp4">>
-				<p>All your clothes on and possessions gathered, you take a look back at <<=$npcs.get($sex.npcId,'firstname')>>, smiling to yourself. You had a pretty good time last night. Maybe you could hook up with him again like this. You might even become fuckbuddies.</p>
+				<p>All your clothes on and possessions gathered, you take a look back at <<npc $sex.npcId>><</npc>>, smiling to yourself. You had a pretty good time last night. Maybe you could hook up with him again like this. You might even become fuckbuddies.</p>
 				You fumble around for a minute to find a piece of paper and a pen and write down your number on it.
 				<i>Text me if you want to hook up later</i>
 				<p>	<i>- $pc.name_nick</i></p>
@@ -829,7 +829,7 @@ end} -->
 	<<if $npcs.get($sex.npcId,'apt_type') > 2>>
 		<p>"Actually, do you mind if I borrow your shower?"</p>
 		"Yeah, go ahead. You can catch up when you're done."
-		<p>"Thanks," you smile gratefully as he leaves the room. Hauling yourself out of the bed, you duck out the door yourself, finding <<=$npcs.get($sex.npcId,'firstname')>>'s bathroom in the hallway and hop in the shower.</p>
+		<p>"Thanks," you smile gratefully as he leaves the room. Hauling yourself out of the bed, you duck out the door yourself, finding <<npc $sex.npcId>><</npc>>'s bathroom in the hallway and hop in the shower.</p>
 	<<else>>
 		<p>"Mind if I borrow your shower?" you ask, glancing towards the bathroom door of his small apartment.</p>
 		"Yeah, go ahead."
@@ -839,7 +839,7 @@ end} -->
 		<<video "shared/home/bathroom/dush.mp4">>
 		<<set $time.minutes += 10>>
 		<<run $inventory.inc('shampoo',1)>>
-		<p>You twist the faucet and hot water comes rushing out, sighing in pleasure as it pours over your skin. <i>That feels so nice...</i> After enjoying it for a little while, you borrow <<=$npcs.get($sex.npcId,'firstname')>>'s shampoo and start scrubbing your hair, washing it out shortly after.</p>
+		<p>You twist the faucet and hot water comes rushing out, sighing in pleasure as it pours over your skin. <i>That feels so nice...</i> After enjoying it for a little while, you borrow <<npc $sex.npcId>><</npc>>'s shampoo and start scrubbing your hair, washing it out shortly after.</p>
 		<<gs 'cleanBody'>>
 		Figuring you've used enough of his water, you turn off the tap and step out.
 		<<if getvar("$hookup['coffee']") == 1 and $npcs.get($sex.npcId,'apt_type') > 2>>
@@ -850,7 +850,7 @@ end} -->
 				<<video "pc/activities/misc/dress_1.mp4">>
 				<<gs 'clothing' 'wear_last_worn'>>
 				<<gs 'underwear' 'wear'>>
-				<p>Heading back to <<=$npcs.get($sex.npcId,'firstname')>>'s room, you pick up your clothes off the floor and tug them on over your wet hair before leaving again to join him in the kitchen.</p>
+				<p>Heading back to <<npc $sex.npcId>><</npc>>'s room, you pick up your clothes off the floor and tug them on over your wet hair before leaving again to join him in the kitchen.</p>
 				<<actCLA 'Go to the kitchen'>>
 					<<gt 'hookup_morning' 'coffee'>>
 				<</actCLA>>
@@ -864,7 +864,7 @@ end} -->
 				<<gs 'clothing' 'wear_last_worn'>>
 				<<gs 'underwear' 'wear'>>
 				Stepping out of the bathroom, you're immediately hit by the smell of cooked food.
-				<p>"Coffee's done," <<=$npcs.get($sex.npcId,'firstname')>> says, gesturing to his side where the pot is filled black liquid. "Help yourself when you're ready. I thought I'd fry up some eggs while you were in there."</p>
+				<p>"Coffee's done," <<npc $sex.npcId>><</npc>> says, gesturing to his side where the pot is filled black liquid. "Help yourself when you're ready. I thought I'd fry up some eggs while you were in there."</p>
 				"Thanks," you say, beginning to pick up your clothes. "I'm just going to get dressed first. Don't want any accidents."
 				"Yeah sure. Help yourself when you're ready."
 				You tug your clothes on, frowning at the wrinkles on them. Well, that's going to happen when you throw your clothes on the ground rushing to get into somebody''s pants.
@@ -878,7 +878,7 @@ end} -->
 					<<actCLA 'Time to get going'>>
 						<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 						"That was great," you sigh. "But I should get going."
-						<p>You put the empty mug in <<=$npcs.get($sex.npcId,'firstname')>>'s sink and turn around to grab your stuff.</p>
+						<p>You put the empty mug in <<npc $sex.npcId>><</npc>>'s sink and turn around to grab your stuff.</p>
 						<<actCLA 'Gather your things'>>
 							<<gt 'hookup_morning' 'morning_leave'>>
 						<</actCLA>>
@@ -897,10 +897,10 @@ end} -->
 				<<gs 'clothing' 'wear_last_worn'>>
 				<<gs 'underwear' 'wear'>>
 				<<if $npcs.get($sex.npcId,'apt_type') > 2>>
-					<p>Feeling refreshed, you leave the bathroom and head back to <<=$npcs.get($sex.npcId,'firstname')>>'s room to tug on your clothes.</p>
+					<p>Feeling refreshed, you leave the bathroom and head back to <<npc $sex.npcId>><</npc>>'s room to tug on your clothes.</p>
 					<<actCLA 'Skip out on $npcs.get('+$sex.npcId,'firstname')+''>>
 						<<video "shared/romance/misc/depart1.mp4">>
-						<p>While you're at it, you grab the rest of your things and head straight for the door. You pass by the kitchen on the way and <<=$npcs.get($sex.npcId,'firstname')>> watches you with confusion.</p>
+						<p>While you're at it, you grab the rest of your things and head straight for the door. You pass by the kitchen on the way and <<npc $sex.npcId>><</npc>> watches you with confusion.</p>
 						<p>"Hey! Where're you going? You're not staying for breakfast?"</p>
 						"Sorry, I really can't stay."
 						<p>"Wait but-"</p>
@@ -936,7 +936,7 @@ end} -->
 						<<actCLA 'Time to get going'>>
 							<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 							"That was great," you sigh. "But I should get going."
-							<p>You put the empty mug in <<=$npcs.get($sex.npcId,'firstname')>>'s sink and turn around to grab your stuff.</p>
+							<p>You put the empty mug in <<npc $sex.npcId>><</npc>>'s sink and turn around to grab your stuff.</p>
 							<<actCLA 'Gather your things'>>
 								<<gt 'hookup_morning' 'morning_leave'>>
 							<</actCLA>>
@@ -950,7 +950,7 @@ end} -->
 		<<else>>
 			<<actCLA 'Dry off'>>
 				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-				<p>You step out of the bathroom and see <<=$npcs.get($sex.npcId,'firstname')>> still laying in bed.</p>
+				<p>You step out of the bathroom and see <<npc $sex.npcId>><</npc>> still laying in bed.</p>
 				"Love that view," he smirks, shamelessly ogling your moist naked body.
 				"Thanks, I really needed that," you smile back. "I should really get going though."
 				<<actCLA 'Get dressed'>>
@@ -968,7 +968,7 @@ if hookup['hangover'] = 1:
 act'I need coffee':
 cla & *nl
 '"I desperately need coffee," you wince, rubbing your brow as if will somehow make your blindingly painful headache go away.'
-'"Me too." <<<<=$npcs.get($sex.npcId,'firstname')>>>> says, seemingly in the same state.'
+'"Me too." <<<<npc $sex.npcId>><</npc>>>> says, seemingly in the same state.'
 end
 act'Can I use your shower?':
 end
@@ -991,7 +991,7 @@ end} -->
 	<<if $wardrobe.pantyworntype != 'none'>>
 		<!-- !! IMAGE HERE-->
 		<<video "shared/romance/misc/nude_walk1.mp4">>
-		<p>You skip through <<=$npcs.get($sex.npcId,'firstname')>>'s apartment, peeking into all the different rooms.</p>
+		<p>You skip through <<npc $sex.npcId>><</npc>>'s apartment, peeking into all the different rooms.</p>
 	<<else>>
 		<!-- !! IMAGE HERE-->
 	<</if>>
@@ -1009,16 +1009,16 @@ end} -->
 <<if $location_var[$here][0] == 'spare_explore'>>
 	<!-- !!links for popups broken and in need of fixing at some time-->
 	<<if $npcs.get($sex.npcId,'apt_spare') == 1>>
-		<p>Through one door is the living room you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<=$npcs.get($sex.npcId,'firstname')>>'s body, instead of what the room looked like. Inside another room, you find a desk with a monitor and a keyboard on top.</p>
-		<!-- !!		'Through one door is the <<link "living room">><<gs 'shortgs' 'img msg' '<<=$npcs.get($sex.npcId,'apt_livingroom')>>'>><</link>> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<<<=$npcs.get($sex.npcId,'firstname')>>>>''s body, instead of what the room looked like. Inside another room, you find <<link "a desk with a monitor and a keyboard on top.">><<gs 'shortgs' 'img msg' '<<=$npcs.get($sex.npcId,'apt_spare')>>'>><</link>>'-->
+		<p>Through one door is the living room you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<npc $sex.npcId>><</npc>>'s body, instead of what the room looked like. Inside another room, you find a desk with a monitor and a keyboard on top.</p>
+		<!-- !!		'Through one door is the <<link "living room">><<gs 'shortgs' 'img msg' '<<=$npcs.get($sex.npcId,'apt_livingroom')>>'>><</link>> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<<<npc $sex.npcId>><</npc>>>>''s body, instead of what the room looked like. Inside another room, you find <<link "a desk with a monitor and a keyboard on top.">><<gs 'shortgs' 'img msg' '<<=$npcs.get($sex.npcId,'apt_spare')>>'>><</link>>'-->
 		<p><i>Bit of a gamer huh?</i> you think to yourself, strutting past.</p>
 	<<elseif $npcs.get($sex.npcId,'apt_spare') == 2>>
-		<p>Through one door is the living room you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<=$npcs.get($sex.npcId,'firstname')>>'s body, instead of what the room looked like. Inside another room, you find a room filled with various exercise equipment.</p>
-		<!-- !!		'Through one door is the <<link "living room">><<gs 'shortgs' 'img msg' '<<=$npcs.get($sex.npcId,'apt_livingroom')>>'>><</link>> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<<<=$npcs.get($sex.npcId,'firstname')>>>>''s body, instead of what the room looked like. Inside another room, you find <<link "a room filled with various exercise equipment.">><<gs 'shortgs' 'img msg' '<<=$npcs.get($sex.npcId,'apt_spare')>>'>><</link>>'-->
+		<p>Through one door is the living room you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<npc $sex.npcId>><</npc>>'s body, instead of what the room looked like. Inside another room, you find a room filled with various exercise equipment.</p>
+		<!-- !!		'Through one door is the <<link "living room">><<gs 'shortgs' 'img msg' '<<=$npcs.get($sex.npcId,'apt_livingroom')>>'>><</link>> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<<<npc $sex.npcId>><</npc>>>>''s body, instead of what the room looked like. Inside another room, you find <<link "a room filled with various exercise equipment.">><<gs 'shortgs' 'img msg' '<<=$npcs.get($sex.npcId,'apt_spare')>>'>><</link>>'-->
 		<p><i>Likes to work out huh?</i> you think to yourself, strutting past.</p>
 	<<else>>
-		<p>Through one door is the living room you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<=$npcs.get($sex.npcId,'firstname')>>'s body, instead of what the room looked like.</p>
-		<!-- !!		'Through one door is the <<link "living room">><<gs 'shortgs' 'img msg' '<<=$npcs.get($sex.npcId,'apt_livingroom')>>'>><</link>> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<<<=$npcs.get($sex.npcId,'firstname')>>>>''s body, instead of what the room looked like.'-->
+		<p>Through one door is the living room you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<npc $sex.npcId>><</npc>>'s body, instead of what the room looked like.</p>
+		<!-- !!		'Through one door is the <<link "living room">><<gs 'shortgs' 'img msg' '<<=$npcs.get($sex.npcId,'apt_livingroom')>>'>><</link>> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<<<npc $sex.npcId>><</npc>>>>''s body, instead of what the room looked like.'-->
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'kitchen'>>
@@ -1028,9 +1028,9 @@ end} -->
 		<</if>>
 		<<if $npcs.get($sex.npcId,'apt_type') == 1>>
 			<!-- !! studio apartment-->
-			<p><<=$npcs.get($sex.npcId,'firstname')>> wakes up</p>
+			<p><<npc $sex.npcId>><</npc>> wakes up</p>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> comes out</p>
+			<p><<npc $sex.npcId>><</npc>> comes out</p>
 		<</if>>
 	<</actCLA>>
 	<<actCLA 'Get a glass of water'>>
@@ -1039,9 +1039,9 @@ end} -->
 		<</if>>
 		<<if $npcs.get($sex.npcId,'apt_type') == 1>>
 			<!-- !! studio apartment-->
-			<p><<=$npcs.get($sex.npcId,'firstname')>> wakes up</p>
+			<p><<npc $sex.npcId>><</npc>> wakes up</p>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> comes out</p>
+			<p><<npc $sex.npcId>><</npc>> comes out</p>
 		<</if>>
 	<</actCLA>>
 	<<actCLA 'Cook breakfast'>>
@@ -1051,7 +1051,7 @@ end} -->
 			You cook breakfast normally.
 		<</if>>
 		<<if $npcs.get($sex.npcId,'apt_type') == 4 and getvar("$hookup['explore']") != 1>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>>'s roommates come out</p>
+			<p><<npc $sex.npcId>><</npc>>'s roommates come out</p>
 			<<actCLA 'Shriek'>>
 			<</actCLA>>
 			<<actCLA 'Act casual'>>
@@ -1059,9 +1059,9 @@ end} -->
 		<<else>>
 			<<if $npcs.get($sex.npcId,'apt_type') == 1>>
 				<!-- !! studio apartment-->
-				<p><<=$npcs.get($sex.npcId,'firstname')>> wakes up</p>
+				<p><<npc $sex.npcId>><</npc>> wakes up</p>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> comes out</p>
+				<p><<npc $sex.npcId>><</npc>> comes out</p>
 			<</if>>
 			"Made us breakfast"
 			<<actCLA 'Eat together'>>
@@ -1094,11 +1094,11 @@ end} -->
 			As you wander towards the kitchen, you sniff the air, detecting something more than just coffee.
 			"That smells nice," you say, entering the room.
 			<<if $wardrobe.clothingworntype == 'nude'>>
-				<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> says, turning to face you. "Since you were going to be a little while, I thought I'd make some eg-"</p>
+				<p>"Yeah," <<npc $sex.npcId>><</npc>> says, turning to face you. "Since you were going to be a little while, I thought I'd make some eg-"</p>
 				He stops mid sentence when he sees you standing there naked, hair still wet from the shower. You smirk at his stare.
 				"Thanks."
 			<<else>>
-				<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> says, turning to face you. "Since you were going to be a little while, I thought I'd make some eggs in the meantime. Coffee's already done if you want to pour yourself a cup."</p>
+				<p>"Yeah," <<npc $sex.npcId>><</npc>> says, turning to face you. "Since you were going to be a little while, I thought I'd make some eggs in the meantime. Coffee's already done if you want to pour yourself a cup."</p>
 				"Thanks."
 			<</if>>
 			<<actCLA 'Just have coffee'>>
@@ -1116,11 +1116,11 @@ end} -->
 					<<if $wardrobe.clothingworntype == 'nude'>>
 						<<image "shared/romance/misc/nude_kitchen1.jpg">>
 						"That was great," you sigh. "But I should get going."
-						<p>You put the empty mug in <<=$npcs.get($sex.npcId,'firstname')>>'s sink and head back to his room to get dressed.</p>
+						<p>You put the empty mug in <<npc $sex.npcId>><</npc>>'s sink and head back to his room to get dressed.</p>
 					<<else>>
 						$npc_apt_kitchen
 						"That was great," you sigh. "But I should get going."
-						<p>You put the empty mug in <<=$npcs.get($sex.npcId,'firstname')>>'s sink and turn around to grab your stuff.</p>
+						<p>You put the empty mug in <<npc $sex.npcId>><</npc>>'s sink and turn around to grab your stuff.</p>
 					<</if>>
 					<<actCLA 'Gather your things'>>
 						<<gt 'hookup_morning' 'morning_leave'>>
@@ -1133,7 +1133,7 @@ end} -->
 		<<else>>
 			<<set $time.minutes += 5>>
 			<<if $wardrobe.clothingworntype == 'nude'>>
-				<p>You follow <<=$npcs.get($sex.npcId,'firstname')>> to the kitchen and sit down at his table, waiting patiently while he pulls coffee paraphernalia from his cupboards and begins brewing. A few minutes later, he hands you a steaming cup of joe, which you gratefully accept.</p>
+				<p>You follow <<npc $sex.npcId>><</npc>> to the kitchen and sit down at his table, waiting patiently while he pulls coffee paraphernalia from his cupboards and begins brewing. A few minutes later, he hands you a steaming cup of joe, which you gratefully accept.</p>
 			<<else>>
 				You step into the kitchen and are immediately hit by the wonderful smell of coffee.
 				"Hey, you're just in time. Pot just finished brewing." He pours a cup and hands it to you, which you gratefully accept.
@@ -1150,13 +1150,13 @@ end} -->
 				<<actCLA 'Time to get going'>>
 					<<if $wardrobe.clothingworntype == 'nude'>>
 						"That was great," you sigh. "But I should get going."
-						<p>You put the empty mug in <<=$npcs.get($sex.npcId,'firstname')>>'s sink and head back to his room to get dressed.</p>
+						<p>You put the empty mug in <<npc $sex.npcId>><</npc>>'s sink and head back to his room to get dressed.</p>
 						<<actCLA 'Get dressed'>>
 							<<gt 'hookup_morning' 'morning_leave'>>
 						<</actCLA>>
 					<<else>>
 						"That was great," you sigh. "But I should get going."
-						<p>You put the empty mug in <<=$npcs.get($sex.npcId,'firstname')>>'s sink and turn around to grab your stuff.</p>
+						<p>You put the empty mug in <<npc $sex.npcId>><</npc>>'s sink and turn around to grab your stuff.</p>
 						<<actCLA 'Gather your things'>>
 							<<gt 'hookup_morning' 'morning_leave'>>
 						<</actCLA>>
@@ -1177,13 +1177,13 @@ end} -->
 				<<actCLA 'Time to get going'>>
 					<<if $wardrobe.clothingworntype == 'nude'>>
 						"That was great," you sigh. "But I should get going."
-						<p>You put the empty mug in <<=$npcs.get($sex.npcId,'firstname')>>'s sink and head back to his room to get dressed.</p>
+						<p>You put the empty mug in <<npc $sex.npcId>><</npc>>'s sink and head back to his room to get dressed.</p>
 						<<actCLA 'Get dressed'>>
 							<<gt 'hookup_morning' 'morning_leave'>>
 						<</actCLA>>
 					<<else>>
 						"That was great," you sigh. "But I should get going."
-						<p>You put the empty mug in <<=$npcs.get($sex.npcId,'firstname')>>'s sink and turn around to grab your stuff.</p>
+						<p>You put the empty mug in <<npc $sex.npcId>><</npc>>'s sink and turn around to grab your stuff.</p>
 						<<actCLA 'Gather your things'>>
 							<<gt 'hookup_morning' 'morning_leave'>>
 						<</actCLA>>
@@ -1197,7 +1197,7 @@ end} -->
 		<<if getvar("$hookup['morning_shower']") == 1 and $wardrobe.clothingworntype == 'nude'>>
 			Stepping out of the bathroom, you're immediately hit by the smell of cooked food.
 			"That smells nice," you say, stepping out into the room.
-			<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> says, turning to face you. "Since you were going to be a little while, I thought I'd make some eggs."</p>
+			<p>"Yeah," <<npc $sex.npcId>><</npc>> says, turning to face you. "Since you were going to be a little while, I thought I'd make some eggs."</p>
 			Ignoring your clothes and the eggs, you head straight to the coffee pot, grabbing a mug and filling it to the brim.
 			<<actCLA 'Just coffee'>>
 				<<set $time.minutes += 2>>
@@ -1209,7 +1209,7 @@ end} -->
 				<<actCLA 'Time to get going'>>
 					$npc_apt_kitchen
 					"That was great," you sigh. "But I should get going."
-					<p>You put the empty mug in <<=$npcs.get($sex.npcId,'firstname')>>'s sink and turn around to grab your stuff.</p>
+					<p>You put the empty mug in <<npc $sex.npcId>><</npc>>'s sink and turn around to grab your stuff.</p>
 					<<actCLA 'Gather your things'>>
 						<<gt 'hookup_morning' 'morning_leave'>>
 					<</actCLA>>
@@ -1228,7 +1228,7 @@ end} -->
 		$npc_apt_kitchen
 		<p>The two of you enjoy your eggs and coffee together. The coffee is cheap, the eggs are alright, but the company is pleasant as you chit-chat about nothing. Soon enough, your cups are empty and your plates are clean.</p>
 		<<actCLA 'I should go'>>
-			<p>"Well, I should probably get going," you say, standing up and putting your dishes in the sink. You head back to <<=$npcs.get($sex.npcId,'firstname')>>'s bedroom, with him following along behind.</p>
+			<p>"Well, I should probably get going," you say, standing up and putting your dishes in the sink. You head back to <<npc $sex.npcId>><</npc>>'s bedroom, with him following along behind.</p>
 			<<actCLA 'Get dressed'>>
 				<<gt 'hookup_morning' 'morning_leave'>>
 			<</actCLA>>
@@ -1270,7 +1270,7 @@ end} -->
 	<<video "pc/activities/misc/dress_1.mp4">>
 	<<gs 'hookup_after' 'dress_loop'>>
 	<<if getvar("$hookup['continuation']") > 0>>
-		<p>"I had a great time last night," <<=$npcs.get($sex.npcId,'firstname')>> says, while you're $hookup['dress_describe'].</p>
+		<p>"I had a great time last night," <<npc $sex.npcId>><</npc>> says, while you're $hookup['dress_describe'].</p>
 		<<gs 'hookup_morning' 'continuation_reponse1'>>
 	<</if>>
 	<<gs 'hookup_morning' 'later_nude'>>
@@ -1315,8 +1315,8 @@ end} -->
 				"Whatever, your loss," he shrugs.
 				<p>"Pfft-! Yeah, sure," you snigger back, pulling on the rest of your clothes. You give yourself a once over, making sure everything's in place and wave goodbye as you head towards the door.</p>
 			<<elseif getvar("$hookup['continuation']") == 2>>
-				<p>"Oh. Uhh, well..." <<=$npcs.get($sex.npcId,'firstname')>> trails off and you're left in an extremely uncomfortable silence while you finish getting dressed in front of him.</p>
-				<p><i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<=$npcs.get($sex.npcId,'firstname')>> a strained smile and wave goodbye, quickly striding towards the door to escape.</p>
+				<p>"Oh. Uhh, well..." <<npc $sex.npcId>><</npc>> trails off and you're left in an extremely uncomfortable silence while you finish getting dressed in front of him.</p>
+				<p><i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<npc $sex.npcId>><</npc>> a strained smile and wave goodbye, quickly striding towards the door to escape.</p>
 			<</if>>
 			<<gs 'hookup_after' 'dress'>>
 		<<else>>
@@ -1324,9 +1324,9 @@ end} -->
 			<<if getvar("$hookup['continuation']") == 1>>
 				"Whatever, your loss," he shrugs.
 				<p>"Pfft-! Yeah, sure," you snigger back, turning towards the door. "Still, maybe we'll run into each other again or something. See you."</p>
-				<p>With a half-hearted goodbye, you open the door and leave <<=$npcs.get($sex.npcId,'firstname')>>'s apartment.</p>
+				<p>With a half-hearted goodbye, you open the door and leave <<npc $sex.npcId>><</npc>>'s apartment.</p>
 			<<elseif getvar("$hookup['continuation']") == 2>>
-				<p>"Oh. Uhh, well..." <<=$npcs.get($sex.npcId,'firstname')>> trails off and you're left in an extremely uncomfortable silence.</p>
+				<p>"Oh. Uhh, well..." <<npc $sex.npcId>><</npc>> trails off and you're left in an extremely uncomfortable silence.</p>
 				<i>Well this is awkward...</i> you think to yourself as you turn towards the door.
 				"I guess I'll see you later then... or... well... not..." There''s another awkward silence. Not knowing what else to do, you just open the door and close it behind you without another word.
 			<</if>>
@@ -1392,10 +1392,10 @@ end} -->
 				"Sorry..."
 				<<if $wardrobe.clothingworntype == 'nude'>>
 					<<gs 'hookup_after' 'dress'>>
-					<p>"Oh. Uhh, well, it's fine I guess..." <<=$npcs.get($sex.npcId,'firstname')>> trails off and you're left in an extremely uncomfortable silence while you get dressed in front of him.</p>
-					<p><i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<=$npcs.get($sex.npcId,'firstname')>> a strained smile and wave goodbye, quickly striding towards the door to escape.</p>
+					<p>"Oh. Uhh, well, it's fine I guess..." <<npc $sex.npcId>><</npc>> trails off and you're left in an extremely uncomfortable silence while you get dressed in front of him.</p>
+					<p><i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<npc $sex.npcId>><</npc>> a strained smile and wave goodbye, quickly striding towards the door to escape.</p>
 				<<else>>
-					<p>"Oh. Uhh, well, it's fine I guess..." <<=$npcs.get($sex.npcId,'firstname')>> trails off and you're left in an extremely uncomfortable silence while you get dressed in front of him.</p>
+					<p>"Oh. Uhh, well, it's fine I guess..." <<npc $sex.npcId>><</npc>> trails off and you're left in an extremely uncomfortable silence while you get dressed in front of him.</p>
 					<i>Well this is awkward...</i> you think to yourself as you turn towards the door.
 					"I guess I'll see you later then... or... well... not..." There''s another awkward silence. Not knowing what else to do, you just open the door and close it behind you without another word.
 				<</if>>
@@ -1407,9 +1407,9 @@ end} -->
 				"If it's just a hookup," you continue. "or something like last night, I wouldn''t mind getting together for some fun, but I'm just not interested in dating anybody."
 				<<if rand(1,10) > 7>>
 					<<setinit $hookup['fuckbuddy'] = 1>>
-					<p>"Well... If it means I can see you again, then sure I guess." <<=$npcs.get($sex.npcId,'firstname')>> doesn't really seem satisfied with the results, but he still tells you his number while you tap it into your contact list.</p>
+					<p>"Well... If it means I can see you again, then sure I guess." <<npc $sex.npcId>><</npc>> doesn't really seem satisfied with the results, but he still tells you his number while you tap it into your contact list.</p>
 					<p>"So uhh, yeah... Call me sometime?"</p>
-					<p>"If I need some relief," you say with a shrug. You wave an awkward goodbye, you head out the door and out of <<=$npcs.get($sex.npcId,'firstname')>>'s apartment.</p>
+					<p>"If I need some relief," you say with a shrug. You wave an awkward goodbye, you head out the door and out of <<npc $sex.npcId>><</npc>>'s apartment.</p>
 					<<actCLA 'Leave'>>
 						<<gt 'hookup_after' 'exit'>>
 					<</actCLA>>
@@ -1418,7 +1418,7 @@ end} -->
 					<<actCLA 'Taken aback'>>
 						<<=$npcs.get($sex.npcId,'apt_hall')>>
 						<p>You blink in surprise, recoiling slightly at his words. That response really wasn't what you saw coming. After all, what guy just gives up free access to sex?</p>
-						<p>"Uhh well, uhh... Alright... Guess I won't see you later then..." you respond awkwardly. After giving yourself a once over, you give <<=$npcs.get($sex.npcId,'firstname')>> a strained smile and wave goodbye, quickly striding towards out the door.</p>
+						<p>"Uhh well, uhh... Alright... Guess I won't see you later then..." you respond awkwardly. After giving yourself a once over, you give <<npc $sex.npcId>><</npc>> a strained smile and wave goodbye, quickly striding towards out the door.</p>
 						<<actCLA 'Leave'>>
 							<<gt 'hookup_after' 'exit'>>
 						<</actCLA>>
@@ -1426,7 +1426,7 @@ end} -->
 					<<actCLA 'It`s to be expected'>>
 						<<=$npcs.get($sex.npcId,'apt_hall')>>
 						You nod to yourself, admittedly a little bit wistfully. It's to be expected from a guy like him. But if he wants something more, you just can't give it to him. You're only after pleasure, you don't want to get tangled up in a relationship.
-						<p>"Well, guess I won't see you around then so... Bye?" You wave <<=$npcs.get($sex.npcId,'firstname')>> goodbye and stride out the door, unable to feel that this little bit of fun took a bit of a damper turn right at the end.</p>
+						<p>"Well, guess I won't see you around then so... Bye?" You wave <<npc $sex.npcId>><</npc>> goodbye and stride out the door, unable to feel that this little bit of fun took a bit of a damper turn right at the end.</p>
 						<<actCLA 'Leave'>>
 							<<gt 'hookup_after' 'exit'>>
 						<</actCLA>>
@@ -1498,7 +1498,7 @@ end} -->
 			<p>You pause for a moment, $hookup['reaction1'], giving him a look. "Seriously?"</p>
 			<p>"Do I look like I'm kidding?" he grins back, clearly satisfied with himself.</p>
 			<p><i>Free access to pussy and you're just gonna turn it down. Whatever...</i> you think to yourself as you $hookup['reaction2'].</p>
-			<p>Once you're done, you grab your things and leave. <<=$npcs.get($sex.npcId,'firstname')>> doesn't say a word as you close the door behind you.</p>
+			<p>Once you're done, you grab your things and leave. <<npc $sex.npcId>><</npc>> doesn't say a word as you close the door behind you.</p>
 			<<actCLA 'Leave'>>
 				<<gt 'hookup_after' 'exit'>>
 			<</actCLA>>
@@ -1542,7 +1542,7 @@ end} -->
 			<p>You pause for a moment, $hookup['reaction1'], giving him a look. "Seriously?"</p>
 			<p>"Do I look like I'm kidding?" he grins back, clearly satisfied with himself.</p>
 			<i>Wow... You can really pick em, huh <<$pc.name_nick>>...</i> you think to yourself as you <<$hookup[''reaction2'']>>. <i>Ugh. Whatever...</i>
-			<p>Once you're done, you grab your things and leave. <<=$npcs.get($sex.npcId,'firstname')>> doesn't say a word as you close the door behind you.</p>
+			<p>Once you're done, you grab your things and leave. <<npc $sex.npcId>><</npc>> doesn't say a word as you close the door behind you.</p>
 			<<actCLA 'Leave'>>
 				<<gt 'hookup_after' 'exit'>>
 			<</actCLA>>
@@ -1614,7 +1614,7 @@ end} -->
 			<p>You pause for a moment, $hookup['reaction1'], giving him a look. "Seriously?"</p>
 			<p>"Do I look like I'm kidding?" he grins back, clearly satisfied with himself.</p>
 			<i>Wow... You can really pick em, huh <<$pc.name_nick>>...</i> you think to yourself as you <<$hookup[''reaction2'']>>. <i>Ugh. Whatever...</i>
-			<p>Once you're done, you grab your things and leave. <<=$npcs.get($sex.npcId,'firstname')>> doesn't say a word as you close the door behind you.</p>
+			<p>Once you're done, you grab your things and leave. <<npc $sex.npcId>><</npc>> doesn't say a word as you close the door behind you.</p>
 			<<actCLA 'Leave'>>
 				<<gt 'hookup_after' 'exit'>>
 			<</actCLA>>

+ 3 - 3
sugarcube/src/autogenerated/unsorted/hookup_rape.tw

@@ -4,11 +4,11 @@
 <<if $location_var[$here][0] == 'skip_condom'>>
 	<<setinit $birth_control['condom_stealth'] = $time.daystart>>
 	<<video "shared/sex/cum/vagcreampie/doggy3.mp4">>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> suddenly stops and you feel something spurt inside you. Your eyes go wide with shock.</p>
+	<p><<npc $sex.npcId>><</npc>> suddenly stops and you feel something spurt inside you. Your eyes go wide with shock.</p>
 	<i>Wait... is that...?</i>
 	<<actCLA 'Continue'>>
 		<<video "shared/sex/cum/vagcreampie/doggy1.mp4">>
-		<p>You wait a few heartbeats and <<=$npcs.get($sex.npcId,'firstname')>> pulls out of you. Immediately, you feel something thick spurt from your pussy.</p>
+		<p>You wait a few heartbeats and <<npc $sex.npcId>><</npc>> pulls out of you. Immediately, you feel something thick spurt from your pussy.</p>
 		<<gs 'hookup_rape' 'skip_condom_react'>>
 	<</actCLA>>
 <</if>>
@@ -17,7 +17,7 @@
 		<<image "shared/sex/cum/cum111.jpg">>
 		<p>"What the fuck!" you scream. Jumping up, you look down between your legs in horror and wipe your hand across your pussy, confirming your suspicions. Cum coats your fingers and continues to dribble from your snatch, running down your legs.</p>
 		<p>"What the fuck!" you shout again. "You said you put on a condom!"</p>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't look the least bit apologetic and in fact shrugs smugly with a smile on his face.</p>
+		<p><<npc $sex.npcId>><</npc>> doesn't look the least bit apologetic and in fact shrugs smugly with a smile on his face.</p>
 		"I lied."
 		<<actCLA 'Grab your stuff!'>>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>

+ 140 - 140
sugarcube/src/autogenerated/unsorted/hookup_sex.tw

@@ -24,7 +24,7 @@
 	<<actCLA 'Spread your legs'>>
 		<<image "shared/sex/foreplay/miss1.jpg">>
 		<<setinit $hookup['position'] = 'miss'>>
-		<p>"I want you inside me," you whisper, drawing back off of him and spreading your legs. <<=$npcs.get($sex.npcId,'firstname')>> eagerly follows you and you grab his cock, guiding it into your pussy.</p>
+		<p>"I want you inside me," you whisper, drawing back off of him and spreading your legs. <<npc $sex.npcId>><</npc>> eagerly follows you and you grab his cock, guiding it into your pussy.</p>
 		<<actCLA 'Get fucked'>>
 			<<if rand(0,1) == 1 or getvar("$hookup['gentle']") == 1 and getvar("$hookup['rough']") != 1>>
 				<<gt 'hookup_sex' 'miss_norm1'>>
@@ -100,10 +100,10 @@
 		<<else>>
 			<<image "shared/sex/vag/miss/blood1.jpg">>
 		<</if>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> fucks you slowly but steadily. His cock is coated in the blood from your menstrual cycle, red liquid streaming out of your pussy with every thrust. But it doesn't stop him from continuing to drive balls deep inside you every time.</p>
+		<p><<npc $sex.npcId>><</npc>> fucks you slowly but steadily. His cock is coated in the blood from your menstrual cycle, red liquid streaming out of your pussy with every thrust. But it doesn't stop him from continuing to drive balls deep inside you every time.</p>
 	<<else>>
 		<<video "shared/sex/vag/miss/slow2.mp4">>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> fucks you slowly but steadily, drawing his cock all the way out and driving it balls deep inside you each time.</p>
+		<p><<npc $sex.npcId>><</npc>> fucks you slowly but steadily, drawing his cock all the way out and driving it balls deep inside you each time.</p>
 	<</if>>
 	<<actCLA 'Don`t stop!'>>
 		<<setinit $hookup['orgasm'] = $orgasm>>
@@ -120,7 +120,7 @@
 		You love the way he fucks you, how his cock slowly stretches your pussy out until you feel completely full before withdrawing it again, leaving you aching for more.
 		<<if $hookup['orgasm'] < $orgasm>>
 			It builds something inside your body, some kind of energy. You can feel it in your toes, curling in pleasure. You can feel it in the tips of your nipples, stiff with arousal. And the burning <i>heat</i> inside your pussy, growing hotter by the second. Each thrust causes the heat to intensify inside you, straining against your skin until you can't take it anymore.
-			<p>You release a wordless cry, every muscle in your body going taut and your pussy clenching hard with <<=$npcs.get($sex.npcId,'firstname')>> still inside you. For the briefest of moments, it's almost like you can feel every single contour, curve, and vein of his cock.</p>
+			<p>You release a wordless cry, every muscle in your body going taut and your pussy clenching hard with <<npc $sex.npcId>><</npc>> still inside you. For the briefest of moments, it's almost like you can feel every single contour, curve, and vein of his cock.</p>
 		<<else>>
 			<p>"Don't stop! Don't stop! Don't stop! Don't stop!" you repeat over and over again, unable to think of any other words with your mind lost in carnal pleasures.</p>
 		<</if>>
@@ -129,14 +129,14 @@
 	<<actCLA 'Isn`t this kind of slow?'>>
 		<<setinit $hookup['orgasm'] = $orgasm>>
 		<span class="innerThought">Isn't this kind of... slow?</span>
-		<p>The pace at which <<=$npcs.get($sex.npcId,'firstname')>> is fucking you is unbelievably frustrating. It feels nice, but you want more! As it currently is, it just feels like a literal cocktease.</p>
+		<p>The pace at which <<npc $sex.npcId>><</npc>> is fucking you is unbelievably frustrating. It feels nice, but you want more! As it currently is, it just feels like a literal cocktease.</p>
 		<<actCLA 'Don`t ruin the mood'>>
 			<<setinit $hookup['bored'] = 1>>
 			<<set $orgasm_or = 'no'>>
 			<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 			<<set $orgasm_or = ''>>
 			<<video "shared/sex/vag/miss/slow2.mp4">>
-			<p>You sigh internally, but decide not to ruin the mood by telling <<=$npcs.get($sex.npcId,'firstname')>> he's a boring lay. He continues to fuck you excruciatingly slowly, while you try to focus on the sensations as much as possible to just maybe get some satisfaction out of it.</p>
+			<p>You sigh internally, but decide not to ruin the mood by telling <<npc $sex.npcId>><</npc>> he's a boring lay. He continues to fuck you excruciatingly slowly, while you try to focus on the sensations as much as possible to just maybe get some satisfaction out of it.</p>
 			<<gs 'hookup_sex' 'fuck_cum'>>
 		<</actCLA>>
 		<<actCLA 'Can you fuck me harder?'>>
@@ -154,7 +154,7 @@
 				<<gs 'hookup_sex' 'fuck_cum'>>
 			<<else>>
 				<p>"Oh! Uhmm, sure I can do that."</p>
-				<p>You sigh in relief that he took the hint and <<=$npcs.get($sex.npcId,'firstname')>> changes his pace, beginning to fuck you a little bit faster and a whole lot harder.</p>
+				<p>You sigh in relief that he took the hint and <<npc $sex.npcId>><</npc>> changes his pace, beginning to fuck you a little bit faster and a whole lot harder.</p>
 				<<actCLA 'Continue'>>
 					<<gt 'hookup_sex' 'miss_hard2'>>
 				<</actCLA>>
@@ -168,8 +168,8 @@
 			<<set $orgasm_or = ''>>
 			<<video "shared/sex/vag/miss/slow2.mp4">>
 			<p>"Ugh! Ugh! Ugh! <i>Ughhhh!!</i>"</p>
-			<p>You moan loudly despite the distinct <i>lack</i> of pleasure you feel right now before crying out and clenching down on <<=$npcs.get($sex.npcId,'firstname')>>'s cock with your pussy as hard as you can, dramatically arching your back and thrusting your nipples into the air.</p>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> slows down even more for a beat.</p>
+			<p>You moan loudly despite the distinct <i>lack</i> of pleasure you feel right now before crying out and clenching down on <<npc $sex.npcId>><</npc>>'s cock with your pussy as hard as you can, dramatically arching your back and thrusting your nipples into the air.</p>
+			<p><<npc $sex.npcId>><</npc>> slows down even more for a beat.</p>
 			<p>"Did you just...?"</p>
 			"Yeah," you pant, forcing breathlessness into your voice.
 			<p>"Do you need me to slo-"</p>
@@ -192,10 +192,10 @@
 
 	<</if>>
 	<<video "shared/sex/vag/miss/slow2.mp4">>
-	<p>Now that <<=$npcs.get($sex.npcId,'firstname')>> isn't fucking with the force of a jackhammer, the whole experience becomes much more pleasant. Instead of pounding your pussy numb, you can actually feel his cock stretching your walls, the sensation of being filled up when he's deep inside you, and every thrust elicits moans of pleasure from your lips.</p>
+	<p>Now that <<npc $sex.npcId>><</npc>> isn't fucking with the force of a jackhammer, the whole experience becomes much more pleasant. Instead of pounding your pussy numb, you can actually feel his cock stretching your walls, the sensation of being filled up when he's deep inside you, and every thrust elicits moans of pleasure from your lips.</p>
 	<<if $hookup['orgasm'] < $orgasm>>
 		It builds something inside your body, some kind of energy. You can feel it in your toes, curling in pleasure. You can feel it in the tips of your nipples, stiff with arousal. And the burning <i>heat</i> inside your pussy, growing hotter by the second. Each thrust causes the heat to intensify inside you, straining against your skin until you can't take it anymore.
-		<p>You release a wordless cry, every muscle in your body going taut and your pussy clenching hard with <<=$npcs.get($sex.npcId,'firstname')>> still inside you. For the briefest of moments, it's almost like you can feel every single contour, curve, and vein of his cock.</p>
+		<p>You release a wordless cry, every muscle in your body going taut and your pussy clenching hard with <<npc $sex.npcId>><</npc>> still inside you. For the briefest of moments, it's almost like you can feel every single contour, curve, and vein of his cock.</p>
 	<</if>>
 	<<gs 'hookup_sex' 'fuck_cum'>>
 <</if>>
@@ -211,10 +211,10 @@
 		<<else>>
 			<<image "shared/sex/vag/miss/blood1.jpg">>
 		<</if>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>>'s elicits an involuntary gasp from your lips as he goes balls deep with the first thrust. He doesn't give you a single moment to adjust and immediately pulls out to thrust back in. <<=$npcs.get($sex.npcId,'firstname')>> rapidly builds up to a fast pace. Tiny flecks of blood from your period spatter across both of your skin from the force of his fucking and you can see his cock is painted red with it.</p>
+		<p><<npc $sex.npcId>><</npc>>'s elicits an involuntary gasp from your lips as he goes balls deep with the first thrust. He doesn't give you a single moment to adjust and immediately pulls out to thrust back in. <<npc $sex.npcId>><</npc>> rapidly builds up to a fast pace. Tiny flecks of blood from your period spatter across both of your skin from the force of his fucking and you can see his cock is painted red with it.</p>
 	<<else>>
 		<<video "shared/sex/vag/miss/med3.mp4">>
-		<p><<=$npcs.get($sex.npcId,'firstname')>>'s elicits an involuntary gasp from your lips as he goes balls deep with the first thrust. He doesn't give you a single moment to adjust and immediately pulls out to thrust back in. <<=$npcs.get($sex.npcId,'firstname')>> rapidly builds up to a fast pace, bouncing your breasts with the force of his fucking and you think to yourself...</p>
+		<p><<npc $sex.npcId>><</npc>>'s elicits an involuntary gasp from your lips as he goes balls deep with the first thrust. He doesn't give you a single moment to adjust and immediately pulls out to thrust back in. <<npc $sex.npcId>><</npc>> rapidly builds up to a fast pace, bouncing your breasts with the force of his fucking and you think to yourself...</p>
 	<</if>>
 	<<actCLA 'This feels so good'>>
 		<<setinit $hookup['orgasm'] = $orgasm>>
@@ -231,21 +231,21 @@
 		<i>This feels soooo goooood...</i>
 		You love the way he fucks you, thoroughly enjoying the pounding you're receiving and you quickly lose yourself in the rhythmic slapping of his body against yours.
 		<<if $hookup['orgasm'] < $orgasm>>
-			<p>As <<=$npcs.get($sex.npcId,'firstname')>> continues to fuck you, something builds inside you. Every time his cock slams into your pussy is like sparks flying off a hammer. This <i>heat</i>, this friction, burning inside your pussy and every part of your body, growing hotter by the second. Each thrust builds more heat inside you, straining against your skin until you can't take it anymore.</p>
-			<p>You scream uncontrollably as you climax, every muscle in your body going taut and your pussy clenching hard with <<=$npcs.get($sex.npcId,'firstname')>> still pounding you. You ride out your orgasm as far as it will take you until your body goes slack.</p>
+			<p>As <<npc $sex.npcId>><</npc>> continues to fuck you, something builds inside you. Every time his cock slams into your pussy is like sparks flying off a hammer. This <i>heat</i>, this friction, burning inside your pussy and every part of your body, growing hotter by the second. Each thrust builds more heat inside you, straining against your skin until you can't take it anymore.</p>
+			<p>You scream uncontrollably as you climax, every muscle in your body going taut and your pussy clenching hard with <<npc $sex.npcId>><</npc>> still pounding you. You ride out your orgasm as far as it will take you until your body goes slack.</p>
 		<</if>>
 		<<gs 'hookup_sex' 'fuck_cum'>>
 	<</actCLA>>
 	<<actCLA 'This is too hard!'>>
 		<<setinit $hookup['orgasm'] = $orgasm>>
 		<span class="innerThought">Isn''t this - ! Kind of - ! Rough - ?!</span>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> is fucking you way too hard for your pleasure. Your tits hurt with how much they're bouncing around and his cock is stabbing into you at uncomfortable angles, the force he's putting behind the thrusts making it even worse.</p>
+		<p><<npc $sex.npcId>><</npc>> is fucking you way too hard for your pleasure. Your tits hurt with how much they're bouncing around and his cock is stabbing into you at uncomfortable angles, the force he's putting behind the thrusts making it even worse.</p>
 		<<actCLA 'Don`t ruin the mood'>>
 			<<set $orgasm_or = 'no'>>
 			<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 			<<set $orgasm_or = ''>>
 			<<video "shared/sex/vag/miss/med3.mp4">>
-			<p>You don't want to ruin the mood, so you don't say anything and continue to endure the painful fucking you're receiving from <<=$npcs.get($sex.npcId,'firstname')>>, wincing with every thrust.</p>
+			<p>You don't want to ruin the mood, so you don't say anything and continue to endure the painful fucking you're receiving from <<npc $sex.npcId>><</npc>>, wincing with every thrust.</p>
 			<<gs 'hookup_sex' 'fuck_cum'>>
 		<</actCLA>>
 		<<actCLA 'Can you slow down a little?'>>
@@ -255,7 +255,7 @@
 				<<set $orgasm_or = 'no'>>
 				<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 				<<set $orgasm_or = ''>>
-				<p>"No way, this is great!" <<=$npcs.get($sex.npcId,'firstname')>> grunts back, not even slowing down a beat.</p>
+				<p>"No way, this is great!" <<npc $sex.npcId>><</npc>> grunts back, not even slowing down a beat.</p>
 				<p>"This is-! I'm really not-!"</p>
 				<p>"You'll get used to it soon!"</p>
 				He keeps fucking you hard, redoubling his efforts to fuck you with even greater force.
@@ -277,8 +277,8 @@
 			<<set $orgasm_or = ''>>
 			<<video "shared/sex/vag/miss/med3.mp4">>
 			<p>"Ugh! Ugh! Ugh! <i>Ughhhh!!</i>"</p>
-			<p>You moan loudly despite the distinct <i>lack</i> of pleasure you feel right now before crying out and clenching down on <<=$npcs.get($sex.npcId,'firstname')>>'s cock with your pussy as hard as you can, dramatically arching your back and thrusting your nipples into the air.</p>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> slows down even more for a beat.</p>
+			<p>You moan loudly despite the distinct <i>lack</i> of pleasure you feel right now before crying out and clenching down on <<npc $sex.npcId>><</npc>>'s cock with your pussy as hard as you can, dramatically arching your back and thrusting your nipples into the air.</p>
+			<p><<npc $sex.npcId>><</npc>> slows down even more for a beat.</p>
 			<p>"Did you just...?"</p>
 			"Yeah," you pant, forcing breathlessness into your voice.
 			<<if $npcs.get($sex.npcId,'generous') == 1>>
@@ -309,10 +309,10 @@
 
 	<</if>>
 	<<video "shared/sex/vag/miss/med1.mp4">>
-	<p>Now that <<=$npcs.get($sex.npcId,'firstname')>> isn't fucking you like your bones were made of glass, the whole experience becomes much more enjoyable. He pounds your pussy with enough force to make your breasts jiggle and the bed creak and the sensation is enough to make you openly moan.</p>
+	<p>Now that <<npc $sex.npcId>><</npc>> isn't fucking you like your bones were made of glass, the whole experience becomes much more enjoyable. He pounds your pussy with enough force to make your breasts jiggle and the bed creak and the sensation is enough to make you openly moan.</p>
 	<<if $hookup['orgasm'] < $orgasm>>
-		<p>As <<=$npcs.get($sex.npcId,'firstname')>> continues to fuck you, something builds inside you. Every time his cock slams into your pussy is like sparks flying off a hammer. This <i>heat</i>, this friction, burning inside your pussy and every part of your body, growing hotter by the second. Each thrust builds more heat inside you, straining against your skin until you can't take it anymore.</p>
-		<p>You scream uncontrollably in climax, every muscle in your body going taut and your pussy clenching hard with <<=$npcs.get($sex.npcId,'firstname')>> still pounding you. You ride out your orgasm as far as it will take you until your body goes slack.</p>
+		<p>As <<npc $sex.npcId>><</npc>> continues to fuck you, something builds inside you. Every time his cock slams into your pussy is like sparks flying off a hammer. This <i>heat</i>, this friction, burning inside your pussy and every part of your body, growing hotter by the second. Each thrust builds more heat inside you, straining against your skin until you can't take it anymore.</p>
+		<p>You scream uncontrollably in climax, every muscle in your body going taut and your pussy clenching hard with <<npc $sex.npcId>><</npc>> still pounding you. You ride out your orgasm as far as it will take you until your body goes slack.</p>
 	<</if>>
 	<<gs 'hookup_sex' 'fuck_cum'>>
 <</if>>
@@ -324,15 +324,15 @@
 	<</if>>
 	<<arouse 'vaginal' 1 `['no_orgasm_msg']`>>
 	<<video "shared/sex/vag/doggy/enter1.mp4">>
-	<p>You tense up slightly when <<=$npcs.get($sex.npcId,'firstname')>> presses his cock inside you. You can't help but hold your breath as he slowly slides in, his girth stretching the walls of your pussy, finally releasing it when you can feel his entire length inside you. After a moment of letting you adjust, he starts moving.</p>
+	<p>You tense up slightly when <<npc $sex.npcId>><</npc>> presses his cock inside you. You can't help but hold your breath as he slowly slides in, his girth stretching the walls of your pussy, finally releasing it when you can feel his entire length inside you. After a moment of letting you adjust, he starts moving.</p>
 	<<actCLA 'Get fucked'>>
 		<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 		<<if getvar("$mesec") > 0>>
 			<<image "shared/sex/vag/doggy/blood1.jpg">>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> drives his cock in and out of you in a steady rhythm, not too fast but not particularly slow either. His hips brush against your ass with every thrust, driving himself deep inside you. As he fucks you, you can feel the blood of your menstrual cycle leaking from your pussy, trickling down your thighs.</p>
+			<p><<npc $sex.npcId>><</npc>> drives his cock in and out of you in a steady rhythm, not too fast but not particularly slow either. His hips brush against your ass with every thrust, driving himself deep inside you. As he fucks you, you can feel the blood of your menstrual cycle leaking from your pussy, trickling down your thighs.</p>
 		<<else>>
 			<<video "shared/sex/vag/doggy/slow2.mp4">>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> drives his cock in and out of you in a steady rhythm, not too fast but not particularly slow either. His hips brush against your ass with every thrust, and you think to yourself...</p>
+			<p><<npc $sex.npcId>><</npc>> drives his cock in and out of you in a steady rhythm, not too fast but not particularly slow either. His hips brush against your ass with every thrust, and you think to yourself...</p>
 		<</if>>
 		<<actCLA 'Don`t stop!'>>
 			<<setinit $hookup['orgasm'] = $orgasm>>
@@ -345,10 +345,10 @@
 				<<set $orgasm_or = ''>>
 
 			<</if>>
-			<p>"Don't stop!" you moan. Everything about this sends pleasure coursing through your body. Getting fucked from behind, how deep <<=$npcs.get($sex.npcId,'firstname')>> drives his cock inside you, and the perfect pace that leaves you panting like a wanton whore.</p>
+			<p>"Don't stop!" you moan. Everything about this sends pleasure coursing through your body. Getting fucked from behind, how deep <<npc $sex.npcId>><</npc>> drives his cock inside you, and the perfect pace that leaves you panting like a wanton whore.</p>
 			<<if $hookup['orgasm'] < $orgasm>>
 				Your panting becomes heavier with every thrust and a burning heat is building up between your legs. Your nipples start to tingle and you can feel them quivering in the air with the motions of your jiggling breasts. It builds pressure inside you, stacking one good feeling on top of another until it cresendos, the pressure releasing in waves of mindnumbing bliss.
-				<p>Every muscle of your body goes taut and <<=$npcs.get($sex.npcId,'firstname')>> continues to fuck you even as you cum hard on his cock. Your chest feels so tight that you can't breathe and your voice becomes a mere whine as you clench your teeth together, unable to do anything else in the face of euphoric orgasm. Finally, it breaks and your elbows buckle underneath your own weight, leaving you ass up, face down, and gasping for air.</p>
+				<p>Every muscle of your body goes taut and <<npc $sex.npcId>><</npc>> continues to fuck you even as you cum hard on his cock. Your chest feels so tight that you can't breathe and your voice becomes a mere whine as you clench your teeth together, unable to do anything else in the face of euphoric orgasm. Finally, it breaks and your elbows buckle underneath your own weight, leaving you ass up, face down, and gasping for air.</p>
 			<<else>>
 				<p>"Don't stop! Don't stop! Don't stop! Don't stop!" you repeat over and over again, unable to think of any other words with your mind lost in carnal pleasures as you moan into the bedsheets.</p>
 			<</if>>
@@ -363,7 +363,7 @@
 				<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 				<<set $orgasm_or = ''>>
 				<<video "shared/sex/vag/doggy/bored1.mp4">>
-				<p>You sigh internally, but decide not to ruin the mood by telling <<=$npcs.get($sex.npcId,'firstname')>> he's a boring lay. He continues to fuck you from behind while you openly let your disappointment show on the face he can't see.</p>
+				<p>You sigh internally, but decide not to ruin the mood by telling <<npc $sex.npcId>><</npc>> he's a boring lay. He continues to fuck you from behind while you openly let your disappointment show on the face he can't see.</p>
 				<<gs 'hookup_sex' 'fuck_cum'>>
 			<</actCLA>>
 			<<actCLA 'Can you fuck me harder?'>>
@@ -381,7 +381,7 @@
 				<<else>>
 					<p>"Really?" He starts, seeming surprised but eager.</p>
 					"Yeah," you grin back at him. I can take it. <i>Clap</i> my cheeks."
-					<p>You shriek in delight as he thrusts his cock into you with full force, the impact rippling through your entire body. Shortly after scream quickly devolves into rhythmic moans when <<=$npcs.get($sex.npcId,'firstname')>> continues fucking you, but much harder than before.</p>
+					<p>You shriek in delight as he thrusts his cock into you with full force, the impact rippling through your entire body. Shortly after scream quickly devolves into rhythmic moans when <<npc $sex.npcId>><</npc>> continues fucking you, but much harder than before.</p>
 					<<actCLA 'Continue'>>
 						<<gt 'hookup_sex' 'doggy_hard2'>>
 					<</actCLA>>
@@ -395,11 +395,11 @@
 				<<set $orgasm_or = ''>>
 				<<video "shared/sex/vag/doggy/slow2.mp4">>
 				<p>"Ugh! Ugh! Ugh! <i>Ughhhh!!</i>"</p>
-				<p>You moan loudly despite the distinct <i>lack</i> of pleasure you feel right now before crying out and clenching down on <<=$npcs.get($sex.npcId,'firstname')>>'s cock with your pussy as hard as you can, dramatically shaking your shoulders, faking climax.</p>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> slows down even more for a beat.</p>
+				<p>You moan loudly despite the distinct <i>lack</i> of pleasure you feel right now before crying out and clenching down on <<npc $sex.npcId>><</npc>>'s cock with your pussy as hard as you can, dramatically shaking your shoulders, faking climax.</p>
+				<p><<npc $sex.npcId>><</npc>> slows down even more for a beat.</p>
 				<p>"Did you just...?"</p>
 				"Yeah," you pant, forcing breathlessness into your voice.
-				<p><<=$npcs.get($sex.npcId,'firstname')>> slows down even more for a beat.</p>
+				<p><<npc $sex.npcId>><</npc>> slows down even more for a beat.</p>
 				<p>"Did you just...?"</p>
 				"Yeah," you pant, forcing breathlessness into your voice.
 				<p>"Do you need me to slo-"</p>
@@ -423,10 +423,10 @@
 
 	<</if>>
 	<<video "shared/sex/vag/doggy/slow2.mp4">>
-	<p>Now that <<=$npcs.get($sex.npcId,'firstname')>> isn't fucking with the force of a jackhammer, the whole experience becomes much more pleasant. Instead of pounding your pussy numb, you can actually feel his cock stretching your walls, the pleasure of being filled to the brim when his full length is inside you and being able to enjoy it for the moment before he pulls away. Every thrust leaves you moaning for more.</p>
+	<p>Now that <<npc $sex.npcId>><</npc>> isn't fucking with the force of a jackhammer, the whole experience becomes much more pleasant. Instead of pounding your pussy numb, you can actually feel his cock stretching your walls, the pleasure of being filled to the brim when his full length is inside you and being able to enjoy it for the moment before he pulls away. Every thrust leaves you moaning for more.</p>
 	<<if $hookup['orgasm'] < $orgasm>>
 		It builds something inside your body, some kind of energy. You can feel it in your toes, curling in pleasure. You can feel it in the tips of your nipples, stiff with arousal. And the burning <i>heat</i> inside your pussy, growing hotter by the second. Each thrust causes the heat to intensify inside you, straining against your skin until you can't take it anymore.
-		<p>You release a wordless cry, every muscle in your body going taut and your pussy clenching hard with <<=$npcs.get($sex.npcId,'firstname')>> still inside you. For the briefest of moments, it's almost like you can feel every single contour, curve, and vein of his cock.</p>
+		<p>You release a wordless cry, every muscle in your body going taut and your pussy clenching hard with <<npc $sex.npcId>><</npc>> still inside you. For the briefest of moments, it's almost like you can feel every single contour, curve, and vein of his cock.</p>
 	<</if>>
 	<<gs 'hookup_sex' 'fuck_cum'>>
 <</if>>
@@ -439,11 +439,11 @@
 	<<set $time.minutes += rand(4,8)>>
 	<<arouse 'vaginal' 1 `['no_orgasm_msg','rough']`>>
 	<<video "shared/sex/vag/doggy/rough1.mp4">>
-	<p>You gasp as <<=$npcs.get($sex.npcId,'firstname')>> slams his cock into you from behind, the impact rippling through your entire body. As your head jerks back reflexively, <<=$npcs.get($sex.npcId,'firstname')>>'s hand grabs hold of your hair, yanking on it to pull you harder onto his cock.</p>
+	<p>You gasp as <<npc $sex.npcId>><</npc>> slams his cock into you from behind, the impact rippling through your entire body. As your head jerks back reflexively, <<npc $sex.npcId>><</npc>>'s hand grabs hold of your hair, yanking on it to pull you harder onto his cock.</p>
 	<<if getvar("$mesec") > 0>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> drives himself in and out of your pussy, fucking you hard, the sound of your cheeks getting clapped bouncing off the walls. His cock slams into you and you can feel it force the menstrual blood from your uterus, sending it running down your thighs.</p>
+		<p><<npc $sex.npcId>><</npc>> drives himself in and out of your pussy, fucking you hard, the sound of your cheeks getting clapped bouncing off the walls. His cock slams into you and you can feel it force the menstrual blood from your uterus, sending it running down your thighs.</p>
 	<<else>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> drives himself in and out of your pussy, fucking you hard, the sound of your cheeks getting clapped bouncing off the walls. And you think to yourself...</p>
+		<p><<npc $sex.npcId>><</npc>> drives himself in and out of your pussy, fucking you hard, the sound of your cheeks getting clapped bouncing off the walls. And you think to yourself...</p>
 	<</if>>
 	<<actCLA 'Yes! Yes! Yes! Yes!'>>
 		<<setinit $hookup['orgasm'] = $orgasm>>
@@ -460,7 +460,7 @@
 		The hair grab was unexpected, but you're loving how rough he's treating you, the force with which he fucks you. You love how deep his cock goes inside you and he's hammering your pussy in all the right ways.
 		<<if $hookup['orgasm'] < $orgasm>>
 			Every time his hips come into contact with your ass, it's like your body is storing up the force of his thrusts. The pressure builds inside you and your groans get louder and louder until you're trembling. And then your orgasm breaks.
-			<p>Every muscle of your body goes taut and <<=$npcs.get($sex.npcId,'firstname')>> continues to fuck you even as you cum hard. You scream in pleasure, so intense it's almost painful, coming close to blacking out. You vaguely remember individual sensations, like the rigidity of your nipples or your pussy clamping down on his cock. But beyond that, everything just becomes a blur, pulsations of orgasm rocking through your body.</p>
+			<p>Every muscle of your body goes taut and <<npc $sex.npcId>><</npc>> continues to fuck you even as you cum hard. You scream in pleasure, so intense it's almost painful, coming close to blacking out. You vaguely remember individual sensations, like the rigidity of your nipples or your pussy clamping down on his cock. But beyond that, everything just becomes a blur, pulsations of orgasm rocking through your body.</p>
 		<</if>>
 		<<gs 'hookup_sex' 'fuck_cum'>>
 	<</actCLA>>
@@ -473,7 +473,7 @@
 			<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg','rough']`>>
 			<<set $orgasm_or = ''>>
 			<<video "shared/sex/vag/doggy/hard2.mp4">>
-			<p>For whatever reason, you can't bring yourself to say anything, and simply endure the rough treatment. You sigh in relief when <<=$npcs.get($sex.npcId,'firstname')>> releases your hair but only for a brief moment when he uses his extra hand to grab hold of your ass and pound you even harder. You grab onto the edge of the bed and hang on for dear life, whimpering as he mercilessly fucks you.</p>
+			<p>For whatever reason, you can't bring yourself to say anything, and simply endure the rough treatment. You sigh in relief when <<npc $sex.npcId>><</npc>> releases your hair but only for a brief moment when he uses his extra hand to grab hold of your ass and pound you even harder. You grab onto the edge of the bed and hang on for dear life, whimpering as he mercilessly fucks you.</p>
 			<<gs 'hookup_sex' 'fuck_cum'>>
 		<</actCLA>>
 		<<actCLA 'Can we slow down?'>>
@@ -483,7 +483,7 @@
 				<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 				<<set $orgasm_or = ''>>
 				<p>"Do you think-! We could-! Slow down a little?" you manage to whimper out. "This is to rough for me."</p>
-				<p>"No way, this is great!" <<=$npcs.get($sex.npcId,'firstname')>> grunts back, not even slowing down a beat.</p>
+				<p>"No way, this is great!" <<npc $sex.npcId>><</npc>> grunts back, not even slowing down a beat.</p>
 				<p>"This is-! I'm not really-!"</p>
 				<p>"You'll get used to it soon!"</p>
 				He releases your hair, grabbing your ass with both hands and fucks you even harder, pounding you into the mattress. All you can do is grab the sheets and grit your teeth, praying that it will end soon.
@@ -505,8 +505,8 @@
 			<<set $orgasm_or = ''>>
 			<<video "shared/sex/vag/doggy/hard2.mp4">>
 			<p>"Ugh! Ugh! Ugh! <i>Ughhhh!!</i>"</p>
-			<p>You moan loudly despite the distinct <i>lack</i> of pleasure you feel right now before crying out and clenching down on <<=$npcs.get($sex.npcId,'firstname')>>'s cock with your pussy as hard as you can, dramatically shaking your shoulders, faking climax.</p>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> slows down even more for a beat.</p>
+			<p>You moan loudly despite the distinct <i>lack</i> of pleasure you feel right now before crying out and clenching down on <<npc $sex.npcId>><</npc>>'s cock with your pussy as hard as you can, dramatically shaking your shoulders, faking climax.</p>
+			<p><<npc $sex.npcId>><</npc>> slows down even more for a beat.</p>
 			<p>"Did you just...?"</p>
 			"Yeah," you pant, forcing breathlessness into your voice.
 			<<if $npcs.get($sex.npcId,'generous') == 1>>
@@ -541,12 +541,12 @@
 	<<else>>
 		<<video "shared/sex/vag/doggy/hard1.mp4">>
 	<</if>>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> slams his cock into your pussy and you can't help yourself, throwing your ass back into his thrusts to increase the force with which he obligingly claps your cheeks. Endorphins rush to your head, sending you into a giggling fit even while the bed wobbles beneath you.</p>
+	<p><<npc $sex.npcId>><</npc>> slams his cock into your pussy and you can't help yourself, throwing your ass back into his thrusts to increase the force with which he obligingly claps your cheeks. Endorphins rush to your head, sending you into a giggling fit even while the bed wobbles beneath you.</p>
 	<<if $hookup['orgasm'] < $orgasm>>
 		<<actCLA 'Continue'>>
 			<<video "shared/sex/vag/doggy/orgasm1.mp4">>
 			Your giggling slowly turns into panting and your breath becomes heavier with every thrust. Tension begins to build inside you, storing itself inside you. Your core begins to grow tighter and tighter until every muscle in your body goes completely taut and you shudder in violent orgasm.
-			<p><<=$npcs.get($sex.npcId,'firstname')>> drives himself deep inside you and you release a tortured cry, continuing to spasm as you ride out the rest of your orgasm on his cock.</p>
+			<p><<npc $sex.npcId>><</npc>> drives himself deep inside you and you release a tortured cry, continuing to spasm as you ride out the rest of your orgasm on his cock.</p>
 			<<gs 'hookup_sex' 'fuck_cum'>>
 		<</actCLA>>
 	<<else>>
@@ -581,7 +581,7 @@
 		You start bouncing up and down on his cock, enjoying the feeling of it slide in and out of you, hitting the angles in your pussy that can only be hit when you're on top.
 	<</if>>
 	<<if $hookup['orgasm'] < $orgasm>>
-		<p>Each bounce builds pressure inside you. Every bounce of pressure piles on the last one. Soon, your body is filled with tension. You throw yourself down onto <<=$npcs.get($sex.npcId,'firstname')>>'s cock one last time and the tension breaks, releasing waves of orgasm through your entire body. You cry out, impaling yourself on his cock, toes curling with pleasure, shuddering as you become oblivious to everything except your mind numbing orgasm and the cock stuffed in inside pussy.</p>
+		<p>Each bounce builds pressure inside you. Every bounce of pressure piles on the last one. Soon, your body is filled with tension. You throw yourself down onto <<npc $sex.npcId>><</npc>>'s cock one last time and the tension breaks, releasing waves of orgasm through your entire body. You cry out, impaling yourself on his cock, toes curling with pleasure, shuddering as you become oblivious to everything except your mind numbing orgasm and the cock stuffed in inside pussy.</p>
 	<</if>>
 	<<gs 'hookup_sex' 'fuck_cum'>>
 <</if>>
@@ -603,12 +603,12 @@
 	<</if>>
 	<<video "shared/sex/vag/cowgirl/hard2.mp4">>
 	<<if getvar("$mesec") > 0>>
-		<p>You begin throwing yourself up and down on <<=$npcs.get($sex.npcId,'firstname')>>'s cock, your breasts bouncing wildly from the force of your thrusts. Blood from your cycle runs down his cock, making it extra slick as you lean back on your own legs for leverage, trying to pound yourself on his dick as hard as possible.</p>
+		<p>You begin throwing yourself up and down on <<npc $sex.npcId>><</npc>>'s cock, your breasts bouncing wildly from the force of your thrusts. Blood from your cycle runs down his cock, making it extra slick as you lean back on your own legs for leverage, trying to pound yourself on his dick as hard as possible.</p>
 	<<else>>
-		<p>You begin throwing yourself up and down on <<=$npcs.get($sex.npcId,'firstname')>>'s cock, your breasts bouncing wildly from the force of your thrusts. You lean back on your own legs for leverage, trying to get the maximum height to come down on his dick with the maximum force every time.</p>
+		<p>You begin throwing yourself up and down on <<npc $sex.npcId>><</npc>>'s cock, your breasts bouncing wildly from the force of your thrusts. You lean back on your own legs for leverage, trying to get the maximum height to come down on his dick with the maximum force every time.</p>
 	<</if>>
 	<<if $hookup['orgasm'] < $orgasm>>
-		<p>Each bounce builds pressure inside you. Every bounce of pressure piles on the last one. Soon, your body is filled with tension. You throw yourself down onto <<=$npcs.get($sex.npcId,'firstname')>>'s cock one last time and the tension breaks, releasing waves of ecstasy through your entire body. You cry out, impaling yourself on his cock, toes curling with pleasure, shuddering as you become oblivious to everything except your mind numbing orgasm and the cock stuffed in inside pussy.</p>
+		<p>Each bounce builds pressure inside you. Every bounce of pressure piles on the last one. Soon, your body is filled with tension. You throw yourself down onto <<npc $sex.npcId>><</npc>>'s cock one last time and the tension breaks, releasing waves of ecstasy through your entire body. You cry out, impaling yourself on his cock, toes curling with pleasure, shuddering as you become oblivious to everything except your mind numbing orgasm and the cock stuffed in inside pussy.</p>
 	<</if>>
 	<<gs 'hookup_sex' 'fuck_cum'>>
 <</if>>
@@ -623,29 +623,29 @@
 				<!-- !! differing descriptions based on position-->
 				<<if $hookup['position'] == 'miss'>>
 					<<image "shared/sex/cum/cum61.jpg">>
-					<p>As your orgasm winds down, you look up and realize that <<=$npcs.get($sex.npcId,'firstname')>> has stopped moving and is breathing heavily. He pulls out of you and you can see the condom encasing his cock sagging, filled with white liquid.</p>
+					<p>As your orgasm winds down, you look up and realize that <<npc $sex.npcId>><</npc>> has stopped moving and is breathing heavily. He pulls out of you and you can see the condom encasing his cock sagging, filled with white liquid.</p>
 					<<actCLA 'Continue'>>
 						<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 						<<setinit $hookup['cum_choice'] = 'condom'>>
 						<<if rand(1,5) <= 2>>
 							<<image "shared/sex/cum/condom1.jpg">>
-							<p><<=$npcs.get($sex.npcId,'firstname')>> pulls the condom from his dick with a wet slapping sound, and semen flies from the open end, spattering across your skin. He ties it off and tosses it onto your stomach, landing next to his cum.</p>
+							<p><<npc $sex.npcId>><</npc>> pulls the condom from his dick with a wet slapping sound, and semen flies from the open end, spattering across your skin. He ties it off and tosses it onto your stomach, landing next to his cum.</p>
 							<<gs 'hookup_talk' 'gross_condom'>>
 						<<else>>
 							$npc_apt_bedroom
-							<p><<=$npcs.get($sex.npcId,'firstname')>> pulls the condom from his dick with a wet slapping sound and tosses it into a wastebasket nearby.</p>
+							<p><<npc $sex.npcId>><</npc>> pulls the condom from his dick with a wet slapping sound and tosses it into a wastebasket nearby.</p>
 						<</if>>
 						<<gs 'hookup_talk' 'pillow_talk1'>>
 						<<gs 'hookup_after' 'pre'>>
 					<</actCLA>>
 				<<elseif $hookup['position'] == 'doggy'>>
 					<<image "shared/sex/cum/cum71.jpg">>
-					<p>Right as your orgasm finishes winding down, <<=$npcs.get($sex.npcId,'firstname')>> thrusts hard into you one last time, holding his cock as deep inside you as it can go. You feel him shudder inside you, his cock flexing inside of your pussy before his body relaxes and pulls his dick from your pussy. Based on that, you assume he must've cum too, and as you glance backwards you can see him peeling the condom from his cock, a white viscous liquid filling the rubber sleeve.</p>
+					<p>Right as your orgasm finishes winding down, <<npc $sex.npcId>><</npc>> thrusts hard into you one last time, holding his cock as deep inside you as it can go. You feel him shudder inside you, his cock flexing inside of your pussy before his body relaxes and pulls his dick from your pussy. Based on that, you assume he must've cum too, and as you glance backwards you can see him peeling the condom from his cock, a white viscous liquid filling the rubber sleeve.</p>
 					<<gs 'hookup_talk' 'pillow_talk1'>>
 					<<gs 'hookup_after' 'pre'>>
 				<<elseif $hookup['position'] == 'cowgirl'>>
 					<<image "shared/sex/cum/cum81.jpg">>
-					<p>As your orgasm finishes winding down, you look down and see <<=$npcs.get($sex.npcId,'firstname')>>'s face also somewhat strained.</p>
+					<p>As your orgasm finishes winding down, you look down and see <<npc $sex.npcId>><</npc>>'s face also somewhat strained.</p>
 					<p>"Did you... did we... together...?" you pant, climbing off his cock. As you suspected, the condom encasing it is filled with thick white liquid. He pulls it off with a wet slapping sound, tying the end off and throwing it into the corner.</p>
 					<<gs 'hookup_talk' 'pillow_talk1'>>
 					<<gs 'hookup_after' 'pre'>>
@@ -668,13 +668,13 @@
 					<!-- !! differing descriptions based on position-->
 					<<if $hookup['position'] == 'miss'>>
 						<<video "shared/sex/cum/vagcreampie/miss1.mp4">>
-						<p>As your orgasm finishes winding down, you stiffen when you realize that <<=$npcs.get($sex.npcId,'firstname')>> isn't moving. His expression seems strained, like he's holding his breath. After a moment, he pulls his cock from your pussy and you feel something dribble out after it.</p>
+						<p>As your orgasm finishes winding down, you stiffen when you realize that <<npc $sex.npcId>><</npc>> isn't moving. His expression seems strained, like he's holding his breath. After a moment, he pulls his cock from your pussy and you feel something dribble out after it.</p>
 					<<elseif $hookup['position'] == 'doggy'>>
 						<<video "shared/sex/cum/vagcreampie/doggy1.mp4">>
-						<p>As your orgasm finishes winding down <<=$npcs.get($sex.npcId,'firstname')>> pulls his cock from your pussy and you feel something dribble out after it.</p>
+						<p>As your orgasm finishes winding down <<npc $sex.npcId>><</npc>> pulls his cock from your pussy and you feel something dribble out after it.</p>
 					<<elseif $hookup['position'] == 'cowgirl'>>
 						<<video "shared/sex/cum/vagcreampie/cowgirl3.mp4">>
-						<p>As your orgasm finishes winding down, you stiffen when you realize you can feel <<=$npcs.get($sex.npcId,'firstname')>> twitching inside you. Lifting your thigh, he pushes you off of him. His dick flops out of you and you can feel something dribble out after it.</p>
+						<p>As your orgasm finishes winding down, you stiffen when you realize you can feel <<npc $sex.npcId>><</npc>> twitching inside you. Lifting your thigh, he pushes you off of him. His dick flops out of you and you can feel something dribble out after it.</p>
 					<</if>>
 					<<setinit $hookup['creampie_exit'] = 1>>
 					<<if getvar("$hookup['stealth']") == 1>>
@@ -696,11 +696,11 @@
 
 			<</if>>
 			<<if $hookup['position'] == 'miss'>>
-				<p>After your orgasm winds down, <<=$npcs.get($sex.npcId,'firstname')>> continues fucking you, driving himself deep between your legs.</p>
+				<p>After your orgasm winds down, <<npc $sex.npcId>><</npc>> continues fucking you, driving himself deep between your legs.</p>
 			<<elseif $hookup['position'] == 'doggy'>>
-				<p>After your orgasm winds down, <<=$npcs.get($sex.npcId,'firstname')>> continues driving his cock deep inside you, piledriving your pussy from behind.</p>
+				<p>After your orgasm winds down, <<npc $sex.npcId>><</npc>> continues driving his cock deep inside you, piledriving your pussy from behind.</p>
 			<<elseif $hookup['position'] == 'cowgirl'>>
-				<p>After your orgasm winds down, you take a few deep breathes and tiredly resume bouncing up and down on <<=$npcs.get($sex.npcId,'firstname')>>'s cock.</p>
+				<p>After your orgasm winds down, you take a few deep breathes and tiredly resume bouncing up and down on <<npc $sex.npcId>><</npc>>'s cock.</p>
 			<</if>>
 			<p>A few minutes later, you feel him tense up and he grunts out, "I'm gonna come!"</p>
 		<<else>>
@@ -715,7 +715,7 @@
 					You lean in close, feeling sexier than you've ever felt in your life and giving a grin to match.
 					"You can come <i>wherever you want</i>," you whisper directly into his ear.
 				<<else>>
-					<p>You turn your head over your shoulder to look at <<=$npcs.get($sex.npcId,'firstname')>>, feeling sexier than you've ever felt in your life and giving a grin to match.</p>
+					<p>You turn your head over your shoulder to look at <<npc $sex.npcId>><</npc>>, feeling sexier than you've ever felt in your life and giving a grin to match.</p>
 					"You can come <i>wherever you want</i>," you say.
 				<</if>>
 			<</if>>
@@ -777,48 +777,48 @@
 		<<if $hookup['position'] == 'miss'>>
 			You push him off of you and onto his back. Leaning forward between his legs, you rip off the condom, flinging it away and begin fervently jerk him off. Moments later, a fountain of white liquid erupts from the tip of his cock, spilling down your fingers.
 		<<elseif $hookup['position'] == 'doggy'>>
-			<p>Pulling yourself off <<=$npcs.get($sex.npcId,'firstname')>>'s cock, you turn around and push him onto his back. You jump between his legs, ripping off the condom and flinging it away before fervently jerking him off. Moments later a fountain of white liquid erupts from the tip of his cock, spilling down your fingers.</p>
+			<p>Pulling yourself off <<npc $sex.npcId>><</npc>>'s cock, you turn around and push him onto his back. You jump between his legs, ripping off the condom and flinging it away before fervently jerking him off. Moments later a fountain of white liquid erupts from the tip of his cock, spilling down your fingers.</p>
 		<<elseif $hookup['position'] == 'cowgirl'>>
-			<p>Pulling yourself off <<=$npcs.get($sex.npcId,'firstname')>>'s cock, you shuffle backwards and kneel between his legs. You rip off the condom and fling it away before fervently jerking him off. Moments later a fountain of white liquid erupts from the tip of his cock, spilling down your fingers.</p>
+			<p>Pulling yourself off <<npc $sex.npcId>><</npc>>'s cock, you shuffle backwards and kneel between his legs. You rip off the condom and fling it away before fervently jerking him off. Moments later a fountain of white liquid erupts from the tip of his cock, spilling down your fingers.</p>
 		<</if>>
 	<<else>>
 		<<if $hookup['position'] == 'miss'>>
 			You push him off of you and onto his back. Leaning forward between his legs, you grab hold of his cock and fervently jerk him off. Moments later, a fountain of white liquid erupts from it, spilling down your fingers.
 		<<elseif $hookup['position'] == 'doggy'>>
-			<p>Pulling yourself off <<=$npcs.get($sex.npcId,'firstname')>>'s cock, you turn around and push him onto his back. You jump between his legs, grabbing hold of his cock, fervently jerking him off and moments later a fountain of white liquid erupts from the tip of his cock, spilling down your fingers.</p>
+			<p>Pulling yourself off <<npc $sex.npcId>><</npc>>'s cock, you turn around and push him onto his back. You jump between his legs, grabbing hold of his cock, fervently jerking him off and moments later a fountain of white liquid erupts from the tip of his cock, spilling down your fingers.</p>
 		<<elseif $hookup['position'] == 'cowgirl'>>
-			<p>Pulling yourself off <<=$npcs.get($sex.npcId,'firstname')>>'s cock, you shuffle backwards and kneel between his legs. You grab hold of his cock, fervently jerking him off and moments later, a fountain of white liquid erupts from it, spilling down your fingers.</p>
+			<p>Pulling yourself off <<npc $sex.npcId>><</npc>>'s cock, you shuffle backwards and kneel between his legs. You grab hold of his cock, fervently jerking him off and moments later, a fountain of white liquid erupts from it, spilling down your fingers.</p>
 		<</if>>
 	<</if>>
 	You grin at him as he cums all over your hand, continuing to jerk him until his cock stops twitching and nothing else comes out. After a couple more tugs for good measure, you pull back.
 	<<if $inventory.get("wipe") > 0>>
 		<<actCLA 'Get some wipes from your bag'>>
 			<<gs 'cum_cleanup' 'cleanloc' 13>>
-			<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+			<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-			<p>Leaning down off the bed, you dig into your bag with your clean hand and grab some wipes out of it and clean off your fingers. Feeling nice, you also take a moment to wipe down <<=$npcs.get($sex.npcId,'firstname')>>'s cock for him at the same time since you sort of made him cum all over himself. Once you're both all cleaned off, you toss it into the wastebasket by his bed.</p>
+			<p>Leaning down off the bed, you dig into your bag with your clean hand and grab some wipes out of it and clean off your fingers. Feeling nice, you also take a moment to wipe down <<npc $sex.npcId>><</npc>>'s cock for him at the same time since you sort of made him cum all over himself. Once you're both all cleaned off, you toss it into the wastebasket by his bed.</p>
 			<<gs 'hookup_after' 'pre'>>
 			<<gs 'hookup_talk' 'pillow_talk1'>>
 		<</actCLA>>
 	<</if>>
 	<<actCLA 'Ask him if he has any tissues'>>
 		<<gs 'cum_cleanup' 'cleanloc' 13>>
-		<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+		<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 		<p>"Got anything for this?" you ask, holding up your hand, spreading your fingers to emphasize the sticky strands of cum hanging from them.</p>
-		<p>"Yeah, got some wipes right here." <<=$npcs.get($sex.npcId,'firstname')>> reaches for his nightstand, pulling a bag of wipes out of the drawer. He pulls one out and starts wiping himself down, tossing you the bag. You pull one out with your unsoiled hand and wipe off your fingers until your hand is feeling nice and clean. Following <<=$npcs.get($sex.npcId,'firstname')>>'s lead, you finish by tossing the used wipe into a small trashcan in the corner of the room.</p>
+		<p>"Yeah, got some wipes right here." <<npc $sex.npcId>><</npc>> reaches for his nightstand, pulling a bag of wipes out of the drawer. He pulls one out and starts wiping himself down, tossing you the bag. You pull one out with your unsoiled hand and wipe off your fingers until your hand is feeling nice and clean. Following <<npc $sex.npcId>><</npc>>'s lead, you finish by tossing the used wipe into a small trashcan in the corner of the room.</p>
 		<<gs 'hookup_after' 'pre'>>
 		<<gs 'hookup_talk' 'pillow_talk1'>>
 	<</actCLA>>
 	<<actCLA 'Lick your fingers clean'>>
 		<<gs 'cum_cleanup' 'cleanloc' 13>>
 		<<run $pc.sexStatInc('swallow','aware',1)>>
-		<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+		<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-		<p>Briefly making eye contact with <<=$npcs.get($sex.npcId,'firstname')>>, you stick out your tongue and run it up your hand, drawing loose strands of cum from it and into your mouth. You give your hand a thorough tongue bath, sucking your fingers clean at the end. Once finished, you smack your lips, smiling at <<=$npcs.get($sex.npcId,'firstname')>> who stared at you the whole time.</p>
+		<p>Briefly making eye contact with <<npc $sex.npcId>><</npc>>, you stick out your tongue and run it up your hand, drawing loose strands of cum from it and into your mouth. You give your hand a thorough tongue bath, sucking your fingers clean at the end. Once finished, you smack your lips, smiling at <<npc $sex.npcId>><</npc>> who stared at you the whole time.</p>
 		<p>"Any chance I could get one of those?" he gestures towards his cock, still covered with cum.</p>
 		<<actCLA 'You`re on your own'>>
-			<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+			<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			"Sorry soldier, but you're on your own," you giggle.
 			"<i>Of course I am...</i>" He sighs but reaches for his nightstand, pulling a pack of wipes from it and gets to work cleaning himself up. Once he's done, he tosses the used wipe into a trash can in the corner of his room.
@@ -826,7 +826,7 @@
 		<</actCLA>>
 		<<actCLA 'Sure'>>
 			<<image "shared/sex/blowjob/clean.jpg">>
-			<p>"Sure thing," you shrug. Crawling forward between his legs, you bend down and begin to lap up the cum running down <<=$npcs.get($sex.npcId,'firstname')>>'s cock. You lick every curve and contour of is dick until it's completely clean, licking your hand clean a second time once you're done.</p>
+			<p>"Sure thing," you shrug. Crawling forward between his legs, you bend down and begin to lap up the cum running down <<npc $sex.npcId>><</npc>>'s cock. You lick every curve and contour of is dick until it's completely clean, licking your hand clean a second time once you're done.</p>
 			<p>"There. All better?"</p>
 			"Much better," he smiles back.
 			<<gs 'hookup_after' 'pre'>>
@@ -847,35 +847,35 @@
 	<</if>>
 	<<if getvar("$hookup['condom']") == 1>>
 		<<if $hookup['position'] == 'miss'>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> pulls out from you and tears the condom off his cock before rapidly jerking off in front of your face. In the moments just before he cums, you...</p>
+			<p><<npc $sex.npcId>><</npc>> pulls out from you and tears the condom off his cock before rapidly jerking off in front of your face. In the moments just before he cums, you...</p>
 		<<elseif $hookup['position'] == 'doggy'>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> pulls out from you and turns you around. He tears the condom off his cock and begins rapidly jerking off in front of your face. In the moments just before he cums, you...</p>
+			<p><<npc $sex.npcId>><</npc>> pulls out from you and turns you around. He tears the condom off his cock and begins rapidly jerking off in front of your face. In the moments just before he cums, you...</p>
 		<<elseif $hookup['position'] == 'cowgirl'>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> lifts you off his cock and tears the condom off of it before rapidly jerking off in front of your face. In the moments just before he cums, you...</p>
+			<p><<npc $sex.npcId>><</npc>> lifts you off his cock and tears the condom off of it before rapidly jerking off in front of your face. In the moments just before he cums, you...</p>
 		<</if>>
 	<<else>>
 		<<if $hookup['position'] == 'miss'>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> pulls out from you and begins rapidly jerking off in front of your face. In the moments just before he cums, you...</p>
+			<p><<npc $sex.npcId>><</npc>> pulls out from you and begins rapidly jerking off in front of your face. In the moments just before he cums, you...</p>
 		<<elseif $hookup['position'] == 'doggy'>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> pulls out from you and turns you around. He begins rapdily jerking off in front of your face. In the moments just before he cums, you...</p>
+			<p><<npc $sex.npcId>><</npc>> pulls out from you and turns you around. He begins rapdily jerking off in front of your face. In the moments just before he cums, you...</p>
 		<<elseif $hookup['position'] == 'cowgirl'>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> lifts you off his cock and begins rapidly jerking off in front of your face. In the moments just before he cums, you...</p>
+			<p><<npc $sex.npcId>><</npc>> lifts you off his cock and begins rapidly jerking off in front of your face. In the moments just before he cums, you...</p>
 		<</if>>
 	<</if>>
 	<<actCLA 'Close your eyes'>>
 		<<video "shared/sex/cum/facial/facial0,3.mp4">>
-		<p>You close your eyes, waiting for <<=$npcs.get($sex.npcId,'firstname')>> to blow his load and in seconds you feel hot liquid splash over your skin. Despite the fact you were expecting it, you can't help but flinch with every time cum spatters across your face, especially when somehow every shot manages to hit one of your eyelids.</p>
+		<p>You close your eyes, waiting for <<npc $sex.npcId>><</npc>> to blow his load and in seconds you feel hot liquid splash over your skin. Despite the fact you were expecting it, you can't help but flinch with every time cum spatters across your face, especially when somehow every shot manages to hit one of your eyelids.</p>
 		<i>He better not be aiming for my eyes...</i> you think to yourself.
 		<<actCLA 'Wipe your eyes'>>
 			<<gs 'cum_call' 'hands' $sex.npcId 1>>
 			<<image "shared/sex/cum/facial/facial31.jpg">>
-			<p>You carefully wipe the cum away from your eyes and open them. The edges of your vision are still blurry with sticky liquid, but you can still see <<=$npcs.get($sex.npcId,'firstname')>> relaxing back onto his bed.</p>
+			<p>You carefully wipe the cum away from your eyes and open them. The edges of your vision are still blurry with sticky liquid, but you can still see <<npc $sex.npcId>><</npc>> relaxing back onto his bed.</p>
 			<<gs 'hookup_after' 'pre'>>
 			<<gs 'hookup_talk' 'pillow_talk1'>>
 		<</actCLA>>
 		<<actCLA 'Clean him off with your mouth'>>
 			<<image "shared/sex/cum/facial/facial24.jpg">>
-			<p>Opening your mouth, you lean forward, blindly questing for <<=$npcs.get($sex.npcId,'firstname')>>'s cock with your mouth. Your lips bump into the tip and you ease yourself onto it. You can faintly taste yourself on his cock, as well as the remenants of cum that was still inside it, drawn out by the vacuum of your mouth. Carefully prying your eyes open, you are greeted with the sight of <<=$npcs.get($sex.npcId,'firstname')>> staring down at you.</p>
+			<p>Opening your mouth, you lean forward, blindly questing for <<npc $sex.npcId>><</npc>>'s cock with your mouth. Your lips bump into the tip and you ease yourself onto it. You can faintly taste yourself on his cock, as well as the remenants of cum that was still inside it, drawn out by the vacuum of your mouth. Carefully prying your eyes open, you are greeted with the sight of <<npc $sex.npcId>><</npc>> staring down at you.</p>
 			"Fuck..."
 			<<gs 'hookup_after' 'pre'>>
 			<<gs 'hookup_talk' 'pillow_talk1'>>
@@ -890,8 +890,8 @@
 		<<actCLA 'Gulp'>>
 			<<run $pc.sexStatInc('swallow','aware',1)>>
 			<<video "shared/sex/cum/facial/facial26.mp4">>
-			<p>A few seconds go by and no more spurts of cum land on you so you close your mouth and swallow, gulping down the entire load. You open your mouth again afterwards to pick up any stray shots, but it seems <<=$npcs.get($sex.npcId,'firstname')>> is out of ammo so you open your eyes to look at him.</p>
-			<p>"You're a swallower huh?" <<=$npcs.get($sex.npcId,'firstname')>> says, cock still hanging in front of your face.</p>
+			<p>A few seconds go by and no more spurts of cum land on you so you close your mouth and swallow, gulping down the entire load. You open your mouth again afterwards to pick up any stray shots, but it seems <<npc $sex.npcId>><</npc>> is out of ammo so you open your eyes to look at him.</p>
+			<p>"You're a swallower huh?" <<npc $sex.npcId>><</npc>> says, cock still hanging in front of your face.</p>
 			<<actCLA 'Guys think it`s hot'>>
 				<<image "shared/sex/cum/after.jpg">>
 				"Eh, guys think it's hot. Wouldn''t do it otherwise." You shrug but can't help smiling at him.
@@ -899,7 +899,7 @@
 				<<gs 'hookup_after' 'pre'>>
 				<<actCLA 'Kiss his cock'>>
 					<<video "shared/sex/cum/kiss_cock.mp4">>
-					<p>"Glad my hard work is appreciated," you smile, leaning in and giving <<=$npcs.get($sex.npcId,'firstname')>>'s cock a gentle kiss on the tip.</p>
+					<p>"Glad my hard work is appreciated," you smile, leaning in and giving <<npc $sex.npcId>><</npc>>'s cock a gentle kiss on the tip.</p>
 					<<gs 'hookup_after' 'pre'>>
 					<<gs 'hookup_talk' 'pillow_talk1'>>
 				<</actCLA>>
@@ -912,7 +912,7 @@
 				<<gs 'hookup_after' 'pre'>>
 				<<actCLA 'Kiss his cock'>>
 					<<video "shared/sex/cum/kiss_cock.mp4">>
-					<p>"Isn't that the same thing?" you smile, leaning in and giving <<=$npcs.get($sex.npcId,'firstname')>>'s cock a gentle kiss on the tip.</p>
+					<p>"Isn't that the same thing?" you smile, leaning in and giving <<npc $sex.npcId>><</npc>>'s cock a gentle kiss on the tip.</p>
 					<<gs 'hookup_after' 'pre'>>
 					<<gs 'hookup_talk' 'pillow_talk1'>>
 				<</actCLA>>
@@ -925,7 +925,7 @@
 				<<gs 'hookup_after' 'pre'>>
 				<<actCLA 'Kiss his cock'>>
 					<<video "shared/sex/cum/kiss_cock.mp4">>
-					<p>"It's cause I like cock so much." You lean in, giving <<=$npcs.get($sex.npcId,'firstname')>> a gentle kiss on the tip.</p>
+					<p>"It's cause I like cock so much." You lean in, giving <<npc $sex.npcId>><</npc>> a gentle kiss on the tip.</p>
 					<<gs 'hookup_after' 'pre'>>
 					<<gs 'hookup_talk' 'pillow_talk1'>>
 				<</actCLA>>
@@ -942,12 +942,12 @@
 		<<setinit $hookup['cum_choice'] = 'face'>>
 		<<setinit $hookup['bj_cum'] = 2>>
 		<<video "shared/sex/cum/facial/facial29.mp4">>
-		<p>You open your mouth wide and stick your tongue out, waiting for the shot to come. <<=$npcs.get($sex.npcId,'firstname')>> grins, continuing to jack off with one hand and grabbing you by the hair with the other, positioning your face right in front of his cock. Moments later, spurts of semen erupt from it, spattering across your face and covering your tongue. You quickly spit the bitter liquid out over your lips as he continues to cum, a couple stray shots flying into your hair. A few seconds later, he stops ejaculating and releases your hair, stepping back from you.</p>
+		<p>You open your mouth wide and stick your tongue out, waiting for the shot to come. <<npc $sex.npcId>><</npc>> grins, continuing to jack off with one hand and grabbing you by the hair with the other, positioning your face right in front of his cock. Moments later, spurts of semen erupt from it, spattering across your face and covering your tongue. You quickly spit the bitter liquid out over your lips as he continues to cum, a couple stray shots flying into your hair. A few seconds later, he stops ejaculating and releases your hair, stepping back from you.</p>
 		<<if rand(0,1) == 1>>
 			<p>"What, you don't swallow?"</p>
 			<<gs 'hookup_sex' 'dont_swallow'>>
 		<<else>>
-			<p>"Love seeing a girl's face with my cum all over it," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+			<p>"Love seeing a girl's face with my cum all over it," <<npc $sex.npcId>><</npc>> grins.</p>
 			"Well I'm glad you enjoy the view," you say amusedly.
 			<<gs 'hookup_after' 'pre'>>
 			<<gs 'hookup_talk' 'pillow_talk1'>>
@@ -962,7 +962,7 @@
 			<<if getvar("$hookup['condom']") != 1>>
 				<<actCLA 'I didn`t want you cumming inside'>>
 					<<image "shared/sex/cum/facial/facial31.jpg">>
-					<p>"I just didn't want you to cum inside me," you say, carefully wiping the cum from your eyes. Blinking them open, your vision has a lot of white blurry edges, and the first sight you're greeted with is <<=$npcs.get($sex.npcId,'firstname')>> wearing a shit eating grin while looking at your plastered face.</p>
+					<p>"I just didn't want you to cum inside me," you say, carefully wiping the cum from your eyes. Blinking them open, your vision has a lot of white blurry edges, and the first sight you're greeted with is <<npc $sex.npcId>><</npc>> wearing a shit eating grin while looking at your plastered face.</p>
 					<<actCLA 'Why do you even like this??'>>
 						<<image "shared/sex/cum/facial/facial31.jpg">>
 						<p>"Why do boys even like doing this???" you complain.</p>
@@ -984,7 +984,7 @@
 			<</if>>
 			<<actCLA 'Because guys like it'>>
 				<<image "shared/sex/cum/facial/facial31.jpg">>
-				<p>"Because guys like it?" you say, carefully wiping the cum from your eyes. Blinking them open, your vision has a lot of white blurry edges, and the first sight you're greeted with is <<=$npcs.get($sex.npcId,'firstname')>> wearing a shit eating grin while looking at your plastered face.</p>
+				<p>"Because guys like it?" you say, carefully wiping the cum from your eyes. Blinking them open, your vision has a lot of white blurry edges, and the first sight you're greeted with is <<npc $sex.npcId>><</npc>> wearing a shit eating grin while looking at your plastered face.</p>
 				<<actCLA 'Why do you even like this??'>>
 					<<image "shared/sex/cum/facial/facial31.jpg">>
 					<p>"Why do boys even like doing this???" you complain.</p>
@@ -1005,7 +1005,7 @@
 			<</actCLA>>
 			<<actCLA 'I didn`t think it would be this gross!'>>
 				<<image "shared/sex/cum/facial/facial31.jpg">>
-				<p>"Because I didn't think it would be this gross!" you cry. Carefully wiping the cum from your eyes, you blinking them open, vision ringed with blurry white edges, and the first sight you're greeted with is <<=$npcs.get($sex.npcId,'firstname')>> wearing a shit eating grin while looking at your plastered face.</p>
+				<p>"Because I didn't think it would be this gross!" you cry. Carefully wiping the cum from your eyes, you blinking them open, vision ringed with blurry white edges, and the first sight you're greeted with is <<npc $sex.npcId>><</npc>> wearing a shit eating grin while looking at your plastered face.</p>
 				<p>"What? You mean to tell me you've never had a facial before?"</p>
 				<<if getvar("$facial") == 1>>
 					"... yes... You're the first one."
@@ -1049,7 +1049,7 @@
 				<</if>>
 			<</actCLA>>
 		<<else>>
-			<p>Carefully wiping the cum from your eyes, you blinking them open, vision ringed with blurry white edges, and the first sight you're greeted with is <<=$npcs.get($sex.npcId,'firstname')>> wearing a shit eating grin while looking at your plastered face.</p>
+			<p>Carefully wiping the cum from your eyes, you blinking them open, vision ringed with blurry white edges, and the first sight you're greeted with is <<npc $sex.npcId>><</npc>> wearing a shit eating grin while looking at your plastered face.</p>
 			<<actCLA 'Why do you even like this??'>>
 				<<image "shared/sex/cum/facial/facial31.jpg">>
 				<p>"Why do boys even like doing this???" you complain.</p>
@@ -1084,27 +1084,27 @@
 		<p>"I wanna cum in your mouth!"</p>
 	<</if>>
 	<<if getvar("$hookup['not_inside']") == 1>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> pulls out of you and grabs your head, pushing it down onto his cock. Moments later, hot, salty liquid spurts into your mouth.</p>
+		<p><<npc $sex.npcId>><</npc>> pulls out of you and grabs your head, pushing it down onto his cock. Moments later, hot, salty liquid spurts into your mouth.</p>
 	<<elseif getvar("$hookup['condom']") == 1>>
 		<<if $hookup['position'] == 'miss'>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> climbs off of you rips the condom off of his cock. You kneel forward, wrapping your lips around his cock and begin sucking him off until you feel hot globs of liquid spurt into your mouth.</p>
+			<p><<npc $sex.npcId>><</npc>> climbs off of you rips the condom off of his cock. You kneel forward, wrapping your lips around his cock and begin sucking him off until you feel hot globs of liquid spurt into your mouth.</p>
 		<<elseif $hookup['position'] == 'doggy'>>
-			<p>You feel <<=$npcs.get($sex.npcId,'firstname')>>'s cock pull out of you and you quickly turn around, pushing him onto his back and rip the condom off him. Wrapping your lips around his girth,you suck him off until you feel hot globs of liquid spurt into your mouth.</p>
+			<p>You feel <<npc $sex.npcId>><</npc>>'s cock pull out of you and you quickly turn around, pushing him onto his back and rip the condom off him. Wrapping your lips around his girth,you suck him off until you feel hot globs of liquid spurt into your mouth.</p>
 		<<elseif $hookup['position'] == 'cowgirl'>>
-			<p>You jump off <<=$npcs.get($sex.npcId,'firstname')>>'s cock and turn around, ripping the condom off of him. Wrapping your lips around his girth, you begin sucking him off, you begin sucking him off until you feel hot globs of liquid spurt into your mouth.</p>
+			<p>You jump off <<npc $sex.npcId>><</npc>>'s cock and turn around, ripping the condom off of him. Wrapping your lips around his girth, you begin sucking him off, you begin sucking him off until you feel hot globs of liquid spurt into your mouth.</p>
 		<</if>>
 	<<else>>
 		<<if $hookup['position'] == 'miss'>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> off of you on to his back and dive between his legs. Wrapping your lips around his cock, you begin sucking him off until you feel hot globs of liquid spurt into your mouth.</p>
+			<p><<npc $sex.npcId>><</npc>> off of you on to his back and dive between his legs. Wrapping your lips around his cock, you begin sucking him off until you feel hot globs of liquid spurt into your mouth.</p>
 		<<elseif $hookup['position'] == 'doggy'>>
-			<p>You feel <<=$npcs.get($sex.npcId,'firstname')>>'s cock pull out of you and you quickly turn around, pushing him onto his back. Wrapping your lips around his girth, you suck him off until you feel hot globs of liquid spurt into your mouth.</p>
+			<p>You feel <<npc $sex.npcId>><</npc>>'s cock pull out of you and you quickly turn around, pushing him onto his back. Wrapping your lips around his girth, you suck him off until you feel hot globs of liquid spurt into your mouth.</p>
 		<<elseif $hookup['position'] == 'cowgirl'>>
-			<p>You jump off <<=$npcs.get($sex.npcId,'firstname')>>'s cock and turn around, diving between his legs. Wrapping your lips around his girth, you begin sucking him off until you feel hot globs of liquid spurt into your mouth.</p>
+			<p>You jump off <<npc $sex.npcId>><</npc>>'s cock and turn around, diving between his legs. Wrapping your lips around his girth, you begin sucking him off until you feel hot globs of liquid spurt into your mouth.</p>
 		<</if>>
 	<</if>>
 	<<actCLA 'Gather it in your mouth'>>
 		<<image "shared/sex/cum/mouth/cum51.jpg">>
-		<p>You keep your lips wrapped tight around the tip of <<=$npcs.get($sex.npcId,'firstname')>>'s cock while he cums, sucking every last drop of spunk from it until it stops twitching and you think his orgasm if finished. Looking up at him, you stick out your tongue, showing him the entire load you gathered in your mouth.</p>
+		<p>You keep your lips wrapped tight around the tip of <<npc $sex.npcId>><</npc>>'s cock while he cums, sucking every last drop of spunk from it until it stops twitching and you think his orgasm if finished. Looking up at him, you stick out your tongue, showing him the entire load you gathered in your mouth.</p>
 		A whispered, "Holy fuck..." is his only response.
 		<<actCLA 'Spit'>>
 			<<setinit $hookup['bj_cum'] = 2>>
@@ -1115,7 +1115,7 @@
 				<p>"What, you don't swallow?"</p>
 				<<gs 'hookup_sex' 'dont_swallow'>>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> just stares back in awe.</p>
+				<p><<npc $sex.npcId>><</npc>> just stares back in awe.</p>
 				<<gs 'hookup_after' 'pre'>>
 				<<gs 'hookup_talk' 'pillow_talk1'>>
 			<</if>>
@@ -1124,8 +1124,8 @@
 			<<setinit $hookup['swallow'] = 1>>
 			<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 			<<video "shared/sex/cum/mouth/swallow3.mp4">>
-			<p>Taking a step back, you open your mouth again to show <<=$npcs.get($sex.npcId,'firstname')>> how much cum is still inside it. With a deep breath, you swallow the entire load in one gulp, sticking your tongue back out again to show him that it's all gone.</p>
-			<p>"Fucking hell..." <<=$npcs.get($sex.npcId,'firstname')>> whispers, the only thing he's able to say.</p>
+			<p>Taking a step back, you open your mouth again to show <<npc $sex.npcId>><</npc>> how much cum is still inside it. With a deep breath, you swallow the entire load in one gulp, sticking your tongue back out again to show him that it's all gone.</p>
+			<p>"Fucking hell..." <<npc $sex.npcId>><</npc>> whispers, the only thing he's able to say.</p>
 			You smile back at him, satisfied with a job well done.
 			<<gs 'hookup_after' 'pre'>>
 			<<gs 'hookup_talk' 'pillow_talk1'>>
@@ -1134,7 +1134,7 @@
 	<<actCLA 'Gag'>>
 		<<video "shared/sex/cum/mouth/gag2.mp4">>
 		The intensity of the bitter flavor is far more than you expect and you immediately pull your mouth off, spitting out the first load. You stick your tongue out, tryiing to soldier through and at least take the rest of it but as soon as the next shot hits your tongue your gag reflex kicks in instead, causing you to retch.
-		<p>Still holding onto <<=$npcs.get($sex.npcId,'firstname')>>'s cock with one hand, you clamp your other hand over your mouth, throat convulsing. It smears the cum on your lips all over your face, but you somehow manage to stop yourself from throwing up all over the bed.</p>
+		<p>Still holding onto <<npc $sex.npcId>><</npc>>'s cock with one hand, you clamp your other hand over your mouth, throat convulsing. It smears the cum on your lips all over your face, but you somehow manage to stop yourself from throwing up all over the bed.</p>
 		<p>"Uhh, you okay?"</p>
 		<<actCLA 'Wrong pipe'>>
 			<<image "shared/sex/cum/cum112.jpg">>
@@ -1192,13 +1192,13 @@
 			<p>"Come inside me!" you cry. "Fill me up!"</p>
 			<<if $pc.horny > 90>>
 				<<set $orgasm += 1>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> grunts and you feel cum spurt out inside you. The sensation pushes you over the edge and you clench hard on his cock, your body spasming uncontrollably in orgasm. The two of come together, both of your orgasms fueling the other's. After some time, your orgasm fades and <<=$npcs.get($sex.npcId,'firstname')>> pulls out of you.</p>
+				<p><<npc $sex.npcId>><</npc>> grunts and you feel cum spurt out inside you. The sensation pushes you over the edge and you clench hard on his cock, your body spasming uncontrollably in orgasm. The two of come together, both of your orgasms fueling the other's. After some time, your orgasm fades and <<npc $sex.npcId>><</npc>> pulls out of you.</p>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> goes stiff as soon as you say the words, his cock pulsing inside you. He groans loudly and something spills into your pussy. The two of you stay like that for several seconds before <<=$npcs.get($sex.npcId,'firstname')>> relaxes and pulls himself out of you.</p>
+				<p><<npc $sex.npcId>><</npc>> goes stiff as soon as you say the words, his cock pulsing inside you. He groans loudly and something spills into your pussy. The two of you stay like that for several seconds before <<npc $sex.npcId>><</npc>> relaxes and pulls himself out of you.</p>
 			<</if>>
 			<<actCLA 'Continue'>>
 				<<video "shared/sex/cum/vagcreampie/drip3.mp4">>
-				<p>As <<=$npcs.get($sex.npcId,'firstname')>> pulls away, a slurry of liquid trickles from your pussy, running down your ass and into the bedsheets.</p>
+				<p>As <<npc $sex.npcId>><</npc>> pulls away, a slurry of liquid trickles from your pussy, running down your ass and into the bedsheets.</p>
 				<<gs 'hookup_after' 'pre'>>
 				<<gs 'hookup_after' 'creampie_react'>>
 				<<gs 'hookup_talk' 'pillow_talk1'>>
@@ -1208,9 +1208,9 @@
 			<p>"Come inside me!" you cry. "Fill me up!"</p>
 			<<if $pc.horny > 90>>
 				<<set $orgasm += 1>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> drives himself deep inside you as soon as you say the words and you feel cum spurt out inside you. The sensation pushes you over the edge and you clench hard on his cock, your body spasming uncontrollably in orgasm. The two of come together, both of your orgasms fueling the other's. After some time, your orgasm fades and <<=$npcs.get($sex.npcId,'firstname')>> slips from your pussy, thick liquid dripping out after.</p>
+				<p><<npc $sex.npcId>><</npc>> drives himself deep inside you as soon as you say the words and you feel cum spurt out inside you. The sensation pushes you over the edge and you clench hard on his cock, your body spasming uncontrollably in orgasm. The two of come together, both of your orgasms fueling the other's. After some time, your orgasm fades and <<npc $sex.npcId>><</npc>> slips from your pussy, thick liquid dripping out after.</p>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> pulls your ass flush against his hips, shoving his full length inside you. He groans loudly and you feel his his cock pulsing within. He holds you there for several moments before withdrawing and you feel something thick drip from your pussy.</p>
+				<p><<npc $sex.npcId>><</npc>> pulls your ass flush against his hips, shoving his full length inside you. He groans loudly and you feel his his cock pulsing within. He holds you there for several moments before withdrawing and you feel something thick drip from your pussy.</p>
 			<</if>>
 			<<actCLA 'Continue'>>
 				<<video "shared/sex/cum/vagcreampie/drip3.mp4">>
@@ -1224,16 +1224,16 @@
 			<p>"Come inside me!" you cry. "Fill me up!"</p>
 			<<if $pc.horny > 90>>
 				<<set $orgasm += 1>>
-				<p>You drop your hips, impaling yourself on <<=$npcs.get($sex.npcId,'firstname')>>'s cock. He thrusts his hips upward, driving himself deep inside you and you feel cum spurt out inside you. The sensation pushes you over the edge, causing your pussy to clamp down onto his cock even more and your body to spasm uncontrollably. The two of come together, holding each other tight, both of your orgasms fueling the other's. After some time, your orgasm fades, leaving both of you panting.</p>
+				<p>You drop your hips, impaling yourself on <<npc $sex.npcId>><</npc>>'s cock. He thrusts his hips upward, driving himself deep inside you and you feel cum spurt out inside you. The sensation pushes you over the edge, causing your pussy to clamp down onto his cock even more and your body to spasm uncontrollably. The two of come together, holding each other tight, both of your orgasms fueling the other's. After some time, your orgasm fades, leaving both of you panting.</p>
 			<<else>>
-				<p>You drop your hips, impaling yourself on <<=$npcs.get($sex.npcId,'firstname')>>'s cock. He grabs you and holds you tight, thrusting humself upward, driving his cock in deep into you as he can manage. As he does, you feel him stiffen up and groan, and his cock pulses inside you.</p>
+				<p>You drop your hips, impaling yourself on <<npc $sex.npcId>><</npc>>'s cock. He grabs you and holds you tight, thrusting humself upward, driving his cock in deep into you as he can manage. As he does, you feel him stiffen up and groan, and his cock pulses inside you.</p>
 			<</if>>
 			<<actCLA 'Continue'>>
 				<<video "shared/sex/cum/vagcreampie/cowgirl3.mp4">>
-				<p>Grabbing you by the thigh, <<=$npcs.get($sex.npcId,'firstname')>> carefully pushes you away from him and you oblige, pulling yourself off of him. His cock flops from your pussy and you feel a thick glob of liquid leak out of your snatch.</p>
+				<p>Grabbing you by the thigh, <<npc $sex.npcId>><</npc>> carefully pushes you away from him and you oblige, pulling yourself off of him. His cock flops from your pussy and you feel a thick glob of liquid leak out of your snatch.</p>
 				<<actCLA 'Continue'>>
 					<<video "shared/sex/cum/vagcreampie/drip3.mp4">>
-					<p>You flop down onto the bed next to <<=$npcs.get($sex.npcId,'firstname')>>, breathing hard as a slurry of liquid trickles from your pussy, running down your ass and into the bedsheets.</p>
+					<p>You flop down onto the bed next to <<npc $sex.npcId>><</npc>>, breathing hard as a slurry of liquid trickles from your pussy, running down your ass and into the bedsheets.</p>
 					<<gs 'hookup_after' 'pre'>>
 					<<gs 'hookup_after' 'creampie_react'>>
 					<<gs 'hookup_talk' 'pillow_talk1'>>
@@ -1248,7 +1248,7 @@
 				<<set $orgasm += 1>>
 				<<gs 'hookup_sex' 'cum_wherever_creampie'>>
 				The sensation pushes you over the edge, gasping as waves of orgasm wash through you. The two of come together, both of your orgasms fueling the other''s.
-				<p>Your orgasms fade and you both lay there, breathing heavily, <<=$npcs.get($sex.npcId,'firstname')>> resting on top of you, his cock still filling you to the brim.</p>
+				<p>Your orgasms fade and you both lay there, breathing heavily, <<npc $sex.npcId>><</npc>> resting on top of you, his cock still filling you to the brim.</p>
 			<<else>>
 				<<gs 'hookup_sex' 'cum_wherever_creampie'>>
 				He quivers on top of you for a few seconds, during which you can feel his cock throbbing and his cum filling you up inside before finally collasping.
@@ -1256,7 +1256,7 @@
 			<</if>>
 			<<actCLA 'Continue'>>
 				<<video "shared/sex/cum/vagcreampie/drip3.mp4">>
-				<p>Eventually, <<=$npcs.get($sex.npcId,'firstname')>> pulls away, his cock coming loose from your pussy with a gentle <i>pop</i>. You feel a slurry of liquid come running out after, trickling down your ass and into the bedsheets.</p>
+				<p>Eventually, <<npc $sex.npcId>><</npc>> pulls away, his cock coming loose from your pussy with a gentle <i>pop</i>. You feel a slurry of liquid come running out after, trickling down your ass and into the bedsheets.</p>
 				<<gs 'hookup_after' 'pre'>>
 				<<gs 'hookup_after' 'creampie_react'>>
 				<<gs 'hookup_talk' 'pillow_talk1'>>
@@ -1266,7 +1266,7 @@
 				<<set $orgasm += 1>>
 				<<video "shared/sex/cum/vagcreampie/doggy2.mp4">>
 				<<gs 'hookup_sex' 'cum_wherever_creampie'>>
-				<p>The sensation pushes you over the edge, and you groan, tensing as waves of orgasm wash through you. The two of come together, both of your orgasms fueling the other's. After some time, your orgasm fades and <<=$npcs.get($sex.npcId,'firstname')>> pulls out of you.</p>
+				<p>The sensation pushes you over the edge, and you groan, tensing as waves of orgasm wash through you. The two of come together, both of your orgasms fueling the other's. After some time, your orgasm fades and <<npc $sex.npcId>><</npc>> pulls out of you.</p>
 			<<else>>
 				<<video "shared/sex/cum/vagcreampie/doggy1.mp4">>
 				<<gs 'hookup_sex' 'cum_wherever_creampie'>>
@@ -1286,11 +1286,11 @@
 				<<gs 'hookup_sex' 'cum_wherever_creampie'>>
 				The sensation pushes you over the edge, causing your pussy to clamp down onto his cock even more and your body to spasm uncontrollably. The two of come together, holding each other tight, both of your orgasms fueling the other''s. After some time, your orgasm fades, leaving both of you panting.
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> grabs you and pulls you down onto his cock. He holds you tight, thrusting humself upward, driving his cock in deep into you as he can manage. As he does, you feel him stiffen up and groan, and his cock pulses inside you.</p>
+				<p><<npc $sex.npcId>><</npc>> grabs you and pulls you down onto his cock. He holds you tight, thrusting humself upward, driving his cock in deep into you as he can manage. As he does, you feel him stiffen up and groan, and his cock pulses inside you.</p>
 			<</if>>
 			<<actCLA 'Continue'>>
 				<<video "shared/sex/cum/vagcreampie/cowgirl3.mp4">>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> carefully pushes you away from him and you oblige, pulling yourself off of him. His cock flops from your pussy and you feel a thick glob of liquid leak out of your snatch.</p>
+				<p><<npc $sex.npcId>><</npc>> carefully pushes you away from him and you oblige, pulling yourself off of him. His cock flops from your pussy and you feel a thick glob of liquid leak out of your snatch.</p>
 				<<setinit $hookup['creampie_exit'] = 1>>
 				<<gs 'hookup_after' 'pre'>>
 				<<gs 'hookup_after' 'creampie_react'>>
@@ -1298,7 +1298,7 @@
 				<!-- !!				act'Continue':-->
 				<!-- !!					cla & *clr-->
 				<!-- !!					'<<video "shared/sex/cum/vagcreampie/drip3.mp4">>'-->
-				<!-- !!					'You flop down onto the bed next to <<<<=$npcs.get($sex.npcId,'firstname')>>>>, breathing hard as a slurry of liquid trickles from your pussy, running down your ass and into the bedsheets.'-->
+				<!-- !!					'You flop down onto the bed next to <<<<npc $sex.npcId>><</npc>>>>, breathing hard as a slurry of liquid trickles from your pussy, running down your ass and into the bedsheets.'-->
 				<!-- !!				end-->
 			<</actCLA>>
 		<</if>>
@@ -1306,10 +1306,10 @@
 <</if>>
 <<if $location_var[$here][0] == 'cum_wherever_creampie'>>
 	<<if getvar("$hookup['cum_wherever']") == 0>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> grunts, driving himself balls deep into you. His cock twitches inside you and you feel a sudden warmth spreading through your belly, filling you up.</p>
+		<p><<npc $sex.npcId>><</npc>> grunts, driving himself balls deep into you. His cock twitches inside you and you feel a sudden warmth spreading through your belly, filling you up.</p>
 	<<else>>
 		<p>"Oh fu-!"</p>
-		<p>The promise to let <<=$npcs.get($sex.npcId,'firstname')>> come wherever he wants is apparently too much for him to handle and he blows his load right then and there. No sooner do the words leave your lips than he grunts and you feel his cock pulse inside you. Incredible warmth shoots into your belly, filling you up.</p>
+		<p>The promise to let <<npc $sex.npcId>><</npc>> come wherever he wants is apparently too much for him to handle and he blows his load right then and there. No sooner do the words leave your lips than he grunts and you feel his cock pulse inside you. Incredible warmth shoots into your belly, filling you up.</p>
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'cum_force'>>
@@ -1321,15 +1321,15 @@
 		<<if $pc.horny > 90>>
 			<<set $orgasm += 1>>
 			<<video "shared/sex/cum/vagcreampie/cumvaginal.mp4">>
-			<p>With a devilish grin, you suddenly speed up your movements, riding <<=$npcs.get($sex.npcId,'firstname')>> as hard as you can. Seconds later, you feel him cum inside the condom, pulsing within you, and it sends you over the edge. The two of come together, holding each other tight, both of your orgasms fueling the other's. After some time, your orgasm fades, leaving both of you panting.</p>
+			<p>With a devilish grin, you suddenly speed up your movements, riding <<npc $sex.npcId>><</npc>> as hard as you can. Seconds later, you feel him cum inside the condom, pulsing within you, and it sends you over the edge. The two of come together, holding each other tight, both of your orgasms fueling the other's. After some time, your orgasm fades, leaving both of you panting.</p>
 		<<else>>
 			<<video "shared/sex/vag/cowgirl/condom1.mp4">>
-			<p>With a devilish grin, you suddenly speed up your movements and seconds later, you feel <<=$npcs.get($sex.npcId,'firstname')>> cum inside the condom, pulsing within you. You don't even slow down for a second, continuing to ride him as hard as you can until you're sure he's completely finished with his orgasm. Only then do you slow down and come to a halt on top of him.</p>
+			<p>With a devilish grin, you suddenly speed up your movements and seconds later, you feel <<npc $sex.npcId>><</npc>> cum inside the condom, pulsing within you. You don't even slow down for a second, continuing to ride him as hard as you can until you're sure he's completely finished with his orgasm. Only then do you slow down and come to a halt on top of him.</p>
 			"Holy shit," he gasps, wheezing like you sucked the very life out of him.
 		<</if>>
 		<<actCLA 'Continue'>>
 			<<image "shared/sex/cum/cum81.jpg">>
-			<p>You can't help but grin at his state and carefully pull yourself off of <<=$npcs.get($sex.npcId,'firstname')>>, removing his dick from your pussy. As it slides out, you see that the rubber encasing it is filled with a thick white liquid. Seeing as he still seems quite exhausted by what you put him through, you take the liberty of pulling it off, coming free with a wet slapping sound, and tossing it aside.</p>
+			<p>You can't help but grin at his state and carefully pull yourself off of <<npc $sex.npcId>><</npc>>, removing his dick from your pussy. As it slides out, you see that the rubber encasing it is filled with a thick white liquid. Seeing as he still seems quite exhausted by what you put him through, you take the liberty of pulling it off, coming free with a wet slapping sound, and tossing it aside.</p>
 			<<gs 'hookup_after' 'pre'>>
 			<<gs 'hookup_talk' 'pillow_talk1'>>
 		<</actCLA>>
@@ -1337,7 +1337,7 @@
 		<<if $pc.horny > 90>>
 			<<set $orgasm += 1>>
 			<<video "shared/sex/cum/vagcreampie/cowgirl2.mp4">>
-			<p>With a devilish grin, you suddenly speed up your movements, riding <<=$npcs.get($sex.npcId,'firstname')>> as hard as you can. Seconds later, you feel him cum, pulsing within you, and it sends you over the edge. But you don't stop, not for a second, and you continue to plunge yourself up and down even as you shudder in climax together.</p>
+			<p>With a devilish grin, you suddenly speed up your movements, riding <<npc $sex.npcId>><</npc>> as hard as you can. Seconds later, you feel him cum, pulsing within you, and it sends you over the edge. But you don't stop, not for a second, and you continue to plunge yourself up and down even as you shudder in climax together.</p>
 			<<actCLA 'Continue'>>
 				<<video "shared/sex/cum/vagcreampie/cowgirl1.mp4">>
 				Finally, your orgasm fadess and his seems to have finished as well. Still wearing your grin, you drive your hips down as far as they can go one last time, clenching your pussy around his cock on the way back up, and try to milk him for every last drop. His cum is overflowing from your pussy lips and when you draw back up to the top, you can feel it spill around his cock, dribbling down its length.
@@ -1347,7 +1347,7 @@
 			<</actCLA>>
 		<<else>>
 			<<video "shared/sex/cum/vagcreampie/cowgirl2.mp4">>
-			<p>With a devilish grin, you suddenly speed up your movements and seconds later, you feel <<=$npcs.get($sex.npcId,'firstname')>> cum inside you. You don't even slow down for a second, continuing to ride him as hard as you can until you're sure he's completely finished with his orgasm. Only then do you slow down and come to a halt on top of him.</p>
+			<p>With a devilish grin, you suddenly speed up your movements and seconds later, you feel <<npc $sex.npcId>><</npc>> cum inside you. You don't even slow down for a second, continuing to ride him as hard as you can until you're sure he's completely finished with his orgasm. Only then do you slow down and come to a halt on top of him.</p>
 			<<actCLA 'Continue'>>
 				<<video "shared/sex/cum/vagcreampie/cowgirl1.mp4">>
 				Still wearing your grin, you drive your hips down as far as they can go one last time, clenching your pussy around his cock on the way back up, and try to milk him for every last drop. His cum is overflowing from your pussy lips and when you draw back up to the top, you can feel it spill around his cock, dribbling down its length.
@@ -1392,9 +1392,9 @@
 			<</if>>
 			<<setinit $hookup['cum_choice'] = 'stomach'>>
 			<<if getvar("$hookup['condom']") == 1>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> pulls himself out of your pussy and tears off the condom, furiously jacking off over you. Moments later, he ejaculates, sending cum flying all over your body, spattering across your belly.</p>
+				<p><<npc $sex.npcId>><</npc>> pulls himself out of your pussy and tears off the condom, furiously jacking off over you. Moments later, he ejaculates, sending cum flying all over your body, spattering across your belly.</p>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> pulls himself out of your pussy and starts furiously jacking off over you. Moments later, he ejaculates, sending cum flying all over your body, spattering across your belly.</p>
+				<p><<npc $sex.npcId>><</npc>> pulls himself out of your pussy and starts furiously jacking off over you. Moments later, he ejaculates, sending cum flying all over your body, spattering across your belly.</p>
 			<</if>>
 		<<elseif $hookup['position'] == 'doggy'>>
 			<<setinit $hookup['cum_choice'] = 'back'>>
@@ -1442,7 +1442,7 @@
 			<<setinit $hookup['no_cum'] = 1>>
 			<p>"Nngh~! Ahhh~! Don't stop!" you moan. "Don't stop! Don't stop! Don-"</p>
 		<</if>>
-		<p>Suddenly, <<=$npcs.get($sex.npcId,'firstname')>> grabs you tight, thrusting himself deep into your pussy. His cock twitches inside you and you feel something warm spread through your pussy.</p>
+		<p>Suddenly, <<npc $sex.npcId>><</npc>> grabs you tight, thrusting himself deep into your pussy. His cock twitches inside you and you feel something warm spread through your pussy.</p>
 	<<elseif $hookup['position'] == 'doggy'>>
 		<<video "shared/sex/cum/vagcreampie/doggy3.mp4">>
 		<<if getvar("$hookup['not_inside']") == 1>>
@@ -1451,16 +1451,16 @@
 			<<setinit $hookup['no_cum'] = 1>>
 			<p>"Nngh~! Ahhh~! Don't stop!" you moan. "Don't stop! Don't stop! Don-"</p>
 		<</if>>
-		<p>Suddenly, <<=$npcs.get($sex.npcId,'firstname')>> stops. His cock twitches inside you and you feel something warm spread through your pussy.</p>
+		<p>Suddenly, <<npc $sex.npcId>><</npc>> stops. His cock twitches inside you and you feel something warm spread through your pussy.</p>
 	<<elseif $hookup['position'] == 'cowgirl'>>
 		<<video "shared/sex/cum/vagcreampie/cumvaginal.mp4">>
 		<<if getvar("$hookup['not_inside']") == 1>>
 			<p>"Not insi-!"</p>
 		<<elseif $pc.horny >= 90 and $hookup['orgasm'] == $orgasm and getvar("$hookup['bored']") != 1 and getvar("$hookup['pain']") != 1>>
 			<<setinit $hookup['no_cum'] = 1>>
-			<p>"Nngh~! Ahhh~! Yeah!" you moan, frantically bouncing up and down on <<=$npcs.get($sex.npcId,'firstname')>>'s cock. "Yes! Yes! Fuck! Fuck! Ye-"</p>
+			<p>"Nngh~! Ahhh~! Yeah!" you moan, frantically bouncing up and down on <<npc $sex.npcId>><</npc>>'s cock. "Yes! Yes! Fuck! Fuck! Ye-"</p>
 		<</if>>
-		<p>Suddenly, <<=$npcs.get($sex.npcId,'firstname')>> grabs you tight, pulling you down against his chest and thrusting himself deep into your pussy. His cock twitches inside you and you feel something warm spread through your pussy.</p>
+		<p>Suddenly, <<npc $sex.npcId>><</npc>> grabs you tight, pulling you down against his chest and thrusting himself deep into your pussy. His cock twitches inside you and you feel something warm spread through your pussy.</p>
 	<</if>>
 	<<actCLA 'What the fuck!'>>
 		<<gs 'cum_call' 'hands' $sex.npcId 1>>
@@ -1504,11 +1504,11 @@
 			<<setinit $hookup['no_cum'] = 1>>
 			<p>"Nngh~! Ahhh~! Don't stop!" you moan. "Don't stop! Don't stop! Don-"</p>
 		<</if>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> suddenly thrusts into you one more time and stops, tensing up and shuddering as he does so. A few moments later, he withdraws his cock from your pussy and you can see the condom around it sagging, filled with a white liquid.</p>
+		<p><<npc $sex.npcId>><</npc>> suddenly thrusts into you one more time and stops, tensing up and shuddering as he does so. A few moments later, he withdraws his cock from your pussy and you can see the condom around it sagging, filled with a white liquid.</p>
 		<<actCLA 'Continue'>>
 			<<gs 'cum_call' 'stomach' $sex.npcId 1>>
 			<<image "shared/sex/cum/condom1.jpg">>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> pulls the condom from his dick with a wet slapping sound, and semen flies from the open end, spattering across your skin. He ties it off and tosses it onto your stomach, landing next to his cum.</p>
+			<p><<npc $sex.npcId>><</npc>> pulls the condom from his dick with a wet slapping sound, and semen flies from the open end, spattering across your skin. He ties it off and tosses it onto your stomach, landing next to his cum.</p>
 			<<gs 'hookup_talk' 'gross_condom'>>
 			<<gs 'hookup_talk' 'pillow_talk1'>>
 		<</actCLA>>
@@ -1518,16 +1518,16 @@
 			<<setinit $hookup['no_cum'] = 1>>
 			<p>"Nngh~! Ahhh~! Don't stop!" you moan. "Don't stop! Don't stop! Don-"</p>
 		<</if>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> suddenly thrusts hard into you and stops moving, holding his cock as deep inside you as it can go. You feel him shudder inside you, his cock flexing inside your pussy before his body relaxes and pulls his dick from your pussy. Based on that, you assume he must've cum and as you glance backwards you confirm your suspicions, watching him peel the condom from his cock, a white viscous liquid filling the rubber sleeve. He ties it off and tosses it aside.</p>
+		<p><<npc $sex.npcId>><</npc>> suddenly thrusts hard into you and stops moving, holding his cock as deep inside you as it can go. You feel him shudder inside you, his cock flexing inside your pussy before his body relaxes and pulls his dick from your pussy. Based on that, you assume he must've cum and as you glance backwards you confirm your suspicions, watching him peel the condom from his cock, a white viscous liquid filling the rubber sleeve. He ties it off and tosses it aside.</p>
 		<<gs 'hookup_after' 'pre'>>
 		<<gs 'hookup_talk' 'pillow_talk1'>>
 	<<elseif $hookup['position'] == 'cowgirl'>>
 		<<image "shared/sex/cum/cum81.jpg">>
 		<<if $pc.horny >= 90 and $hookup['orgasm'] == $orgasm and getvar("$hookup['bored']") != 1>>
 			<<setinit $hookup['no_cum'] = 1>>
-			<p>"Nngh~! Ahhh~!" you moan, continuing to bounce up and down on <<=$npcs.get($sex.npcId,'firstname')>>'s cock. "Yes! Yes! Yes! Ye-"</p>
+			<p>"Nngh~! Ahhh~!" you moan, continuing to bounce up and down on <<npc $sex.npcId>><</npc>>'s cock. "Yes! Yes! Yes! Ye-"</p>
 		<</if>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> suddenly grabs you by the hips thrusts hard into you, holding you down onto his cock. You feel him shudder inside you, his cock flexing inside your pussy before his body relaxes. You carefully pull yourself from <<=$npcs.get($sex.npcId,'firstname')>>'s dick. As it pops from your pussy, you see that the rubber encasing it is filled with a thick white liquid. He pulls off the condom with a wet slapping sound, tying it off and tossing it aside.</p>
+		<p><<npc $sex.npcId>><</npc>> suddenly grabs you by the hips thrusts hard into you, holding you down onto his cock. You feel him shudder inside you, his cock flexing inside your pussy before his body relaxes. You carefully pull yourself from <<npc $sex.npcId>><</npc>>'s dick. As it pops from your pussy, you see that the rubber encasing it is filled with a thick white liquid. He pulls off the condom with a wet slapping sound, tying it off and tossing it aside.</p>
 		<<gs 'hookup_after' 'pre'>>
 		<<gs 'hookup_talk' 'pillow_talk1'>>
 	<</if>>
@@ -1548,13 +1548,13 @@
 		<<warn "CONVERSION ERROR 3ada2357b95194b32546d35bbc604ae9">>
 			"Please," he snorts. "I've heard the rumors about you. Everybody knows you swallow."
 			<<actCLA 'Rude!'>>
-				<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+				<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				Your expression forms into a scowl as you get off the bed.
 				"Pretty rude way of treating a girl who just did you a favor," you huff.
 				<p>"What? You're going to say you're not a cocksucker right after sucking my cock?"</p>
 				<<actCLA 'Asshole!'>>
-					<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+					<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 					<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 					<p>"Fucking asshole!" you spit as you start grabbing your clothes.</p>
 					<p>"Oh yeah, I heard you do that too. Do you mind? Or do I have to pay for that one?"</p>

+ 66 - 66
sugarcube/src/autogenerated/unsorted/hookup_talk.tw

@@ -46,7 +46,7 @@
 			Cum still glazing your face, the two of you lay back on the bed, sitting in the afterglow.
 		<<elseif $hookup['cum_choice'] == 'stomach'>>
 			<!-- !! stomach-->
-			<p><<=$npcs.get($sex.npcId,'firstname')>>'s cum still resting on your stomach, the two of you lay back on the bed, sitting in the afterglow.</p>
+			<p><<npc $sex.npcId>><</npc>>'s cum still resting on your stomach, the two of you lay back on the bed, sitting in the afterglow.</p>
 		<<else>>
 			Laying back on the bed, the two of you rest in the afterglow together.
 		<</if>>
@@ -56,7 +56,7 @@
 	hookup['pillow_talk'] = 2
 	'<<image `'shared/sex/after/pillow_talk2.jpg'`>>'
 	'You both lay back on the bed, breathing heavily, and turn to face each other.'
-	'"That was fucking great," <<<<=$npcs.get($sex.npcId,'firstname')>>>> pants, leaning over to snake his hand down and play with your pussy.'
+	'"That was fucking great," <<<<npc $sex.npcId>><</npc>>>> pants, leaning over to snake his hand down and play with your pussy.'
 	act'That <i>was</i> great':
 	cla & *nl
 	'"Mmmm!" You close your eyes, enjoying the sensation of his fingers on your clit. "That <i>was</i> great," you agree.'
@@ -117,7 +117,7 @@
 	end
 	else
 	'"Anyone ever tell you what a fuckable pussy you've got?"'
-	'<<<<=$npcs.get($sex.npcId,'firstname')>>>> emphasizes his words by jamming his fingers inside you and schlicking your just-fucked pussy a few times.'
+	'<<<<npc $sex.npcId>><</npc>>>> emphasizes his words by jamming his fingers inside you and schlicking your just-fucked pussy a few times.'
 	act'Not lately':
 	cla & *nl
 	'"Not lately," you giggle, involuntarily squeezing your legs together from his fingering, "but I appreciate the compliment anyways."'
@@ -143,7 +143,7 @@
 	act'Stop it! I'm still sensitive!':
 	cla & *nl
 	'"Stop it!" you gasp, your legs snapping shut around his hand. "I'm still sensitive from when I came!"'
-	'<<<<=$npcs.get($sex.npcId,'firstname')>>>> grins back at you and rubs your clit a little more despite your protests, making you squirm, but he pulls away right after.'
+	'<<<<npc $sex.npcId>><</npc>>>> grins back at you and rubs your clit a little more despite your protests, making you squirm, but he pulls away right after.'
 	gs'hookup_after','pre'
 	end
 	end
@@ -205,7 +205,7 @@
 		<<actCLA 'That was nice'>>
 			<<setinit $hookup['sex_review'] = 1>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
-			<p>Looking over at <<=$npcs.get($sex.npcId,'firstname')>>, you give him a soft smile.</p>
+			<p>Looking over at <<npc $sex.npcId>><</npc>>, you give him a soft smile.</p>
 			"That was really nice," you say sweetly.
 			<<gs 'hookup_talk' 'did_you_come'>>
 		<</actCLA>>
@@ -218,7 +218,7 @@
 		<<actCLA 'I haven`t been fucked like that since grade school'>>
 			<<setinit $hookup['sex_review'] = 1>>
 			<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
-			<p>"I haven't been fucked like that since grade school," you sigh. <<=$npcs.get($sex.npcId,'firstname')>> turns and gives you a puzzled look.</p>
+			<p>"I haven't been fucked like that since grade school," you sigh. <<npc $sex.npcId>><</npc>> turns and gives you a puzzled look.</p>
 			<p>"Grade school? What's that? You mean like secondary school?"</p>
 			"I don't actually know," you admit sheepishly. "It's just a line from an old movie. I guess I was just trying to be funny."
 			<p>"Uhh, okay... So... you're saying...?"</p>
@@ -285,12 +285,12 @@
 			"Well that sucked," you pout, staring straight ahead at the far wall.
 			<<setinit $hookup['sex_review'] = 1>>
 			<<if $npcs.get($sex.npcId,'generous') == 1>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> sits up all of a sudden. "Shit. You didn't get to cum."</p>
+				<p><<npc $sex.npcId>><</npc>> sits up all of a sudden. "Shit. You didn't get to cum."</p>
 				<<if getvar("$hookup['no_cum']") == 1>>
 					"I got pretty close," you continue. "But <i>somebody</i> came first..."
 					<p>"Well... how about I finish you off?"</p>
 					<p>You turn to look at him. "Meaning?"</p>
-					<p>"I could go down on you. Get you off." <<=$npcs.get($sex.npcId,'firstname')>> moves closer to you, lightly tracing his finger up and down your thigh.</p>
+					<p>"I could go down on you. Get you off." <<npc $sex.npcId>><</npc>> moves closer to you, lightly tracing his finger up and down your thigh.</p>
 					<<actCLA 'No, it`s fine'>>
 						<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 						"No, it's fine," you sigh. "I'm sorry. I'm just being fussy."
@@ -301,7 +301,7 @@
 						<<actCLA 'If you`re offering...'>>
 							<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
 							"Well... if you're seriously offering..."
-							<p><<=$npcs.get($sex.npcId,'firstname')>> smiles at you and slinks down the bed, pushing your legs open and dipping his head between them.</p>
+							<p><<npc $sex.npcId>><</npc>> smiles at you and slinks down the bed, pushing your legs open and dipping his head between them.</p>
 							<<actCLA 'Get eaten out'>>
 								<<gt 'hookup' 'lick_pussy'>>
 							<</actCLA>>
@@ -332,7 +332,7 @@
 							<<actCLA 'If you`re offering...'>>
 								<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
 								"Well... if you're seriously offering..."
-								<p><<=$npcs.get($sex.npcId,'firstname')>> smiles at you and slinks down the bed, pushing your legs open and dipping his head between them.</p>
+								<p><<npc $sex.npcId>><</npc>> smiles at you and slinks down the bed, pushing your legs open and dipping his head between them.</p>
 								<<actCLA 'Get eaten out'>>
 									<<gt 'hookup' 'lick_pussy'>>
 								<</actCLA>>
@@ -364,7 +364,7 @@
 							<<actCLA 'If you`re offering...'>>
 								<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
 								"Well... if you're seriously offering..."
-								<p><<=$npcs.get($sex.npcId,'firstname')>> smiles at you and slinks down the bed, pushing your legs open and dipping his head between them.</p>
+								<p><<npc $sex.npcId>><</npc>> smiles at you and slinks down the bed, pushing your legs open and dipping his head between them.</p>
 								<<actCLA 'Get eaten out'>>
 									<<gt 'hookup' 'lick_pussy'>>
 								<</actCLA>>
@@ -392,7 +392,7 @@
 							<p>"Gladly!"</p>
 							<<actCLA 'Gather your things and leave'>>
 								<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-								<p>You've had enough of <<=$npcs.get($sex.npcId,'firstname')>>'s shit. You grab your clothes and tug them on as fast as you can, before picking up the rest of your things and stomping your way out the door, slamming it behind you.</p>
+								<p>You've had enough of <<npc $sex.npcId>><</npc>>'s shit. You grab your clothes and tug them on as fast as you can, before picking up the rest of your things and stomping your way out the door, slamming it behind you.</p>
 								<i>Fuck! What a prick!</i>
 								<<actCLA 'Leave'>>
 									<<gt 'hookup_after' 'exit'>>
@@ -422,7 +422,7 @@
 					<<gs 'hookup_talk' 'pleasure_argue'>>
 				<</actCLA>>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> stiffens at your comment, but decides not to respond, quietly withdrawing while you pout in silence.</p>
+				<p><<npc $sex.npcId>><</npc>> stiffens at your comment, but decides not to respond, quietly withdrawing while you pout in silence.</p>
 				<<gs 'hookup_after' 'pre'>>
 			<</if>>
 		<</actCLA>>
@@ -465,13 +465,13 @@
 			<</if>>
 			"That was great," you sigh contentedly. "You're even better than my boyfriend."
 			<<if $npcs.get($sex.npcId,'girlfriend') == 1>>
-				<p>"You're not bad yourself," <<=$npcs.get($sex.npcId,'firstname')>> says. "My girlfriend never makes me come like that."</p>
+				<p>"You're not bad yourself," <<npc $sex.npcId>><</npc>> says. "My girlfriend never makes me come like that."</p>
 			<<elseif $npcs.get($sex.npcId,'goal') == 1 and rand(0,1) == 1>>
 				"I bet I'm bigger than him too," he says, grinning arrogantly.
 			<<else>>
-				<p>"Boyfriend...?" <<=$npcs.get($sex.npcId,'firstname')>> asks hesitantly.</p>
+				<p>"Boyfriend...?" <<npc $sex.npcId>><</npc>> asks hesitantly.</p>
 				<p>"You didn't think that one dick is enough for a girl like me, did you?" you ask back, giving him a smile that's anything but innocent. "But don't be jealous. Like I said, you're better."</p>
-				<p>You give <<=$npcs.get($sex.npcId,'firstname')>> a wink, but he doesn't look any more comfortable.</p>
+				<p>You give <<npc $sex.npcId>><</npc>> a wink, but he doesn't look any more comfortable.</p>
 			<</if>>
 			<<gs 'hookup_talk' '$hookup['topic']'>>
 		<</actCLA>>
@@ -495,7 +495,7 @@
 				<!-- !! felt amazing-->
 				"Also, you were totally right," you say with a wide grin. "It <i>was</i> better without the condom."
 			<<else>>
-				<p>"By the way," you smile at <<=$npcs.get($sex.npcId,'firstname')>>. "You were right. It <i>was</i> better without the condom."</p>
+				<p>"By the way," you smile at <<npc $sex.npcId>><</npc>>. "You were right. It <i>was</i> better without the condom."</p>
 			<</if>>
 			<<if $npcs.get($sex.npcId,'selfish') == 1>>
 				<<if $hookup['cum_choice'] == 'creampie'>>
@@ -532,7 +532,7 @@
 					<<else>>
 						"Your pussy felt amazing."
 						"So did your dick," you murmur back.
-						<p>"Is it okay that I... you know...?" <<=$npcs.get($sex.npcId,'firstname')>> eyes your pussy, his cum still leaking from it.</p>
+						<p>"Is it okay that I... you know...?" <<npc $sex.npcId>><</npc>> eyes your pussy, his cum still leaking from it.</p>
 					<</if>>
 					<<actCLA 'I`ll be fine'>>
 						"I'll be fine," you say reassuringly. "One creampie isn''t gonna kill me."
@@ -557,13 +557,13 @@
 							<<elseif getvar("$birth_control['think_safe']") == 1>>
 								"It's fine. I'm on the pill," you reassure him. "I just wanted to be extra safe. No harm done."
 							<</if>>
-							<p><<=$npcs.get($sex.npcId,'firstname')>> seems to relax, relieved that you're not upset.</p>
+							<p><<npc $sex.npcId>><</npc>> seems to relax, relieved that you're not upset.</p>
 							<<gs 'hookup_talk' '$hookup['topic']'>>
 						<</actCLA>>
 					<<else>>
 						<<actCLA 'I`m on birth control (lie)'>>
 							"It's fine. I'm on birth control," you lie through your teeth.
-							<p><<=$npcs.get($sex.npcId,'firstname')>> seems to relax, relieved that you're not upset.</p>
+							<p><<npc $sex.npcId>><</npc>> seems to relax, relieved that you're not upset.</p>
 							<i>I wonder if his baby is going to be swimming around inside me after this...</i>
 							<<gs 'hookup_talk' '$hookup['topic']'>>
 						<</actCLA>>
@@ -596,7 +596,7 @@
 			<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
 			"When you came inside me... it felt <i>so</i> good..."
 			<<if getvar("$hookup['condom']") > 1>>
-				<p>"I thought you didn't want me to cum inside you?" <<=$npcs.get($sex.npcId,'firstname')>> asks, smiling at you.</p>
+				<p>"I thought you didn't want me to cum inside you?" <<npc $sex.npcId>><</npc>> asks, smiling at you.</p>
 				<<if getvar("$hookup['creampie_force']") == 1>>
 					"I changed my mind," you smirk mischeviously.
 				<<elseif getvar("$hookup['creampie_ask']") == 1>>
@@ -614,7 +614,7 @@
 		<<actCLA 'That was my first creampie (blush)'>>
 			<<setinit $hookup['first_creampie'] = 1>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
-			<p>"You know," you start to say, your face heating up as you look into <<=$npcs.get($sex.npcId,'firstname')>>'s eyes. "That was, uh... the first time anyone's come inside me."</p>
+			<p>"You know," you start to say, your face heating up as you look into <<npc $sex.npcId>><</npc>>'s eyes. "That was, uh... the first time anyone's come inside me."</p>
 			<p>"Really?" he asks and you feel your cheeks burns even hotter.</p>
 			<<actCLA ''>>
 			<</actCLA>>
@@ -634,7 +634,7 @@
 				<p>"You got some kind of creampie fetish huh?"</p>
 				"Maybe..."
 			<<else>>
-				<p>"That's fucking hot," <<=$npcs.get($sex.npcId,'firstname')>> he grins back, staring at your pussy and watching the fruit of his labor.</p>
+				<p>"That's fucking hot," <<npc $sex.npcId>><</npc>> he grins back, staring at your pussy and watching the fruit of his labor.</p>
 			<</if>>
 			<<gs 'hookup_talk' '$hookup['topic']'>>
 		<</actCLA>>
@@ -714,7 +714,7 @@
 			<<else>>
 				"Man," you say, staring into the ceiling. "I really hope I don't get pregnant."
 			<</if>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> pauses. "You'll get the morning after pill from the pharmacy tomorrow, right?"</p>
+			<p><<npc $sex.npcId>><</npc>> pauses. "You'll get the morning after pill from the pharmacy tomorrow, right?"</p>
 			<<actCLA 'I will'>>
 				"I will, this kind of thing just stresses me out."
 				"Well, just make sure you do it and there''s nothing to stress out about."
@@ -734,7 +734,7 @@
 			<<if $finances.cash < 740>>
 				<<actCLA 'If I can afford it'>>
 					"If I can afford it..." you gulp.
-					<p><<=$npcs.get($sex.npcId,'firstname')>> stops.</p>
+					<p><<npc $sex.npcId>><</npc>> stops.</p>
 					<p>"You don't have 750<b>₽</b>???"</p>
 					"No..."
 					<<if $npcs.get($sex.npcId,'childfree') == 1>>
@@ -755,7 +755,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'creampie_surprise_cum_react1'>>
 	<<actCLA '... not what I expected'>>
-		<p>"... not what I expected," you finish, flattly. <<=$npcs.get($sex.npcId,'firstname')>> looks at you confused.</p>
+		<p>"... not what I expected," you finish, flattly. <<npc $sex.npcId>><</npc>> looks at you confused.</p>
 		<p>"You're... you're not mad?" he asks.</p>
 		You reach between your legs, fingering the fluid coming out of you and holding it up in front of your eyes. Vaguely white, sticky, the strands of cum hang thick between your fingers as you stare at it.
 		<<gs 'hookup_talk' 'creampie_surprise_cum_react_options1'>>
@@ -763,18 +763,18 @@
 	<<actCLA '... incredible'>>
 		<<setinit $hookup['furious'] = 2>>
 		<p>"... <i>incredible</i>," you gush, taking a shuddering breath as shivers run through you. "I could feel it when you came inside me! I felt your cock move and then all this warm stuff was filling me up and I-! It was amazing!"</p>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> seems taken aback by your reaction, hesitantly asking, "So... you're not mad?"</p>
+		<p><<npc $sex.npcId>><</npc>> seems taken aback by your reaction, hesitantly asking, "So... you're not mad?"</p>
 		<<gs 'hookup_talk' 'creampie_surprise_cum_react_options1'>>
 	<</actCLA>>
 	<<actCLA '... so fucking hot'>>
 		<<setinit $hookup['furious'] = 2>>
 		"... <i>so fucking hot</i>," you moan, taking a shuddering breath as shivers run through you. "I could <i>feel</i> your cum inside me. Shooting right into my cervix, filling up my womb. The heat, the sensation, I just felt <i>full</i>. It was so fucking good, you have no idea. I actually feel bad that guys can't experience this," you say, unable to help but grin.
-		<p><<=$npcs.get($sex.npcId,'firstname')>> seems taken aback by your reaction, hesitantly asking, "So... you're not mad?"</p>
+		<p><<npc $sex.npcId>><</npc>> seems taken aback by your reaction, hesitantly asking, "So... you're not mad?"</p>
 		<<gs 'hookup_talk' 'creampie_surprise_cum_react_options1'>>
 	<</actCLA>>
 	<<actCLA 'I forgive you'>>
 		"I forgive you," you say, giving him a smile and gently caressing his arm. "Like you said, it was an accident. I'm not going to break your balls off for that. Besides, you did a pretty good job of making me come."
-		<p>Your smile widens into a full blown grin and <<=$npcs.get($sex.npcId,'firstname')>> can't help but return it.</p>
+		<p>Your smile widens into a full blown grin and <<npc $sex.npcId>><</npc>> can't help but return it.</p>
 		<<gs 'hookup_after' 'pre'>>
 	<</actCLA>>
 <</if>>
@@ -782,10 +782,10 @@
 	<<actCLA 'I didn`t expect that'>>
 		<!-- !!	hookup['felt_good_creampie'] = 2-->
 		<<image "shared/sex/after/pillow_talk1.jpg">>
-		<p>"I can't believe I just came like that," you say, looking over at <<=$npcs.get($sex.npcId,'firstname')>> in disbelief of what just happened. "The last thing I remember... you were fucking me, and then I felt something warm spreading inside me... and then I just... <i>came</i>..."</p>
-		<p>"Maybe you have some kind of creampie fetish you didn't know about," <<=$npcs.get($sex.npcId,'firstname')>> says back, looking amused.</p>
+		<p>"I can't believe I just came like that," you say, looking over at <<npc $sex.npcId>><</npc>> in disbelief of what just happened. "The last thing I remember... you were fucking me, and then I felt something warm spreading inside me... and then I just... <i>came</i>..."</p>
+		<p>"Maybe you have some kind of creampie fetish you didn't know about," <<npc $sex.npcId>><</npc>> says back, looking amused.</p>
 		<<actCLA 'Gulp'>>
-			<p>You swallow hard, throat suddenly feeling dry. The thought of being creampied like that again has your face feeling hot and you have to look away from <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+			<p>You swallow hard, throat suddenly feeling dry. The thought of being creampied like that again has your face feeling hot and you have to look away from <<npc $sex.npcId>><</npc>>.</p>
 			He might have hit the nail on the head a little too hard there.
 			<<gs 'hookup_after' 'pre'>>
 			<<gs 'hookup_talk' 'pillow_talk1'>>
@@ -793,13 +793,13 @@
 		<<actCLA 'I don`t think so'>>
 			You shake your head at his hypothesis.
 			"I don't think so. This doesn''t usually happen to me. It must just be coincidence."
-			<p>"Or maybe I have a magic dick," <<=$npcs.get($sex.npcId,'firstname')>> grins. You can't help but laugh back.</p>
+			<p>"Or maybe I have a magic dick," <<npc $sex.npcId>><</npc>> grins. You can't help but laugh back.</p>
 			<p>"Or maybe that! Haha!"</p>
 			<<gs 'hookup_after' 'pre'>>
 			<<gs 'hookup_talk' 'pillow_talk1'>>
 		<</actCLA>>
 		<<actCLA 'Maybe'>>
-			<p>Your face suddenly flushes with heat at the thought and you know it's just turned bright red. <<=$npcs.get($sex.npcId,'firstname')>>'s smile grows a little wider.</p>
+			<p>Your face suddenly flushes with heat at the thought and you know it's just turned bright red. <<npc $sex.npcId>><</npc>>'s smile grows a little wider.</p>
 			"Maybe," you say hoarsely. "I might have to do a little self discovery on that..."
 			<<gs 'hookup_after' 'pre'>>
 			<<gs 'hookup_talk' 'pillow_talk1'>>
@@ -834,12 +834,12 @@
 	<<actCLA 'You`re an asshole'>>
 		<<image "shared/sex/after/annoyed1.jpg">>
 		<!-- !!		if hookup['condom'] = 3:-->
-		<p>Now that you've come down from your orgasmic high, it hits you how irritated you are with <<=$npcs.get($sex.npcId,'firstname')>> that he just came inside you like that.</p>
+		<p>Now that you've come down from your orgasmic high, it hits you how irritated you are with <<npc $sex.npcId>><</npc>> that he just came inside you like that.</p>
 		<<if $npcs.get($sex.npcId,'smoker') > 0>>
 			<p>"You're a fucking asshole, you know that?" you say, glaring at him as he reaches over to his nightstand to grab a cigarette.</p>
 			"An asshole who''s fantastic in bed," he replies, grinning at you from around the fag as he lights it. "Don't think I didn''t feel you coming on my cock too. Your pussy was practically begging for it."
 		<<else>>
-			<p>"You're a fucking asshole, you know that?" you say, glaring at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+			<p>"You're a fucking asshole, you know that?" you say, glaring at <<npc $sex.npcId>><</npc>>.</p>
 			He just looks back at you, a smug grin on his face. "An asshole who''s great in bed. Don't think I didn''t feel you coming on my cock too. Your pussy was practically begging for it.
 		<</if>>
 		You huff in disgust and turn your head away from him. <i>Asshole...</i> you curse again internally.
@@ -873,8 +873,8 @@
 		<<else>>
 			"Maybe I should be," you say. "After all, you <i>did</i> just blow your load inside me without even asking me..."
 		<</if>>
-		<p>You lay back on the bed, looking up at <<=$npcs.get($sex.npcId,'firstname')>>, feeling his cum continue to trickle out of your pussy. <<=$npcs.get($sex.npcId,'firstname')>> gulps.</p>
-		<p>But no," you say. "I'm not mad. You didn't mean to, and I think you'd know I was lying if I said it didn't feel good. I won't hold it against you." You let your face light up with a smile and <<=$npcs.get($sex.npcId,'firstname')>> breathes a sigh of relief, letting himself smile as well.</p>
+		<p>You lay back on the bed, looking up at <<npc $sex.npcId>><</npc>>, feeling his cum continue to trickle out of your pussy. <<npc $sex.npcId>><</npc>> gulps.</p>
+		<p>But no," you say. "I'm not mad. You didn't mean to, and I think you'd know I was lying if I said it didn't feel good. I won't hold it against you." You let your face light up with a smile and <<npc $sex.npcId>><</npc>> breathes a sigh of relief, letting himself smile as well.</p>
 		<<gs 'hookup_after' 'pre'>>
 	<</actCLA>>
 <</if>>
@@ -888,8 +888,8 @@
 		<<else>>
 			"Well, I am a <i>little</i> mad," you say, letting a hard edge creep into your voice. "After all, you did just blow your load into me without even having the common fucking decency of asking."
 		<</if>>
-		<p>You lay back on the bed, looking up at <<=$npcs.get($sex.npcId,'firstname')>>, feeling his cum continue to trickle out of your pussy. <<=$npcs.get($sex.npcId,'firstname')>> gulps.</p>
-		<p>But..." you say. "It felt really good too. If you hadn't made me come, then I'd probably be beating the shit out of you right now. But you did, so you get off easy this time," You give <<=$npcs.get($sex.npcId,'firstname')>> a gentle punch on the arm and let your face light up with a smile. <<=$npcs.get($sex.npcId,'firstname')>> breathes a sigh of relief, letting himself smile as well.</p>
+		<p>You lay back on the bed, looking up at <<npc $sex.npcId>><</npc>>, feeling his cum continue to trickle out of your pussy. <<npc $sex.npcId>><</npc>> gulps.</p>
+		<p>But..." you say. "It felt really good too. If you hadn't made me come, then I'd probably be beating the shit out of you right now. But you did, so you get off easy this time," You give <<npc $sex.npcId>><</npc>> a gentle punch on the arm and let your face light up with a smile. <<npc $sex.npcId>><</npc>> breathes a sigh of relief, letting himself smile as well.</p>
 		<<gs 'hookup_after' 'pre'>>
 	<</actCLA>>
 <</if>>
@@ -911,7 +911,7 @@
 	<<actCLA 'I`m furious'>>
 		<<image "shared/sex/after/annoyed1.jpg">>
 		<p>"Mad?" you scoff. "I'm fucking furious!"</p>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> cringes back as you glare at him with all the anger you can muster.</p>
+		<p><<npc $sex.npcId>><</npc>> cringes back as you glare at him with all the anger you can muster.</p>
 		<<if getvar("$hookup['condom']") == 2>>
 			<p>"First," you say, jabbing your finger at him in accusation. "I ask you to use a condom. Then you talk me into skipping it, saying 'oh, it'll be okay, it's just this one time' and like a moron, I listened to you. And <i>then</i> you fucking come inside me anyways!" By the time you're finished with your rant, you're practically shouting.</p>
 		<<elseif getvar("$hookup['condom']") == 3>>
@@ -928,7 +928,7 @@
 		<<run $npcs.set($sex.npcId,'need_ask_creampie',1)>>
 		<<video "shared/sex/after/pillow_talk3.mp4">>
 		<p>"I don't mind when a guy comes inside me. But," you smile, holding up a finger. "You have. To. Ask!"</p>
-		<p>You punctuate your mild chastisement with a gentle tap on his nose. All <<=$npcs.get($sex.npcId,'firstname')>> can do is grin back at you.</p>
+		<p>You punctuate your mild chastisement with a gentle tap on his nose. All <<npc $sex.npcId>><</npc>> can do is grin back at you.</p>
 		<<gs 'hookup_after' 'pre'>>
 	<</actCLA>>
 <</if>>
@@ -952,7 +952,7 @@
 	<<if getvar("$siga") > 0>>
 		<<actCLA 'I need a cigarette'>>
 			<<image "shared/sex/after/bed_smoke0.jpg">>
-			<p>"I think I need a cigarette," you say, smirking at <<=$npcs.get($sex.npcId,'firstname')>>. You reach down to your purse and pull out a fag and a lighter, sparking it and inhaling deeply.</p>
+			<p>"I think I need a cigarette," you say, smirking at <<npc $sex.npcId>><</npc>>. You reach down to your purse and pull out a fag and a lighter, sparking it and inhaling deeply.</p>
 			<<actCLA 'Continue'>>
 				<<gs 'drugs' 'smoke'>>
 				<<if $npcs.get($sex.npcId,'smoker') > 0>>
@@ -963,7 +963,7 @@
 				Smoke fills your lungs and you sigh, letting out the breath and feeling your entire body relax into bliss. Something about ending a good fuck with a smoke just <i>completes</i> the experience.
 				<<if $npcs.get($sex.npcId,'smoker') > 0>>
 					<<setinit $hookup['cigarette'] = 5>>
-					<p>You look over and see <<=$npcs.get($sex.npcId,'firstname')>> following your lead, reaching over to his nightstand and lighting up a cigarette for himself as well.</p>
+					<p>You look over and see <<npc $sex.npcId>><</npc>> following your lead, reaching over to his nightstand and lighting up a cigarette for himself as well.</p>
 				<<else>>
 					<<setinit $hookup['cigarette'] = 4>>
 				<</if>>
@@ -977,7 +977,7 @@
 	<<setinit $hookup['talk'] += 1>>
 	<<setinit $hookup['get_out'] = 2>>
 	<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
-	<p>"So that's what sex is like..." you murmur to yourself, but <<=$npcs.get($sex.npcId,'firstname')>> looks over anyways.</p>
+	<p>"So that's what sex is like..." you murmur to yourself, but <<npc $sex.npcId>><</npc>> looks over anyways.</p>
 	<<setinit $hookup['virgin_talk'] = 1>>
 	<<setinit $hookup['sex_review'] = 1>>
 	<p>"How did you like it?" he asks. "How was your first time?"</p>
@@ -989,21 +989,21 @@
 			"It gets better. You were probably too tight because you were a virgin."
 			<<actCLA 'Really?'>>
 				<p>"Really?" you ask, voice heavy with sketicism.</p>
-				<p>"Yeah, really," <<=$npcs.get($sex.npcId,'firstname')>> laughs back. "Some girls I know said their first time hurt. But those same girls love it now."</p>
+				<p>"Yeah, really," <<npc $sex.npcId>><</npc>> laughs back. "Some girls I know said their first time hurt. But those same girls love it now."</p>
 				"Wish you could''ve warned me."
 				"If it's any consolation, your pussy felt great."
 				"It's not," you harumph, crossing your arms and he laughs again.
 				<<gs 'hookup_talk' 'sex_talk'>>
 			<</actCLA>>
 			<<actCLA 'I hope so'>>
-				<p>"I hope so," you groan, throwing your head back as <<=$npcs.get($sex.npcId,'firstname')>> laughs.</p>
+				<p>"I hope so," you groan, throwing your head back as <<npc $sex.npcId>><</npc>> laughs.</p>
 				"If it's any consolation, your pussy felt great."
 				"It's not," you harumph, crossing your arms and he laughs again.
 				<<gs 'hookup_talk' 'sex_talk'>>
 			<</actCLA>>
 			<<actCLA 'How would you know?'>>
 				<p>"How would you know?" you ask, giving him a dirty look. "Have you ever taken a cock inside you?"</p>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> laughs in reply but holds his hands up in surrender.</p>
+				<p><<npc $sex.npcId>><</npc>> laughs in reply but holds his hands up in surrender.</p>
 				<<gs 'hookup_talk' 'sex_talk'>>
 			<</actCLA>>
 		<</actCLA>>
@@ -1041,7 +1041,7 @@
 			<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
 			<p>"It was... nice," you say, giving a genuine smile. "Felt really good. I just felt... <i>full</i>. Like my insides were getting massaged. But better!"</p>
 			<<if $npcs.get($sex.npcId,'generous') == 1>>
-				<p>"I'm glad I was able to give you a good first time," <<=$npcs.get($sex.npcId,'firstname')>> smiles back, leaning in to kiss you.</p>
+				<p>"I'm glad I was able to give you a good first time," <<npc $sex.npcId>><</npc>> smiles back, leaning in to kiss you.</p>
 				<<gs 'hookup_talk' 'kiss_turn_head'>>
 				<<actCLA 'Kiss him back'>>
 					You smile and let him press his lips against yours, leaning in to steal another one when he pulls away.
@@ -1049,7 +1049,7 @@
 					<<gs 'hookup_talk' 'sex_talk'>>
 				<</actCLA>>
 			<<else>>
-				<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
+				<p>"Yeah," <<npc $sex.npcId>><</npc>> grins. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
 				<<actCLA 'Thought: "Really?!"'>>
 					<i>Fuck, really?!</i> you think to yourself. <i>This isn''t how it always feels?</i>
 					<<gs 'hookup_talk' 'sex_talk'>>
@@ -1065,7 +1065,7 @@
 			<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
 			<p>"It was amazing!" you gush with a shameless grin. "It was like I've been missing something this entire time. And you being inside me made me feel <i>full</i>. I can't believe I waited this long to have sex! I need to be careful or I could get addicted to this!"</p>
 			<<if $npcs.get($sex.npcId,'generous') == 1>>
-				<p>Perhaps spurred by your words, <<=$npcs.get($sex.npcId,'firstname')>> quickly moves in to kiss you.</p>
+				<p>Perhaps spurred by your words, <<npc $sex.npcId>><</npc>> quickly moves in to kiss you.</p>
 				<<gs 'hookup_talk' 'kiss_turn_head'>>
 				<<actCLA 'Kiss him back'>>
 					You smile and let him. He presses his lips against you passionately and your eyes go wide in surprise when you feel his tongue snake between your lips and press against yours. You push back with your own, enjoying the way it feels, savoring the taste of his mouth. It's not as good as the sex you just experienced, but it feels <i>damn</i> nice. You even lean in to steal another kiss when he pulls away.
@@ -1075,7 +1075,7 @@
 					<<gs 'hookup_talk' 'sex_talk'>>
 				<</actCLA>>
 			<<else>>
-				<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
+				<p>"Yeah," <<npc $sex.npcId>><</npc>> grins. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
 				<<actCLA 'Thought: "Really?!"'>>
 					<i>Fuck, really?!</i> you think to yourself. <i>This isn''t how it always feels? Shit!</i>
 					<<gs 'hookup_talk' 'sex_talk'>>
@@ -1110,7 +1110,7 @@ gs'hookup_talk','first_cum_lie'
 			"It was... nice," you say, giving a forced smile. Actually, it didn''t feel like very much at all. All you really felt was a weird pressure moving inside you. Didn''t feel bad, but it didn''t feel good either. But you don't want to hurt his feelings so you just lie instead. "Felt really good."
 		<</if>>
 		<<if $npcs.get($sex.npcId,'generous') == 1>>
-			<p>"I'm glad I was able to give you a good first time," <<=$npcs.get($sex.npcId,'firstname')>> smiles back, leaning in to kiss you.</p>
+			<p>"I'm glad I was able to give you a good first time," <<npc $sex.npcId>><</npc>> smiles back, leaning in to kiss you.</p>
 			<<gs 'hookup_talk' 'kiss_turn_head'>>
 			<<actCLA 'Kiss him back'>>
 				You smile and let him press his lips against yours, leaning in to steal another one when he pulls away. Unlike the experience you just had, this <i>does</i> feel nice.
@@ -1122,7 +1122,7 @@ gs'hookup_talk','first_cum_lie'
 				<<gs 'hookup_talk' 'sex_talk'>>
 			<</actCLA>>
 		<<else>>
-			<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
+			<p>"Yeah," <<npc $sex.npcId>><</npc>> grins. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
 			<<if getvar("$hookup['virgin_enjoyment']") == -1>>
 				<i>Fuck, I hope so,</i> you think to yourself. <i>That was fucking torture!</i>
 			<<elseif getvar("$hookup['virgin_enjoyment']") == 0>>
@@ -1144,10 +1144,10 @@ gs'hookup_talk','first_cum_lie'
 			"It was... nice," you say, giving a forced smile, boredly ignoring his hand between your legs. Actually, it didn''t feel like very much at all. All you really felt was a weird pressure moving inside you. Didn''t feel bad, but it didn''t feel good either. But you don't want to hurt his feelings so you just lie instead. "Felt really good."
 		<</if>>
 		<<if $npcs.get($sex.npcId,'generous') == 1>>
-			<p>"I'm glad I was able to give you a good first time," <<=$npcs.get($sex.npcId,'firstname')>> smiles back, leaning in to kiss you.</p>
+			<p>"I'm glad I was able to give you a good first time," <<npc $sex.npcId>><</npc>> smiles back, leaning in to kiss you.</p>
 			<<gs 'hookup_talk' 'kiss_turn_head'>>
 			<<actCLA 'Kiss him back'>>
-				<p>You smile and let <<=$npcs.get($sex.npcId,'firstname')>> press his lips against yours, gasping into his mouth when you feel his fingers thumb over your clit again before pulling away. Unlike the experience you just had, this <i>does</i> feel nice.</p>
+				<p>You smile and let <<npc $sex.npcId>><</npc>> press his lips against yours, gasping into his mouth when you feel his fingers thumb over your clit again before pulling away. Unlike the experience you just had, this <i>does</i> feel nice.</p>
 				<<if getvar("$hookup['virgin_enjoyment']") == -1>>
 					Losing your virginity was painful, but at least he's sweet.
 				<<elseif getvar("$hookup['virgin_enjoyment']") == 0>>
@@ -1156,7 +1156,7 @@ gs'hookup_talk','first_cum_lie'
 				<<gs 'hookup_talk' 'sex_talk'>>
 			<</actCLA>>
 		<<else>>
-			<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> grins, giving your clit a hard rub before pulling away. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
+			<p>"Yeah," <<npc $sex.npcId>><</npc>> grins, giving your clit a hard rub before pulling away. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
 			<<if getvar("$hookup['virgin_enjoyment']") == -1>>
 				<i>Fuck, I hope so,</i> you think to yourself. <i>That was fucking torture!</i>
 			<<elseif getvar("$hookup['virgin_enjoyment']") == 0>>
@@ -1178,7 +1178,7 @@ gs'hookup_talk','first_cum_lie'
 			<p>"It was amazing!" you say, giving a fake smile. Actually, it didn't feel like very much at all. All you really felt was a weird pressure moving inside you. Didn't feel bad, but it didn't feel good either. But you don't want to hurt his feelings so you just lie instead. "I loved the way it felt when you were inside me. I could get addicted to this if I'm not careful."</p>
 		<</if>>
 		<<if $npcs.get($sex.npcId,'generous') == 1>>
-			<p>Perhaps spurred by your words, <<=$npcs.get($sex.npcId,'firstname')>> quickly moves in to kiss you.</p>
+			<p>Perhaps spurred by your words, <<npc $sex.npcId>><</npc>> quickly moves in to kiss you.</p>
 			<<gs 'hookup_talk' 'kiss_turn_head'>>
 			<<actCLA 'Kiss him back'>>
 				You smile and let him. He presses his lips against you passionately and your eyes go wide in surprise when you feel his tongue snake between your lips and press against yours. You push back with your own, enjoying the way it feels, savoring the taste of his mouth. Unlike the experience you just had, this <i>does</i> feel nice. You even lean in to steal another kiss when he pulls away.
@@ -1186,12 +1186,12 @@ gs'hookup_talk','first_cum_lie'
 				<<if getvar("$hookup['virgin_enjoyment']") == -1>>
 					Losing your virginity was painful, but at least he's sweet.
 				<<elseif getvar("$hookup['virgin_enjoyment']") == 0>>
-					<p>Losing your virginity didn't feel like much in the end, but at least <<=$npcs.get($sex.npcId,'firstname')>> is sweet.</p>
+					<p>Losing your virginity didn't feel like much in the end, but at least <<npc $sex.npcId>><</npc>> is sweet.</p>
 				<</if>>
 				<<gs 'hookup_talk' 'sex_talk'>>
 			<</actCLA>>
 		<<else>>
-			<p>"Better hope you don't," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Not every guy's as good a lay as I am. Could be hard for you to get your fix."</p>
+			<p>"Better hope you don't," <<npc $sex.npcId>><</npc>> grins. "Not every guy's as good a lay as I am. Could be hard for you to get your fix."</p>
 			<<if getvar("$hookup['virgin_enjoyment']") == -1>>
 				<i>Fuck, I hope so,</i> you think to yourself. <i>That was fucking torture!</i>
 			<<elseif getvar("$hookup['virgin_enjoyment']") == 0>>
@@ -1213,7 +1213,7 @@ gs'hookup_talk','first_cum_lie'
 			<p>"It was amazing!" you say, giving a forced grin, boredly ignoring hand between your legs. Actually, it didn't feel like very much at all. All you really felt was a weird pressure moving inside you. Didn't feel bad, but it didn't feel good either. But you don't want to hurt his feelings so you just lie instead. "I loved the way it felt when you were inside me. I could get addicted to this if I'm not careful."</p>
 		<</if>>
 		<<if $npcs.get($sex.npcId,'generous') == 1>>
-			<p>Perhaps spurred by your words, <<=$npcs.get($sex.npcId,'firstname')>> quickly moves in to kiss you.</p>
+			<p>Perhaps spurred by your words, <<npc $sex.npcId>><</npc>> quickly moves in to kiss you.</p>
 			<<gs 'hookup_talk' 'kiss_turn_head'>>
 			<<actCLA 'Kiss him back'>>
 				You smile and let him. He presses his lips against you passionately and your eyes go wide in surprise when you feel his tongue snake between your lips and press against yours. You push back with your own, enjoying the way it feels, savoring the taste of his mouth. Then you feel his fingers give your clit another good rub, making you moan directly into his mouth. Unlike the experience you just had, this <i>does</i> feel nice. You bite your lip, letting the pleasure roll through you.
@@ -1221,12 +1221,12 @@ gs'hookup_talk','first_cum_lie'
 				<<if getvar("$hookup['virgin_enjoyment']") == -1>>
 					Losing your virginity was painful, but at least he's sweet.
 				<<elseif getvar("$hookup['virgin_enjoyment']") == 0>>
-					<p>Losing your virginity didn't feel like much in the end, but at least <<=$npcs.get($sex.npcId,'firstname')>> is sweet.</p>
+					<p>Losing your virginity didn't feel like much in the end, but at least <<npc $sex.npcId>><</npc>> is sweet.</p>
 				<</if>>
 				<<gs 'hookup_talk' 'sex_talk'>>
 			<</actCLA>>
 		<<else>>
-			<p>"Better hope you don't," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Not every guy's as good a lay as I am. Could be hard for you to get your fix."</p>
+			<p>"Better hope you don't," <<npc $sex.npcId>><</npc>> grins. "Not every guy's as good a lay as I am. Could be hard for you to get your fix."</p>
 			<<if getvar("$hookup['virgin_enjoyment']") == -1>>
 				<i>Fuck, I hope so,</i> you think to yourself. <i>That was fucking torture!</i>
 			<<elseif getvar("$hookup['virgin_enjoyment']") == 0>>
@@ -1360,10 +1360,10 @@ gs'hookup_talk','first_cum_lie'
 			<<if $npcs.get($sex.npcId,'girlfriend') == 1>>
 				<<setinit $pc_know_npc_has_girlfriend[$sex.npcId] = 1>>
 				<<if $npcs.get($sex.npcId,'fidelity') == 4>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> stiffens at your question. "Yeah..." he mumbles, taking a drag on his cigarette as well, not looking at you as he does.</p>
+					<p><<npc $sex.npcId>><</npc>> stiffens at your question. "Yeah..." he mumbles, taking a drag on his cigarette as well, not looking at you as he does.</p>
 					<<gs 'hookup_talk' 'girlfriend2'>>
 				<<elseif $npcs.get($sex.npcId,'fidelity') == 5>>
-					<p>"Yeah..." <<=$npcs.get($sex.npcId,'firstname')>> says, thumbing his cigarette, watching the ash fall off the end of it. He takes a deep breath and sighs. "I shouldn't be cheating on her like this."</p>
+					<p>"Yeah..." <<npc $sex.npcId>><</npc>> says, thumbing his cigarette, watching the ash fall off the end of it. He takes a deep breath and sighs. "I shouldn't be cheating on her like this."</p>
 				<<elseif $npcs.get($sex.npcId,'fidelity') == 6>>
 					<<gs 'hookup_talk' 'girlfriend2'>>
 				<</if>>
@@ -1400,7 +1400,7 @@ gs'hookup_talk','first_cum_lie'
 					<<gs 'hookup_talk' 'small_talk1'>>
 				<</actCLA>>
 				<<actCLA 'Good for you (annoyed)'>>
-					<p>"Well good for you," you huff, steaming in irritation. You're not sure if you pissed at <<=$npcs.get($sex.npcId,'firstname')>> for saying it or jealous of this girl who's boyfriend you just cheated with.</p>
+					<p>"Well good for you," you huff, steaming in irritation. You're not sure if you pissed at <<npc $sex.npcId>><</npc>> for saying it or jealous of this girl who's boyfriend you just cheated with.</p>
 					<<gs 'hookup_talk' 'small_talk1'>>
 				<</actCLA>>
 			<<else>>

+ 76 - 76
sugarcube/src/autogenerated/unsorted/hookup_virgin.tw

@@ -5,13 +5,13 @@
 	<<setinit $hookup['virgin'] = 1>>
 	<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 	<<if $hookup['position'] == 'miss'>>
-		<p>"Wait!" you yelp, closing up your legs halfway. <<=$npcs.get($sex.npcId,'firstname')>> freezes up, body over yours, his cock resting against your pussy.</p>
+		<p>"Wait!" you yelp, closing up your legs halfway. <<npc $sex.npcId>><</npc>> freezes up, body over yours, his cock resting against your pussy.</p>
 		"I... I'm a virgin..."
 		"Oh." He slumps backwards, not sure where you're going with this.
 		<<gs 'hookup_virgin' 'not_ready'>>
 		<<actCLA 'Go slow okay?'>>
 			<p>"Just... go slow, okay? I'm new at this," you smile nervously, spreading your legs again.</p>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> nods and gently pushes cock into your pussy.</p>
+			<p><<npc $sex.npcId>><</npc>> nods and gently pushes cock into your pussy.</p>
 			<<actCLA 'Lose your virginity'>>
 				<<gt 'hookup_virgin' 'miss_virg_norm1'>>
 			<</actCLA>>
@@ -19,13 +19,13 @@
 		<<gs 'hookup_virgin' 'virgin_condom3'>>
 		<<gs 'hookup_virgin' 'virgin_condom4'>>
 	<<elseif $hookup['position'] == 'doggy'>>
-		<p>"Wait!" you yelp. <<=$npcs.get($sex.npcId,'firstname')>> freezes up, hands on your ass, and you can feel his cock pressing right against your pussy lips.</p>
+		<p>"Wait!" you yelp. <<npc $sex.npcId>><</npc>> freezes up, hands on your ass, and you can feel his cock pressing right against your pussy lips.</p>
 		Sitting up and looking over your shoulder to face him, you stammer out, "I... I'm a virgin..."
 		"Oh." He slumps backwards, not sure where you're going with this.
 		<<gs 'hookup_virgin' 'not_ready'>>
 		<<actCLA 'Go slow okay?'>>
 			<p>"Just... go slow, okay? I'm new at this," you smile nervously.</p>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> nods and you turn back around and hold your breath, feeling him gently push his cock into your pussy.</p>
+			<p><<npc $sex.npcId>><</npc>> nods and you turn back around and hold your breath, feeling him gently push his cock into your pussy.</p>
 			<<actCLA 'Lose your virginity'>>
 				<<gt 'hookup_virgin' 'doggy_virg_norm1'>>
 			<</actCLA>>
@@ -33,13 +33,13 @@
 		<<gs 'hookup_virgin' 'virgin_condom3'>>
 		<<gs 'hookup_virgin' 'virgin_condom4'>>
 	<<elseif $hookup['position'] == 'cowgirl'>>
-		<p>"Wait!" you yelp. <<=$npcs.get($sex.npcId,'firstname')>> freezes up, putting his hands up, .</p>
+		<p>"Wait!" you yelp. <<npc $sex.npcId>><</npc>> freezes up, putting his hands up, .</p>
 		Still resting your thighs on top of his, you stammer out, "I... I'm a virgin..."
 		"Oh." He relaxes back onto the bed underneath you, not sure where you're going with this.
 		<<gs 'hookup_virgin' 'not_ready'>>
 		<<actCLA 'Go slow okay?'>>
 			<p>"Just... go slow, okay? I'm new at this," you smile nervously.</p>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> nods and you raise your hips again, biting your lip in apprehension as you slowly lower yourself down onto his cock.</p>
+			<p><<npc $sex.npcId>><</npc>> nods and you raise your hips again, biting your lip in apprehension as you slowly lower yourself down onto his cock.</p>
 			<<actCLA 'Lose your virginity'>>
 				<<gt 'hookup_virgin' 'cowgirl_virg_norm1'>>
 			<</actCLA>>
@@ -50,9 +50,9 @@
 <</if>>
 <<if $location_var[$here][0] == 'virginity_take'>>
 	<<actCLA 'Ask him to take your virginity'>>
-		<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+		<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 		<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-		<p>In your post orgasmic high, you find yourself staring at <<=$npcs.get($sex.npcId,'firstname')>>'s cock. You're so wet right now and looking at his erection makes you realize just how badly you want to be <i>filled.</i></p>
+		<p>In your post orgasmic high, you find yourself staring at <<npc $sex.npcId>><</npc>>'s cock. You're so wet right now and looking at his erection makes you realize just how badly you want to be <i>filled.</i></p>
 		<p>"Like what you see?" You glance up and realize he's noticed your stare.</p>
 		"I want you to fuck me," you whisper.
 		<p>"What happened to saving yourself for marriage?"</p>
@@ -71,7 +71,7 @@
 			<</if>>
 		<</if>>
 		<<actCLA 'Just get to fucking already!'>>
-			<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+			<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			<<if getvar("$hookup['condom_conscious']") == 1>>
 				<<setinit $hookup['condom'] = 1>>
@@ -114,8 +114,8 @@
 <<if $location_var[$here][0] == 'virginity_take2'>>
 	<<actCLA 'Ask him to take your virginity'>>
 		<<video "shared/sex/kuni/pussylick4.mp4">>
-		<p>You look down at <<=$npcs.get($sex.npcId,'firstname')>>, his face buried between your legs. You're so wet right now but his tongue isn't enough. You <i>ache</i> to be filled.</p>
-		<p>"<<=$npcs.get($sex.npcId,'firstname')>>," you whisper tapping his head. He looks up at you with glistening lips. "I want you to fuck me."</p>
+		<p>You look down at <<npc $sex.npcId>><</npc>>, his face buried between your legs. You're so wet right now but his tongue isn't enough. You <i>ache</i> to be filled.</p>
+		<p>"<<npc $sex.npcId>><</npc>>," you whisper tapping his head. He looks up at you with glistening lips. "I want you to fuck me."</p>
 		<p>"What happened to saving yourself for marriage?"</p>
 		<i>"I can't wait that long."</i>
 		<<gs 'willpower' 'misc' 'self'>>
@@ -132,7 +132,7 @@
 			<</if>>
 		<</if>>
 		<<actCLA 'Just get to fucking already!'>>
-			<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+			<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			<<if getvar("$hookup['condom_conscious']") == 1>>
 				<<setinit $hookup['condom'] = 1>>
@@ -188,7 +188,7 @@
 					<p>"Are you sure?" you ask. "I feel kind of bad now... we got this far and all..."</p>
 					"Yeah of course. It's your body, your choice."
 					"If it's really okay then..."
-					<p>"Although..." <<=$npcs.get($sex.npcId,'firstname')>> seems hesitant to say something. "Maybe you could at least blow me before we call it quits?"</p>
+					<p>"Although..." <<npc $sex.npcId>><</npc>> seems hesitant to say something. "Maybe you could at least blow me before we call it quits?"</p>
 					<<actCLA 'Sure'>>
 						"Yeah," you smile. "That sounds fair."
 						You wiggle down the bed and lean down to get between his legs.
@@ -201,7 +201,7 @@
 			<<gs 'hookup_virgin' 'want_to'>>
 			<<gs 'hookup_virgin' 'bj_instead'>>
 		<<elseif $npcs.get($sex.npcId,'selfish') == 1>>
-			<p>"Seriously? We get right here and you're going to call it quits?" <<=$npcs.get($sex.npcId,'firstname')>> seems furious.</p>
+			<p>"Seriously? We get right here and you're going to call it quits?" <<npc $sex.npcId>><</npc>> seems furious.</p>
 			<<actCLA 'I`m just scared!'>>
 				<p>"I'm jus-" you try to protest before he interrupts, shouting at you.</p>
 				<i><b>"Are you fucking kidding me?!"</b></i>
@@ -225,7 +225,7 @@
 			<<gs 'hookup_virgin' 'bj_instead'>>
 		<<else>>
 			"Uhh... well..."
-			<p><<=$npcs.get($sex.npcId,'firstname')>> looks down at himself, almost as if contemplating what to do with his solidly erect dick.</p>
+			<p><<npc $sex.npcId>><</npc>> looks down at himself, almost as if contemplating what to do with his solidly erect dick.</p>
 			<p>"Soooo... you <i>don't</i> want to have sex...?</p>
 			<<gs 'hookup_virgin' 'want_to'>>
 			<<gs 'hookup_virgin' 'bj_instead'>>
@@ -237,7 +237,7 @@
 		<<if $hookup['position'] == 'miss'>>
 			<<image "shared/sex/foreplay/miss1.jpg">>
 			"No, no," you shake your head. "I want to. I was just getting cold feet."
-			<p>You spread your legs wider, tugging on <<=$npcs.get($sex.npcId,'firstname')>>'s cock, beckoning him in.</p>
+			<p>You spread your legs wider, tugging on <<npc $sex.npcId>><</npc>>'s cock, beckoning him in.</p>
 			<<actCLA 'Lose your virginity'>>
 				<<if rand(0,1) == 1 or $npcs.get($sex.npcId,'generous') == 1>>
 					<<gt 'hookup_virgin' 'miss_virg_norm1'>>
@@ -303,13 +303,13 @@
 						<<setinit $hookup['orgasm'] = $orgasm>>
 						<<if $hookup['position'] == 'miss'>>
 							<<image "shared/sex/foreplay/miss1.jpg">>
-							<p>Unable to summon the will to say no, you nod and spread your legs, allowing <<=$npcs.get($sex.npcId,'firstname')>> to eagerly push his cock inside you.</p>
+							<p>Unable to summon the will to say no, you nod and spread your legs, allowing <<npc $sex.npcId>><</npc>> to eagerly push his cock inside you.</p>
 							<<actCLA 'Lose your virginity'>>
 								<<gt 'hookup_virgin' 'miss_virg_hard1'>>
 							<</actCLA>>
 						<<elseif $hookup['position'] == 'doggy'>>
 							<<image "shared/sex/foreplay/doggy1.jpg">>
-							<p>Unable to summon the will to say no, you nod and turn around. You bite your lip in apprehension as you feel <<=$npcs.get($sex.npcId,'firstname')>> push his cock inside you.</p>
+							<p>Unable to summon the will to say no, you nod and turn around. You bite your lip in apprehension as you feel <<npc $sex.npcId>><</npc>> push his cock inside you.</p>
 							<<actCLA 'Lose your virginity'>>
 								<<gt 'hookup_virgin' 'doggy_virg_hard1'>>
 							<</actCLA>>
@@ -370,13 +370,13 @@
 					<<actCLA 'Give in'>>
 						<<if $hookup['position'] == 'miss'>>
 							<<image "shared/sex/foreplay/miss1.jpg">>
-							<p>Unable to summon the will to say no, you nod and spread your legs, allowing <<=$npcs.get($sex.npcId,'firstname')>> to eagerly push his cock inside you.</p>
+							<p>Unable to summon the will to say no, you nod and spread your legs, allowing <<npc $sex.npcId>><</npc>> to eagerly push his cock inside you.</p>
 							<<actCLA 'Lose your virginity'>>
 								<<gt 'hookup_virgin' 'miss_virg_hard1'>>
 							<</actCLA>>
 						<<elseif $hookup['position'] == 'doggy'>>
 							<<image "shared/sex/foreplay/doggy1.jpg">>
-							<p>Unable to summon the will to say no, you nod and turn around. You bite your lip in apprehension as you feel <<=$npcs.get($sex.npcId,'firstname')>> push his cock inside you.</p>
+							<p>Unable to summon the will to say no, you nod and turn around. You bite your lip in apprehension as you feel <<npc $sex.npcId>><</npc>> push his cock inside you.</p>
 							<<actCLA 'Lose your virginity'>>
 								<<gt 'hookup_virgin' 'doggy_virg_hard1'>>
 							<</actCLA>>
@@ -400,16 +400,16 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'virgin_condom1'>>
-	<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+	<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 	<<=$npcs.get($sex.npcId,'apt_bedroom')>>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> climbs on top of you and just as he's preparing to enter you, you freeze up and say, "Wait!" His body also goes tense at the panic in your voice.</p>
+	<p><<npc $sex.npcId>><</npc>> climbs on top of you and just as he's preparing to enter you, you freeze up and say, "Wait!" His body also goes tense at the panic in your voice.</p>
 	<p>"Could you put on a condom first?" you ask.</p>
 	<<if rand(1,10) >= 7>>
 		<p>"Come on... You really want to use a condom for your first time?"</p>
 		<<actCLA 'Can`t take chances'>>
 			<<setinit $hookup['condom'] = 1>>
 			<p>"Yes," you respond. "I can't take any chances. Please?"</p>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> sighs. "Okay, fine." Pulling himself off of you, he grabs a package from his nightstand, tearing it open and rolling it onto his dick before taking his place back between you legs.</p>
+			<p><<npc $sex.npcId>><</npc>> sighs. "Okay, fine." Pulling himself off of you, he grabs a package from his nightstand, tearing it open and rolling it onto his dick before taking his place back between you legs.</p>
 			<<actCLA 'Lose your virginity'>>
 				<<if rand(0,1) == 1>>
 					<<gt 'hookup_virgin' 'miss_virg_norm1'>>
@@ -439,7 +439,7 @@
 	<<image "shared/sex/misc/condom_put.jpg">>
 	<<set $prezikcount -= 1>>
 	<<setinit $hookup['condom'] = 1>>
-	<p>You hurriedly lean over the side of the bed and reach down to your purse, groping around inside it. You manage to grab hold of a condom and tear the open the packaging and impatiently roll it onto <<=$npcs.get($sex.npcId,'firstname')>>'s cock for him.</p>
+	<p>You hurriedly lean over the side of the bed and reach down to your purse, groping around inside it. You manage to grab hold of a condom and tear the open the packaging and impatiently roll it onto <<npc $sex.npcId>><</npc>>'s cock for him.</p>
 	<p>"Okay!" you grin. "Now let's fuck!"</p>
 	He grins back at you, pushing you down onto the bed and climbing on top of you.
 	<<actCLA 'Lose your virginity'>>
@@ -454,14 +454,14 @@
 	<<if getvar("$hookup['condom']") < 1>>
 		<<actCLA 'Ask him to use a condom (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'self'>>
-			<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+			<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 			<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 			<p>"I changed my mind, can you use a condom? Please?"</p>
 			<<if rand(1,10) >= 7>>
 				<p>"Come on... You really want to use a condom for your first time?"</p>
 				<<actCLA 'Can`t take chances'>>
 					<p>"Yes," you respond. "I can't take any chances. Please?"</p>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> sighs. "Okay, fine." Pulling himself off of you, he grabs a package from his nightstand, tearing it open and rolling it onto his dick before taking his place back between you legs.</p>
+					<p><<npc $sex.npcId>><</npc>> sighs. "Okay, fine." Pulling himself off of you, he grabs a package from his nightstand, tearing it open and rolling it onto his dick before taking his place back between you legs.</p>
 					<<actCLA 'Lose your virginity'>>
 						<<if $hookup['position'] == 'miss'>>
 							<<if rand(0,1) == 1 or $npcs.get($sex.npcId,'generous') == 1>>
@@ -530,7 +530,7 @@
 		<<actCLA 'Put a condom on him (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'self'>>
 			<<if rand(1,10) >= 7>>
-				<h2><<<<=$npcs.get($sex.npcId,'firstname')>>>>''s Bedroom</h2>
+				<h2><<<<npc $sex.npcId>><</npc>>>>''s Bedroom</h2>
 				<<=$npcs.get($sex.npcId,'apt_bedroom')>>
 				Reaching over the side of the bed, you scrabble through your purse until you find the condom you're looking for, holding it up in front of you.
 				<p>"Let's use a condom, okay?"</p>
@@ -538,7 +538,7 @@
 				<<actCLA 'Can`t take chances'>>
 					<<image "shared/sex/misc/condom_put.jpg">>
 					<p>"Yes," you respond. "I can't take any chances. Please?"</p>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> sighs. "Okay, fine."</p>
+					<p><<npc $sex.npcId>><</npc>> sighs. "Okay, fine."</p>
 					You sigh in relief, tearing open the packaging and clumsily rolling the rubber onto his cock.
 					<<actCLA 'Lose your virginity'>>
 						<<if $hookup['position'] == 'miss'>>
@@ -615,14 +615,14 @@
 		<<else>>
 			<<image "shared/sex/vag/miss/blood1.jpg">>
 		<</if>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> presses his cock inside you slowly, centimeter by centimeter. It fills you up, stretching your walls until you feel it bump against your hymen. He doesn't stop though, and keeps pushing until you feel him tear straight through your maidenhood, eliciting a gasp from your mouth. Whether in excitement or pain, you aren't really sure.</p>
+		<p><<npc $sex.npcId>><</npc>> presses his cock inside you slowly, centimeter by centimeter. It fills you up, stretching your walls until you feel it bump against your hymen. He doesn't stop though, and keeps pushing until you feel him tear straight through your maidenhood, eliciting a gasp from your mouth. Whether in excitement or pain, you aren't really sure.</p>
 		<p>"You okay?"</p>
 		<p>"Mhmm." You just nod, not feeling able to say anything else in the moment. He continues to push inside until you feel his hips touching your ass. He's all the way inside you. Having a penis inside you is a decidedly strange experience, leaving you feeling "full" and stretched to the limit. He gives you a minute to adjust when you feel something seep out of your pussy. It takes you a few seconds before you suddenly you realize; it's blood. He did just pop your cherry after all...</p>
 		"I'm gonna start moving now," he says. You nod again, indicating for him to continue.
 		<<actCLA 'Continue'>>
 			<<setinit $hookup['orgasm'] = $orgasm>>
 			<<video "shared/sex/vag/miss/slow2.mp4">>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> slowly pulls out of you before pushing himself back inside. He pulls out a little bit faster, but still gently before pushing back in at the same pace. After a couple minutes, he's built into a steady rhythm of fucking you, and you...</p>
+			<p><<npc $sex.npcId>><</npc>> slowly pulls out of you before pushing himself back inside. He pulls out a little bit faster, but still gently before pushing back in at the same pace. After a couple minutes, he's built into a steady rhythm of fucking you, and you...</p>
 			<<gs 'hookup_virgin' 'virgin_enjoyment'>>
 		<</actCLA>>
 	<<else>>
@@ -631,19 +631,19 @@
 		<<else>>
 			<<image "shared/sex/vag/miss/blood1.jpg">>
 		<</if>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> presses his cock against the entrance of your pussy before plunging it all the way in. It fills you up, stretching your walls and tearing straight through your maidenhood, causing you to gasp. Whether in excitement or pain, you aren't really sure.</p>
+		<p><<npc $sex.npcId>><</npc>> presses his cock against the entrance of your pussy before plunging it all the way in. It fills you up, stretching your walls and tearing straight through your maidenhood, causing you to gasp. Whether in excitement or pain, you aren't really sure.</p>
 		Oblivious to the loss of your virginity, he doesn''t stop, working up to a steady rhythm right away while you continue to wince in pain.
 		<<actCLA 'Continue'>>
 			<<setinit $hookup['orgasm'] = $orgasm>>
 			<<video "shared/sex/vag/miss/slow2.mp4">>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> continues to fuck you and you...</p>
+			<p><<npc $sex.npcId>><</npc>> continues to fuck you and you...</p>
 			<<gs 'hookup_virgin' 'virgin_enjoyment'>>
 		<</actCLA>>
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'miss_virg_norm2'>>
 	<<video "shared/sex/vag/miss/slow2.mp4">>
-	<p>As <<=$npcs.get($sex.npcId,'firstname')>> changes his pace, you sigh deeply, feeling like you can breathe again.</p>
+	<p>As <<npc $sex.npcId>><</npc>> changes his pace, you sigh deeply, feeling like you can breathe again.</p>
 	Now that you aren''t worried about being literally fucked to death, you feel like you can focus on the sensations of your first time and you...
 	<<gs 'hookup_virgin' 'virgin_enjoyment'>>
 <</if>>
@@ -656,16 +656,16 @@
 	<<else>>
 		<<image "shared/sex/vag/miss/blood1.jpg">>
 	<</if>>
-	<p>You half gasp half shriek as <<=$npcs.get($sex.npcId,'firstname')>> slams his cock inside you, tearing straight through your hymen in one thrust and your eyes water at the intense stab of pain.</p>
+	<p>You half gasp half shriek as <<npc $sex.npcId>><</npc>> slams his cock inside you, tearing straight through your hymen in one thrust and your eyes water at the intense stab of pain.</p>
 	<<if getvar("$hookup['virgin']") == 1>>
-		<p>Clearly, <<=$npcs.get($sex.npcId,'firstname')>> doesn't care at all that you're a virgin and decided to christen you first time by fucking you <i>hard</i>.</p>
+		<p>Clearly, <<npc $sex.npcId>><</npc>> doesn't care at all that you're a virgin and decided to christen you first time by fucking you <i>hard</i>.</p>
 	<<else>>
-		<p>Completely oblivious to the loss of your virginity, <<=$npcs.get($sex.npcId,'firstname')>> doesn't stop for even a second and begins fucking you <i>hard</i>.</p>
+		<p>Completely oblivious to the loss of your virginity, <<npc $sex.npcId>><</npc>> doesn't stop for even a second and begins fucking you <i>hard</i>.</p>
 	<</if>>
 	<<actCLA 'Continue'>>
 		<<video "shared/sex/vag/miss/hard2.mp4">>
 		<i>"Ahh! Ahh!! AH! AHH!!"</i>
-		<p>You can't help but scream with every thrust as <<=$npcs.get($sex.npcId,'firstname')>> fucks you roughly and with high intensity. It hurts so much. Every time his cock slams back in to you, you feel like you're going to die. The force of his thrusts bounce your breasts so violently they hurt. It feels like your pussy is being fucked into an open wound and you wonder if you're going to have internal bruises tomorrow morning.</p>
+		<p>You can't help but scream with every thrust as <<npc $sex.npcId>><</npc>> fucks you roughly and with high intensity. It hurts so much. Every time his cock slams back in to you, you feel like you're going to die. The force of his thrusts bounce your breasts so violently they hurt. It feels like your pussy is being fucked into an open wound and you wonder if you're going to have internal bruises tomorrow morning.</p>
 		<<actCLA 'Endure it'>>
 			<<set $orgasm_or = 'no'>>
 			<<setinit $hookup['pain'] = 1>>
@@ -675,7 +675,7 @@
 			<<gs 'hookup_sex' 'fuck_cum'>>
 		<</actCLA>>
 		<<actCLA 'Can we slow down?'>>
-			<p>"Can we-! Slow down-! A little-?" you whimper under <<=$npcs.get($sex.npcId,'firstname')>>'s relentless pounding. "This is-! A bit-! Rough-!"</p>
+			<p>"Can we-! Slow down-! A little-?" you whimper under <<npc $sex.npcId>><</npc>>'s relentless pounding. "This is-! A bit-! Rough-!"</p>
 			<<if (rand(1,10) >= 7 or $npcs.get($sex.npcId,'selfish') == 1 or getvar("$npc_abusive") == 1) and $npcs.get($sex.npcId,'generous') != 1>>
 				<<set $orgasm_or = 'no'>>
 				<<arouse 'vaginal' `rand(8,16)` `['rough','no_orgasm_msg']`>>
@@ -698,18 +698,18 @@
 	<<setinit $hookup['position'] = 'doggy'>>
 	<<image "shared/sex/vag/doggy/blood1.jpg">>
 	<<if getvar("$hookup['virgin']") == 1>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> presses his cock against the entrance of your pussy before plunging it all the way in. It fills you up, stretching your walls and tearing straight through your maidenhood, causing you to gasp. Whether in excitement or pain, you aren't really sure.</p>
+		<p><<npc $sex.npcId>><</npc>> presses his cock against the entrance of your pussy before plunging it all the way in. It fills you up, stretching your walls and tearing straight through your maidenhood, causing you to gasp. Whether in excitement or pain, you aren't really sure.</p>
 		<p>"You okay?"</p>
 		<p>"Mhmm." You just nod, not feeling able to say anything else in the moment. He continues to push inside until you feel his hips touching your ass. He's all the way inside you. Having a penis inside you is a decidedly strange experience, leaving you feeling "full" and stretched to the limit. He gives you a minute to adjust when you feel something seep out of your pussy. It takes you a few seconds before you suddenly you realize; it's blood. He did just pop your cherry after all...</p>
 		"I'm gonna start moving," he says. You nod again, indicating for him to continue.
 		<<actCLA 'Continue'>>
 			<<setinit $hookup['orgasm'] = $orgasm>>
 			<<video "shared/sex/vag/doggy/slow2.mp4">>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> slowly builds into a steady rhythm and as he continues to fuck you, you...</p>
+			<p><<npc $sex.npcId>><</npc>> slowly builds into a steady rhythm and as he continues to fuck you, you...</p>
 			<<gs 'hookup_virgin' 'virgin_enjoyment'>>
 		<</actCLA>>
 	<<else>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> slowly presses his cock inside you. The walls of your pussy gradually stretch as he moves further inside and you gasp at the sensation until he reaches your hymen. Completely unaware of your virginity, he continues pushing.</p>
+		<p><<npc $sex.npcId>><</npc>> slowly presses his cock inside you. The walls of your pussy gradually stretch as he moves further inside and you gasp at the sensation until he reaches your hymen. Completely unaware of your virginity, he continues pushing.</p>
 		His cock tears through it and you feel a stab of pain, eliciting a pained cry from your mouth. Drawing back out again, he thrusts again, causing another whimper. But as he draws back out the next time he pauses.
 		<p>"What the- Is this blood? Hey... are you a virgin?"</p>
 		<<if getvar("$mesec") > 0>>
@@ -726,7 +726,7 @@
 			<<actCLA 'I`m on my peroid (lie)'>>
 				<p>"No! I'm not! I'm just... on my period." You're not entirely sure why you're lying about this, but you are nonetheless.</p>
 				<p>"But we can keep going, right?" you ask timidly.</p>
-				<p>"Oh. Yeah." <<=$npcs.get($sex.npcId,'firstname')>> begins fucking you agian, picking up to a steady rhythm.</p>
+				<p>"Oh. Yeah." <<npc $sex.npcId>><</npc>> begins fucking you agian, picking up to a steady rhythm.</p>
 				<<actCLA 'Continue'>>
 					<<gt 'hookup_virgin' 'doggy_virg_norm1_1'>>
 				<</actCLA>>
@@ -736,7 +736,7 @@
 			<<setinit $hookup['virgin'] = 1>>
 			<p>"Ye- yes..." you mumble shyly.</p>
 			"You should have said something," he grins. "This is going to be fun..."
-			<p><<=$npcs.get($sex.npcId,'firstname')>> starts fucking you again, working up to a steady pace.</p>
+			<p><<npc $sex.npcId>><</npc>> starts fucking you again, working up to a steady pace.</p>
 			<<actCLA 'Continue'>>
 				<<gt 'hookup_virgin' 'doggy_virg_norm1_1'>>
 			<</actCLA>>
@@ -744,7 +744,7 @@
 		<<actCLA 'Not anymore'>>
 			<<setinit $hookup['virgin'] = 1>>
 			"Not anymore," you say, looking back at him over your shoulder with a pained smile.
-			<p>"You fucking minx," <<=$npcs.get($sex.npcId,'firstname')>> grins back, immediately thrusting back into you and building up a steady rhythm.</p>
+			<p>"You fucking minx," <<npc $sex.npcId>><</npc>> grins back, immediately thrusting back into you and building up a steady rhythm.</p>
 			<<actCLA 'Continue'>>
 				<<gt 'hookup_virgin' 'doggy_virg_norm1_1'>>
 			<</actCLA>>
@@ -754,12 +754,12 @@
 <<if $location_var[$here][0] == 'doggy_virg_norm1_1'>>
 	<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 	<<video "shared/sex/vag/doggy/med2.mp4">>
-	<p>The sound of flesh against flesh fills the room, <<=$npcs.get($sex.npcId,'firstname')>> cock rhythmically moving in and out of your bloody pussy, hips slapping against your ass. As he fucks you, you...</p>
+	<p>The sound of flesh against flesh fills the room, <<npc $sex.npcId>><</npc>> cock rhythmically moving in and out of your bloody pussy, hips slapping against your ass. As he fucks you, you...</p>
 	<<gs 'hookup_virgin' 'virgin_enjoyment'>>
 <</if>>
 <<if $location_var[$here][0] == 'doggy_virg_norm2'>>
 	<<video "shared/sex/vag/doggy/med2.mp4">>
-	<p>As <<=$npcs.get($sex.npcId,'firstname')>> changes his pace, you sigh deeply, feeling like you can breathe again.</p>
+	<p>As <<npc $sex.npcId>><</npc>> changes his pace, you sigh deeply, feeling like you can breathe again.</p>
 	Now that you aren''t worried about being literally fucked to death, you feel like you can focus on the sensations of your first time and you...
 	<<gs 'hookup_virgin' 'virgin_enjoyment'>>
 <</if>>
@@ -769,17 +769,17 @@
 	<<setinit $hookup['virgin_enjoyment'] = -1>>
 	<<image "shared/sex/vag/doggy/blood2.jpg">>
 	<<if getvar("$hookup['virgin']") == 1>>
-		<p>Without warning, <<=$npcs.get($sex.npcId,'firstname')>> plunges his entire cock all the way inside you. He tears straight through your hymen, eliciting a uncontainable shriek of pain from your lips and tears immediately filling your eyes. Your arms and legs buckle beneath you, but he keeps pushing forward anyways, leaving your belly flush with the bed and his cock stretching you beyond your limits.</p>
+		<p>Without warning, <<npc $sex.npcId>><</npc>> plunges his entire cock all the way inside you. He tears straight through your hymen, eliciting a uncontainable shriek of pain from your lips and tears immediately filling your eyes. Your arms and legs buckle beneath you, but he keeps pushing forward anyways, leaving your belly flush with the bed and his cock stretching you beyond your limits.</p>
 		He doesn''t give you even a moment to adjust and begins fucking you full force, absolutely <i>pounding</i> your pussy.
 	<<else>>
-		<p>Without warning, <<=$npcs.get($sex.npcId,'firstname')>> plunges his cock inside you full force. He tears straight through your hymen, eliciting a uncontainable shriek of pain from your lips and tears immediately filling your eyes. Your arms and legs buckle beneath you, but he keeps pushing forward anyways, leaving your belly flush with the bed and his cock stretching you beyond your limits.</p>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't stop for even a second and begins fucking you <i>hard</i>.</p>
+		<p>Without warning, <<npc $sex.npcId>><</npc>> plunges his cock inside you full force. He tears straight through your hymen, eliciting a uncontainable shriek of pain from your lips and tears immediately filling your eyes. Your arms and legs buckle beneath you, but he keeps pushing forward anyways, leaving your belly flush with the bed and his cock stretching you beyond your limits.</p>
+		<p><<npc $sex.npcId>><</npc>> doesn't stop for even a second and begins fucking you <i>hard</i>.</p>
 	<</if>>
 	<<actCLA 'Scream'>>
 		<!-- !!		gs 'pain', 2, 'breasts', 'stretch'-->
 		<<video "shared/sex/vag/doggy/laying_down1.mp4">>
 		<i>"Ahh! Ahh!! AH! AHH!!"</i>
-		<p>You're reduced to a screaming mess as <<=$npcs.get($sex.npcId,'firstname')>> fucks you roughly and without mercy or restraint. It hurts so much. Every time his cock slams back in to you, you feel like you're going to die. It's like your pussy is being torn in half and you wonder if you're going to piss blood after this. All you can do is squirm beneath <<=$npcs.get($sex.npcId,'firstname')>> as he pounds your virgin pussy over and over again.</p>
+		<p>You're reduced to a screaming mess as <<npc $sex.npcId>><</npc>> fucks you roughly and without mercy or restraint. It hurts so much. Every time his cock slams back in to you, you feel like you're going to die. It's like your pussy is being torn in half and you wonder if you're going to piss blood after this. All you can do is squirm beneath <<npc $sex.npcId>><</npc>> as he pounds your virgin pussy over and over again.</p>
 		<<actCLA 'Endure it'>>
 			<<set $orgasm_or = 'no'>>
 			<<setinit $hookup['pain'] = 1>>
@@ -789,7 +789,7 @@
 			<<gs 'hookup_sex' 'fuck_cum'>>
 		<</actCLA>>
 		<<actCLA 'Can we slow down?'>>
-			<p>"Can we-! Slow down-! A little-?" you whimper under <<=$npcs.get($sex.npcId,'firstname')>>'s relentless pounding. "This is-! A bit-! Rough-!"</p>
+			<p>"Can we-! Slow down-! A little-?" you whimper under <<npc $sex.npcId>><</npc>>'s relentless pounding. "This is-! A bit-! Rough-!"</p>
 			<<if (rand(1,10) >= 7 or $npcs.get($sex.npcId,'selfish') == 1 or getvar("$npc_abusive") == 1) and $npcs.get($sex.npcId,'generous') != 1>>
 				<<setinit $hookup['pain'] = 1>>
 				<<set $orgasm_or = 'no'>>
@@ -813,19 +813,19 @@
 	<<video "shared/sex/vag/cowgirl/enter1.mp4">>
 	<<if getvar("$hookup['virgin']") == 1>>
 		<!-- !! to be written later-->
-		<p>Grabbing hold of <<=$npcs.get($sex.npcId,'firstname')>>'s cock, you try to guide it in with your hand as you ease yourself down onto it. It's kind of awkward to do and you have a lot of difficulty getting it to enter your pussy straight.</p>
+		<p>Grabbing hold of <<npc $sex.npcId>><</npc>>'s cock, you try to guide it in with your hand as you ease yourself down onto it. It's kind of awkward to do and you have a lot of difficulty getting it to enter your pussy straight.</p>
 		<<if $npcs.get($sex.npcId,'generous') == 1>>
-			<p>"It's okay, take your time," <<=$npcs.get($sex.npcId,'firstname')>> assures you. "Hard to get it in, isn't it?"</p>
+			<p>"It's okay, take your time," <<npc $sex.npcId>><</npc>> assures you. "Hard to get it in, isn't it?"</p>
 			<p>"Y-yeah," you blush, embarrassed at your obvious lack of experience.</p>
 			Finally, you manage to get the tip inside your pussy and carefully lower yourself down. You feel your walls stretch slowly and keep going lower until you feel yourself bump into something, some kind of resistance. It takes a moment, but then you realize it's your hymen.
-			<p>"Ready?" <<=$npcs.get($sex.npcId,'firstname')>> asks gently.</p>
+			<p>"Ready?" <<npc $sex.npcId>><</npc>> asks gently.</p>
 			"Mhmm," you nod. With a deep breath, you lift yourself up slightly and bounce straight down, tearing through your virginity.
 			<<actCLA '<b>!!!!</b>'>>
 				<<arouse 'vaginal' 1 `['no_orgasm_msg']`>>
 				<<image "shared/sex/vag/cowgirl/blood1.jpg">>
-				<p>The pain of <<=$npcs.get($sex.npcId,'firstname')>>'s cock ripping through your hymen is enough to make your eyes water.</p>
+				<p>The pain of <<npc $sex.npcId>><</npc>>'s cock ripping through your hymen is enough to make your eyes water.</p>
 				<p>"Fuck!" you involuntarily squeak. "Fuckfuckfuckfuckfuckfuckfuck! That hurts!"</p>
-				<p>"It's okay," <<=$npcs.get($sex.npcId,'firstname')>> says, assuring you, putting his hands on your hips. "Take it slow, alright?" You nod in response, taking deep breaths trying to adjust to feeling this... <i>thing</i> impaling you, filling you up, stretching you to your limits. Once you feel ready, you start to move.</p>
+				<p>"It's okay," <<npc $sex.npcId>><</npc>> says, assuring you, putting his hands on your hips. "Take it slow, alright?" You nod in response, taking deep breaths trying to adjust to feeling this... <i>thing</i> impaling you, filling you up, stretching you to your limits. Once you feel ready, you start to move.</p>
 				<<actCLA 'Start moving'>>
 					<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 					<<if getvar("$hookup['condom']") == 1>>
@@ -834,19 +834,19 @@
 						<<video "shared/sex/vag/cowgirl/slow1.mp4">>
 					<</if>>
 					<p>Clenching your jaw, you slowly lift yourself up before sliding back down on his cock. And then again. And again. And again. Your legs feel slick with something running down your thighs, but it doesn't feel like your juices. In fact it's hard to feel aroused at all right now. Suddenly you realize; it's blood. You did just pop your cherry after all...</p>
-					<p>You soldier onwards, continuing to ride <<=$npcs.get($sex.npcId,'firstname')>>. A few minutes pass and you've worked yourself up to a slow but steady rhythm, bouncing up and down on his cock. And soon, you realize you...</p>
+					<p>You soldier onwards, continuing to ride <<npc $sex.npcId>><</npc>>. A few minutes pass and you've worked yourself up to a slow but steady rhythm, bouncing up and down on his cock. And soon, you realize you...</p>
 					<<gs 'hookup_virgin' 'virgin_enjoyment'>>
 				<</actCLA>>
 			<</actCLA>>
 		<<elseif $npcs.get($sex.npcId,'selfish') == 1>>
-			<p>"Come on, hurry up," <<=$npcs.get($sex.npcId,'firstname')>> complains loudly.</p>
+			<p>"Come on, hurry up," <<npc $sex.npcId>><</npc>> complains loudly.</p>
 			<p>"I'm <i>trying!</i>" you yelp, blushing hard at your obvious lack of experience.</p>
 			Finally, you manage to get the tip inside your pussy and carefully lower yourself down. You feel your walls stretch slowly and keep going lower until you feel yourself bump into something, some kind of resistance. It takes a moment, but then you realize it's your hymen and you sit there for a moment, pausing.
-			<p>"Come on already!" <<=$npcs.get($sex.npcId,'firstname')>> doesn't wait for a response and thrusts his hips up, sending his cock tearing through your virginity.</p>
+			<p>"Come on already!" <<npc $sex.npcId>><</npc>> doesn't wait for a response and thrusts his hips up, sending his cock tearing through your virginity.</p>
 			<<actCLA '<b>!!!!</b>'>>
 				<<arouse 'vaginal' 1 `['no_orgasm_msg']`>>
 				<<image "shared/sex/vag/cowgirl/blood1.jpg">>
-				<p>The pain of <<=$npcs.get($sex.npcId,'firstname')>>'s cock ripping through your hymen is enough to make your eyes water.</p>
+				<p>The pain of <<npc $sex.npcId>><</npc>>'s cock ripping through your hymen is enough to make your eyes water.</p>
 				<p>"<i><b>FUCK!</b></i>" you shout. "Cocksucker! Motherfuck! Piece of shit, <i>bastard!</i>"</p>
 				You continue to scream obscenities at him even as he grabs your hips.
 				"You were taking too long, decided to help you take the plunge," he grins, trying to guide you back up again.
@@ -857,22 +857,22 @@
 					<<else>>
 						<<video "shared/sex/vag/cowgirl/slow1.mp4">>
 					<</if>>
-					<p>Deciding you're already this far, you let him, slowly lifting yourself up and sliding back down on his cock. And then again. And again. And again. A few minutes pass and you've worked yourself up to a steady rhythm, bouncing up and down on <<=$npcs.get($sex.npcId,'firstname')>>'s cock. And soon, you realize you...</p>
+					<p>Deciding you're already this far, you let him, slowly lifting yourself up and sliding back down on his cock. And then again. And again. And again. A few minutes pass and you've worked yourself up to a steady rhythm, bouncing up and down on <<npc $sex.npcId>><</npc>>'s cock. And soon, you realize you...</p>
 					<<gs 'hookup_virgin' 'virgin_enjoyment'>>
 				<</actCLA>>
 			<</actCLA>>
 		<<else>>
-			<p>"You okay up there?" <<=$npcs.get($sex.npcId,'firstname')>> asks, a quizzical look on his face.</p>
+			<p>"You okay up there?" <<npc $sex.npcId>><</npc>> asks, a quizzical look on his face.</p>
 			<p>"Y-yeah," you stammer. "I'm just having a hard time... getting it in..." You blush hard, embarrassed at your obvious lack of experience.</p>
 			Finally, you manage to get the tip inside your pussy and carefully lower yourself down. You feel your walls stretch slowly and keep going lower until you feel yourself bump into something, some kind of resistance. It takes a moment, but then you realize it's your hymen.
-			<p>"Whenever you're ready," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+			<p>"Whenever you're ready," <<npc $sex.npcId>><</npc>> grins.</p>
 			You nod back at him and take a deep breath. You lift yourself up slightly, and then force yourself straight down, tearing through your virginity.
 			<<actCLA '<b>!!!!</b>'>>
 				<<arouse 'vaginal' 1 `['no_orgasm_msg']`>>
 				<<image "shared/sex/vag/cowgirl/blood1.jpg">>
-				<p>The pain of <<=$npcs.get($sex.npcId,'firstname')>>'s cock ripping through your hymen is enough to make your eyes water.</p>
+				<p>The pain of <<npc $sex.npcId>><</npc>>'s cock ripping through your hymen is enough to make your eyes water.</p>
 				<p>"Fuck!" you involuntarily squeak. "Fuckfuckfuckfuckfuckfuckfuck! That hurts!"</p>
-				<p>"Keep moving, it'll get better," <<=$npcs.get($sex.npcId,'firstname')>> says, assuring you, putting his hands on your hips.</p>
+				<p>"Keep moving, it'll get better," <<npc $sex.npcId>><</npc>> says, assuring you, putting his hands on your hips.</p>
 				<<actCLA 'Keep moving'>>
 					<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 					<<if getvar("$hookup['condom']") == 1>>
@@ -881,19 +881,19 @@
 						<<video "shared/sex/vag/cowgirl/slow1.mp4">>
 					<</if>>
 					<p>Clenching your jaw, you slowly lift yourself up before sliding back down on his cock. And then again. And again. And again. Your legs feel slick with something running down your thighs, but it doesn't feel like your juices. In fact it's hard to feel aroused at all right now. Suddenly you realize; it's blood. You did just pop your cherry after all...</p>
-					<p>You soldier onwards, continuing to ride <<=$npcs.get($sex.npcId,'firstname')>>. A few minutes pass and you've worked yourself up to a slow but steady rhythm, bouncing up and down on his cock. And soon, you realize you...</p>
+					<p>You soldier onwards, continuing to ride <<npc $sex.npcId>><</npc>>. A few minutes pass and you've worked yourself up to a slow but steady rhythm, bouncing up and down on his cock. And soon, you realize you...</p>
 					<<gs 'hookup_virgin' 'virgin_enjoyment'>>
 				<</actCLA>>
 			<</actCLA>>
 		<</if>>
 	<<else>>
-		<p>Grabbing hold of <<=$npcs.get($sex.npcId,'firstname')>>'s cock, you try to guide it in with your hand as you ease yourself down onto it. It's kind of awkward to do and you have a lot of difficulty getting it to enter your pussy straight. Embarrassingly, it takes several tries before you think you finally have the tip inside you. With that out of the way, you carefully lower yourself down, letting your walls stretch until you feel <<=$npcs.get($sex.npcId,'firstname')>>'s dick putting pressure on your hymen.</p>
+		<p>Grabbing hold of <<npc $sex.npcId>><</npc>>'s cock, you try to guide it in with your hand as you ease yourself down onto it. It's kind of awkward to do and you have a lot of difficulty getting it to enter your pussy straight. Embarrassingly, it takes several tries before you think you finally have the tip inside you. With that out of the way, you carefully lower yourself down, letting your walls stretch until you feel <<npc $sex.npcId>><</npc>>'s dick putting pressure on your hymen.</p>
 		<p>"You okay?" he asks.</p>
 		<p>"Yeah! Yeah!" you reply hurriedly. And with a deep breath, you bounce once, tearing straight through your virginity.</p>
 		<<actCLA '<b>!!!!</b>'>>
 			<<arouse 'vaginal' 1 `['no_orgasm_msg']`>>
 			<<image "shared/sex/vag/cowgirl/blood1.jpg">>
-			<p>The pain of <<=$npcs.get($sex.npcId,'firstname')>>'s cock ripping through your hymen is enough to make you involuntarily squeak and your eyes water. You raise yourself up again and look down, horrified when you see blood leaking out of your pussy. <<=$npcs.get($sex.npcId,'firstname')>> has a similar expression of shock on his face as he looks up from beneath you.</p>
+			<p>The pain of <<npc $sex.npcId>><</npc>>'s cock ripping through your hymen is enough to make you involuntarily squeak and your eyes water. You raise yourself up again and look down, horrified when you see blood leaking out of your pussy. <<npc $sex.npcId>><</npc>> has a similar expression of shock on his face as he looks up from beneath you.</p>
 			<p>"Hey... Are you a... virgin?"</p>
 			<<actCLA 'Yes... (shy)'>>
 				<<setinit $hookup['virgin'] = 1>>
@@ -906,7 +906,7 @@
 			<<actCLA 'Not anymore'>>
 				<<setinit $hookup['virgin'] = 1>>
 				"Not anymore," you say, looking down at him with watering eyes and a pained smile.
-				<p>"You fucking minx," <<=$npcs.get($sex.npcId,'firstname')>> grins back, putting his hands on your hips and guiding you back down again.</p>
+				<p>"You fucking minx," <<npc $sex.npcId>><</npc>> grins back, putting his hands on your hips and guiding you back down again.</p>
 				<<actCLA 'Continue'>>
 					<<gt 'hookup_virgin' 'cowgirl_virg_norm2'>>
 				<</actCLA>>
@@ -922,7 +922,7 @@
 		<<video "shared/sex/vag/cowgirl/slow1.mp4">>
 	<</if>>
 	Clenching your jaw, you slowly lift yourself up before sliding back down on his cock. And then again. And again. And again. Your legs are slick blood and despite the pain it seems to help with lubrication at least a small bit.
-	<p>You soldier onwards, continuing to ride <<=$npcs.get($sex.npcId,'firstname')>>, his hands guiding you the whole way. A few minutes pass and you've worked yourself up to a slow but steady rhythm, bouncing up and down on his cock. And soon, you realize you...</p>
+	<p>You soldier onwards, continuing to ride <<npc $sex.npcId>><</npc>>, his hands guiding you the whole way. A few minutes pass and you've worked yourself up to a slow but steady rhythm, bouncing up and down on his cock. And soon, you realize you...</p>
 	<<gs 'hookup_virgin' 'virgin_enjoyment'>>
 <</if>>
 <<if $location_var[$here][0] == 'virgin_enjoyment'>>
@@ -934,7 +934,7 @@
 			<<set $orgasm_or = ''>>
 			<<set $pc.horny -= 50>>
 			... still find it really painful.
-			<p>Maybe it's just the after effect of being too rough with you before carrying over, but this <i>really fucking hurts!</i> Every time <<=$npcs.get($sex.npcId,'firstname')>> thrusts into you, it feels like your vagina is going to split in half. Everything about it hurts. Your insides hurt, your vulva hurts, your cervix hurts, it feels like your pussy is literally being stabbed. You keep expecting it to get better, for the pain to go away and the enjoyment to start, but it never does. All you can do is clench your teeth, squeeze your eyes shut, and keep enduring until it's over.</p>
+			<p>Maybe it's just the after effect of being too rough with you before carrying over, but this <i>really fucking hurts!</i> Every time <<npc $sex.npcId>><</npc>> thrusts into you, it feels like your vagina is going to split in half. Everything about it hurts. Your insides hurt, your vulva hurts, your cervix hurts, it feels like your pussy is literally being stabbed. You keep expecting it to get better, for the pain to go away and the enjoyment to start, but it never does. All you can do is clench your teeth, squeeze your eyes shut, and keep enduring until it's over.</p>
 			<<gs 'hookup_sex' 'fuck_cum'>>
 		<</actCLA>>
 		<<actCLA '... aren`t really enjoying it'>>
@@ -944,7 +944,7 @@
 			<<set $orgasm_or = ''>>
 			<<set $time.minutes += rand(3,4)>>
 			... still don't really enjoy it...
-			<p>It hurt when <<=$npcs.get($sex.npcId,'firstname')>> first entered you and when he was just pounding on you with no regard for your comfort, but now that he's slowed down, it's just a sort of pressure you feel inside you. The sensation isn't painful but it you're not getting any pleasure from it either. After his previous speed, maybe your pussy just went numb...?</p>
+			<p>It hurt when <<npc $sex.npcId>><</npc>> first entered you and when he was just pounding on you with no regard for your comfort, but now that he's slowed down, it's just a sort of pressure you feel inside you. The sensation isn't painful but it you're not getting any pleasure from it either. After his previous speed, maybe your pussy just went numb...?</p>
 			<<gs 'hookup_sex' 'fuck_cum'>>
 		<</actCLA>>
 		<<actCLA '... are starting to feel good'>>
@@ -953,7 +953,7 @@
 			... start to feel really good...
 			The pain of the previous form of fucking begins to fade and pleasure takes its place. Like an itch you've never been able to scratch or a "fullness" you've never experienced, you can feel his cock deep inside you and it feels <i>so good</i>, causing you to openly moan as he fucks you.
 			<<if $hookup['orgasm'] < $orgasm>>
-				<p>You're so caught up in the enjoyment of it, you almost don't realize when you're about to cum. The pressure inside you building and building with each time <<=$npcs.get($sex.npcId,'firstname')>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut as you cum hard on <<=$npcs.get($sex.npcId,'firstname')>>'s dick.</p>
+				<p>You're so caught up in the enjoyment of it, you almost don't realize when you're about to cum. The pressure inside you building and building with each time <<npc $sex.npcId>><</npc>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut as you cum hard on <<npc $sex.npcId>><</npc>>'s dick.</p>
 			<<else>>
 				<p>You spend the next several minutes fucking joyously, wondering why you waited so long to feel this good!</p>
 			<</if>>
@@ -967,7 +967,7 @@
 			<<set $orgasm_or = ''>>
 			<<set $time.minutes += rand(3,4)>>
 			... find this really painful.
-			<p>Every time <<=$npcs.get($sex.npcId,'firstname')>>'s cock moves inside you, it feels like your vagina is going to split in half. Everything about it hurts. Your insides hurt, your vulva hurts, your cervix hurts, it feels like your pussy is literally being stabbed. You keep expecting it to get better, for the pain to go away and the enjoyment to start, but it never does. All you can do is clench your teeth, squeeze your eyes shut, and keep enduring until it's over.</p>
+			<p>Every time <<npc $sex.npcId>><</npc>>'s cock moves inside you, it feels like your vagina is going to split in half. Everything about it hurts. Your insides hurt, your vulva hurts, your cervix hurts, it feels like your pussy is literally being stabbed. You keep expecting it to get better, for the pain to go away and the enjoyment to start, but it never does. All you can do is clench your teeth, squeeze your eyes shut, and keep enduring until it's over.</p>
 			<<gs 'hookup_sex' 'fuck_cum'>>
 		<</actCLA>>
 		<<actCLA '... aren`t really enjoying it'>>
@@ -976,7 +976,7 @@
 			<<arouse 'vaginal' `rand(4,8)` >>
 			<<set $orgasm_or = ''>>
 			... aren''t really enjoying it...
-			<p>It hurt when <<=$npcs.get($sex.npcId,'firstname')>> first entered you, but now that your pussy has adjusted but that pain has taken a back seat and become nothing more than a dull throb. But other than that, it's just a sort of pressure you feel inside you that comes and goes with the motions of his cock. The sensation isn't painful but it you're not getting any pleasure from it either. The experience is just sort of... bland.</p>
+			<p>It hurt when <<npc $sex.npcId>><</npc>> first entered you, but now that your pussy has adjusted but that pain has taken a back seat and become nothing more than a dull throb. But other than that, it's just a sort of pressure you feel inside you that comes and goes with the motions of his cock. The sensation isn't painful but it you're not getting any pleasure from it either. The experience is just sort of... bland.</p>
 			<<gs 'hookup_sex' 'fuck_cum'>>
 		<</actCLA>>
 		<<actCLA '... are starting to feel good'>>
@@ -985,7 +985,7 @@
 			... start to feel really good...
 			The initial pain you felt is still there, but now there''s something else that's going along with it. Like an itch you've never been able to scratch or a "fullness" you've never experienced, you can feel his cock deep inside you and it feels <i>so good</i>, causing you to openly moan.
 			<<if $hookup['orgasm'] < $orgasm>>
-				<p>You're so caught up in the enjoyment of it, you almost don't realize when you're about to cum. The pressure inside you builds and builds with each time <<=$npcs.get($sex.npcId,'firstname')>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut as you go into spasms, cumming hard on <<=$npcs.get($sex.npcId,'firstname')>>'s dick.</p>
+				<p>You're so caught up in the enjoyment of it, you almost don't realize when you're about to cum. The pressure inside you builds and builds with each time <<npc $sex.npcId>><</npc>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut as you go into spasms, cumming hard on <<npc $sex.npcId>><</npc>>'s dick.</p>
 			<<else>>
 				<p>You spend the next several minutes fucking joyously, wondering why you waited so long to feel this good!</p>
 			<</if>>

+ 125 - 125
sugarcube/src/autogenerated/unsorted/sex_ev_after.tw

@@ -5,11 +5,11 @@
 	<<if $sex_ev['loc'] != 'pc_home'>>
 		<<actCLA 'Leave in anger'>>
 			$sex_ev['bed_room']
-			<p>"You know what, <<=$npcs.get($sex.npcId,'firstname')>>? <i>Fuck you!</i>" You leap off the bed in a huff, quickly grabbing your things and throwing your clothes on.</p>
+			<p>"You know what, <<npc $sex.npcId>><</npc>>? <i>Fuck you!</i>" You leap off the bed in a huff, quickly grabbing your things and throwing your clothes on.</p>
 			<!-- !! if npc_abusive[$sex.npcId] > 0 and rand(1,10) > number:-->
 			<!-- !! get raped-->
 			<!-- !! else-->
-			<p><<=$npcs.get($sex.npcId,'firstname')>> glares daggers at you the whole time but you don't care and the moment you have all your clothes on, you stalk out the door, giving him the finger as you slam it behind you.</p>
+			<p><<npc $sex.npcId>><</npc>> glares daggers at you the whole time but you don't care and the moment you have all your clothes on, you stalk out the door, giving him the finger as you slam it behind you.</p>
 			<<actCLA 'Leave'>>
 				<<gt 'sex_ev_leave' 'exit'>>
 			<</actCLA>>
@@ -18,7 +18,7 @@
 	<<else>>
 		<<actCLA 'Kick $npcs.get('+$sex.npcId,'firstname')+' out'>>
 			$sex_ev['bed_room']
-			<p>"You know what, <<=$npcs.get($sex.npcId,'firstname')>>? <i>Fuck you!</i>" You shove <<=$npcs.get($sex.npcId,'firstname')>> out of your bed. "Get the fuck out! We're done here!"</p>
+			<p>"You know what, <<npc $sex.npcId>><</npc>>? <i>Fuck you!</i>" You shove <<npc $sex.npcId>><</npc>> out of your bed. "Get the fuck out! We're done here!"</p>
 			<!-- !! if npc_abusive[$sex.npcId] > 0 and rand(1,10) > number:-->
 			<!-- !! get raped-->
 			<!-- !! else-->
@@ -35,11 +35,11 @@
 	Both of you lay back in bed, slightly frustrated with each other to the point that the mood is demonstrably ruined, but neither willing to concede.
 	<<if $npcs.get($sex.npcId,'smoker') > 0>>
 		<<if $sex_ev['loc'] == 'pc_home'>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> grabs his cigarettes from the pockets of his discarded clothing and lights up, puffing away at it in annoyance.</p>
+			<p><<npc $sex.npcId>><</npc>> grabs his cigarettes from the pockets of his discarded clothing and lights up, puffing away at it in annoyance.</p>
 		<<elseif $sex_ev['loc'] == 'npc_home'>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> grabs his cigarettes from his nightstand and lights up, puffing away at it in annoyance.</p>
+			<p><<npc $sex.npcId>><</npc>> grabs his cigarettes from his nightstand and lights up, puffing away at it in annoyance.</p>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> grabs his cigarettes from the nightstand and lights up, puffing away at it in annoyance.</p>
+			<p><<npc $sex.npcId>><</npc>> grabs his cigarettes from the nightstand and lights up, puffing away at it in annoyance.</p>
 		<</if>>
 	<</if>>
 	<<gs 'sex_ev_after' 'after_sex2'>>
@@ -99,19 +99,19 @@
 		<<elseif getvar("$sex_ev['keep_going_continue']") > 0 and $npcs.get($sex.npcId,'caretaker') == 1>>
 			<<gs 'sex_ev_after' 'finish_sex'>>
 		<<elseif getvar("$sex_ev['keep_going_continue']") > 0>>
-			<p>"Just a couple more times?" <<=$npcs.get($sex.npcId,'firstname')>> begs. "I still want to get off a few more times with you."</p>
+			<p>"Just a couple more times?" <<npc $sex.npcId>><</npc>> begs. "I still want to get off a few more times with you."</p>
 			<<gs 'sex_ev_after' 'ask_continue_options'>>
 		<<elseif $npcs.get($sex.npcId,'abusive') == 1 or $npcs.get($sex.npcId,'selfish') == 1 or (npc_caretaker[$sex.npcId] != 1 and $rand(1,3))>>
-			<p>"You're done already?" <<=$npcs.get($sex.npcId,'firstname')>> complains. "I still want to get off a few more times with you."</p>
+			<p>"You're done already?" <<npc $sex.npcId>><</npc>> complains. "I still want to get off a few more times with you."</p>
 			<<gs 'sex_ev_after' 'ask_continue_options'>>
 			<!-- !!{		elseif sex_ev['cum_count'] = 0:
 			sex_ev['ask_to_cum_once'] = 1
 			if $sex_ev['position'] = 'miss' or $sex_ev['position'] = 'doggy' or $sex_ev['position'] = 'cowgirl':
-			'"Can I just come real quick?" <<<<=$npcs.get($sex.npcId,'firstname')>>>> asks. "I'm really close."'
+			'"Can I just come real quick?" <<<<npc $sex.npcId>><</npc>>>> asks. "I'm really close."'
 			else
 			end} -->
 		<<elseif $npcs.get($sex.npcId,'caretaker') == 1>>
-			<p>"I was actually hoping to go a few more times," <<=$npcs.get($sex.npcId,'firstname')>> says a bit wistfully. "But if you want to stop, that's all right."</p>
+			<p>"I was actually hoping to go a few more times," <<npc $sex.npcId>><</npc>> says a bit wistfully. "But if you want to stop, that's all right."</p>
 			<<gs 'sex_ev_after' 'ask_continue_options'>>
 		<<elseif $npcs.get($sex.npcId,'caretaker') == 1>>
 			<<gs 'sex_ev_after' 'ask_continue_options'>>
@@ -123,9 +123,9 @@
 <<if $location_var[$here][0] == 'ask_continue_options'>>
 	<<actCLA 'I can`t keep going'>>
 		<!-- !!		if sex_ev['fuck_count'] > 0:-->
-		<p>"I'm sorry <<=$npcs.get($sex.npcId,'firstname')>>," you say, rubbing his arm, genuinely apologetic. "But I just can't keep up with your sex drive. I'm all tapped out. Maybe next time?"</p>
+		<p>"I'm sorry <<npc $sex.npcId>><</npc>>," you say, rubbing his arm, genuinely apologetic. "But I just can't keep up with your sex drive. I'm all tapped out. Maybe next time?"</p>
 		<<if $npcs.get($sex.npcId,'caretaker') == 1>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> smiles wistfully at you.</p>
+			<p><<npc $sex.npcId>><</npc>> smiles wistfully at you.</p>
 			"I guess it's okay then..."
 			<<gs 'sex_ev_after' 'after_sex1'>>
 		<<else>>
@@ -148,7 +148,7 @@
 					<<gs 'sex_ev_foreplay' 'bj_ask2'>>
 				<</if>>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> seems really disappointed, almost upset.</p>
+				<p><<npc $sex.npcId>><</npc>> seems really disappointed, almost upset.</p>
 				<<setinit $sex_ev['blue_ball'] = 1>>
 				<<gs 'sex_ev_after' 'after_sex1'>>
 			<</if>>
@@ -158,9 +158,9 @@
 	<<actCLA 'I don`t have time'>>
 		<<setinit $sex_ev['no_time'] += 1>>
 		<<if getvar("$sex_ev['keep_going_continue']") >= 1>>
-			<p>"Seriously <<=$npcs.get($sex.npcId,'firstname')>>," you say. "I can't. You're gonna make me late."</p>
+			<p>"Seriously <<npc $sex.npcId>><</npc>>," you say. "I can't. You're gonna make me late."</p>
 		<<else>>
-			<p>"I wish I could, but I don't have time <<=$npcs.get($sex.npcId,'firstname')>>," you shake your head. "I really need to get going soon."</p>
+			<p>"I wish I could, but I don't have time <<npc $sex.npcId>><</npc>>," you shake your head. "I really need to get going soon."</p>
 		<</if>>
 		<<if $npcs.get($sex.npcId,'caretaker') == 1>>
 			"Well, I don't want to make you late," he says softly.
@@ -168,7 +168,7 @@
 			<<if $sex_ev['cum_count'] < $npcs.get($sex.npcId,'sexdrive') - 5>>
 				<p>"Come on, please? Just a couple more times?"</p>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> seems really disappointed, almost upset.</p>
+				<p><<npc $sex.npcId>><</npc>> seems really disappointed, almost upset.</p>
 			<</if>>
 		<</if>>
 		<<gs 'sex_ev_after' 'after_sex1'>>
@@ -180,12 +180,12 @@
 			<<setinit $sex_ev['blue_ball'] = 1>>
 			<<if getvar("$sex_ev['keep_going_continue']") >= 1>>
 				<<if $time.hour < 3>>
-					<p>"Seriously <<=$npcs.get($sex.npcId,'firstname')>>," you say. "I can't. My mom is already going to kill me for staying out past curfew."</p>
+					<p>"Seriously <<npc $sex.npcId>><</npc>>," you say. "I can't. My mom is already going to kill me for staying out past curfew."</p>
 				<<else>>
-					<p>"Seriously <<=$npcs.get($sex.npcId,'firstname')>>," you say. "I can't. I need to get home soon or my mom will kill me."</p>
+					<p>"Seriously <<npc $sex.npcId>><</npc>>," you say. "I can't. I need to get home soon or my mom will kill me."</p>
 				<</if>>
 			<<else>>
-				<p>"I wish I could, but I need to get home <<=$npcs.get($sex.npcId,'firstname')>>," you shake your head. "My mom will kill me if I'm not back before midnight."</p>
+				<p>"I wish I could, but I need to get home <<npc $sex.npcId>><</npc>>," you shake your head. "My mom will kill me if I'm not back before midnight."</p>
 			<</if>>
 			<<if $npcs.get($sex.npcId,'caretaker') == 1>>
 				"Well, I guess there''s always next time," he says softly.
@@ -197,7 +197,7 @@
 					<<gs 'sex_ev_after' 'well_continue'>>
 				<<else>>
 					<<setinit $sex_ev['blue_ball'] = 1>>
-					<p>"Your mom's a bitch, you know that?" <<=$npcs.get($sex.npcId,'firstname')>> grumbles, pulling away.</p>
+					<p>"Your mom's a bitch, you know that?" <<npc $sex.npcId>><</npc>> grumbles, pulling away.</p>
 					<<actCLA 'Tell me about it'>>
 						"Tell me about it," you roll your eyes. "At least you don't have to live with her."
 						<<gs 'sex_ev_after' 'after_sex1'>>
@@ -218,7 +218,7 @@
 			<<setinit $sex_ev['blue_ball'] = 1>>
 			"My pussy is so sore," you say, rubbing his arm, feeling genuinely apologetic. "You're gonna fuck me to death if we keep going."
 			<<if $npcs.get($sex.npcId,'caretaker') == 1>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> smiles apologetically at you.</p>
+				<p><<npc $sex.npcId>><</npc>> smiles apologetically at you.</p>
 				"Oh. Sorry about that..."
 				<<gs 'sex_ev_after' 'after_sex1'>>
 			<<elseif $npcs.get($sex.npcId,'selfish') == 1 and $sex_ev['cum_count'] < $npcs.get($sex.npcId,'sexdrive') - 5>>
@@ -226,7 +226,7 @@
 				<<gs 'sex_ev_after' 'after_sex1'>>
 				<<gs 'sex_ev_after' 'well_continue'>>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> seems really disappointed, almost upset.</p>
+				<p><<npc $sex.npcId>><</npc>> seems really disappointed, almost upset.</p>
 				<<gs 'sex_ev_after' 'after_sex1'>>
 			<</if>>
 		<</actCLA>>
@@ -288,14 +288,14 @@
 				<<if getvar("$sex_ev['cock_inserted']") == 0>>
 					"I can't keep this up..." you pant breathlessly. "You're just too big for me... I can't keep going..."
 				<<else>>
-					<p>"I can't keep this up..." you pant, wincing at the pain of <<=$npcs.get($sex.npcId,'firstname')>>'s large cock stretching your pussy past its limits. "You're too big for me... I just... I can't keep going..."</p>
+					<p>"I can't keep this up..." you pant, wincing at the pain of <<npc $sex.npcId>><</npc>>'s large cock stretching your pussy past its limits. "You're too big for me... I just... I can't keep going..."</p>
 				<</if>>
 				<<if $npcs.get($sex.npcId,'selfish') == 1 or $npcs.get($sex.npcId,'abusive') == 1>>
-					<p>"Come on, don't be like that," <<=$npcs.get($sex.npcId,'firstname')>> moans. "You just need to get used to it. Don't pussy out now."</p>
+					<p>"Come on, don't be like that," <<npc $sex.npcId>><</npc>> moans. "You just need to get used to it. Don't pussy out now."</p>
 					<<actCLA 'I can`t'>>
 						<<run $npcs.set($sex.npcId,'dick_too_big',1)>>
 						"I just can't," you shake your head, legs tightening over your sore lady bits. "My pussy hurts so much, I can't handle your cock inside me again."
-						<p>"Ugh," <<=$npcs.get($sex.npcId,'firstname')>> says rolling his eyes. "Way to be a little bitch about it. Never going to learn to enjoy my big cock unless you practice."</p>
+						<p>"Ugh," <<npc $sex.npcId>><</npc>> says rolling his eyes. "Way to be a little bitch about it. Never going to learn to enjoy my big cock unless you practice."</p>
 						<<gs 'sex_ev_after' 'after_sex1'>>
 					<</actCLA>>
 					<<actCLA 'Force yourself to keep going'>>
@@ -303,7 +303,7 @@
 						<<if getvar("$sex_ev['cock_inserted']") == 0>>
 							"I can't believe I'm letting you talk me into this..." you grimace, rubbing your thighs together over your sore pussy. "Okay, keep going..."
 						<<else>>
-							<p>"I can't believe I'm letting you talk me into this..."  you grimace, wincing again as you adjust your hips around <<=$npcs.get($sex.npcId,'firstname')>>'s cock. "Okay, keep going..."</p>
+							<p>"I can't believe I'm letting you talk me into this..."  you grimace, wincing again as you adjust your hips around <<npc $sex.npcId>><</npc>>'s cock. "Okay, keep going..."</p>
 						<</if>>
 						<<if getvar("$sex_ev['boy_cum']") >= 1>>
 							<<gs 'sex_ev_sex' 'reset'>>
@@ -324,7 +324,7 @@
 				<<else>>
 					<<if $npcs.get($sex.npcId,'caretaker') == 1>>
 						<<run $npcs.set($sex.npcId,'dick_too_big',1)>>
-						<p>"Sorry," <<=$npcs.get($sex.npcId,'firstname')>> says, looking truly apologetic. "I know it's not easy for girls to handle. We can try again another time."</p>
+						<p>"Sorry," <<npc $sex.npcId>><</npc>> says, looking truly apologetic. "I know it's not easy for girls to handle. We can try again another time."</p>
 						<<actCLA 'Thanks'>>
 							"Thanks," you say, smiling gratefully at him. "Yeah... maybe another time..."
 							<<gs 'sex_ev_after' 'after_sex1'>>
@@ -336,7 +336,7 @@
 						<</actCLA>>
 					<<else>>
 						<<run $npcs.set($sex.npcId,'dick_too_big',1)>>
-						<p>"Damn, my dick's too big for you?" <<=$npcs.get($sex.npcId,'firstname')>> asks, smiling smugly when you return an exhausted nod. "Just one of those big dick problems I guess. Okay we'll try again later."</p>
+						<p>"Damn, my dick's too big for you?" <<npc $sex.npcId>><</npc>> asks, smiling smugly when you return an exhausted nod. "Just one of those big dick problems I guess. Okay we'll try again later."</p>
 						He laughs aloud, not seeming to care much that your pussy is sore beyond belief.
 						<<actCLA 'Finish sex'>>
 							<<gs 'sex_ev_after' 'after_sex1'>>
@@ -344,7 +344,7 @@
 					<</if>>
 					<<actCLA 'Blow him for a little bit'>>
 						<p>"I just need a little break," you smile gratefully. "Maybe I can blow you for a little bit and then come back to it?"</p>
-						<p>"That sounds great," <<=$npcs.get($sex.npcId,'firstname')>> smiles back.</p>
+						<p>"That sounds great," <<npc $sex.npcId>><</npc>> smiles back.</p>
 						<<actCLA 'Blow him'>>
 							<<gt 'sex_ev_foreplay' 'bj_sub1'>>
 						<</actCLA>>
@@ -352,7 +352,7 @@
 					<<actCLA 'We can do other stuff'>>
 						<<setinit $sex_ev['no_sex'] = 1>>
 						"We don't have to stop," you smile. "My pussy can't take your cock anymore, but we can still do other stuff."
-						<p>"Like what?" <<=$npcs.get($sex.npcId,'firstname')>> smiles back.</p>
+						<p>"Like what?" <<npc $sex.npcId>><</npc>> smiles back.</p>
 						<<if getvar("$sex_ev['boy_cum']") >= 1>>
 							<<gs 'sex_ev_sex' 'reset'>>
 
@@ -369,20 +369,20 @@
 	$sex_ev['bed_room']
 	<<if getvar("$sex_ev['fucked_out']") > 1>>
 		$sex_ev['bed_room']
-		<p>"I really can't... keep going... <<=$npcs.get($sex.npcId,'firstname')>> huffs exhaustedly.</p>
+		<p>"I really can't... keep going... <<npc $sex.npcId>><</npc>> huffs exhaustedly.</p>
 	<<else>>
 		<<if getvar("$sex_ev['fuck_again']") == 1>>
-			<p>"Wanna keep going?" you eagerly ask <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+			<p>"Wanna keep going?" you eagerly ask <<npc $sex.npcId>><</npc>>.</p>
 		<<elseif getvar("$sex_ev['cock_inserted']") == 1>>
-			<p>"Wanna keep going?" you eagerly ask, flexing your pussy around <<=$npcs.get($sex.npcId,'firstname')>>'s cock.</p>
+			<p>"Wanna keep going?" you eagerly ask, flexing your pussy around <<npc $sex.npcId>><</npc>>'s cock.</p>
 		<<else>>
-			<p>"Wanna keep going?" you eagerly ask <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+			<p>"Wanna keep going?" you eagerly ask <<npc $sex.npcId>><</npc>>.</p>
 		<</if>>
 		"I don't think I can..." he groans.
 		<<if getvar("$sex_ev['cock_inserted']") == 0>>
-			<p>You look down and see <<=$npcs.get($sex.npcId,'firstname')>>'s cock already going limp, rapidly deflating right before your eyes.</p>
+			<p>You look down and see <<npc $sex.npcId>><</npc>>'s cock already going limp, rapidly deflating right before your eyes.</p>
 		<<else>>
-			<p>You realize with a start that <<=$npcs.get($sex.npcId,'firstname')>> is getting <i>softer</i>, not harder, inside you.</p>
+			<p>You realize with a start that <<npc $sex.npcId>><</npc>> is getting <i>softer</i>, not harder, inside you.</p>
 		<</if>>
 		"I think I might be all fucked out for the day..."
 	<</if>>
@@ -452,7 +452,7 @@
 			"I guess that's a sign we should stop..."
 		<</if>>
 		<<if $sex_ev['cum_count'] < npc_sexdrive[$sex.npcId] - rand(1,3) and $sex_ev['condoms_used'] < $sex_ev['condom_count']>>
-			<p>"I have a few," <<=$npcs.get($sex.npcId,'firstname')>> says, reaching for another one."</p>
+			<p>"I have a few," <<npc $sex.npcId>><</npc>> says, reaching for another one."</p>
 			<<gs 'sex_ev_condoms' 'npc_condom_use_stats'>>
 			<<gs 'sex_ev_sex' 'reset'>>
 			<<actCLA 'Let him lead'>>
@@ -462,13 +462,13 @@
 				 <<gs 'sex_ev_sex' 'position_choose'>>
 			<</actCLA>>
 		<<elseif $sex_ev['cum_count'] >= $npcs.get($sex.npcId,'sexdrive')>>
-			<p>"I think I'm all fucked out anyways," <<=$npcs.get($sex.npcId,'firstname')>> sighs limply.</p>
+			<p>"I think I'm all fucked out anyways," <<npc $sex.npcId>><</npc>> sighs limply.</p>
 			<<gs 'sex_ev_after' 'after_sex1'>>
 		<<elseif getvar("$sex_ev['fuck_count']") == 0 and $sex_ev['cum_count'] < npc_sexdrive[$sex.npcId] - rand(1,3)>>
-			<p>"Well this was fucking bullshit," <<=$npcs.get($sex.npcId,'firstname')>> grumbles.</p>
+			<p>"Well this was fucking bullshit," <<npc $sex.npcId>><</npc>> grumbles.</p>
 			<<gs 'sex_ev_after' 'after_sex1'>>
 		<<else>>
-			<p>"Yeah, I think so too," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+			<p>"Yeah, I think so too," <<npc $sex.npcId>><</npc>> says.</p>
 			<<gs 'sex_ev_after' 'after_sex1'>>
 		<</if>>
 	<</actCLA>>
@@ -487,13 +487,13 @@
 				<<image "shared/sex/cum/facial/facial36.jpg">>
 				<<if getvar("$sex_ev['wipes']") == 2>>
 					<p>"Hey, got anything I can use to clean up?" you trying not to smile under the spunk covering your face.</p>
-					<p>"Oh yeah, right here." <<=$npcs.get($sex.npcId,'firstname')>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.</p>
+					<p>"Oh yeah, right here." <<npc $sex.npcId>><</npc>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.</p>
 				<<else>>
 					You reach up and poke at the sperm coating your face. Ew. You really need to clean that up before you do anything else. Reaching down to your purse, you pull some wipes out of your purse.
 				<</if>>
 				<<if $pc.cumAtLocation(16) > 0>>
 					<!-- !! hair-->
-					<p>You carefully wipe the cum from your face, making sure to get every last drop, including getting the tangled web that <<=$npcs.get($sex.npcId,'firstname')>> managed to get in your hair. About a minute later, you can still feel a faintly sticky layer over the top of your skin, but at least nobody is going to give you funny looks walking down the street.</p>
+					<p>You carefully wipe the cum from your face, making sure to get every last drop, including getting the tangled web that <<npc $sex.npcId>><</npc>> managed to get in your hair. About a minute later, you can still feel a faintly sticky layer over the top of your skin, but at least nobody is going to give you funny looks walking down the street.</p>
 				<<else>>
 					You carefully wipe the cum from your face, making sure to get every last drop. About a minute later, you can still feel a faintly sticky layer over the top of your skin, but at least nobody is going to give you funny looks walking down the street.
 				<</if>>
@@ -502,7 +502,7 @@
 				<<image "shared/sex/cum/stomach/bellycum3.jpg">>
 				<<if getvar("$sex_ev['wipes']") == 2>>
 					<p>"Hey, got anything I can use to clean up?" you ask, looking at your belly, cum still spattered over it.</p>
-					<p>"Oh yeah, right here." <<=$npcs.get($sex.npcId,'firstname')>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.</p>
+					<p>"Oh yeah, right here." <<npc $sex.npcId>><</npc>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.</p>
 				<<else>>
 					You really need to clean yourself after up after that. Reaching down to your purse, you pull some wipes out of your purse.
 				<</if>>
@@ -511,7 +511,7 @@
 				<<image "shared/sex/cum/back1.jpg">>
 				<<if getvar("$sex_ev['wipes']") == 2>>
 					<p>"Hey, got anything I can use to clean up?" you ask, looking over your shoulder and wiggling your ass to emphasize the cum resting on it.</p>
-					<p>"Oh yeah, right here." <<=$npcs.get($sex.npcId,'firstname')>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work awkwardly trying to wipe your ass and up your back.</p>
+					<p>"Oh yeah, right here." <<npc $sex.npcId>><</npc>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work awkwardly trying to wipe your ass and up your back.</p>
 				<<else>>
 					You really need to clean yourself after up after that. Reaching down to your purse, you pull some wipes out of your purse, awkwardly wiping your ass and back with it.
 				<</if>>
@@ -524,7 +524,7 @@
 						<p><i>Why did I get out my wipes?</i> you think to yourself. You frown at the packet, befuddled as to what you wanted to do with the,.</p>
 						<i>Meh. If it's important, it will come back to me later,</i> you think to yourself as you put it back into your purse, oblivious to the liquid dribbling down the inside of your thigh.
 					<<elseif getvar("$sex_ev['wipes']") == 2>>
-						<p>"Hey, do you-" you start and then suddenly lose track of what you were trying to say. You frown to yourself as <<=$npcs.get($sex.npcId,'firstname')>> looks at you quizically.</p>
+						<p>"Hey, do you-" you start and then suddenly lose track of what you were trying to say. You frown to yourself as <<npc $sex.npcId>><</npc>> looks at you quizically.</p>
 						<p>"Did you need something?"</p>
 						"I uhh..." Your frown deepens. "I wanted to ask you something... but I forgot what it was... I guess it doesn''t really matter..."
 						<i>Meh. If it's important, it will come back to me later,</i> you think to yourself, oblivious to the liquid dribbling down the inside of your thigh.
@@ -533,7 +533,7 @@
 					<<if getvar("$sex_ev['wipes']") == 2>>
 						<<video "shared/sex/cum/vagcreampie/after1.mp4">>
 						<p>"Hey, got anything I can use to clean up?" you say, holding your fingers over your pussy, trying to keep the cum from spilling out any further.</p>
-						<p>"Oh yeah, right here." <<=$npcs.get($sex.npcId,'firstname')>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.</p>
+						<p>"Oh yeah, right here." <<npc $sex.npcId>><</npc>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.</p>
 					<<else>>
 						<<image "shared/sex/cum/cum111.jpg">>
 						You really need to clean yourself after up after that. Reaching down to your purse, you pull some wipes out of your purse before reaching between your legs to wipe yourself up.
@@ -635,7 +635,7 @@
 					<p><i>Why did I get out these wipes?</i> you think to yourself. You frown at the packet, befuddled as to what you wanted to do with the,.</p>
 					<i>Meh. If it's important, it will come back to me later,</i> you think to yourself as you put it back into your purse, completely ignoring the liquid dribbling down your thigh.
 				<<elseif getvar("$sex_ev['wipes']") == 2>>
-					<p>"Hey, do you-" you start and then suddenly lose track of what you were trying to say. You frown to yourself as <<=$npcs.get($sex.npcId,'firstname')>> looks at you quizzically.</p>
+					<p>"Hey, do you-" you start and then suddenly lose track of what you were trying to say. You frown to yourself as <<npc $sex.npcId>><</npc>> looks at you quizzically.</p>
 					<p>"Did you need something?"</p>
 					"I uhh..." Your frown deepens. "I wanted to ask you something... but I forgot what it was... I guess it doesn''t really matter..."
 					<i>Meh. If it's important, it will come back to me later,</i> you think to yourself, completely ignoring the liquid dribbling down your thigh.
@@ -660,16 +660,16 @@
 		<!-- !!		sex_ev['force_harden'] = 3-->
 		<!-- !!		gs'sex_ev_after', 'after_sex1'-->
 	<<elseif $sex_ev['cum_count'] < $npcs.get($sex.npcId,'sexdrive') + $sex_ev['extra_cum'] / 2>>
-		<p>"I could go a few more times, but I guess this is good enough for now," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+		<p>"I could go a few more times, but I guess this is good enough for now," <<npc $sex.npcId>><</npc>> says.</p>
 		<<gs 'sex_ev_after' 'after_sex1'>>
 	<<elseif $sex_ev['cum_count'] >= $npcs.get($sex.npcId,'sexdrive') + $sex_ev['extra_cum']>>
 		<<setinit $sex_ev['sex_over'] = 1>>
-		<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> pants. "I'm totally tapped out."</p>
+		<p>"Yeah," <<npc $sex.npcId>><</npc>> pants. "I'm totally tapped out."</p>
 		<<gs 'sex_ev_after' 'after_sex1'>>
 	<<elseif getvar("$sex_ev['cum_count']") == 0>>
 		<<setinit $sex_ev['sex_over'] = 1>>
 		"Sorry," you say only a little apologetically. "I really can't keep going. I'm finished here."
-		<p>"This is bullshit..." <<=$npcs.get($sex.npcId,'firstname')>> grumbles.</p>
+		<p>"This is bullshit..." <<npc $sex.npcId>><</npc>> grumbles.</p>
 		<<gs 'sex_ev_after' 'after_sex1'>>
 	<<else>>
 		<<setinit $sex_ev['sex_over'] = 1>>
@@ -679,11 +679,11 @@
 <</if>>
 <<if $location_var[$here][0] == 'no_cum_end'>>
 	<<if getvar("$sex_ev['fuck_count']") == 0>>
-		<p>"Really?" <<=$npcs.get($sex.npcId,'firstname')>> asks, sitting up. "But we didn't fuck. You didn't even get to come."</p>
+		<p>"Really?" <<npc $sex.npcId>><</npc>> asks, sitting up. "But we didn't fuck. You didn't even get to come."</p>
 		<<if getvar("$know_virgin["+$sex.npcId+"]") == 1 and $pc.thinksIsVirgin and getvar("$sex_ev['fuck_count']") == 0 and $npcs.get($sex.npcId,'rel_type') == 'husband'>>
 			<<actCLA 'You know I`m saving my virginity'>>
 				$sex_ev['bed_room']
-				<p>"Come on <<=$npcs.get($sex.npcId,'firstname')>>," you sigh. "You know I'm saving myself for marriage."</p>
+				<p>"Come on <<npc $sex.npcId>><</npc>>," you sigh. "You know I'm saving myself for marriage."</p>
 				<<if $npcs.get($sex.npcId,'rel_type') == 'fuckbuddy'>>
 					"And you still have a fuckbuddy."
 					"Shut up," you roll your eyes.
@@ -727,7 +727,7 @@
 			<<gs 'sex_ev_after' 'after_sex1'>>
 		<</actCLA>>
 	<<else>>
-		<p>"Really?" <<=$npcs.get($sex.npcId,'firstname')>> asks, sitting up. "But you didn't get to come."</p>
+		<p>"Really?" <<npc $sex.npcId>><</npc>> asks, sitting up. "But you didn't get to come."</p>
 		<<actCLA 'It`s okay'>>
 			"That's sweet of you," you say, smiling. "But don't worry about that. I'm okay without it today."
 			<p>"You're sure?" he asks.</p>
@@ -752,7 +752,7 @@
 	<<actCLA 'End here (bad end)'>>
 		<<image "shared/sex/after/annoyed1.jpg">>
 		"Let''s call it here," you say, letting your negative feelings get to you.
-		<p>"What, done already?" <<=$npcs.get($sex.npcId,'firstname')>> says, sitting up.</p>
+		<p>"What, done already?" <<npc $sex.npcId>><</npc>> says, sitting up.</p>
 		<<actCLA 'Don`t feel like it anymore'>>
 			"I don't feel like doing anything else," you say, feeling deflated and dejected, sinking further into the bed. "I'm just... not in the mood anymore."
 			<<gs 'sex_ev_after' 'after_sex1'>>
@@ -773,44 +773,44 @@
 	<<if getvar("$sex_ev['cum_together']") > 0>>
 		<<if $sex_ev['position'] == 'miss'>>
 			<<image "shared/sex/vag/miss/2.jpg">>
-			<p>Your simultaneous orgasm was too much to handle and your vision begins to blur. At the back of your mind, you realize that your body is succumbing to exhaustion. The last thing you're aware of is <<=$npcs.get($sex.npcId,'firstname')>>'s cock stuffed inside you, his cum filling your pussy to the brim, and then...</p>
+			<p>Your simultaneous orgasm was too much to handle and your vision begins to blur. At the back of your mind, you realize that your body is succumbing to exhaustion. The last thing you're aware of is <<npc $sex.npcId>><</npc>>'s cock stuffed inside you, his cum filling your pussy to the brim, and then...</p>
 		<<elseif $sex_ev['position'] == 'doggy'>>
 			<<image "shared/sex/cum/vagcreampie/doggy1.jpg">>
-			<p>Your simultaneous orgasm was too much to handle and your knees give out underneath you, collapsing onto the bed in exhaustion as your vision begins to blur and fade. The last thing you're aware of is <<=$npcs.get($sex.npcId,'firstname')>>'s cock slipping from your pussy, the tickling sensation of his cum leaking from your snatch, and then...</p>
+			<p>Your simultaneous orgasm was too much to handle and your knees give out underneath you, collapsing onto the bed in exhaustion as your vision begins to blur and fade. The last thing you're aware of is <<npc $sex.npcId>><</npc>>'s cock slipping from your pussy, the tickling sensation of his cum leaking from your snatch, and then...</p>
 		<<elseif $sex_ev['position'] == 'cowgirl'>>
 			<<image "shared/sex/vag/cowgirl/1.jpg">>
-			<p>Your simultaneous orgasm was too much to handle and you collapse, no strength left to stay upright and your vision begins to blur. At the back of your mind, you realize that your body is succumbing to exhaustion. The last thing you're aware of is your breasts pressed up against <<=$npcs.get($sex.npcId,'firstname')>>'s chest, his cock stuffed inside you and cum filling your pussy to the brim, and then...</p>
+			<p>Your simultaneous orgasm was too much to handle and you collapse, no strength left to stay upright and your vision begins to blur. At the back of your mind, you realize that your body is succumbing to exhaustion. The last thing you're aware of is your breasts pressed up against <<npc $sex.npcId>><</npc>>'s chest, his cock stuffed inside you and cum filling your pussy to the brim, and then...</p>
 		<</if>>
 	<<elseif $sex_ev['last_cum'] == 'creampie'>>
 		<<if $sex_ev['position'] == 'miss'>>
 			<<image "shared/sex/vag/miss/2.jpg">>
-			<p>Exhaustion hits you in a sudden wave and your vision begins to blur. The last thing you're aware of is <<=$npcs.get($sex.npcId,'firstname')>> inside you, his cock and cum filling your pussy to the brim, and then...</p>
+			<p>Exhaustion hits you in a sudden wave and your vision begins to blur. The last thing you're aware of is <<npc $sex.npcId>><</npc>> inside you, his cock and cum filling your pussy to the brim, and then...</p>
 		<<elseif $sex_ev['position'] == 'doggy'>>
 			<<image "shared/sex/cum/vagcreampie/doggy1.jpg">>
-			<p>Exhaustion hits you in a sudden wave and your knees give out underneath you, collapsing onto the bed in exhaustion as your vision begins to blur and fade. The last thing you're aware of is <<=$npcs.get($sex.npcId,'firstname')>>'s cock slipping from your pussy, the tickling sensation of his cum leaking from your snatch, and then...</p>
+			<p>Exhaustion hits you in a sudden wave and your knees give out underneath you, collapsing onto the bed in exhaustion as your vision begins to blur and fade. The last thing you're aware of is <<npc $sex.npcId>><</npc>>'s cock slipping from your pussy, the tickling sensation of his cum leaking from your snatch, and then...</p>
 		<<elseif $sex_ev['position'] == 'cowgirl'>>
 			<<image "shared/sex/vag/cowgirl/1.jpg">>
-			<p>Exhaustion hits you in a sudden wave and you collapse, no strength left to stay upright and your vision begins to blur. The last thing you're aware of is your breasts pressed up against <<=$npcs.get($sex.npcId,'firstname')>>'s chest, his cock and cum filling your pussy to the brim, and then...</p>
+			<p>Exhaustion hits you in a sudden wave and you collapse, no strength left to stay upright and your vision begins to blur. The last thing you're aware of is your breasts pressed up against <<npc $sex.npcId>><</npc>>'s chest, his cock and cum filling your pussy to the brim, and then...</p>
 		<</if>>
 	<<elseif $sex_ev['last_cum'] == 'facial'>>
 		<<image "shared/sex/cum/facial/facial35.jpg">>
-		<p>You collapse to the bed, <<=$npcs.get($sex.npcId,'firstname')>>'s cum still hot on your face. Your vision blurs and you struggle to keep your eyes open. The last thing you remember is a trickle of liquid running down your cheek, and then...</p>
+		<p>You collapse to the bed, <<npc $sex.npcId>><</npc>>'s cum still hot on your face. Your vision blurs and you struggle to keep your eyes open. The last thing you remember is a trickle of liquid running down your cheek, and then...</p>
 	<<elseif $sex_ev['last_cum'] == 'swallow'>>
 		<<image "shared/sex/after/sleep4.jpg">>
-		<p>You collapse to the bed as soon as you gulp, no strength left for you to stay upright. Your vision blurs and you struggle to keep your eyes open. The last thing you remember is the salty taste of <<=$npcs.get($sex.npcId,'firstname')>>'s cum on your lips, and then...</p>
+		<p>You collapse to the bed as soon as you gulp, no strength left for you to stay upright. Your vision blurs and you struggle to keep your eyes open. The last thing you remember is the salty taste of <<npc $sex.npcId>><</npc>>'s cum on your lips, and then...</p>
 	<<elseif $sex_ev['last_cum'] == 'spit'>>
 		<<image "locations/pavlovsk/resident/rekshome/party/party_girls_party_gost_22.jpg">>
-		<p>You collapse to the bed, <<=$npcs.get($sex.npcId,'firstname')>>'s cum still dribbling down your chin. Your vision blurs and you struggle to keep your eyes open. The last thing you remember is a trickle of liquid running down your cheek, and then...</p>
+		<p>You collapse to the bed, <<npc $sex.npcId>><</npc>>'s cum still dribbling down your chin. Your vision blurs and you struggle to keep your eyes open. The last thing you remember is a trickle of liquid running down your cheek, and then...</p>
 	<<elseif $sex_ev['last_cum'] == 'face_mouth'>>
 		<<image "shared/sex/cum/facial/sleep4.jpg">>
-		<p>You collapse to the bed, <<=$npcs.get($sex.npcId,'firstname')>>'s cum hot on your face, still running down your chin. Your vision blurs and you struggle to keep your eyes open. The last thing you remember is a trickle of liquid dribbling from your lips, and then...</p>
+		<p>You collapse to the bed, <<npc $sex.npcId>><</npc>>'s cum hot on your face, still running down your chin. Your vision blurs and you struggle to keep your eyes open. The last thing you remember is a trickle of liquid dribbling from your lips, and then...</p>
 	<<elseif $sex_ev['last_cum'] == 'tits'>>
 		<<if $pc.pubesLength < 3>>
 			<<image "shared/sex/after/sleep1.jpg">>
 		<<else>>
 			<<image "shared/sex/after/sleep2.jpg">>
 		<</if>>
-		<p>You collapse to the bed, <<=$npcs.get($sex.npcId,'firstname')>>'s cum hot on your chest. Your vision blurs and you struggle to keep your eyes open, to keep conscious. The last thing you remember is a trickle of liquid running down between your breasts, and then...</p>
+		<p>You collapse to the bed, <<npc $sex.npcId>><</npc>>'s cum hot on your chest. Your vision blurs and you struggle to keep your eyes open, to keep conscious. The last thing you remember is a trickle of liquid running down between your breasts, and then...</p>
 	<<elseif $sex_ev['last_cum'] == 'pullout'>>
 		<<if $sex_ev['position'] == 'miss'>>
 			<<image "shared/sex/cum/stomach/sleep1.jpg">>
@@ -843,7 +843,7 @@
 	<p>"Hey! Wake up!"</p>
 	You sit up in a rush, confused.
 	"Wha... Whe..."
-	<p>"You passed out suddenly," <<=$npcs.get($sex.npcId,'firstname')>> says, looking annoyed. "You need to get dressed and get out. My girlfriend is going to be here any minute."</p>
+	<p>"You passed out suddenly," <<npc $sex.npcId>><</npc>> says, looking annoyed. "You need to get dressed and get out. My girlfriend is going to be here any minute."</p>
 	<<setinit $pc_know_npc_has_girlfriend[$sex.npcId] = 1>>
 	<<gs 'sex_ev_after' 'black_out_wake_options'>>
 <</if>>
@@ -854,7 +854,7 @@
 	<<actCLA 'Shower?'>>
 		$sex_ev['bed_room']
 		<p>"Ugh..." you moan, holding your hand to your head. "Can I borrow your shower first? I'm kind of-"</p>
-		<p>"No, no time," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head. "If you wanted that, then you shouldn't have fallen asleep on me."</p>
+		<p>"No, no time," <<npc $sex.npcId>><</npc>> says, shaking his head. "If you wanted that, then you shouldn't have fallen asleep on me."</p>
 		<<actCLA 'Get out of bed'>>
 			<<gt 'sex_ev_after' 'black_out_wake2'>>
 		<</actCLA>>
@@ -868,11 +868,11 @@
 			<<actCLA 'Get dressed'>>
 				<<video "pc/activities/misc/dress_1.mp4">>
 				<<if getvar("$cumloc") > 0>>
-					<p>Sleepily, you pull your clothing on, frowning as you feel cum smear across the inside. <<=$npcs.get($sex.npcId,'firstname')>> stands beside you impatiently, constantly checking the time and the door.</p>
+					<p>Sleepily, you pull your clothing on, frowning as you feel cum smear across the inside. <<npc $sex.npcId>><</npc>> stands beside you impatiently, constantly checking the time and the door.</p>
 				<<else>>
-					<p>Sleepily, you pull your clothing on slowly. <<=$npcs.get($sex.npcId,'firstname')>> stands beside you impatiently, constantly checking the time and the door.</p>
+					<p>Sleepily, you pull your clothing on slowly. <<npc $sex.npcId>><</npc>> stands beside you impatiently, constantly checking the time and the door.</p>
 				<</if>>
-				<p>Once you've picked up the last of your things, <<=$npcs.get($sex.npcId,'firstname')>> hurries you to the door, practically pushing you out.</p>
+				<p>Once you've picked up the last of your things, <<npc $sex.npcId>><</npc>> hurries you to the door, practically pushing you out.</p>
 				<<actCLA 'Continue'>>
 					<<gt 'sex_ev_after' 'black_out_end'>>
 				<</actCLA>>
@@ -895,11 +895,11 @@
 	<<actCLA 'Get dressed'>>
 		<<video "pc/activities/misc/dress_1.mp4">>
 		<<if getvar("$cumloc") > 0>>
-			<p>Groggily, you pull your clothing on, frowning as you feel cum smear across the inside. <<=$npcs.get($sex.npcId,'firstname')>> is throwing your things at you, constantly checking the time and the door.</p>
+			<p>Groggily, you pull your clothing on, frowning as you feel cum smear across the inside. <<npc $sex.npcId>><</npc>> is throwing your things at you, constantly checking the time and the door.</p>
 		<<else>>
-			<p>Groggily, you pull your clothing on slowly. <<=$npcs.get($sex.npcId,'firstname')>> is throwing your things at you, constantly checking the time and the door.</p>
+			<p>Groggily, you pull your clothing on slowly. <<npc $sex.npcId>><</npc>> is throwing your things at you, constantly checking the time and the door.</p>
 		<</if>>
-		<p>Once you've picked up the last of your things, <<=$npcs.get($sex.npcId,'firstname')>> hurries you to the door, practically pushing you out.</p>
+		<p>Once you've picked up the last of your things, <<npc $sex.npcId>><</npc>> hurries you to the door, practically pushing you out.</p>
 		<<actCLA 'Continue'>>
 			<<gt 'sex_ev_after' 'black_out_end'>>
 		<</actCLA>>
@@ -908,9 +908,9 @@
 <<if $location_var[$here][0] == 'black_out_end'>>
 	$sex_ev['hall_way']
 	<<if $npcs.get($sex.npcId,'rel_type') == 'fuckbuddy'>>
-		<p>"I'll text you next time I want to hook up," <<=$npcs.get($sex.npcId,'firstname')>> says, and slams the door behind you.</p>
+		<p>"I'll text you next time I want to hook up," <<npc $sex.npcId>><</npc>> says, and slams the door behind you.</p>
 	<<else>>
-		<p>The moment you clear the threshold, <<=$npcs.get($sex.npcId,'firstname')>> slams it behind you, leaving you alone in the dark.</p>
+		<p>The moment you clear the threshold, <<npc $sex.npcId>><</npc>> slams it behind you, leaving you alone in the dark.</p>
 	<</if>>
 	<<actCLA 'Leave'>>
 		<<gt 'sex_ev_leave' 'exit'>>
@@ -941,11 +941,11 @@
 					<p>"Got anything for this?" you ask, smiling wryly as you point to the sticky strands of cum covering your body.</p>
 				<</if>>
 				<<if getvar("$sex_ev['sex_over']") > 0>>
-					<p>"Yeah, got some wipes right here." <<=$npcs.get($sex.npcId,'firstname')>> reaches for his nightstand, pulling a bag of wipes out of the drawer. He pulls one out and starts wiping himself down, tossing you the bag.</p>
+					<p>"Yeah, got some wipes right here." <<npc $sex.npcId>><</npc>> reaches for his nightstand, pulling a bag of wipes out of the drawer. He pulls one out and starts wiping himself down, tossing you the bag.</p>
 				<<else>>
-					<p>"Yeah, got some wipes right here." <<=$npcs.get($sex.npcId,'firstname')>> reaches for his nightstand, pulling a bag of wipes out of the drawer and tossing it over.</p>
+					<p>"Yeah, got some wipes right here." <<npc $sex.npcId>><</npc>> reaches for his nightstand, pulling a bag of wipes out of the drawer and tossing it over.</p>
 				<</if>>
-				<p>You pull out a handful and clean yourself off as well. Following <<=$npcs.get($sex.npcId,'firstname')>>'s lead, you finish by tossing the used wipe into a small trashcan in the corner of the room.</p>
+				<p>You pull out a handful and clean yourself off as well. Following <<npc $sex.npcId>><</npc>>'s lead, you finish by tossing the used wipe into a small trashcan in the corner of the room.</p>
 				<<if getvar("$sex_ev['sex_over']") == 1>>
 					<<gs 'sex_ev_after' 'after_sex1'>>
 				<<else>>
@@ -960,7 +960,7 @@
 						<<setinit $sex_ev['cock_inserted'] = 0>>
 						$sex_ev['bed_room']
 						Leaning down off the bed, you dig around with a clean hand, grab a bag of wipes, and start cleaning yourself off.
-						<p>Feeling nice, you also take a moment to clean <<=$npcs.get($sex.npcId,'firstname')>>'s cock for him at the same time. Once you're both all wiped down off, you toss it into the wastebasket by his bed.</p>
+						<p>Feeling nice, you also take a moment to clean <<npc $sex.npcId>><</npc>>'s cock for him at the same time. Once you're both all wiped down off, you toss it into the wastebasket by his bed.</p>
 						<<if getvar("$sex_ev['sex_over']") == 1>>
 							<<gs 'sex_ev_after' 'after_sex1'>>
 						<<else>>
@@ -975,7 +975,7 @@
 					<<gs 'cum_cleanup' 'cleanloc'>>
 					<<run $pc.sexStatInc('swallow','aware',1)>>
 					<<image "shared/sex/cum/lick_fingers.jpg">>
-					<p>Briefly making eye contact with <<=$npcs.get($sex.npcId,'firstname')>>, you use your fingers to gather up all the loose cum on you and stick out your tongue, running it up your hand, licking every drop from it and into your mouth. You give your hand a thorough tongue bath, sucking your fingers clean at the end. Once finished, you smack your lips, smiling at <<=$npcs.get($sex.npcId,'firstname')>> who stared at you the whole time.</p>
+					<p>Briefly making eye contact with <<npc $sex.npcId>><</npc>>, you use your fingers to gather up all the loose cum on you and stick out your tongue, running it up your hand, licking every drop from it and into your mouth. You give your hand a thorough tongue bath, sucking your fingers clean at the end. Once finished, you smack your lips, smiling at <<npc $sex.npcId>><</npc>> who stared at you the whole time.</p>
 					<<if getvar("$sex_ev['he_cleaned']") == 0>>
 						<p>"Any chance I could get one of those?" he gestures towards his cock.</p>
 						<<actCLA 'You`re on your own'>>
@@ -1022,9 +1022,9 @@
 			<!-- !!			'<<image `'shared/sex/cum/facial/facial24.jpg'`>>'-->
 			<<video "shared/sex/blowjob/play1.mp4">>
 			<<if getvar("$sex_ev['fuck_count']") > 0 and getvar("$sex_ev['no_condom']") == 1>>
-				<p>You lean forward, wrapping your lips around <<=$npcs.get($sex.npcId,'firstname')>> and run them up and down to clean him off. You can faintly taste the salty sweetness of yourself on his cock, as well as the remnants of cum that was still inside it, drawn out your mouth. Looking up at <<=$npcs.get($sex.npcId,'firstname')>>, you are greeted with the sight of him staring down at you.</p>
+				<p>You lean forward, wrapping your lips around <<npc $sex.npcId>><</npc>> and run them up and down to clean him off. You can faintly taste the salty sweetness of yourself on his cock, as well as the remnants of cum that was still inside it, drawn out your mouth. Looking up at <<npc $sex.npcId>><</npc>>, you are greeted with the sight of him staring down at you.</p>
 			<<else>>
-				<p>Opening your mouth, you lean forward, wrapping your lips around <<=$npcs.get($sex.npcId,'firstname')>>'s cock and running them up and down to clean him off. You can taste the remnants of cum that was still inside it, drawn out by your mouth. Looking up at <<=$npcs.get($sex.npcId,'firstname')>>, you are greeted with the sight of him staring down at you.</p>
+				<p>Opening your mouth, you lean forward, wrapping your lips around <<npc $sex.npcId>><</npc>>'s cock and running them up and down to clean him off. You can taste the remnants of cum that was still inside it, drawn out by your mouth. Looking up at <<npc $sex.npcId>><</npc>>, you are greeted with the sight of him staring down at you.</p>
 			<</if>>
 			<<gs 'sex_ev_sex' 'sex_end'>>
 		<</actCLA>>
@@ -1053,7 +1053,7 @@
 		<<actCLA 'Finish'>>
 			<<if $pc.cumAtLocation(0) > 0>>
 				<<image "shared/sex/cum/vagcreampie/miss1.jpg">>
-				<p>You lay back, settling down on the other side of the bed. Your body relaxes and you feel <<=$npcs.get($sex.npcId,'firstname')>>'s cum seep from your pussy, trickling down the crack of your ass into the bedsheets.</p>
+				<p>You lay back, settling down on the other side of the bed. Your body relaxes and you feel <<npc $sex.npcId>><</npc>>'s cum seep from your pussy, trickling down the crack of your ass into the bedsheets.</p>
 			<<else>>
 				$sex_ev['bed_room']
 			<</if>>
@@ -1061,7 +1061,7 @@
 				<<gs 'sex_ev_pillow_talk' 'high_five1'>>
 			<<else>>
 				<<if $npcs.get($sex.npcId,'smoker') > 0>>
-					<p>The two of you pull apart and <<=$npcs.get($sex.npcId,'firstname')>> reaches over to his nightstand and pulls out a pack of cigarettes.</p>
+					<p>The two of you pull apart and <<npc $sex.npcId>><</npc>> reaches over to his nightstand and pulls out a pack of cigarettes.</p>
 				<<else>>
 					The two of you quietly bask in the afterglow of your fuck together.
 				<</if>>
@@ -1076,29 +1076,29 @@
 		<<if $sex_ev['position'] == 'miss'>>
 			<<video "shared/sex/after/miss_after1.mp4">>
 			$sex_ev['end_comment']
-			<p><<=$npcs.get($sex.npcId,'firstname')>> climbs off of you, removing his cock from your pussy in the process, and flops down on the other side of the bed. His cum seeps from your pussy, trickling down the crack of your ass into the bedsheets.</p>
+			<p><<npc $sex.npcId>><</npc>> climbs off of you, removing his cock from your pussy in the process, and flops down on the other side of the bed. His cum seeps from your pussy, trickling down the crack of your ass into the bedsheets.</p>
 		<<elseif $sex_ev['position'] == 'doggy'>>
 			<<video "shared/sex/after/doggy_after1.mp4">>
 			$sex_ev['end_comment']
-			<p><<=$npcs.get($sex.npcId,'firstname')>> pulls out from behind you and you roll over together onto your backs. His cum seeps from your pussy, slowly oozing down your thighs.</p>
+			<p><<npc $sex.npcId>><</npc>> pulls out from behind you and you roll over together onto your backs. His cum seeps from your pussy, slowly oozing down your thighs.</p>
 		<<elseif $sex_ev['position'] == 'cowgirl'>>
 			<<video "shared/sex/after/cowgirl_after1.mp4">>
 			$sex_ev['end_comment']
-			<p>You climb off of <<=$npcs.get($sex.npcId,'firstname')>> and flop down next to him. As soon as his cock vacates your pussy, cum begins to drip from it, trickling down the crack of your ass into the bedsheets.</p>
+			<p>You climb off of <<npc $sex.npcId>><</npc>> and flop down next to him. As soon as his cock vacates your pussy, cum begins to drip from it, trickling down the crack of your ass into the bedsheets.</p>
 		<</if>>
 	<<else>>
 		<<if $sex_ev['position'] == 'miss'>>
 			<<video "shared/sex/after/miss_after1.mp4">>
 			$sex_ev['end_comment']
-			<p><<=$npcs.get($sex.npcId,'firstname')>> removes his cock from your pussy, climbing out from between your legs, flopping onto the other side of the bed.</p>
+			<p><<npc $sex.npcId>><</npc>> removes his cock from your pussy, climbing out from between your legs, flopping onto the other side of the bed.</p>
 		<<elseif $sex_ev['position'] == 'doggy'>>
 			<<video "shared/sex/after/doggy_after1.mp4">>
 			$sex_ev['end_comment']
-			<p><<=$npcs.get($sex.npcId,'firstname')>> pulls out from behind you and you roll over together onto your backs.</p>
+			<p><<npc $sex.npcId>><</npc>> pulls out from behind you and you roll over together onto your backs.</p>
 		<<elseif $sex_ev['position'] == 'cowgirl'>>
 			<<video "shared/sex/after/cowgirl_after1.mp4">>
 			$sex_ev['end_comment']
-			<p>You climb off of <<=$npcs.get($sex.npcId,'firstname')>>, letting his cock slip from your pussy, and flop down beside him.</p>
+			<p>You climb off of <<npc $sex.npcId>><</npc>>, letting his cock slip from your pussy, and flop down beside him.</p>
 		<</if>>
 	<</if>>
 <</if>>
@@ -1115,7 +1115,7 @@
 	<<elseif getvar("$sex_ev['sleep_fuck']") > 0>>
 		<<actCLA 'Go back to sleep'>>
 			<<image "shared/sex/after/cuddle2.jpg">>
-			<p>Your midnight fuck over, you and <<=$npcs.get($sex.npcId,'firstname')>> cuddle up together and fall asleep again.</p>
+			<p>Your midnight fuck over, you and <<npc $sex.npcId>><</npc>> cuddle up together and fall asleep again.</p>
 			<<actCLA 'Sleep'>>
 				<<gt 'sex_ev_after' 'sleep_function'>>
 			<</actCLA>>
@@ -1134,13 +1134,13 @@
 			<<if getvar("$sex_ev['get_up']") == 1>>
 				<<setinit $sex_ev['get_up'] = 0>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
-				<p>You climb back into bed with <<=$npcs.get($sex.npcId,'firstname')>>, snuggling up with him to relax.</p>
+				<p>You climb back into bed with <<npc $sex.npcId>><</npc>>, snuggling up with him to relax.</p>
 			<<elseif $npcs.get($sex.npcId,'smoker') < 1 or getvar("$sex_ev['boy_smoked']") == 1>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
-				<p>You and <<=$npcs.get($sex.npcId,'firstname')>> both lay back, quietly relaxing together in the still bliss of your love-making.</p>
+				<p>You and <<npc $sex.npcId>><</npc>> both lay back, quietly relaxing together in the still bliss of your love-making.</p>
 			<<else>>
 				<<image "shared/sex/after/bed_smoke2.jpg">>
-				<p>You lay back, quietly relaxing beside <<=$npcs.get($sex.npcId,'firstname')>> in the still bliss of your love-making as he puffs away on his cigarette.</p>
+				<p>You lay back, quietly relaxing beside <<npc $sex.npcId>><</npc>> in the still bliss of your love-making as he puffs away on his cigarette.</p>
 				<<setinit $sex_ev['boy_smoked'] = 1>>
 			<</if>>
 			<<gs 'sex_ev_after' 'relax_together'>>
@@ -1274,7 +1274,7 @@
 			<<set $time.minutes += 15>>
 			<<actCLA 'Wait it out'>>
 				<<image "shared/home/bathroom/toilet_naked.jpg">>
-				<p>You sit on the toilet humming to yourself while you wait for <<=$npcs.get($sex.npcId,'firstname')>>'s cum to drain from your pussy. It takes a long time with minutes passing between sudden gushes of semen pouring out of your snatch.</p>
+				<p>You sit on the toilet humming to yourself while you wait for <<npc $sex.npcId>><</npc>>'s cum to drain from your pussy. It takes a long time with minutes passing between sudden gushes of semen pouring out of your snatch.</p>
 				After about fifteen minutes, you figure you're safe and grab some toilet paper to wipe the last strands from your labia.
 				<<actCLA 'Continue'>>
 					<<gs 'sex_ev_after' 'boy_bathroom'>>
@@ -1285,7 +1285,7 @@
 					<<gs 'drugs' 'smoke'>>
 					<<image "shared/home/bathroom/toilet_naked_smoke.jpg">>
 					You know this is going to take a long time so you take your smokes and a lighter into the bathroom with you.
-					<p>Plopping down on the toilet, you light up while waiting for <<=$npcs.get($sex.npcId,'firstname')>>'s cum to drain from your pussy. Minutes pass between sudden gushes of semen pouring out of your snatch and you pass the time puffing smoke and flicking ashes.</p>
+					<p>Plopping down on the toilet, you light up while waiting for <<npc $sex.npcId>><</npc>>'s cum to drain from your pussy. Minutes pass between sudden gushes of semen pouring out of your snatch and you pass the time puffing smoke and flicking ashes.</p>
 					<p>After about fifteen minutes, you figure you're safe and grab some toilet paper to wipe the last strands from your labia before making sure your long-burned out cigarette is fully extinguished and tossing it in the trash.</p>
 					<<actCLA 'Continue'>>
 						<<gs 'sex_ev_after' 'boy_bathroom'>>
@@ -1324,18 +1324,18 @@
 			<<video "shared/sex/blowjob/play1.mp4">>
 			<<if getvar("$sex_ev['no_condom']") == 1>>
 				<<if $sex_ev['last_cum'] == 'creampie'>>
-					<p>"Here, let me take care of that for you," you say, slithering down between <<=$npcs.get($sex.npcId,'firstname')>>'s legs and taking his cock in your mouth. You run your lips up and down his shaft and give it a thorough tongue bath, lapping up your own juices and the remnants of the creampie he filled you with.</p>
+					<p>"Here, let me take care of that for you," you say, slithering down between <<npc $sex.npcId>><</npc>>'s legs and taking his cock in your mouth. You run your lips up and down his shaft and give it a thorough tongue bath, lapping up your own juices and the remnants of the creampie he filled you with.</p>
 				<<else>>
-					<p>"Here, let me take care of that for you," you say, slithering down between <<=$npcs.get($sex.npcId,'firstname')>>'s legs and taking his cock in your mouth. You run your lips up and down his shaft and give it a thorough tongue bath, lapping up your own juices and sucking any remaining cum out of the tip.</p>
+					<p>"Here, let me take care of that for you," you say, slithering down between <<npc $sex.npcId>><</npc>>'s legs and taking his cock in your mouth. You run your lips up and down his shaft and give it a thorough tongue bath, lapping up your own juices and sucking any remaining cum out of the tip.</p>
 				<</if>>
 			<<elseif getvar("$sex_ev['condoms_used']") > 0>>
 				<<if getvar("$sex_ev['cum_condom']") > 0>>
-					<p>"Here, let me take care of that for you," you say, slithering down between <<=$npcs.get($sex.npcId,'firstname')>>'s legs and taking his cock in your mouth. You run your lips up and down his shaft and give it a thorough tongue bath, lapping up your own juices and the cum that filled the inside of the condom.</p>
+					<p>"Here, let me take care of that for you," you say, slithering down between <<npc $sex.npcId>><</npc>>'s legs and taking his cock in your mouth. You run your lips up and down his shaft and give it a thorough tongue bath, lapping up your own juices and the cum that filled the inside of the condom.</p>
 				<<else>>
-					<p>"Here, let me take care of that for you," you say, slithering down between <<=$npcs.get($sex.npcId,'firstname')>>'s legs and taking his cock in your mouth. You run your lips up and down his shaft and give it a thorough tongue bath, lapping up the condom lube, your own juices, and sucking any remaining cum out of the tip.</p>
+					<p>"Here, let me take care of that for you," you say, slithering down between <<npc $sex.npcId>><</npc>>'s legs and taking his cock in your mouth. You run your lips up and down his shaft and give it a thorough tongue bath, lapping up the condom lube, your own juices, and sucking any remaining cum out of the tip.</p>
 				<</if>>
 			<</if>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> smiles at you appreciatively.</p>
+			<p><<npc $sex.npcId>><</npc>> smiles at you appreciatively.</p>
 			<<gs 'sex_ev_after' 'after_sex2'>>
 		<</actCLA>>
 	<</if>>
@@ -1349,19 +1349,19 @@
 		<<if $npcs.get($sex.npcId,'rel') < 50>>
 			<<arouse 'kiss' -2 >>
 			<<if getvar("$sex_ev['cuni_count']") > 0>>
-				<p>You lean over to kiss <<=$npcs.get($sex.npcId,'firstname')>>, gently pressing your lips against his. They taste slightly salty, which you recognize as the taste of your own pussy, still on his lips from when he ate you out earlier.</p>
+				<p>You lean over to kiss <<npc $sex.npcId>><</npc>>, gently pressing your lips against his. They taste slightly salty, which you recognize as the taste of your own pussy, still on his lips from when he ate you out earlier.</p>
 			<<else>>
-				<p>You lean over to kiss <<=$npcs.get($sex.npcId,'firstname')>>, gently pressing your lips against his.</p>
+				<p>You lean over to kiss <<npc $sex.npcId>><</npc>>, gently pressing your lips against his.</p>
 			<</if>>
-			<p>"What was that for?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+			<p>"What was that for?" <<npc $sex.npcId>><</npc>> asks.</p>
 			<<actCLA 'Just felt like it'>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
-				<p>"I just felt like it," you shrug, giving <<=$npcs.get($sex.npcId,'firstname')>> a pleasant smile.</p>
+				<p>"I just felt like it," you shrug, giving <<npc $sex.npcId>><</npc>> a pleasant smile.</p>
 				<<gs 'sex_ev_after' 'relax_together'>>
 			<</actCLA>>
 			<<actCLA 'Cause I like you'>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
-				<p>"Cause I like you," you say, giving <<=$npcs.get($sex.npcId,'firstname')>> a pleasant smile.</p>
+				<p>"Cause I like you," you say, giving <<npc $sex.npcId>><</npc>> a pleasant smile.</p>
 				<<gs 'sex_ev_after' 'relax_together'>>
 			<</actCLA>>
 			<<if getvar("$sex_ev['orgasm_count']") > 0>>
@@ -1374,14 +1374,14 @@
 		<<else>>
 			<<arouse 'kiss' -10 `['no_orgasm_msg']`>>
 			<<arouse 'kiss' `rand(2,3)` >>
-			<p>You lean over to kiss <<=$npcs.get($sex.npcId,'firstname')>>, gently pressing your lips against his. Instantly, it sparks something within you and the kiss takes on a passion of its own and you find yourself drinking him in; his taste, his scent, his tongue, feverishly pressing your faces together as if you might die at any second.</p>
+			<p>You lean over to kiss <<npc $sex.npcId>><</npc>>, gently pressing your lips against his. Instantly, it sparks something within you and the kiss takes on a passion of its own and you find yourself drinking him in; his taste, his scent, his tongue, feverishly pressing your faces together as if you might die at any second.</p>
 			It's several minutes before you finally break apart, panting breathlessly as you stare into each others eyes.
 			<<gs 'sex_ev_after' 'relax_together'>>
 		<</if>>
 		<<set $orgasm_or = ''>>
 	<<else>>
 		<<image "shared/sex/after/pillow_talk1.jpg">>
-		<p>You lean over to kiss <<=$npcs.get($sex.npcId,'firstname')>> before his eyes widen and he shies away. It puzzles you for a moment before he draws a finger around his face in a circle.</p>
+		<p>You lean over to kiss <<npc $sex.npcId>><</npc>> before his eyes widen and he shies away. It puzzles you for a moment before he draws a finger around his face in a circle.</p>
 		"You've still got..." You blink before remembering. The cum. Right. He probably doesn''t want to kiss you with his own load blown all over your face.
 		<<gs 'sex_ev_after' 'relax_together'>>
 	<</if>>
@@ -1393,9 +1393,9 @@
 			$sex_ev['bed_room']
 			<<if $pc.cumAtLocation(0) > 0>>
 				<<if getvar("$LudaQW['free_condoms']") == 1 and $pc.sexStat('morning_after_pill') == 0>>
-					<p>With <<=$npcs.get($sex.npcId,'firstname')>>'s cum still leaking from your pussy, you reach down to your purse and pull out the morning after pill Luda gave you.</p>
+					<p>With <<npc $sex.npcId>><</npc>>'s cum still leaking from your pussy, you reach down to your purse and pull out the morning after pill Luda gave you.</p>
 				<<else>>
-					<p>With <<=$npcs.get($sex.npcId,'firstname')>>'s cum still leaking from your pussy, you reach down to your purse and pull out the morning after pill you keep inside.</p>
+					<p>With <<npc $sex.npcId>><</npc>>'s cum still leaking from your pussy, you reach down to your purse and pull out the morning after pill you keep inside.</p>
 				<</if>>
 			<<else>>
 				<<if getvar("$LudaQW['free_condoms']") == 1 and $pc.sexStat('morning_after_pill') == 0>>
@@ -1410,13 +1410,13 @@
 <</if>>
 <<if $location_var[$here][0] == 'plan_b2'>>
 	<<actCLA 'Don`t say anything'>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> watches you pop the pill out of it's packaging and you gulp it down without a word of acknowledgement.</p>
+		<p><<npc $sex.npcId>><</npc>> watches you pop the pill out of it's packaging and you gulp it down without a word of acknowledgement.</p>
 		<p>It's not for him, why does he need to know?</p>
 		<<gs 'medical_din' 'morning_after_pill_function'>>
 		<<gs 'sex_ev_after' 'after_sex2'>>
 	<</actCLA>>
 	<<actCLA 'Take it shyly'>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> watches you pop the pill out of it's packaging and you can't help but blush beneath his gaze.</p>
+		<p><<npc $sex.npcId>><</npc>> watches you pop the pill out of it's packaging and you can't help but blush beneath his gaze.</p>
 		<<if getvar("$LudaQW['free_condoms']") == 1 and $pc.sexStat('morning_after_pill') == 0>>
 			"My aunt gave me this for emergencies," you say shyly, blush intensifying as you put it in your mouth and force it down with a dry swallow.
 		<<else>>
@@ -1426,7 +1426,7 @@
 		<<gs 'sex_ev_after' 'after_sex2'>>
 	<</actCLA>>
 	<<actCLA 'Take it sexily'>>
-		<p>As <<=$npcs.get($sex.npcId,'firstname')>> watches you pull the pill from its packaging, you stick out your tongue at him, popping the pill onto it and swallowing with a wide grin.</p>
+		<p>As <<npc $sex.npcId>><</npc>> watches you pull the pill from its packaging, you stick out your tongue at him, popping the pill onto it and swallowing with a wide grin.</p>
 		<<if getvar("$sex_ev['accidental_creampie_convo']") == 1>>
 			"There," you smirk. "Problem solved."
 		<<elseif $sex_ev['last_cum'] == 'swallow'>>
@@ -1472,7 +1472,7 @@
 			$sex_ev['bed_room']
 		<</if>>
 		<<if $pc.cumAtLocation(0) > 0>>
-			<p>With <<=$npcs.get($sex.npcId,'firstname')>>'s cum still leaking from your pussy, you reach down to your purse and pull out your birth control.</p>
+			<p>With <<npc $sex.npcId>><</npc>>'s cum still leaking from your pussy, you reach down to your purse and pull out your birth control.</p>
 			<<if getvar("$sex_ev['risky_creampie']") == 1>>
 				"Hopefully we won''t have to worry about this stuff soon," you smile, shyly placing the pill between your lips and swallowing.
 			<<else>>
@@ -1502,7 +1502,7 @@
 			$sex_ev['bed_room']
 		<</if>>
 		<<if $pc.cumAtLocation(0) > 0>>
-			<p>With <<=$npcs.get($sex.npcId,'firstname')>>'s cum still leaking from your pussy, you reach down to your purse and pull out your birth control.</p>
+			<p>With <<npc $sex.npcId>><</npc>>'s cum still leaking from your pussy, you reach down to your purse and pull out your birth control.</p>
 			<<if getvar("$sex_ev['risky_creampie']") == 1>>
 				"You better hope this stuff kicks in soon," you say, placing the pill between your lips and swallowing with a grin.
 			<<elseif getvar("$birth_control['think_safe']") == 1>>
@@ -1559,9 +1559,9 @@
 	<<run $npcs.set($sex.npcId,'know_pc_smoker',1)>>
 	<<image "shared/sex/after/bed_smoke0.jpg">>
 	<<if $npcs.get($sex.npcId,'smoker') > 0 and getvar("$sex_ev['boy_smoked']") != 1>>
-		<p>Watching <<=$npcs.get($sex.npcId,'firstname')>> inspires you to reach for your own cigarettes and light up too.</p>
+		<p>Watching <<npc $sex.npcId>><</npc>> inspires you to reach for your own cigarettes and light up too.</p>
 	<<elseif getvar("$sex_ev['annoyed']") > 0>>
-		<p>Feeling very irritated at <<=$npcs.get($sex.npcId,'firstname')>>, you grab a cigarette and light up.</p>
+		<p>Feeling very irritated at <<npc $sex.npcId>><</npc>>, you grab a cigarette and light up.</p>
 	<<elseif getvar("$sex_ev['cigarette']") == 1>>
 		Still unsatisfied, you pull another cigarette from the box and flick your lighter, 
 	<<else>>
@@ -1579,12 +1579,12 @@
 			<<if getvar("$sex_ev['annoyed']") > 0>>
 				The two of you puff away in silence, smoking up your irritation and refusing to speak to one another.
 			<<else>>
-				<p>Smoke fills your lungs and you hold it there, savouring it, before exhaling slowly. As the smoke blows past your lips, it's like all your stress goes with it and you sigh happily, relaxing into the bed. <<=$npcs.get($sex.npcId,'firstname')>> does the same beside you.</p>
+				<p>Smoke fills your lungs and you hold it there, savouring it, before exhaling slowly. As the smoke blows past your lips, it's like all your stress goes with it and you sigh happily, relaxing into the bed. <<npc $sex.npcId>><</npc>> does the same beside you.</p>
 			<</if>>
 		<<else>>
 			<<image "shared/sex/after/bed_smoke1.jpg">>
 			<<if getvar("$sex_ev['annoyed']") > 0>>
-				<p>You focus entirely on the cigarette in your mouth, making a point of ignoring <<=$npcs.get($sex.npcId,'firstname')>> for as long as it burns between your lips.</p>
+				<p>You focus entirely on the cigarette in your mouth, making a point of ignoring <<npc $sex.npcId>><</npc>> for as long as it burns between your lips.</p>
 			<<elseif getvar("$sex_ev['cigarette']") == 1>>
 				Smoke fills your lungs and you hold it there, savouring it, before exhaling slowly. The smoke trails hazily around the room as you enjoy another cigarette.
 			<<else>>
@@ -1600,7 +1600,7 @@
 	<<if $npcs.get($sex.npcId,'smoker') > 0>>
 		<<image "shared/sex/after/bed_smoke0.jpg">>
 		<p>"Can I get one of those?" you ask.</p>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> hands over his pack to you and you accept one gratefully, lighting it and inhaling deeply.</p>
+		<p><<npc $sex.npcId>><</npc>> hands over his pack to you and you accept one gratefully, lighting it and inhaling deeply.</p>
 		<<actCLA 'Smoke'>>
 			<<gs 'drugs' 'smoke'>>
 			<<if getvar("$sex_ev['phone']") == 2>>
@@ -1609,7 +1609,7 @@
 			<</if>>
 			<<if $npcs.get($sex.npcId,'smoker') > 0>>
 				<<image "shared/sex/after/bed_smoke3.jpg">>
-				<p>Smoke fills your lungs and you hold it there, savouring it, before exhaling slowly. As the smoke blows past your lips, it's like all your stress goes with it and you sigh happily, relaxing into the bed. <<=$npcs.get($sex.npcId,'firstname')>> does the same beside you.</p>
+				<p>Smoke fills your lungs and you hold it there, savouring it, before exhaling slowly. As the smoke blows past your lips, it's like all your stress goes with it and you sigh happily, relaxing into the bed. <<npc $sex.npcId>><</npc>> does the same beside you.</p>
 			<<else>>
 				<<image "shared/sex/after/bed_smoke1.jpg">>
 				Smoke fills your lungs and you hold it there, savouring it, before exhaling slowly. As the smoke blows past your lips, it's like all your stress goes with it and you sigh happily, relaxing into the bed.
@@ -1618,7 +1618,7 @@
 		<</actCLA>>
 	<<else>>
 		<<image "shared/sex/after/annoyed1.jpg">>
-		<p>"Got any smokes?" you ask but <<=$npcs.get($sex.npcId,'firstname')>> just shakes his head.</p>
+		<p>"Got any smokes?" you ask but <<npc $sex.npcId>><</npc>> just shakes his head.</p>
 		"I don't smoke. It's bad for you y''know."
 		<<actCLA 'Damn'>>
 			"Damn," you sigh unhappily. "A cigarette is just what I need right now..."
@@ -1716,7 +1716,7 @@
 			<<else>>
 				"Of course," he smiles.
 			<</if>>
-			<p>"Thanks," you yawn, snuggling into <<=$npcs.get($sex.npcId,'firstname')>>. "Appreciate it."</p>
+			<p>"Thanks," you yawn, snuggling into <<npc $sex.npcId>><</npc>>. "Appreciate it."</p>
 			<<actCLA 'Cuddle up'>>
 				<<image "shared/sex/after/cuddle1.jpg">>
 				He wraps his arms around you in return and you close your eyes, allowing yourself to drift off into sleep.
@@ -1740,7 +1740,7 @@
 			<<gs 'sex_ev_after' 'after_sex2'>>
 		<<else>>
 			"Sure, I'm not doing anything tomorrow. You can crash here."
-			<p>"Thanks," you yawn, snuggling into <<=$npcs.get($sex.npcId,'firstname')>>. "Appreciate it."</p>
+			<p>"Thanks," you yawn, snuggling into <<npc $sex.npcId>><</npc>>. "Appreciate it."</p>
 			<<actCLA 'Cuddle up'>>
 				<<image "shared/sex/after/cuddle1.jpg">>
 				He wraps his arms around you in return and you close your eyes, allowing yourself to drift off into sleep.
@@ -1773,7 +1773,7 @@
 		<<elseif getvar("$cum_loc['vagina']") > 0>>
 			<!-- !! vagina-->
 			<<image "shared/sex/cum/vagcreampie/after2.jpg">>
-			<!-- !!				'Tired, you curl up onto your side to face <<<<=$npcs.get($sex.npcId,'firstname')>>>>, passively aware that his cum is still leaking from your pussy, slowly dribbling down the curve of your thigh.'-->
+			<!-- !!				'Tired, you curl up onto your side to face <<<<npc $sex.npcId>><</npc>>>>, passively aware that his cum is still leaking from your pussy, slowly dribbling down the curve of your thigh.'-->
 		<<else>>
 			<<image "shared/home/bedroom/son.jpg">>
 		<</if>>

+ 116 - 116
sugarcube/src/autogenerated/unsorted/sex_ev_condoms.tw

@@ -38,7 +38,7 @@
 	<<if getvar("$sex_ev['no_condom']") != 1>>
 		<<if $npcs.get($sex.npcId,'bareback') == 1 and getvar("$sex_ev['no_condom']") != 1 and getvar("$sex_ev['condom']") != 1>>
 			<!-- !!		if npc_know_bc[$sex.npcId] = 1 and npc_condom_conscious[$sex.npcId] ! 2: sex_ev['no_condom'] = 1-->
-			<p>You agreed to stop using condoms with <<=$npcs.get($sex.npcId,'firstname')>> and he makes no move to get one.</p>
+			<p>You agreed to stop using condoms with <<npc $sex.npcId>><</npc>> and he makes no move to get one.</p>
 			<<gs 'sex_ev_sex' 'position_choose'>>
 			<<gs 'sex_ev_condoms' 'dont_cum_in_me'>>
 			<<gs 'sex_ev_condoms' 'pc_safe_day'>>
@@ -47,7 +47,7 @@
 			<<gs 'sex_ev_condoms' 'no_more_free_creampies1'>>
 			<<gs 'sex_ev_condoms' 'already_creampie1'>>
 		<<elseif $npcs.get($sex.npcId,'bareback') == 2 and getvar("$sex_ev['no_condom']") != 1 and getvar("$sex_ev['condom']") != 1>>
-			<p>"Is it safe?" <<=$npcs.get($sex.npcId,'firstname')>> asks. "Can we go bareback?"</p>
+			<p>"Is it safe?" <<npc $sex.npcId>><</npc>> asks. "Can we go bareback?"</p>
 			<<gs 'sex_ev_condoms' 'bareback_check'>>
 		<<elseif getvar("$sex_ev['condom']") == 0>>
 			<<if $npcs.get($sex.npcId,'condom_conscious') > 0>>
@@ -57,7 +57,7 @@
 					<<gs 'sex_ev_condoms' 'npc_condom_use'>>
 				<</actCLA>>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> makes no indication that he's going to put on a condom.</p>
+				<p><<npc $sex.npcId>><</npc>> makes no indication that he's going to put on a condom.</p>
 				<<gs 'sex_ev_condoms' 'pc_condom_ask'>>
 				<<gs 'sex_ev_condoms' 'pc_condoms'>>
 				<<gs 'sex_ev_condoms' 'dont_cum_in_me'>>
@@ -133,7 +133,7 @@
 	<<if $inventory.get("condom") > 0>>
 		<<actCLA 'Pull out a condom'>>
 			<<setinit $sex_ev['using_pc_condoms'] = 1>>
-			<p>Before <<=$npcs.get($sex.npcId,'firstname')>> can penetrate you, you take a swift moment to grab a condom out of your bag.</p>
+			<p>Before <<npc $sex.npcId>><</npc>> can penetrate you, you take a swift moment to grab a condom out of your bag.</p>
 			<p>"Condom first?" you ask, holding it up between you.</p>
 			<<gs 'sex_ev_condoms' 'pc_condoms2'>>
 		<</actCLA>>
@@ -149,7 +149,7 @@
 		<p>"Come on," he moans. "Do we have to use one today?"</p>
 		<<gs 'sex_ev_condoms' 'no_condom1'>>
 	<<else>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> nods and you sigh in relief as he takes it from you, tearing open the package and clumsily rolling the little rubber onto his cock.</p>
+		<p><<npc $sex.npcId>><</npc>> nods and you sigh in relief as he takes it from you, tearing open the package and clumsily rolling the little rubber onto his cock.</p>
 		<<gs 'sex_ev_condoms' 'pc_condom_use_stats'>>
 		<<if $sex_ev['position'] != 'miss' or $sex_ev['position'] != 'doggy' or $sex_ev['position'] != 'cowgirl'>>
 			<<setinit $sex_ev['position'] = 'miss'>>
@@ -172,7 +172,7 @@
 				<<elseif $sex_ev['loc'] == 'player_home'>>
 					Leaning over the side of the bed, you reach into the nightstand where you keep your birth control. After fishing around blindly for a few moments, you mange to find a condom, upon which you tear open the packaging and roll it onto his cock for him.
 				<<else>>
-					<p>Leaning over the side of the bed, you reach down to your purse. After fishing around for a few moments, you pull out a condom. You tear the packaging open and roll it onto <<=$npcs.get($sex.npcId,'firstname')>>'s cock for him.</p>
+					<p>Leaning over the side of the bed, you reach down to your purse. After fishing around for a few moments, you pull out a condom. You tear the packaging open and roll it onto <<npc $sex.npcId>><</npc>>'s cock for him.</p>
 				<</if>>
 				"Gotta practice safe sex," you wink.
 			<<else>>
@@ -194,7 +194,7 @@
 		<<setinit $sex_ev['pc_out_of_condoms'] = 1>>
 		<<if getvar("$sex_ev['out_of_condoms']") == 1>>
 			<p>"I think that was my last condom..." you say. "I guess that means we're both out...?"</p>
-			<p>"I guess so," <<=$npcs.get($sex.npcId,'firstname')>> shrugs.</p>
+			<p>"I guess so," <<npc $sex.npcId>><</npc>> shrugs.</p>
 			<<gs 'sex_ev_after' 'no_condom_end'>>
 			<<gs 'sex_ev_condoms' 'no_sex_only'>>
 		<<else>>
@@ -203,25 +203,25 @@
 			<<actCLA 'Do you have any?'>>
 				$sex_ev['bed_room']
 				<<if getvar("$sex_ev['cock_inserted']") == 1>>
-					<p>"But I'm not ready to stop," you grin, flexing your pussy around <<=$npcs.get($sex.npcId,'firstname')>>'s cock inside you. "Have you got any?"</p>
+					<p>"But I'm not ready to stop," you grin, flexing your pussy around <<npc $sex.npcId>><</npc>>'s cock inside you. "Have you got any?"</p>
 				<<else>>
 					<p>"But I'm not ready to stop," you say. "Have you got any?"</p>
 				<</if>>
 				<<if getvar("$npc_condom_conscious") == 1>>
-					<p>"I always have condoms," <<=$npcs.get($sex.npcId,'firstname')>> says. "You don't have to keep buying them if you don't want to, you know. I order in bulk."</p>
+					<p>"I always have condoms," <<npc $sex.npcId>><</npc>> says. "You don't have to keep buying them if you don't want to, you know. I order in bulk."</p>
 					<<gs 'sex_ev_sex' 'reset'>>
 					<<gs 'sex_ev_condoms' 'bulk_condoms'>>
 				<<elseif getvar("$sex_ev['condom_count']") > 0 and $sex_ev['condoms_used'] < $sex_ev['condom_count']>>
-					<p>"Yeah, I have some," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+					<p>"Yeah, I have some," <<npc $sex.npcId>><</npc>> says.</p>
 					<<gs 'sex_ev_sex' 'reset'>>
 					<<actCLA 'Continue'>>
 						<<gs 'sex_ev_condoms' 'npc_condom_use'>>
 					<</actCLA>>
 				<<else>>
 					<<if $npcs.get($sex.npcId,'no_condoms_know') == 1>>
-						<p>"Come on," <<=$npcs.get($sex.npcId,'firstname')>> says, rolling his eyes. "You know I hate using condoms. Lucky you can even talk me into using yours."</p>
+						<p>"Come on," <<npc $sex.npcId>><</npc>> says, rolling his eyes. "You know I hate using condoms. Lucky you can even talk me into using yours."</p>
 					<<else>>
-						<p><<=$npcs.get($sex.npcId,'firstname')>> shakes his head.</p>
+						<p><<npc $sex.npcId>><</npc>> shakes his head.</p>
 						"I don't."
 					<</if>>
 					<<gs 'sex_ev_after' 'no_condom_end'>>
@@ -235,7 +235,7 @@
 <<if $location_var[$here][0] == 'pc_condom_ask'>>
 	<<actCLA 'Don`t say anything'>>
 		<<setinit $sex_ev['no_condom'] = 1>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> takes your silence as consent and begins maneuvering into position.</p>
+		<p><<npc $sex.npcId>><</npc>> takes your silence as consent and begins maneuvering into position.</p>
 		<<gs 'sex_ev_sex' 'position_choose'>>
 	<</actCLA>>
 	<<gs 'sex_ev_condoms' 'pc_condom_ask2'>>
@@ -283,13 +283,13 @@
 		<<setinit $sex_ev['must_fuck'] = 1>>
 		<p>"I guess we could skip it..." you smile shyly. "Just this once?"</p>
 		<<if getvar("$sex_ev['danger_day']") == 1 and getvar("$npc_childfree") == 1>>
-			<p>"Seems like a bad idea," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head. "You said it's dangerous for you today. I don't want to take the risk."</p>
+			<p>"Seems like a bad idea," <<npc $sex.npcId>><</npc>> says, shaking his head. "You said it's dangerous for you today. I don't want to take the risk."</p>
 			<<actCLA 'Disappointed'>>
-				<p>You sigh deeply as <<=$npcs.get($sex.npcId,'firstname')>> already starts to pull away from you.</p>
+				<p>You sigh deeply as <<npc $sex.npcId>><</npc>> already starts to pull away from you.</p>
 				<<gs 'sex_ev_after' 'after_sex1'>>
 			<</actCLA>>
 			<<actCLA 'You`re probably right'>>
-				<p>"Yeah... You're probably right," you say ruefully as <<=$npcs.get($sex.npcId,'firstname')>> is already pulling away from you.</p>
+				<p>"Yeah... You're probably right," you say ruefully as <<npc $sex.npcId>><</npc>> is already pulling away from you.</p>
 				<<gs 'sex_ev_after' 'after_sex1'>>
 			<</actCLA>>
 			<<gs 'sex_ev_condoms' 'no_sex_only'>>
@@ -333,11 +333,11 @@
 	<<setinit $sex_ev['must_fuck'] = 1>>
 	<<setinit $sex_ev['cock_inserted'] = 0>>
 	<<if getvar("$sex_ev['fuck_count']") > 1 and $sex_ev['last_cum'] == 'condom'>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> swaps out his used condom for a new one.</p>
+		<p><<npc $sex.npcId>><</npc>> swaps out his used condom for a new one.</p>
 	<<elseif getvar("$sex_ev['fuck_count']") > 1>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> reaches for a new condom.</p>
+		<p><<npc $sex.npcId>><</npc>> reaches for a new condom.</p>
 	<<else>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> reaches for a condom from his nightstand.</p>
+		<p><<npc $sex.npcId>><</npc>> reaches for a condom from his nightstand.</p>
 	<</if>>
 	<!-- !!	gs 'sex_ev_sex', 'position_choose'-->
 	<<gs 'sex_ev_condoms' 'npc_condom_put_on'>>
@@ -368,14 +368,14 @@
 		<<gs 'sex_ev_condoms' 'npc_condom_use_stats'>>
 		<<arouse 'foreplay_give' -2 >>
 		<<image "shared/sex/misc/condom_put.jpg">>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> tears open the packaging when you swiftly reach over and pluck the condom out of the wrapper.</p>
+		<p><<npc $sex.npcId>><</npc>> tears open the packaging when you swiftly reach over and pluck the condom out of the wrapper.</p>
 		"Here, let me," you say with a sexy smile. You gently roll the rubber sleeve down his shaft, squeezing just hard enough to make him twitch under your touch.
 		<<gs 'sex_ev_sex' 'position_choose'>>
 	<</actCLA>>
 	<<actCLA 'Put it on with your mouth'>>
 		<<gs 'sex_ev_condoms' 'npc_condom_use_stats'>>
 		<<video "shared/sex/misc/condom_mouth.mp4">>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> tears open the packaging when you swiftly reach over and pluck the condom out of the wrapper.</p>
+		<p><<npc $sex.npcId>><</npc>> tears open the packaging when you swiftly reach over and pluck the condom out of the wrapper.</p>
 		"Here, let me," you say with a sexy smile. Placing it on the tip of his cock, you lean over and put your lips over both. Then, using both hands, you roll the sleeve down his shaft, following with your head, lips pressed tight against the rubber. Even through the rubber, you can feel the heat of his member against your tongue.
 		You bob your head up and down a few times for good measure before coming up and flashing a grin.
 		<<gs 'sex_ev_sex' 'position_choose'>>
@@ -383,9 +383,9 @@
 <</if>>
 <<if $location_var[$here][0] == 'condom_conscious_npc'>>
 	<<if getvar("$sex_ev['fuck_count']") <= 1>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> immediately reaches for a condom.</p>
+		<p><<npc $sex.npcId>><</npc>> immediately reaches for a condom.</p>
 	<<elseif getvar("$sex_ev['fuck_count']") > 1>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> reaches for another condom.</p>
+		<p><<npc $sex.npcId>><</npc>> reaches for another condom.</p>
 	<</if>>
 	<<actCLA 'Continue'>>
 		<<gs 'sex_ev_condoms' 'npc_condom_use'>>
@@ -417,9 +417,9 @@
 <<if $location_var[$here][0] == 'npc_out_of_condoms'>>
 	$sex_ev['bed_room']
 	<<if getvar("$sex_ev['fuck_count']") > 5>>
-		<p>"I think that was my last condom," <<=$npcs.get($sex.npcId,'firstname')>> pants.</p>
+		<p>"I think that was my last condom," <<npc $sex.npcId>><</npc>> pants.</p>
 	<<else>>
-		<p>"I think that was my last condom," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+		<p>"I think that was my last condom," <<npc $sex.npcId>><</npc>> says.</p>
 	<</if>>
 	<<gs 'sex_ev_after' 'no_condom_end'>>
 	<<gs 'sex_ev_condoms' 'pc_skip_the_condom'>>
@@ -450,13 +450,13 @@
 	<!-- !! boy says he doesn''t use condoms-->
 	<<if $npcs.get($sex.npcId,'no_condoms_know') == 1>>
 		<<if $npcs.get($sex.npcId,'selfish') == 1>>
-			<p>"You know I don't use that shit," <<=$npcs.get($sex.npcId,'firstname')>> frowns. "It's bareback or nothing."</p>
+			<p>"You know I don't use that shit," <<npc $sex.npcId>><</npc>> frowns. "It's bareback or nothing."</p>
 		<<else>>
-			<p>"Come on! We don't need condoms," <<=$npcs.get($sex.npcId,'firstname')>> insists.</p>
+			<p>"Come on! We don't need condoms," <<npc $sex.npcId>><</npc>> insists.</p>
 		<</if>>
 	<<else>>
 		<<run $npcs.set($sex.npcId,'no_condoms_know',1)>>
-		<p>"I never use condoms," <<=$npcs.get($sex.npcId,'firstname')>> grunts. "It feels better bareback."</p>
+		<p>"I never use condoms," <<npc $sex.npcId>><</npc>> grunts. "It feels better bareback."</p>
 	<</if>>
 	<<gs 'sex_ev_condoms' 'no_condom1'>>
 <</if>>
@@ -485,7 +485,7 @@
 		<<run $npcs.inc($sex.npcId,'rel',1)>>
 		$sex_ev['bed_room']
 		You hesitate for a moment before relenting.
-		<p>"I guess it's okay... I trust you," you smile as <<=$npcs.get($sex.npcId,'firstname')>> eagerly forgoes the condom.</p>
+		<p>"I guess it's okay... I trust you," you smile as <<npc $sex.npcId>><</npc>> eagerly forgoes the condom.</p>
 		<<gs 'sex_ev_sex' 'position_choose'>>
 	<</actCLA>>
 	<<actCLA 'I guess I trust you'>>
@@ -494,7 +494,7 @@
 		<<run $npcs.inc($sex.npcId,'rel',1)>>
 		$sex_ev['bed_room']
 		You hesitate for a moment before relenting.
-		<p>"If you promise..." you say reluctantly as <<=$npcs.get($sex.npcId,'firstname')>> eagerly forgoes the condom.</p>
+		<p>"If you promise..." you say reluctantly as <<npc $sex.npcId>><</npc>> eagerly forgoes the condom.</p>
 		<<gs 'sex_ev_sex' 'position_choose'>>
 	<</actCLA>>
 	<<gs 'sex_ev_condoms' 'pc_skip_the_condom'>>
@@ -504,15 +504,15 @@
 	<<actCLA 'We don`t need a condom (feel better)'>>
 		"Come on," you say, grabbing his arm. "Let''s skip the condom. It'll feel better without one."
 		<<if $npcs.get($sex.npcId,'condom_conscious') == 2 or ($npcs.get($sex.npcId,'condom_conscious') == 1 and $npcs.get($sex.npcId,'childfree') == 1)>>
-			<p>"Don't want to risk it," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head and opens the condom anyways, rolling it onto his cock.</p>
+			<p>"Don't want to risk it," <<npc $sex.npcId>><</npc>> says, shaking his head and opens the condom anyways, rolling it onto his cock.</p>
 		<<else>>
 			<<if rand(npc_willpwr[$sex.npcId],100) < $pc.skillLevel("persuasion") + $npcs.get($sex.npcId,'rel')>>
 				<<setinit $sex_ev['no_condom'] = 1>>
 				<<setinit $sex_ev['condom'] = 0>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> stops, looking back at you for a moment before smiling.</p>
+				<p><<npc $sex.npcId>><</npc>> stops, looking back at you for a moment before smiling.</p>
 				"Okay," he says and leaves the rubber where it is.
 			<<else>>
-				<p>"Don't want to risk it," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head and opens the condom anyways, rolling it onto his cock.</p>
+				<p>"Don't want to risk it," <<npc $sex.npcId>><</npc>> says, shaking his head and opens the condom anyways, rolling it onto his cock.</p>
 			<</if>>
 		<</if>>
 		<<gs 'sex_ev_sex' 'position_choose'>>
@@ -526,12 +526,12 @@
 				"Hey," you smile, grabbing his arm. "We don't need condoms. I'm on the shot."
 				<<if $npcs.get($sex.npcId,'condom_conscious') == 2>>
 					<<setinit $sex_ev['npc_condom_insist'] = 1>>
-					<p>"I want to use one anyways," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head and reaches back for the condom. "Better to be safe."</p>
+					<p>"I want to use one anyways," <<npc $sex.npcId>><</npc>> says, shaking his head and reaches back for the condom. "Better to be safe."</p>
 					Your jaw drops.
 					<i>A free pass to go bareback and he doesn''t take it? What''s with this guy?</i>
 				<<else>>
 					<<setinit $sex_ev['no_condom'] = 1>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> stops reaching and turns to meet your gaze, eyes filled with desire, and your smile widens into a full blown grin.</p>
+					<p><<npc $sex.npcId>><</npc>> stops reaching and turns to meet your gaze, eyes filled with desire, and your smile widens into a full blown grin.</p>
 				<</if>>
 				<<gs 'sex_ev_sex' 'position_choose'>>
 			<</actCLA>>
@@ -543,12 +543,12 @@
 				"Hey," you smile, grabbing his arm. "We don't need condoms. I'm on the pill."
 				<<if $npcs.get($sex.npcId,'condom_conscious') == 2>>
 					<<setinit $sex_ev['npc_condom_insist'] = 1>>
-					<p>"I want to use one anyways," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head and reaches back for the condom. "Better to be safe."</p>
+					<p>"I want to use one anyways," <<npc $sex.npcId>><</npc>> says, shaking his head and reaches back for the condom. "Better to be safe."</p>
 					Your jaw drops.
 					<i>A free pass to go bareback and he doesn''t take it? What''s with this guy?</i>
 				<<else>>
 					<<setinit $sex_ev['no_condom'] = 1>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> stops reaching and turns to meet your gaze, eyes filled with desire, and your smile widens into a full blown grin.</p>
+					<p><<npc $sex.npcId>><</npc>> stops reaching and turns to meet your gaze, eyes filled with desire, and your smile widens into a full blown grin.</p>
 				<</if>>
 				<<gs 'sex_ev_sex' 'position_choose'>>
 			<</actCLA>>
@@ -560,12 +560,12 @@
 			<<run $npcs.set($sex.npcId,'know_not_bc',0)>>
 			"Hey," you smile, grabbing his arm. "We don't need condoms. I'm on birth control."
 			<<if $npcs.get($sex.npcId,'condom_conscious') == 2>>
-				<p>"I want to use one anyways," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head and reaches back for the condom. "Better to be safe."</p>
+				<p>"I want to use one anyways," <<npc $sex.npcId>><</npc>> says, shaking his head and reaches back for the condom. "Better to be safe."</p>
 				Your jaw drops.
 				<i>Son of a bitch! Why is this guy so fucking careful?!</i>
 			<<else>>
 				<<setinit $sex_ev['no_condom'] = 1>>
-				<p>Upon hearing your barefaced lie, <<=$npcs.get($sex.npcId,'firstname')>> stops reaching and turns to meet your gaze, eyes filled with desire. Your smile widens into a full blown grin.</p>
+				<p>Upon hearing your barefaced lie, <<npc $sex.npcId>><</npc>> stops reaching and turns to meet your gaze, eyes filled with desire. Your smile widens into a full blown grin.</p>
 			<</if>>
 			<<gs 'sex_ev_sex' 'position_choose'>>
 		<</actCLA>>
@@ -574,7 +574,7 @@
 <<if $location_var[$here][0] == 'no_condom_leave'>>
 	<!-- !!if sex_ev['rape_chance'] > 0:-->
 	<!-- !!put in chance he rapes you-->
-	<p><<=$npcs.get($sex.npcId,'firstname')>> continues to complain at you while you grab all of your belongings and rush your way out the door, slamming it behind you.</p>
+	<p><<npc $sex.npcId>><</npc>> continues to complain at you while you grab all of your belongings and rush your way out the door, slamming it behind you.</p>
 	<<if $sex_ev['type'] == 'hookup'>>
 		<p>Just because you wanted to sleep with him doesn't mean you'll allow yourself to get taken advantage of!</p>
 	<<elseif $sex_ev['type'] == 'booty call'>>
@@ -620,7 +620,7 @@
 			<<setinit $sex_ev['condom'] = 1>>
 			<<setinit $sex_ev['pc_insist_condom'] = 1>>
 			<<if getvar("$sex_ev['using_pc_condoms']") == 1 and $inventory.get("condom") > 0>>
-				<p>"Ugh, fine," <<=$npcs.get($sex.npcId,'firstname')>> grumbles, taking the condom from you and clumsily rolling the little rubber onto his cock.</p>
+				<p>"Ugh, fine," <<npc $sex.npcId>><</npc>> grumbles, taking the condom from you and clumsily rolling the little rubber onto his cock.</p>
 				<<gs 'sex_ev_condoms' 'pc_condom_use_stats'>>
 				<<if $sex_ev['position'] != 'miss' or $sex_ev['position'] != 'doggy' or $sex_ev['position'] != 'cowgirl'>>
 					<<setinit $sex_ev['position'] = 'miss'>>
@@ -630,7 +630,7 @@
 					<<gt 'sex_ev_$sex_ev['position']' '$sex_ev['position']_goto'>>
 				<</actCLA>>
 			<<else>>
-				<p>"Ugh, fine," <<=$npcs.get($sex.npcId,'firstname')>> grumbles, reaching for a condom.</p>
+				<p>"Ugh, fine," <<npc $sex.npcId>><</npc>> grumbles, reaching for a condom.</p>
 				<<actCLA 'Continue'>>
 					<<gs 'sex_ev_condoms' 'npc_condom_use'>>
 				<</actCLA>>
@@ -711,7 +711,7 @@
 			<<setinit $sex_ev['must_fuck'] = 1>>
 			<<image "shared/sex/misc/condom_put.jpg">>
 			"I've got some right here," you say, pulling a rubber from your bag and tearing it open.
-			<p>You smile at <<=$npcs.get($sex.npcId,'firstname')>> as you roll it onto his cock for him.</p>
+			<p>You smile at <<npc $sex.npcId>><</npc>> as you roll it onto his cock for him.</p>
 			<<gs 'sex_ev_sex' 'position_choose'>>
 		<</actCLA>>
 	<<else>>
@@ -755,7 +755,7 @@
 				<<actCLA 'We could make out'>>
 					$sex_ev['bed_room']
 					<p>"We could do other stuff?" you suggest. "We could just make out?"</p>
-					<p>"Okay," <<=$npcs.get($sex.npcId,'firstname')>> nods and you happily move to kiss him.</p>
+					<p>"Okay," <<npc $sex.npcId>><</npc>> nods and you happily move to kiss him.</p>
 					<<gs 'sex_ev_foreplay' 'makeout_dom1'>>
 				<</actCLA>>
 			<</if>>
@@ -763,9 +763,9 @@
 				$sex_ev['bed_room']
 				<p>"We could do other stuff?" you suggest. "I could just blow you?"</p>
 				<<if $npcs.get($npclastgenerated,'fav_pos') == 'blowjob'>>
-					<p>"I would love that," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+					<p>"I would love that," <<npc $sex.npcId>><</npc>> grins.</p>
 				<<else>>
-					<p>"I could get behind that..." <<=$npcs.get($sex.npcId,'firstname')>> smiles.</p>
+					<p>"I could get behind that..." <<npc $sex.npcId>><</npc>> smiles.</p>
 				<</if>>
 				<<actCLA 'Blow him'>>
 					<<gt 'sex_ev_foreplay' 'bj_dom2'>>
@@ -776,7 +776,7 @@
 					$sex_ev['bed_room']
 					<p>"We could do other stuff?" you suggest. "I wouldn't mind if you ate my pussy for a little while..."</p>
 					<<if $npcs.get($sex.npcId,'pussyeater') == 1>>
-						<p>"I think I'd like that too," <<=$npcs.get($sex.npcId,'firstname')>> says with a dangerous glint in his eye.</p>
+						<p>"I think I'd like that too," <<npc $sex.npcId>><</npc>> says with a dangerous glint in his eye.</p>
 						<<actCLA 'Get eaten out'>>
 							<<gs 'sex_ev_foreplay' 'pussy_lick'>>
 						<</actCLA>>
@@ -899,7 +899,7 @@
 			$sex_ev['bed_room']
 			"Hey," you smile. "We don't need to use condoms anymore. I'm on birth control."
 			<<if $npcs.get($sex.npcId,'condom_conscious') == 2>>
-				<p>"I want to use one anyways," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head and reaches back for the condom. "Better to be safe."</p>
+				<p>"I want to use one anyways," <<npc $sex.npcId>><</npc>> says, shaking his head and reaches back for the condom. "Better to be safe."</p>
 				Your jaw drops.
 				<i>Son of a bitch! Why is this guy so fucking careful?!</i>
 				<<actCLA 'Continue'>>
@@ -908,7 +908,7 @@
 			<<else>>
 				<<setinit $sex_ev['no_condom'] = 1>>
 				<<run $npcs.set($sex.npcId,'bareback',1)>>
-				<p>Upon hearing your barefaced lie, <<=$npcs.get($sex.npcId,'firstname')>> stares back into your eyes filled with desire and your smile widens into a full blown grin.</p>
+				<p>Upon hearing your barefaced lie, <<npc $sex.npcId>><</npc>> stares back into your eyes filled with desire and your smile widens into a full blown grin.</p>
 			<</if>>
 			<<gs 'sex_ev_sex' 'position_choose'>>
 		<</actCLA>>
@@ -935,7 +935,7 @@
 		<<actCLA 'Need condoms again'>>
 			$sex_ev['bed_room']
 			"Hey, we need to start using condoms again," you say.
-			<p>"What for?" <<=$npcs.get($sex.npcId,'firstname')>> asks, confused.</p>
+			<p>"What for?" <<npc $sex.npcId>><</npc>> asks, confused.</p>
 			"I'm not on birth control anymore."
 			<p>"Huh? How come?"</p>
 			<<gs 'sex_ev_condoms' 'reenable_condoms1_stop_bc'>>
@@ -950,7 +950,7 @@
 		<<actCLA 'Can we use condoms again?'>>
 			$sex_ev['bed_room']
 			<p>"Hey, can we start using condoms again?" you say.</p>
-			<p>"What for?" <<=$npcs.get($sex.npcId,'firstname')>> asks, confused.</p>
+			<p>"What for?" <<npc $sex.npcId>><</npc>> asks, confused.</p>
 			<<actCLA 'Assurance'>>
 				<p>"I just want to be more safe," you explain. "It would be a weight off my mind. I can't afford to get pregnant right now. So can we just switch back to using condoms?"</p>
 				<<gs 'sex_ev_condoms' 'reenable_condoms2'>>
@@ -964,7 +964,7 @@
 			<</if>>
 			<<if $npcs.get($sex.npcId,'risky_creampie_count') > 0 and getvar("$birth_control['think_safe']") == 0>>
 				<<actCLA 'Too many close calls'>>
-					<p>"We've had too many close calls," you say, recalling all the times <<=$npcs.get($sex.npcId,'firstname')>>'s come inside you on dangerous days. "I've been too reckless. I can't afford to get pregnant right now. So can we just switch back to using condoms?"</p>
+					<p>"We've had too many close calls," you say, recalling all the times <<npc $sex.npcId>><</npc>>'s come inside you on dangerous days. "I've been too reckless. I can't afford to get pregnant right now. So can we just switch back to using condoms?"</p>
 					<<gs 'sex_ev_condoms' 'reenable_condoms2'>>
 				<</actCLA>>
 			<</if>>
@@ -1006,11 +1006,11 @@
 					<<actCLA 'Uh oh'>>
 						"Uhh..."
 						You gulp as you realize you didn''t think to bring any condoms yourself.
-						<p>"Come on," <<=$npcs.get($sex.npcId,'firstname')>> says with a flat stare. "You're going to insist all that and then not have any condoms to use? So what are we going to do now?"</p>
+						<p>"Come on," <<npc $sex.npcId>><</npc>> says with a flat stare. "You're going to insist all that and then not have any condoms to use? So what are we going to do now?"</p>
 						<<actCLA 'No sex'>>
 							$sex_ev['bed_room']
 							"I guess that means we're not going to have sex today..."
-							<p>"Well this was fucking bullshit," <<=$npcs.get($sex.npcId,'firstname')>> grumbles.</p>
+							<p>"Well this was fucking bullshit," <<npc $sex.npcId>><</npc>> grumbles.</p>
 							<<gs 'sex_ev_after' 'after_sex1'>>
 						<</actCLA>>
 						<<gs 'sex_ev_condoms' 'no_sex_only'>>
@@ -1037,7 +1037,7 @@
 				<!-- !!				end-->
 				You chew your lip, mulling it over.
 				"Well... I guess that would be a good compromise..."  you smile. "Just as long as I tell you when it's safe..."
-				<p>"So?" <<=$npcs.get($sex.npcId,'firstname')>> says, looking expectantly. "Is it safe today?"</p>
+				<p>"So?" <<npc $sex.npcId>><</npc>> says, looking expectantly. "Is it safe today?"</p>
 				<<if getvar("$mesec") > 0>>
 					<<actCLA 'I`m on my period'>>
 						<<setinit $sex_ev['safe_day'] = 1>>
@@ -1049,7 +1049,7 @@
 					<<actCLA 'It`s a safe day'>>
 						<<setinit $sex_ev['safe_day'] = 1>>
 						"Yeah."
-						<p>Your eyes meet for just a moment before <<=$npcs.get($sex.npcId,'firstname')>> begins clambering into position to fuck you bareback.</p>
+						<p>Your eyes meet for just a moment before <<npc $sex.npcId>><</npc>> begins clambering into position to fuck you bareback.</p>
 						<<gs 'sex_ev_sex' 'position_choose'>>
 					<</actCLA>>
 				<<elseif $pc.sexStat('probably_safe_day') == 1>>
@@ -1078,7 +1078,7 @@
 			<<elseif $pc.sexStat('safe_day') == 1>>
 				<<setinit $sex_ev['safe_day'] = 1>>
 				"Yeah."
-				<p>Your eyes meet for just a moment before <<=$npcs.get($sex.npcId,'firstname')>> begins clambering into position to fuck you bareback.</p>
+				<p>Your eyes meet for just a moment before <<npc $sex.npcId>><</npc>> begins clambering into position to fuck you bareback.</p>
 			<<elseif $pc.sexStat('probably_safe_day') == 1>>
 				<<setinit $sex_ev['probably_safe_day'] = 1>>
 				"Probably," you admit, your smile twisting into a smirk. His smile breaks into a grin and pulls you over, preparing to fuck you bareback.
@@ -1092,11 +1092,11 @@
 	<<else>>
 		<<gs 'sex_ev_condoms' 'reenable_condoms_code'>>
 		<<run $npcs.inc($sex.npcId,'rel',5)>>
-		<p>"That's fair," <<=$npcs.get($sex.npcId,'firstname')>> nods. "So do you want to use mine or yours today?"</p>
+		<p>"That's fair," <<npc $sex.npcId>><</npc>> nods. "So do you want to use mine or yours today?"</p>
 		<<actCLA 'Yours'>>
 			<<if $inventory.get("condom") == 0>>
 				"Yours," you say. "I don't have any on me today."
-				<p><<=$npcs.get($sex.npcId,'firstname')>> nods again and reaches for a condom from his nightstand while you wait, happy that this didn't have to be a big deal.</p>
+				<p><<npc $sex.npcId>><</npc>> nods again and reaches for a condom from his nightstand while you wait, happy that this didn't have to be a big deal.</p>
 			<<else>>
 				<p>"Do you mind if we use yours today?"</p>
 				"Not at all," he says, reaching for a condom from his nightstand and you feel happy that this didn''t turn into a big deal.
@@ -1179,7 +1179,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'npc_preg_react'>>
 	<<if $npcs.get($sex.npcId,'creampie_count') > 0>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>>'s eyes go wide.</p>
+		<p><<npc $sex.npcId>><</npc>>'s eyes go wide.</p>
 		<<if $npcs.get($sex.npcId,'childfree') > 0>>
 			<p>"It's... it's not mine, is it?"</p>
 			<<if getvar("$npc_is_father") == 1>>
@@ -1198,7 +1198,7 @@
 	<<if $npcs.get($sex.npcId,'condom_conscious') == 2 or (npc_condom_conscious[$sex.npcId] == 1 and rand(npc_willpwr[$sex.npcId],100) - npc_rel[$sex.npcId]) > $pc.skillLevel("persuasion")>>
 		<<setinit $sex_ev['condom'] = 1>>
 		<<setinit $sex_ev['npc_condom_insist'] = 1>>
-		<p>"I want to use one anyways," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head and reaching back for the condom. "Better to be safe."</p>
+		<p>"I want to use one anyways," <<npc $sex.npcId>><</npc>> says, shaking his head and reaching back for the condom. "Better to be safe."</p>
 		Your jaw drops.
 		<i>A free pass to go bareback forever and he doesn''t take it? What''s with this guy?</i>
 		<<actCLA 'Continue'>>
@@ -1208,10 +1208,10 @@
 		<<setinit $sex_ev['no_condom'] = 1>>
 		<<run $npcs.set($sex.npcId,'bareback',$sex_ev['temp_bareback'])>>
 		<<if $npcs.get($sex.npcId,'bareback') == 1>>
-			<p>"This is going to feel so good," <<=$npcs.get($sex.npcId,'firstname')>> says and your smile widens into a full blown grin.</p>
+			<p>"This is going to feel so good," <<npc $sex.npcId>><</npc>> says and your smile widens into a full blown grin.</p>
 			<<gs 'sex_ev_sex' 'position_choose'>>
 		<<else>>
-			<p>"So is today safe?" <<=$npcs.get($sex.npcId,'firstname')>> asks with a smile.</p>
+			<p>"So is today safe?" <<npc $sex.npcId>><</npc>> asks with a smile.</p>
 			<<gs 'sex_ev_condoms' 'bareback_check'>>
 		<</if>>
 	<</if>>
@@ -1220,7 +1220,7 @@
 	<<if $npcs.get($sex.npcId,'condom_conscious') == 2 or (npc_condom_conscious[$sex.npcId] == 1 and rand(npc_willpwr[$sex.npcId],100) - npc_rel[$sex.npcId]) > $pc.skillLevel("persuasion")>>
 		<<setinit $sex_ev['condom'] = 1>>
 		<<setinit $sex_ev['npc_condom_insist'] = 1>>
-		<p>"I want to use one anyways," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head and reaching back for the condom. "Better to be safe."</p>
+		<p>"I want to use one anyways," <<npc $sex.npcId>><</npc>> says, shaking his head and reaching back for the condom. "Better to be safe."</p>
 		Your jaw drops.
 		<i>A free pass to go bareback and he doesn''t take it? What''s with this guy?</i>
 		<<actCLA 'Continue'>>
@@ -1228,12 +1228,12 @@
 		<</actCLA>>
 	<<else>>
 		<<setinit $sex_ev['no_condom'] = 1>>
-		<p>"This is going to feel so good," <<=$npcs.get($sex.npcId,'firstname')>> says and your smile widens into a full blown grin.</p>
+		<p>"This is going to feel so good," <<npc $sex.npcId>><</npc>> says and your smile widens into a full blown grin.</p>
 	<</if>>
 	<<gs 'sex_ev_sex' 'position_choose'>>
 <</if>>
 <<if $location_var[$here][0] == 'npc_hesitate_childfree'>>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> pauses.</p>
+	<p><<npc $sex.npcId>><</npc>> pauses.</p>
 	<p>"What do you mean 'should' be?" he asks.</p>
 <</if>>
 <<if $location_var[$here][0] == 'bareback_check'>>
@@ -1292,13 +1292,13 @@
 				<<actCLA 'Put it on him'>>
 					<<gs 'sex_ev_condoms' 'pc_condom_use_stats'>>
 					<<image "shared/sex/misc/condom_put.jpg">>
-					<p>With sensually slow movements you crawl over to <<=$npcs.get($sex.npcId,'firstname')>> and tear open the packaging, gently rolling the condom down his erect manhood and jerking it a few times as much as for pleasure as for making sure the rubber's snug.</p>
+					<p>With sensually slow movements you crawl over to <<npc $sex.npcId>><</npc>> and tear open the packaging, gently rolling the condom down his erect manhood and jerking it a few times as much as for pleasure as for making sure the rubber's snug.</p>
 					<<gs 'sex_ev_sex' 'position_choose'>>
 				<</actCLA>>
 				<<actCLA 'Use your mouth'>>
 					<<video "shared/sex/misc/condom_mouth.mp4">>
 					<<gs 'sex_ev_condoms' 'pc_condom_use_stats'>>
-					<p>With sensually slow movements you crawl over to <<=$npcs.get($sex.npcId,'firstname')>> and tear open the packaging, placing the condom on the tip of his penis and kissing it through the rubber. Then, using your fingers, you unroll it smoothly over the length of his cock, your lips following all the way down. You bob your head up and down a few more times to make sure it's all the way on before pulling back.</p>
+					<p>With sensually slow movements you crawl over to <<npc $sex.npcId>><</npc>> and tear open the packaging, placing the condom on the tip of his penis and kissing it through the rubber. Then, using your fingers, you unroll it smoothly over the length of his cock, your lips following all the way down. You bob your head up and down a few more times to make sure it's all the way on before pulling back.</p>
 					<<gs 'sex_ev_sex' 'position_choose'>>
 				<</actCLA>>
 			<</actCLA>>
@@ -1312,25 +1312,25 @@
 			<<setinit $sex_ev['no_creampies_today'] = 1>>
 			$sex_ev['bed_room']
 			<<if getvar("$ovulate") > 0>>
-				<p>"I'm ovulating right now," you warn <<=$npcs.get($sex.npcId,'firstname')>>. </p>
+				<p>"I'm ovulating right now," you warn <<npc $sex.npcId>><</npc>>. </p>
 			<<else>>
-				<p>"I'm ovulating soon," you warn <<=$npcs.get($sex.npcId,'firstname')>>. </p>
+				<p>"I'm ovulating soon," you warn <<npc $sex.npcId>><</npc>>. </p>
 			<</if>>
 			<<actCLA 'You can`t come inside me'>>
 				$sex_ev['bed_room']
 				<<if getvar("$ovulate") > 0>>
-					<p>"I'm ovulating right now," you warn <<=$npcs.get($sex.npcId,'firstname')>>. "You can't come inside me, I'll get pregnant."</p>
+					<p>"I'm ovulating right now," you warn <<npc $sex.npcId>><</npc>>. "You can't come inside me, I'll get pregnant."</p>
 				<<else>>
-					<p>"I'm ovulating soon," you warn <<=$npcs.get($sex.npcId,'firstname')>>. "If you come inside me now, I'll could pregnant."</p>
+					<p>"I'm ovulating soon," you warn <<npc $sex.npcId>><</npc>>. "If you come inside me now, I'll could pregnant."</p>
 				<</if>>
 				<<gs 'sex_ev_condoms' 'pc_dangerous_day2'>>
 			<</actCLA>>
 			<<actCLA 'Don`t forget to pull out'>>
 				$sex_ev['bed_room']
 				<<if getvar("$ovulate") > 0>>
-					<p>"I'm ovulating right now," you warn <<=$npcs.get($sex.npcId,'firstname')>>. "Don't forget to pull out."</p>
+					<p>"I'm ovulating right now," you warn <<npc $sex.npcId>><</npc>>. "Don't forget to pull out."</p>
 				<<else>>
-					<p>"I'm ovulating soon," you warn <<=$npcs.get($sex.npcId,'firstname')>>. "Don't forget to pull out."</p>
+					<p>"I'm ovulating soon," you warn <<npc $sex.npcId>><</npc>>. "Don't forget to pull out."</p>
 				<</if>>
 				<<gs 'sex_ev_condoms' 'pc_dangerous_day2'>>
 			<</actCLA>>
@@ -1338,12 +1338,12 @@
 				<<setinit $sex_ev['pc_wants_condoms'] = 1>>
 				$sex_ev['bed_room']
 				<<if getvar("$ovulate") > 0>>
-					<p>"I'm ovulating right now," you warn <<=$npcs.get($sex.npcId,'firstname')>>. "We need to use a condom."</p>
+					<p>"I'm ovulating right now," you warn <<npc $sex.npcId>><</npc>>. "We need to use a condom."</p>
 				<<else>>
-					<p>"I'm ovulating soon," you warn <<=$npcs.get($sex.npcId,'firstname')>>. "If you come inside me now, I'll get pregnant. We need to use a condom."</p>
+					<p>"I'm ovulating soon," you warn <<npc $sex.npcId>><</npc>>. "If you come inside me now, I'll get pregnant. We need to use a condom."</p>
 				<</if>>
 				<<if $npcs.get($sex.npcId,'condom_conscious') == 1>>
-					<p>"<<=$npcs.get($sex.npcId,'firstname')>> nods and immediately reaches for one from his stash.</p>
+					<p>"<<npc $sex.npcId>><</npc>> nods and immediately reaches for one from his stash.</p>
 					<<gs 'sex_ev_condoms' 'npc_condom_put_on'>>
 				<<elseif $npcs.get($sex.npcId,'no_condoms') == 1 and $npcs.get($sex.npcId,'childfree') == 1>>
 					"Ugh fine..." he sighs. "But I don't have any. We need to use yours."
@@ -1364,7 +1364,7 @@
 					<p>"Come on, do we really have to? I promise I won't come inside."</p>
 					<<gs 'sex_ev_condoms' 'npc_promise_wont_creampie'>>
 				<<else>>
-					<p>"Okay," <<=$npcs.get($sex.npcId,'firstname')>> nods.</p>
+					<p>"Okay," <<npc $sex.npcId>><</npc>> nods.</p>
 					<<actCLA 'Ask to use his'>>
 						$sex_ev['bed_room']
 						<<if $inventory.get("condom") > 0>>
@@ -1441,7 +1441,7 @@
 			<<actCLA 'You can come inside me'>>
 				$sex_ev['bed_room']
 				<<if getvar("$mesec") > 0>>
-					<p>"You can come inside me today," you tell at <<=$npcs.get($sex.npcId,'firstname')>>. "I don't think I can get pregnant on my period."</p>
+					<p>"You can come inside me today," you tell at <<npc $sex.npcId>><</npc>>. "I don't think I can get pregnant on my period."</p>
 				<<else>>
 					<<if $pc.sexStat('safe_day') == 1>>
 						<<setinit $sex_ev['safe_day'] = 1>>
@@ -1451,7 +1451,7 @@
 						<<setinit $sex_ev['probably_safe_day'] = 1>>
 
 					<</if>>
-					<p>"$sex_ev['safe_day_desc1']," you tell at <<=$npcs.get($sex.npcId,'firstname')>>. "$sex_ev['safe_day_creampie_desc']."</p>
+					<p>"$sex_ev['safe_day_desc1']," you tell at <<npc $sex.npcId>><</npc>>. "$sex_ev['safe_day_creampie_desc']."</p>
 				<</if>>
 				<!-- !!				if stat['probably_safe_day'] = 1 and npc_childfree[$sex.npcId] = 1:-->
 				<!-- !!					gs 'sex_ev_condoms', 'npc_hesitate_childfree'-->
@@ -1467,10 +1467,10 @@
 				<<setinit $sex_ev['safe_day'] = 1>>
 				<<setinit $sex_ev['no_condom'] = 1>>
 				$sex_ev['bed_room']
-				<p>"$sex_ev['safe_day_desc1']," you tell <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+				<p>"$sex_ev['safe_day_desc1']," you tell <<npc $sex.npcId>><</npc>>.</p>
 				<<actCLA 'You can come inside me'>>
 					$sex_ev['bed_room']
-					<p>"$sex_ev['safe_day_desc1']," you tell <<=$npcs.get($sex.npcId,'firstname')>>. "$sex_ev['safe_day_creampie_desc']."</p>
+					<p>"$sex_ev['safe_day_desc1']," you tell <<npc $sex.npcId>><</npc>>. "$sex_ev['safe_day_creampie_desc']."</p>
 					<!-- !!				if stat['probably_safe_day'] = 1 and npc_childfree[$sex.npcId] = 1:-->
 					<!-- !!					gs 'sex_ev_condoms', 'npc_hesitate_childfree'-->
 					<<if $npcs.get($sex.npcId,'cum_pref') == 'creampie'>>
@@ -1483,7 +1483,7 @@
 				<<if $npcs.get($sex.npcId,'bareback') != 1>>
 					<<actCLA 'We can skip the condom'>>
 						$sex_ev['bed_room']
-						<p>"$sex_ev['safe_day_desc1']," you smile at <<=$npcs.get($sex.npcId,'firstname')>>. "$sex_ev['safe_day_no_condom_desc']."</p>
+						<p>"$sex_ev['safe_day_desc1']," you smile at <<npc $sex.npcId>><</npc>>. "$sex_ev['safe_day_no_condom_desc']."</p>
 						<<if $npcs.get($sex.npcId,'cum_pref') == 'creampie'>>
 							"I'm going to pump you full of so many creampies," he whispers.
 							<<actCLA 'I didn`t say that (annoyed)'>>
@@ -1496,7 +1496,7 @@
 								<<gs 'sex_ev_sex' 'position_choose'>>
 							<</actCLA>>
 						<<elseif $npcs.get($sex.npcId,'no_condoms') == 1>>
-							<p>"Finally," <<=$npcs.get($sex.npcId,'firstname')>> says. "I'm sick of using that rubber shit."</p>
+							<p>"Finally," <<npc $sex.npcId>><</npc>> says. "I'm sick of using that rubber shit."</p>
 							<<gs 'sex_ev_sex' 'position_choose'>>
 						<<else>>
 							"Good to know," he smiles back.
@@ -1507,7 +1507,7 @@
 				<<if getvar("$sex_ev['virgin']") == 1>>
 					<<actCLA 'I don`t want my first time with a condom'>>
 						$sex_ev['bed_room']
-						<p>"$sex_ev['safe_day_desc1']," you smile at <<=$npcs.get($sex.npcId,'firstname')>>. "Besides, I don't want my first time to be with a condom."</p>
+						<p>"$sex_ev['safe_day_desc1']," you smile at <<npc $sex.npcId>><</npc>>. "Besides, I don't want my first time to be with a condom."</p>
 						<<if $npcs.get($sex.npcId,'no_condoms') == 1>>
 							<<run $npcs.set($sex.npcId,'no_condoms_know',1)>>
 							"I never use condoms anyways," he grins.
@@ -1529,7 +1529,7 @@
 				<<setinit $sex_ev['no_condom'] = 1>>
 				"Somebody came inside me earlier," you say. "So let''s skip the rubber. Seems a little too late for condoms."
 				<<if $npcs.get($sex.npcId,'cum_pref') == 'creampie'>>
-					<p>"Does that mean I can come inside you too?" <<=$npcs.get($sex.npcId,'firstname')>> asks eagerly.</p>
+					<p>"Does that mean I can come inside you too?" <<npc $sex.npcId>><</npc>> asks eagerly.</p>
 					<<actCLA 'No'>>
 						"No it does not," you reply, twisting your mouth in a wry smirk. "I feel like we don't need to be extra careful, I didn''t say I want to be extra risky."
 						<<gs 'sex_ev_sex' 'position_choose'>>
@@ -1540,17 +1540,17 @@
 						<<gs 'sex_ev_sex' 'position_choose'>>
 					<</actCLA>>
 				<<else>>
-					<p>"You really get around don't you?" <<=$npcs.get($sex.npcId,'firstname')>> says amusedly.</p>
+					<p>"You really get around don't you?" <<npc $sex.npcId>><</npc>> says amusedly.</p>
 					<<actCLA 'Blush'>>
-						<p>Your cheeks flush with heat as <<=$npcs.get($sex.npcId,'firstname')>> pulls you towards him.</p>
+						<p>Your cheeks flush with heat as <<npc $sex.npcId>><</npc>> pulls you towards him.</p>
 						<<gs 'sex_ev_sex' 'position_choose'>>
 					<</actCLA>>
 					<<actCLA 'Grumble'>>
-						<p>"Shut up," you grumble as <<=$npcs.get($sex.npcId,'firstname')>> pulls you towards him.</p>
+						<p>"Shut up," you grumble as <<npc $sex.npcId>><</npc>> pulls you towards him.</p>
 						<<gs 'sex_ev_sex' 'position_choose'>>
 					<</actCLA>>
 					<<actCLA 'Giggle'>>
-						<p>"Shut up," you giggle back as <<=$npcs.get($sex.npcId,'firstname')>> pulls you towards him.</p>
+						<p>"Shut up," you giggle back as <<npc $sex.npcId>><</npc>> pulls you towards him.</p>
 						<<gs 'sex_ev_sex' 'position_choose'>>
 					<</actCLA>>
 				<</if>>
@@ -1561,7 +1561,7 @@
 				<<setinit $sex_ev['no_condom'] = 1>>
 				<<setinit $sex_ev['creampie_allowance'] = 1>>
 				"Somebody already came inside me today," you say. "If I have to get a pill anyways, I might as well make the most of it."
-				<p>You pull <<=$npcs.get($sex.npcId,'firstname')>> close to whisper in his ear.</p>
+				<p>You pull <<npc $sex.npcId>><</npc>> close to whisper in his ear.</p>
 				<i>"Come inside me as much as you want."</i>
 				<<gs 'sex_ev_sex' 'position_choose'>>
 			<</actCLA>>
@@ -1580,7 +1580,7 @@
 			<<setinit $sex_ev['no_condom'] = 1>>
 			<<setinit $sex_ev['creampie_allowance'] = 1>>
 			"Well," you say wryly. "Seeing as someone else already came inside me today, it feels a little silly to worry about condoms. In fact..."
-			<p>You pull <<=$npcs.get($sex.npcId,'firstname')>> close to whisper in his ear.</p>
+			<p>You pull <<npc $sex.npcId>><</npc>> close to whisper in his ear.</p>
 			<i>"Come inside me as much as you want."</i>
 			<<gs 'sex_ev_sex' 'position_choose'>>
 		<</actCLA>>
@@ -1664,7 +1664,7 @@
 		<<gs 'sex_ev_condoms' 'no_more_free_creampies5'>>
 	<<else>>
 		<<run $npcs.set($sex.npcId,'free_creampies',$sex_ev['temp_disable_creampies'])>>
-		<p>"Okay," <<=$npcs.get($sex.npcId,'firstname')>> nods. "That's fair."</p>
+		<p>"Okay," <<npc $sex.npcId>><</npc>> nods. "That's fair."</p>
 		"Thanks for making this easy," you smile.
 		<<gs 'sex_ev_sex' 'position_choose'>>
 	<</if>>
@@ -1674,7 +1674,7 @@
 		<<run $npcs.set($sex.npcId,'free_creampies',$sex_ev['temp_disable_creampies'])>>
 		<<set $npc_rel -= 10>>
 		"This isn''t up for debate," you insist. "You need to promise me that you're not going to come inside me or we can't fuck anymore."
-		<p>"Fine, fine," <<=$npcs.get($sex.npcId,'firstname')>> grumbles.</p>
+		<p>"Fine, fine," <<npc $sex.npcId>><</npc>> grumbles.</p>
 		"<i>Thank you</i>," you sigh frustratedly.
 		<<gs 'sex_ev_sex' 'position_choose'>>
 	<</actCLA>>
@@ -1689,7 +1689,7 @@
 		<<elseif $pc.sexStat('safe_day') == 1>>
 			<<setinit $sex_ev['safe_day'] = 1>>
 			"Yeah."
-			<p>Your eyes meet for just a moment before <<=$npcs.get($sex.npcId,'firstname')>> begins clambering into position to fuck you.</p>
+			<p>Your eyes meet for just a moment before <<npc $sex.npcId>><</npc>> begins clambering into position to fuck you.</p>
 			"Pump me full of cum," you giggle.
 		<<elseif $pc.sexStat('probably_safe_day') == 1>>
 			<<setinit $sex_ev['probably_safe_day'] = 1>>
@@ -1728,7 +1728,7 @@
 		<<gs 'sex_ev_condoms' 'npc_condom_use_stats'>>
 		<<video "shared/sex/misc/wait.mp4">>
 		He tears open the packaging and begins rolling the rubber sleeve onto his cock. You watch him, anxious with anticipation, thinking about what''s about to happen next.
-		<p>With the condom securely wrapped around his manhood, he lines his cock up with your pussy and moments later, <<=$npcs.get($sex.npcId,'firstname')>> takes your virginity.</p>
+		<p>With the condom securely wrapped around his manhood, he lines his cock up with your pussy and moments later, <<npc $sex.npcId>><</npc>> takes your virginity.</p>
 		<<if $npcs.get($sex.npcId,'sex_speed') == 3 and ($npcs.get($sex.npcId,'selfish') == 1 or $npcs.get($sex.npcId,'abusive') == 1)>>
 			<<actCLA 'Continue'>>
 				<<gt 'sex_ev_virgin' 'miss_virg_hard1'>>
@@ -1751,7 +1751,7 @@
 		$sex_ev['bed_room']
 		<p>"Can you use a condom?" you whisper. "Please?"</p>
 		<<if $npcs.get($sex.npcId,'condom_conscious') == 1>>
-			<p>"Of course," <<=$npcs.get($sex.npcId,'firstname')>> says, already tearing open a package. "I'm not an idiot you know."</p>
+			<p>"Of course," <<npc $sex.npcId>><</npc>> says, already tearing open a package. "I'm not an idiot you know."</p>
 			<<gs 'sex_ev_virgin' 'start_with_condom'>>
 		<<else>>
 			<<if $npcs.get($sex.npcId,'no_condoms') == 1>>
@@ -1764,7 +1764,7 @@
 				<<gs 'sex_ev_condoms' 'virgin_condom_ask2'>>
 			<<else>>
 				<<if rand(1,2) == 2>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> nods and gets one out, tearing open the package and pulling out the little rubber sleeve.</p>
+					<p><<npc $sex.npcId>><</npc>> nods and gets one out, tearing open the package and pulling out the little rubber sleeve.</p>
 					<<gs 'sex_ev_virgin' 'start_with_condom'>>
 				<<else>>
 					<p>"Come on," he says. "You really want to use a condom for your first time?"</p>
@@ -1783,10 +1783,10 @@
 			<<gs 'willpower' 'pay' 'self'>>
 			$sex_ev['bed_room']
 			Reaching over the side of the bed, you scrabble through your purse until you find what you're looking for: a condom.
-			<p>You hold it up between you and <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+			<p>You hold it up between you and <<npc $sex.npcId>><</npc>>.</p>
 			<p>"Let's use a condom, okay?"</p>
 			<<if $npcs.get($sex.npcId,'condom_conscious') == 1>>
-				<p>"Of course," <<=$npcs.get($sex.npcId,'firstname')>> says, immediately taking it from you and tearing open the package. "I'm not an idiot you know."</p>
+				<p>"Of course," <<npc $sex.npcId>><</npc>> says, immediately taking it from you and tearing open the package. "I'm not an idiot you know."</p>
 				<<gs 'sex_ev_virgin' 'start_with_condom'>>
 			<<else>>
 				<<if $npcs.get($sex.npcId,'no_condoms') == 1>>
@@ -1800,9 +1800,9 @@
 				<<else>>
 					<<if rand(1,2) == 2>>
 						<<if getvar("$sex_ev['using_pc_condoms']") == 1>>
-							<p><<=$npcs.get($sex.npcId,'firstname')>> nods and you sigh in relief as he takes it from you, tearing open the package and clumsily rolling the little rubber onto his cock.</p>
+							<p><<npc $sex.npcId>><</npc>> nods and you sigh in relief as he takes it from you, tearing open the package and clumsily rolling the little rubber onto his cock.</p>
 						<<else>>
-							<p><<=$npcs.get($sex.npcId,'firstname')>> nods and gets one out, tearing open the package and pulling out the little rubber sleeve.</p>
+							<p><<npc $sex.npcId>><</npc>> nods and gets one out, tearing open the package and pulling out the little rubber sleeve.</p>
 						<</if>>
 						<<gs 'sex_ev_virgin' 'start_with_condom'>>
 					<<else>>
@@ -1832,7 +1832,7 @@
 			<</actCLA>>
 			<<actCLA 'Stand firm' undefined `{willpower:['sex','resist','medium']}`>>
 					<<if getvar("$sex_ev['using_pc_condoms']") == 1>>
-						<p>"Nuh uh. If there's no condom, there's no sex." <<=$npcs.get($sex.npcId,'firstname')>> pulls back with a sigh.</p>
+						<p>"Nuh uh. If there's no condom, there's no sex." <<npc $sex.npcId>><</npc>> pulls back with a sigh.</p>
 						"Alright, fine. We'll use the damn condom."
 						He begrudgingly takes it and starts rolling it onto his cock, though you can't help but feel some of the magic of the moment has been lost here.
 						<<gs 'sex_ev_virgin' 'start_with_condom'>>
@@ -1850,7 +1850,7 @@
 			<<elseif getvar("$sex_ev['condom_count']") <= 0>>
 				<p>"Woah!" you exclaim, snapping your legs closed and pulling back from him. "If you don't have a condom, then we can't do this."</p>
 			<</if>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> takes a deep breath and pulls back.</p>
+			<p><<npc $sex.npcId>><</npc>> takes a deep breath and pulls back.</p>
 			<p>"Sorry," he smiles shyly at you. "I was thinking with my dick instead of my head. You're right, we shouldn't do this without protection. What should we do instead?"</p>
 			<<gs 'sex_ev_foreplay' 'foreplay_choose'>>
 			<<actCLA 'Change your mind'>>
@@ -1887,9 +1887,9 @@
 				"That''s okay, I've got one."
 			<</if>>
 			<<if getvar("$LudaQW['free_condoms']") == 1>>
-				<p>You reach into your bag and pull out one of the condoms your aunt gave you and hand it to <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+				<p>You reach into your bag and pull out one of the condoms your aunt gave you and hand it to <<npc $sex.npcId>><</npc>>.</p>
 			<<else>>
-				<p>You reach into your bag and pull out one of the condoms you bought and hand it to <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+				<p>You reach into your bag and pull out one of the condoms you bought and hand it to <<npc $sex.npcId>><</npc>>.</p>
 			<</if>>
 			He takes it and opens the packaging, rolling it onto his cock.
 			<<gs 'sex_ev_virgin' 'start_with_condom'>>
@@ -1900,7 +1900,7 @@
 	<<actCLA 'Can`t take chances'>>
 		<<image "shared/sex/misc/condom_put.jpg">>
 		<p>"Yes," you respond. "I can't take any chances. Please?"</p>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> sighs. "Okay, fine."</p>
+		<p><<npc $sex.npcId>><</npc>> sighs. "Okay, fine."</p>
 		You sigh in relief, tearing open the packaging and clumsily rolling the rubber onto his cock.
 		<<actCLA 'Lose your virginity'>>
 			<<if $sex_ev['position'] == 'miss'>>
@@ -1939,7 +1939,7 @@
 			<<else>>
 				<p>"I don't know that!" you spit back. "Where's the proof? You have a negative test on you? I'm not about to risk it just because you tell me to 'trust you.'"</p>
 				"Fine, fine," he grumbles, rolling his eyes. You fume for a little bit, feeling like he's totally ruined the moment while he rolls the rubber onto his cock. A little bit later, he's back in position between your legs.
-				<p>A moment after that, <<=$npcs.get($sex.npcId,'firstname')>> takes your virginity.</p>
+				<p>A moment after that, <<npc $sex.npcId>><</npc>> takes your virginity.</p>
 				<<setinit $sex_ev['condom'] = 1>>
 				<<gs 'sex_ev_virgin' 'miss_virg_start'>>
 			<</if>>
@@ -1947,7 +1947,7 @@
 		<<actCLA 'Trust him'>>
 			<<setinit $sex_ev['npc_insist_no_condom'] = 1>>
 			$sex_ev['bed_room']
-			<p>"If you say so..." you say hesitantly. He just smiles back in response. You can't help but fume just a little bit, feeling like he's ruined the mood somewhat. But you don't have much time to think about that as moments later, <<=$npcs.get($sex.npcId,'firstname')>> takes your virginity.</p>
+			<p>"If you say so..." you say hesitantly. He just smiles back in response. You can't help but fume just a little bit, feeling like he's ruined the mood somewhat. But you don't have much time to think about that as moments later, <<npc $sex.npcId>><</npc>> takes your virginity.</p>
 			<<gs 'sex_ev_virgin' 'miss_virg_start'>>
 		<</actCLA>>
 	<</actCLA>>
@@ -1995,14 +1995,14 @@
 			While he rolls it on, you make sounds of annoyance, glaring at him.
 			"Really making my first time special," you grumble to yourself.
 			With the condom securely in place, he gets back in position between your legs.
-			<p>A moment after that, <<=$npcs.get($sex.npcId,'firstname')>> takes your virginity.</p>
+			<p>A moment after that, <<npc $sex.npcId>><</npc>> takes your virginity.</p>
 			<<setinit $sex_ev['condom'] = 1>>
 			<<gs 'sex_ev_virgin' 'miss_virg_start'>>
 		<</actCLA>>
 		<<gs 'sex_ev_leave' 'no_condom_breakoff'>>
 	<<else>>
 		"Well I don't have any either," you growl back.
-		<p>"Look who wants to fuck with a condom but doesn't have any now," <<=$npcs.get($sex.npcId,'firstname')>> rolls his eyes.</p>
+		<p>"Look who wants to fuck with a condom but doesn't have any now," <<npc $sex.npcId>><</npc>> rolls his eyes.</p>
 		<<actCLA 'Embarrassed'>>
 			$sex_ev['bed_room']
 			You blush fiercely, turning away.
@@ -2030,7 +2030,7 @@
 		<<actCLA 'Have a morning after pill'>>
 			<<setinit $sex_ev['ma_pill'] = 1>>
 			"Besides," you look pointedly at your bag. "I have a morning after pill."
-			<p><<=$npcs.get($sex.npcId,'firstname')>> raises an eyebrow back at you.</p>
+			<p><<npc $sex.npcId>><</npc>> raises an eyebrow back at you.</p>
 			<<if $time.hour >= 18>>
 				<p>"Were you expecting to lose your virginity tonight?"</p>
 			<<else>>
@@ -2141,9 +2141,9 @@
 	<</if>>
 	<<if getvar("$sex_ev['condom_count']") == 0 or getvar("$sex_ev['no_condom']") == 1>>
 		<<if $npcs.get($sex.npcId,'cum_pref') == 'creampie' and getvar("$sex_ev['virgin_creampie_request']") == 1>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> gulps, apparently stunned with arousal at the thought of coming inside you. It takes several seconds before he nods slowly.</p>
+			<p><<npc $sex.npcId>><</npc>> gulps, apparently stunned with arousal at the thought of coming inside you. It takes several seconds before he nods slowly.</p>
 		<<else>>
-			<p>"Okay," <<=$npcs.get($sex.npcId,'firstname')>> nods.</p>
+			<p>"Okay," <<npc $sex.npcId>><</npc>> nods.</p>
 		<</if>>
 		<<gs 'sex_ev_virgin' 'start_without_condom'>>
 	<<elseif rand(npc_willpwr[$sex.npcId],100) + $sex_ev['condom_bonus'] < $pc.skillLevel("persuasion") + $npcs.get($sex.npcId,'rel') and $npcs.get($sex.npcId,'condom_conscious') != 2>>
@@ -2153,11 +2153,11 @@
 			<<setinit $sex_ev['creampie_allowance'] = 1>>
 
 		<</if>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> stops, looking back at you for a moment before smiling.</p>
+		<p><<npc $sex.npcId>><</npc>> stops, looking back at you for a moment before smiling.</p>
 		"Okay," he says and puts the rubber back on the nightstand.
 		<<gs 'sex_ev_virgin' 'start_without_condom'>>
 	<<else>>
-		<p>"We shouldn't risk it," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head and opening the condom anyways. "Especially not for your first time."</p>
+		<p>"We shouldn't risk it," <<npc $sex.npcId>><</npc>> says, shaking his head and opening the condom anyways. "Especially not for your first time."</p>
 		<<actCLA 'Wait for him'>>
 			<<setinit $sex_ev['condom'] = 1>>
 			<<gs 'sex_ev_condoms' 'npc_condom_use_stats'>>

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 262 - 262
sugarcube/src/autogenerated/unsorted/sex_ev_cowgirl.tw


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 179 - 179
sugarcube/src/autogenerated/unsorted/sex_ev_cum.tw


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 247 - 247
sugarcube/src/autogenerated/unsorted/sex_ev_doggy.tw


+ 97 - 97
sugarcube/src/autogenerated/unsorted/sex_ev_favorite_part.tw

@@ -28,7 +28,7 @@
 	<</actCLA>>
 	<<if $sex_ev['type'] == 'hookup'>>
 		<<if $sex_ev['cum_count'] >= $npcs.get($sex.npcId,'sexdrive') + $sex_ev['extra_cum']>>
-			<p>"Holy shit," <<=$npcs.get($sex.npcId,'firstname')>> pants. "You emptied my balls out."</p>
+			<p>"Holy shit," <<npc $sex.npcId>><</npc>> pants. "You emptied my balls out."</p>
 			<<actCLA 'I could still go more'>>
 				"I could still go for more," you say.
 				<p>"Fuck, you're insatiable!" he grins back.</p>
@@ -42,12 +42,12 @@
 				<<gs 'sex_ev_favorite_part' 'good_for_you2'>>
 			<</actCLA>>
 		<<elseif $sex_ev['cum_count'] >= (npc_sexdrive[$sex.npcId] + sex_ev['extra_cum']) / 4 * 3 and $npcs.get($sex.npcId,'sexdrive') >= 6>>
-			<p>"Damn! You're incredible!" <<=$npcs.get($sex.npcId,'firstname')>> says. "I haven't come that much in ages."</p>
+			<p>"Damn! You're incredible!" <<npc $sex.npcId>><</npc>> says. "I haven't come that much in ages."</p>
 		<<else>>
-			<p>"That was pretty good," <<=$npcs.get($sex.npcId,'firstname')>> smiles at you.</p>
+			<p>"That was pretty good," <<npc $sex.npcId>><</npc>> smiles at you.</p>
 		<</if>>
 	<<else>>
-		<p>"Was it good for you too?" <<=$npcs.get($sex.npcId,'firstname')>> asks, grinning tiredly at you.</p>
+		<p>"Was it good for you too?" <<npc $sex.npcId>><</npc>> asks, grinning tiredly at you.</p>
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'good_for_you2'>>
@@ -110,7 +110,7 @@
 		<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 	<</actCLA>>
 	<<if getvar("$sex_ev['surprise_creampie_count']") >= 3>>
-		<p>"Your pussy is amazing," <<=$npcs.get($sex.npcId,'firstname')>> says. "It's like you were sucking me in, I couldn't stop coming inside you."</p>
+		<p>"Your pussy is amazing," <<npc $sex.npcId>><</npc>> says. "It's like you were sucking me in, I couldn't stop coming inside you."</p>
 		<<if $npcs.get($sex.npcId,'free_creampies') < 1>>
 			<<actCLA 'Ask next time (tease)'>>
 				"It would be nice if you would ask before you do," you smile teasingly. "I'm not just a cum receptacle you know."
@@ -125,12 +125,12 @@
 		<</if>>
 	<<else>>
 		<<if $npcs.get($sex.npcId,'rel') < 100>>
-			<p>"Coming inside you was amazing," <<=$npcs.get($sex.npcId,'firstname')>> says. "Other guys are into facials and watching girls swallow, which is fine I guess, but there's nothing like filling a pussy up with cum. What about you?"</p>
+			<p>"Coming inside you was amazing," <<npc $sex.npcId>><</npc>> says. "Other guys are into facials and watching girls swallow, which is fine I guess, but there's nothing like filling a pussy up with cum. What about you?"</p>
 		<<else>>
 			<<if getvar("$sex_ev['simultaneous_orgasm_count']") > 0>>
-				<p>"I love coming inside you," <<=$npcs.get($sex.npcId,'firstname')>> says smiling warmly at you. "Especially when you come too. It drives me crazy feeling you orgasm on my cock. What about you?"</p>
+				<p>"I love coming inside you," <<npc $sex.npcId>><</npc>> says smiling warmly at you. "Especially when you come too. It drives me crazy feeling you orgasm on my cock. What about you?"</p>
 			<<else>>
-				<p>"I love coming inside you," <<=$npcs.get($sex.npcId,'firstname')>> says smiling warmly at you. "I want to fill your pussy with cum and never stop. What about you?"</p>
+				<p>"I love coming inside you," <<npc $sex.npcId>><</npc>> says smiling warmly at you. "I want to fill your pussy with cum and never stop. What about you?"</p>
 			<</if>>
 		<</if>>
 		<<gs 'sex_ev_favorite_part' 'pc_favorite_part'>>
@@ -139,7 +139,7 @@
 <<if $location_var[$here][0] == 'cum_mouth_favorite'>>
 	<<if getvar("$sex_ev['swallow_count']") > 0>>
 		<<setinit $sex_ev['boy_favorite'] = 'swallowing'>>
-		<p>"It was so hot watching you swallow," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+		<p>"It was so hot watching you swallow," <<npc $sex.npcId>><</npc>> says.</p>
 		<<actCLA 'I aim to please'>>
 			"Glad you thought so," you smile pleasantly. "I aim to please."
 			<p>"So what about you? What did you like?"</p>
@@ -158,7 +158,7 @@
 				"You could stand to eat some more fruit if you want me to keep doing it," you say, wrinkling your nose. "Your cum tastes <i>horrible</i>. It's like drinking expired caviar."
 				You stick your tongue out, half gagging at the lingering flavour.
 				<<if $npcs.get($sex.npcId,'argumentative') == 1 or $npcs.get($sex.npcId,'insecure') == 1>>
-					<p>"Come on, it can't be that bad," <<=$npcs.get($sex.npcId,'firstname')>> scowls at you.</p>
+					<p>"Come on, it can't be that bad," <<npc $sex.npcId>><</npc>> scowls at you.</p>
 					<<actCLA 'Insist'>>
 						<<run $npcs.dec($sex.npcId,'rel',1)>>
 						<p>"Yes, it can be and it is," you say, making a face at him. "I <i>wish</i> was making this up. Yuck!"</p>
@@ -174,12 +174,12 @@
 					<<actCLA 'Get sarcastic'>>
 						<<run $npcs.dec($sex.npcId,'rel',1)>>
 						<<video "shared/sex/after/pillow_talk_eyeroll.mp4">>
-						<p>"<i>It can't be that bad,</i>" you repeat, mocking <<=$npcs.get($sex.npcId,'firstname')>> with a squeaky high voice. "I'd like to see you get down there and blow yourself to completion. Then we'll see."</p>
+						<p>"<i>It can't be that bad,</i>" you repeat, mocking <<npc $sex.npcId>><</npc>> with a squeaky high voice. "I'd like to see you get down there and blow yourself to completion. Then we'll see."</p>
 						<<gs 'sex_ev_pillow_talk' 'angry_end2'>>
 					<</actCLA>>
 				<<else>>
 					<<if getvar("$sex_ev['swallow_count']") > 1>>
-						<p>"If it's so bad, why did you keep doing it?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+						<p>"If it's so bad, why did you keep doing it?" <<npc $sex.npcId>><</npc>> asks.</p>
 						<<actCLA 'For you (affectionate)'>>
 							<<image "shared/sex/after/pillow_talk2.jpg">>
 							"Cause I like you too much to say no," you say, smirking wryly at him.
@@ -197,19 +197,19 @@
 						<<actCLA 'Acquiring taste'>>
 							<<image "shared/sex/after/pillow_talk2.jpg">>
 							"I figure if I do it enough times maybe I'll get used to it," you say, eyeballing him with a grim expression. "Starting to have my doubts though."
-							<p><<=$npcs.get($sex.npcId,'firstname')>> laughs.</p>
+							<p><<npc $sex.npcId>><</npc>> laughs.</p>
 							<p>"Well I appreciate the effort. What about you? Was there something I did to make you feel good?"</p>
 							<<gs 'sex_ev_favorite_part' 'pc_favorite_part'>>
 						<</actCLA>>
 						<<actCLA 'Spitting is quitting'>>
 							<<image "shared/sex/after/pillow_talk2.jpg">>
 							"Cause spitting is quitting," you say, eyeballing him. "If I start something, I'm gonna finish it."
-							<p><<=$npcs.get($sex.npcId,'firstname')>> laughs.</p>
+							<p><<npc $sex.npcId>><</npc>> laughs.</p>
 							<p>"You certainly do. What about you then? Was there something I did to make you feel good?"</p>
 							<<gs 'sex_ev_favorite_part' 'pc_favorite_part'>>
 						<</actCLA>>
 					<<else>>
-						<p>"Sorry I guess," <<=$npcs.get($sex.npcId,'firstname')>> says, looking a little embarrassed. "Was there something you did enjoy?"</p>
+						<p>"Sorry I guess," <<npc $sex.npcId>><</npc>> says, looking a little embarrassed. "Was there something you did enjoy?"</p>
 						<<gs 'sex_ev_favorite_part' 'pc_favorite_part'>>
 					<</if>>
 				<</if>>
@@ -223,7 +223,7 @@
 				<<else>>
 					"Your cum is delicious," you grin. "I don't usually like cum all that much, but yours is really nice. It's almost sweet."
 				<</if>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> looks pretty pleased with himself at that.</p>
+				<p><<npc $sex.npcId>><</npc>> looks pretty pleased with himself at that.</p>
 				<p>"What else did you like?"</p>
 				<<gs 'sex_ev_favorite_part' 'pc_favorite_part'>>
 			<</actCLA>>
@@ -231,14 +231,14 @@
 		<<if $pc.trait('cumeater') > 0>>
 			<<actCLA 'I love cum'>>
 				"I love cum," you grin. "If it's in my mouth, I can't help but swallow."
-				<p><<=$npcs.get($sex.npcId,'firstname')>> can't seem to help but grin back at you.</p>
+				<p><<npc $sex.npcId>><</npc>> can't seem to help but grin back at you.</p>
 				<p>"What else did you like?"</p>
 				<<gs 'sex_ev_favorite_part' 'pc_favorite_part'>>
 			<</actCLA>>
 		<</if>>
 	<<else>>
 		<<setinit $sex_ev['boy_favorite'] = 'cum_in_mouth'>>
-		<p>"Coming in your mouth felt great," <<=$npcs.get($sex.npcId,'firstname')>> says. "I wish you'd swallow though."</p>
+		<p>"Coming in your mouth felt great," <<npc $sex.npcId>><</npc>> says. "I wish you'd swallow though."</p>
 		<<actCLA 'I don`t like it'>>
 			"I don't like it," you say, wrinkling your nose. "It's just <i>weird</i> swallowing cum."
 			<p>"Then what <i>do</i> you like?"</p>
@@ -255,22 +255,22 @@
 			<<actCLA 'No (tease)'>>
 				"No," you smirk teasingly. "Now that I know it's what you want, maybe I'll keep spitting just to fuck with you."
 				<<if $npcs.get($sex.npcId,'argumentative') == 1>>
-					<p>"Way to be a bitch about it," <<=$npcs.get($sex.npcId,'firstname')>> scowls, grumbling to himself.</p>
+					<p>"Way to be a bitch about it," <<npc $sex.npcId>><</npc>> scowls, grumbling to himself.</p>
 					<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 				<<else>>
-					<p>"Okay, I see how it is," <<=$npcs.get($sex.npcId,'firstname')>> chuckles. "So what do <i>you</i> like then? So I know what to avoid in the future?"</p>
+					<p>"Okay, I see how it is," <<npc $sex.npcId>><</npc>> chuckles. "So what do <i>you</i> like then? So I know what to avoid in the future?"</p>
 					<<gs 'sex_ev_favorite_part' 'pc_favorite_part'>>
 				<</if>>
 			<</actCLA>>
 			<<actCLA 'Maybe'>>
 				"Maybe," you smirk teasingly.
-				<p>"Okay, I see how it is," <<=$npcs.get($sex.npcId,'firstname')>> chuckles. "So what did <i>you</i> enjoy then? So I know what to do to make you like me?"</p>
+				<p>"Okay, I see how it is," <<npc $sex.npcId>><</npc>> chuckles. "So what did <i>you</i> enjoy then? So I know what to do to make you like me?"</p>
 				<<gs 'sex_ev_favorite_part' 'pc_favorite_part'>>
 			<</actCLA>>
 			<<actCLA 'Yes'>>
 				"Yes," you smirk, a mischievous twinkle in your eye. "Every drop."
 				<!-- !! insert invite for date if relationship high enough-->
-				<p>"Well in that case," <<=$npcs.get($sex.npcId,'firstname')>> smiles back. "What do I do to make you like me?"</p>
+				<p>"Well in that case," <<npc $sex.npcId>><</npc>> smiles back. "What do I do to make you like me?"</p>
 				<<gs 'sex_ev_favorite_part' 'pc_favorite_part'>>
 			<</actCLA>>
 		<</actCLA>>
@@ -280,19 +280,19 @@
 			<<actCLA 'No (tease)'>>
 				"No," you smirk teasingly. "Not now that I know how much you''d love it. If we started dating, maybe I''d spit just to drive you crazy."
 				<<if $npcs.get($sex.npcId,'argumentative') == 1>>
-					<p>"Way to be a bitch about it," <<=$npcs.get($sex.npcId,'firstname')>> scowls, grumbling to himself.</p>
+					<p>"Way to be a bitch about it," <<npc $sex.npcId>><</npc>> scowls, grumbling to himself.</p>
 					<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 				<<else>>
-					<p>"Okay, I see how it is," <<=$npcs.get($sex.npcId,'firstname')>> chuckles. "So what do <i>you</i> like then? So I know how to drive <i>you</i> crazy."</p>
+					<p>"Okay, I see how it is," <<npc $sex.npcId>><</npc>> chuckles. "So what do <i>you</i> like then? So I know how to drive <i>you</i> crazy."</p>
 					<<gs 'sex_ev_favorite_part' 'pc_favorite_part'>>
 				<</if>>
 			<</actCLA>>
 			<<actCLA 'Maybe'>>
 				"Maybe," you smirk teasingly.
 				<<if $npcs.get($sex.npcId,'know_cheat') == 1>>
-					<p>"Okay, I see how it is," <<=$npcs.get($sex.npcId,'firstname')>> chuckles. "So what did <i>you</i> enjoy then? So I know how to steal you from your boyfriend."</p>
+					<p>"Okay, I see how it is," <<npc $sex.npcId>><</npc>> chuckles. "So what did <i>you</i> enjoy then? So I know how to steal you from your boyfriend."</p>
 				<<else>>
-					<p>"Okay, I see how it is," <<=$npcs.get($sex.npcId,'firstname')>> chuckles. "So what did <i>you</i> enjoy then? So I know what to do to make you my girlfriend."</p>
+					<p>"Okay, I see how it is," <<npc $sex.npcId>><</npc>> chuckles. "So what did <i>you</i> enjoy then? So I know what to do to make you my girlfriend."</p>
 				<</if>>
 				<!-- !! insert option for "are you being serious?"-->
 				<<gs 'sex_ev_favorite_part' 'pc_favorite_part'>>
@@ -301,9 +301,9 @@
 				"Yes," you smirk, a mischievous twinkle in your eye. "Every drop."
 				<!-- !! insert invite to start dating-->
 				<<if $npcs.get($sex.npcId,'know_cheat') == 1>>
-					<p>"Well in that case," <<=$npcs.get($sex.npcId,'firstname')>> smiles back. "What do I do to make you break up with your boyfriend for me?"</p>
+					<p>"Well in that case," <<npc $sex.npcId>><</npc>> smiles back. "What do I do to make you break up with your boyfriend for me?"</p>
 				<<else>>
-					<p>"Well in that case," <<=$npcs.get($sex.npcId,'firstname')>> smiles back. "So what did <i>you</i> enjoy then? So I know what to do to make you my girlfriend."</p>
+					<p>"Well in that case," <<npc $sex.npcId>><</npc>> smiles back. "So what did <i>you</i> enjoy then? So I know what to do to make you my girlfriend."</p>
 				<</if>>
 				<!-- !! insert option for "are you being serious?"-->
 				<<gs 'sex_ev_favorite_part' 'pc_favorite_part'>>
@@ -314,11 +314,11 @@
 <<if $location_var[$here][0] == 'facial_favorite'>>
 	<<setinit $sex_ev['boy_favorite'] = 'facial'>>
 	<<if getvar("$sex_ev['pc_facial_jerk']") == 1>>
-		<p>"I love seeing your face covered in cum," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Especially when you finished me yourself. That was fucking hot."</p>
+		<p>"I love seeing your face covered in cum," <<npc $sex.npcId>><</npc>> grins. "Especially when you finished me yourself. That was fucking hot."</p>
 	<<elseif getvar("$sex_ev['facial_swallow']") > 0>>
-		<p>"I love seeing your face covered in cum," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Plus it was a bonus watching you swallow after. That was hot."</p>
+		<p>"I love seeing your face covered in cum," <<npc $sex.npcId>><</npc>> grins. "Plus it was a bonus watching you swallow after. That was hot."</p>
 	<<else>>
-		<p>"I love blowing my load all over your face," <<=$npcs.get($sex.npcId,'firstname')>> grins. "It's fucking hot."</p>
+		<p>"I love blowing my load all over your face," <<npc $sex.npcId>><</npc>> grins. "It's fucking hot."</p>
 	<</if>>
 	<<actCLA 'Glad you enjoyed it'>>
 		<<if getvar("$cum_loc['face']") > 0>>
@@ -365,18 +365,18 @@
 			<p>"If it's so gross, why do you let me do it?"</p>
 			<<actCLA 'Sex is a two way street'>>
 				<p>"Cause it goes both ways," you shrug. "If I don't let you do stuff to me that you enjoy then how can I ask the same of you?"</p>
-				<p>"Well, what do you enjoy then?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+				<p>"Well, what do you enjoy then?" <<npc $sex.npcId>><</npc>> asks.</p>
 				<<gs 'sex_ev_favorite_part' 'pc_favorite_part'>>
 			<</actCLA>>
 			<<actCLA 'Cause you like it'>>
 				<<actCLA '(Affectionate)'>>
 					"Cause I know you like it," you smirk. "And I like turning you on."
-					<p>"Well, what can I do to turn you on then?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+					<p>"Well, what can I do to turn you on then?" <<npc $sex.npcId>><</npc>> asks.</p>
 					<<gs 'sex_ev_favorite_part' 'pc_favorite_part'>>
 				<</actCLA>>
 				<<actCLA '(Sarcastic)'>>
 					"Cause I know you're a pervert," you say eyeballing him. "And pervs like seeing girls get facials."
-					<p>"We sure do," <<=$npcs.get($sex.npcId,'firstname')>> chuckles. "But what about you? What do you like?"</p>
+					<p>"We sure do," <<npc $sex.npcId>><</npc>> chuckles. "But what about you? What do you like?"</p>
 					<<gs 'sex_ev_favorite_part' 'pc_favorite_part'>>
 				<</actCLA>>
 			<</actCLA>>
@@ -389,13 +389,13 @@
 			<<actCLA 'I don`t get a say (subservient)'>>
 				<p>"Cause it's not up to me," you shrug. "Sex is about making the guy feel good. I'm the girl you're fucking. If you want to come on my face, who am I to stop you?"</p>
 				<<if $npcs.get($sex.npcId,'caretaker') == 1>>
-					<p>"Well I don't want you to feel like you always have to be serving me," <<=$npcs.get($sex.npcId,'firstname')>> smiles back. "What can I do to make you feel good?"</p>
+					<p>"Well I don't want you to feel like you always have to be serving me," <<npc $sex.npcId>><</npc>> smiles back. "What can I do to make you feel good?"</p>
 					<<gs 'sex_ev_favorite_part' 'pc_favorite_part'>>
 				<<elseif $npcs.get($sex.npcId,'abusive') == 1>>
-					<p>"Glad you know your place," <<=$npcs.get($sex.npcId,'firstname')>> says smugly.</p>
+					<p>"Glad you know your place," <<npc $sex.npcId>><</npc>> says smugly.</p>
 					<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 				<<else>>
-					<p>"That's nice of you," <<=$npcs.get($sex.npcId,'firstname')>> smiles back.</p>
+					<p>"That's nice of you," <<npc $sex.npcId>><</npc>> smiles back.</p>
 					<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 				<</if>>
 			<</actCLA>>
@@ -405,9 +405,9 @@
 <<if $location_var[$here][0] == 'tit_cum_favorite'>>
 	<<setinit $sex_ev['boy_favorite'] = 'tit_cum'>>
 	<<if getvar("$sex_ev['pc_titcum_jerk']") == 1>>
-		<p>"I love coming all over your tits," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Especially when you finished me yourself. That was fucking hot."</p>
+		<p>"I love coming all over your tits," <<npc $sex.npcId>><</npc>> grins. "Especially when you finished me yourself. That was fucking hot."</p>
 	<<else>>
-		<p>"I love coming all over your tits," <<=$npcs.get($sex.npcId,'firstname')>> grins. "You look so sexy like that."</p>
+		<p>"I love coming all over your tits," <<npc $sex.npcId>><</npc>> grins. "You look so sexy like that."</p>
 	<</if>>
 	<<actCLA 'Glad you enjoyed it'>>
 		<<if getvar("$cum_loc['tits']") > 0>>
@@ -454,18 +454,18 @@
 			<p>"If it's so gross, why do you let me do it?"</p>
 			<<actCLA 'Sex is a two way street'>>
 				<p>"Cause it goes both ways," you shrug. "If I don't let you do stuff to me that you enjoy then how can I ask the same of you?"</p>
-				<p>"Well, what do you enjoy then?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+				<p>"Well, what do you enjoy then?" <<npc $sex.npcId>><</npc>> asks.</p>
 				<<gs 'sex_ev_favorite_part' 'pc_favorite_part'>>
 			<</actCLA>>
 			<<actCLA 'Cause you like it'>>
 				<<actCLA '(Affectionate)'>>
 					"Cause I know you like it," you smirk. "And I like turning you on."
-					<p>"Well, what can I do to turn you on then?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+					<p>"Well, what can I do to turn you on then?" <<npc $sex.npcId>><</npc>> asks.</p>
 					<<gs 'sex_ev_favorite_part' 'pc_favorite_part'>>
 				<</actCLA>>
 				<<actCLA '(Sarcastic)'>>
 					"Cause I know you're a pervert," you say eyeballing him. "And pervs like seeing girls get slimed."
-					<p>"We sure do," <<=$npcs.get($sex.npcId,'firstname')>> chuckles. "But what about you? What do you like?"</p>
+					<p>"We sure do," <<npc $sex.npcId>><</npc>> chuckles. "But what about you? What do you like?"</p>
 					<<gs 'sex_ev_favorite_part' 'pc_favorite_part'>>
 				<</actCLA>>
 			<</actCLA>>
@@ -478,13 +478,13 @@
 			<<actCLA 'I don`t get a say (subservient)'>>
 				<p>"Cause it's not up to me," you shrug. "Sex is about making the guy feel good. I'm the girl you're fucking. If you want to come on my tits, who am I to stop you?"</p>
 				<<if $npcs.get($sex.npcId,'caretaker') == 1>>
-					<p>"Well I don't want you to feel like you always have to be serving me," <<=$npcs.get($sex.npcId,'firstname')>> smiles back. "What can I do to make you feel good?"</p>
+					<p>"Well I don't want you to feel like you always have to be serving me," <<npc $sex.npcId>><</npc>> smiles back. "What can I do to make you feel good?"</p>
 					<<gs 'sex_ev_favorite_part' 'pc_favorite_part'>>
 				<<elseif $npcs.get($sex.npcId,'abusive') == 1>>
-					<p>"Glad you know your place," <<=$npcs.get($sex.npcId,'firstname')>> says smugly.</p>
+					<p>"Glad you know your place," <<npc $sex.npcId>><</npc>> says smugly.</p>
 					<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 				<<else>>
-					<p>"That's nice of you," <<=$npcs.get($sex.npcId,'firstname')>> smiles back.</p>
+					<p>"That's nice of you," <<npc $sex.npcId>><</npc>> smiles back.</p>
 					<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 				<</if>>
 			<</actCLA>>
@@ -493,7 +493,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'pussyeat_favorite'>>
 	<<setinit $sex_ev['boy_favorite'] = 'pussyeating'>>
-	<p>"I love the way you taste," <<=$npcs.get($sex.npcId,'firstname')>> smiles.</p>
+	<p>"I love the way you taste," <<npc $sex.npcId>><</npc>> smiles.</p>
 	<<actCLA 'What do I taste like?'>>
 		<p>"Yeah?" you smirk back. "What do I taste like?"</p>
 		<p>"Hmm... A little salty. Maybe a little sweet too. Not exactly sure how to describe it other than to say you taste delicious. Did you enjoy it too?"</p>
@@ -502,14 +502,14 @@
 	<<actCLA 'What do you like about eating pussy?'>>
 		<p>"Why do you like eating pussy so much?" you giggle. "You're not gonna come from it."</p>
 		<<if rand(0,1) == 1>>
-			<p>"I just like giving more than I like receiving," <<=$npcs.get($sex.npcId,'firstname')>> shrugs. "It turns me on knowing that what I'm doing is making a girl feel good. I love making girls squirm just by running my tongue across their clit at the right time and I like the way they taste. What can I say? I just think it's fun. What about you? What do you like?"</p>
+			<p>"I just like giving more than I like receiving," <<npc $sex.npcId>><</npc>> shrugs. "It turns me on knowing that what I'm doing is making a girl feel good. I love making girls squirm just by running my tongue across their clit at the right time and I like the way they taste. What can I say? I just think it's fun. What about you? What do you like?"</p>
 			<<gs 'sex_ev_favorite_part' 'pc_favorite_part'>>
 		<<else>>
-			<p>"Well, do you like giving blowjobs?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+			<p>"Well, do you like giving blowjobs?" <<npc $sex.npcId>><</npc>> asks.</p>
 			<<actCLA 'No'>>
 				<p>"Uhh, no?" You cock your head. "It's boring and makes my neck hurt and my jaw ache."</p>
-				<p>"Oh. Well, how do I explain it then?" <<=$npcs.get($sex.npcId,'firstname')>> rubs his chin. "I just like giving more than I like receiving. It turns me on knowing that what I'm doing is making a girl feel good. I love making girls squirm just by running my tongue across their clit at the right time and I like the way they taste."</p>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> shrugs.</p>
+				<p>"Oh. Well, how do I explain it then?" <<npc $sex.npcId>><</npc>> rubs his chin. "I just like giving more than I like receiving. It turns me on knowing that what I'm doing is making a girl feel good. I love making girls squirm just by running my tongue across their clit at the right time and I like the way they taste."</p>
+				<p><<npc $sex.npcId>><</npc>> shrugs.</p>
 				<p>"What can I say? I just think it's fun. What about you? What do you like?"</p>
 				<<gs 'sex_ev_favorite_part' 'pc_favorite_part'>>
 			<</actCLA>>
@@ -518,19 +518,19 @@
 				<p>"What do you like about it?"</p>
 				<<actCLA 'Making you feel good'>>
 					"I like making the guy feel good," you say. "Making <i>you</i> feel good. I love how when I use my tongue just right, I can feel your entire body respond through your cock."
-					<p>"Same thing with eating pussy," <<=$npcs.get($sex.npcId,'firstname')>> smirks back. "I like giving more than receiving. It's fun to make girls squirm and I love the taste of pussy. So if you're allowed to love blowjobs, why can't I love eating pussy?"</p>
+					<p>"Same thing with eating pussy," <<npc $sex.npcId>><</npc>> smirks back. "I like giving more than receiving. It's fun to make girls squirm and I love the taste of pussy. So if you're allowed to love blowjobs, why can't I love eating pussy?"</p>
 					"Guess you've got a point," you chuckle.
 					<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 				<</actCLA>>
 				<<actCLA 'The taste'>>
 					"Something about having a cock in my mouth just feels good," you say. "The sweaty rough texture, the sort of musky smell. It's like licking a warm salty popsicle."
-					<p>"Same thing with eating pussy," <<=$npcs.get($sex.npcId,'firstname')>> smirks back. "I love the taste of pussy. And it's fun to lick them, playing with their little clits and making girls squirm with just my tongue. So if you're allowed to love blowjobs, why can't I love eating pussy?"</p>
+					<p>"Same thing with eating pussy," <<npc $sex.npcId>><</npc>> smirks back. "I love the taste of pussy. And it's fun to lick them, playing with their little clits and making girls squirm with just my tongue. So if you're allowed to love blowjobs, why can't I love eating pussy?"</p>
 					"Guess you've got a point," you chuckle.
 					<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 				<</actCLA>>
 				<<actCLA 'The control'>>
 					<p>"I guess because of the control?" you say. "There's something... empowering about having a cock in my mouth. Like I could just chomp down and cause tons of pain but also that I have a direct line to the pleasure a guy is feeling. <i>I</i> get to decide if he gets to feel good. <i>I</i> get to decide if he gets to come. I can edge him, I can tease him, I can swallow him whole, make him gasp. Something about that just... turns me on."</p>
-					<p>"Same thing with eating pussy," <<=$npcs.get($sex.npcId,'firstname')>> smirks back. "I like giving more than receiving. I love the taste of pussy and it's fun to lick them, playing with their little clits and making girls squirm with just my tongue. So if you're allowed to love blowjobs, why can't I love eating pussy?"</p>
+					<p>"Same thing with eating pussy," <<npc $sex.npcId>><</npc>> smirks back. "I like giving more than receiving. I love the taste of pussy and it's fun to lick them, playing with their little clits and making girls squirm with just my tongue. So if you're allowed to love blowjobs, why can't I love eating pussy?"</p>
 					"Guess you've got a point," you chuckle.
 					<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 				<</actCLA>>
@@ -692,7 +692,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'npc_argue_lashout'>>
 	<<run $npcs.dec($sex.npcId,'rel',1)>>
-	<p>"Why're you being such a bitch?" <<=$npcs.get($sex.npcId,'firstname')>> scowls back. "What's the point of asking me what I liked if you're just going to piss on it?"</p>
+	<p>"Why're you being such a bitch?" <<npc $sex.npcId>><</npc>> scowls back. "What's the point of asking me what I liked if you're just going to piss on it?"</p>
 	<<actCLA 'Let it slide'>>
 		<<video "shared/sex/after/pillow_talk_eyeroll.mp4">>
 		A spike of anger jolts through you and your body stiffens for a fight by instinct. But you take a deep breath through your nose and turn your head, choosing not to pursue conflict and just let it go instead.
@@ -701,7 +701,7 @@
 	<<actCLA 'Apologize'>>
 		<<run $npcs.inc($sex.npcId,'rel',1)>>
 		<<image "shared/sex/after/pillow_talk2.jpg">>
-		<p><<=$npcs.get($sex.npcId,'firstname')>>'s response causes you to start. After a moment of shock, you shake your head.</p>
+		<p><<npc $sex.npcId>><</npc>>'s response causes you to start. After a moment of shock, you shake your head.</p>
 		"You're right," you say ruefully. "I'm sorry. I shouldn''t have said that."
 		He turns to look at you, chewing on his cheek for a few seconds.
 		"It's whatever," he mumbles back.
@@ -731,7 +731,7 @@
 		<<actCLA 'Everything together'>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
 			"All of it," you smile warmly. "I loved how everything came together."
-			<p><<=$npcs.get($sex.npcId,'firstname')>> returns the smile with more than a hint of satisfaction.</p>
+			<p><<npc $sex.npcId>><</npc>> returns the smile with more than a hint of satisfaction.</p>
 			<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 		<</actCLA>>
 	<</actCLA>>
@@ -753,9 +753,9 @@
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				"I liked sucking your cock," you grin. "I love the way I can make you groan and buck your hips just with my mouth. It makes me feel sexy."
 				<<if $npcs.get($sex.npcId,'fav_pos') == 'blowjob'>>
-					<p>"Blowjobs are my favorite," <<=$npcs.get($sex.npcId,'firstname')>> smiles back running his thumb across your lips. "But the head you give is especially great."</p>
+					<p>"Blowjobs are my favorite," <<npc $sex.npcId>><</npc>> smiles back running his thumb across your lips. "But the head you give is especially great."</p>
 				<<else>>
-					<p>"You've got magic lips," <<=$npcs.get($sex.npcId,'firstname')>> smiles back, running his thumb across your lips.</p>
+					<p>"You've got magic lips," <<npc $sex.npcId>><</npc>> smiles back, running his thumb across your lips.</p>
 				<</if>>
 				<<gs 'sex_ev_favorite_part' 'pc_bj_fav2'>>
 				<<gs 'sex_ev_favorite_part' 'pc_bj_fav3'>>
@@ -763,18 +763,18 @@
 			<<actCLA 'Oral fixation'>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				"I liked sucking your cock," you grin. "I think I have some kind of oral fixation. Something about having a cock in my mouth just feels <i>good</i>."
-				<p>"Oral fixation huh?" <<=$npcs.get($sex.npcId,'firstname')>> says, running his thumb across your lips.</p>
+				<p>"Oral fixation huh?" <<npc $sex.npcId>><</npc>> says, running his thumb across your lips.</p>
 				<<gs 'sex_ev_favorite_part' 'pc_bj_fav3'>>
 			<</actCLA>>
 			<<actCLA 'The taste'>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				"I liked sucking your cock," you grin. "It tastes good."
 				<<if getvar("$sex_ev['mouth_cum_gross']") == 1>>
-					<p>"You didn't seem to think that when I came in your mouth," <<=$npcs.get($sex.npcId,'firstname')>> smirks.</p>
+					<p>"You didn't seem to think that when I came in your mouth," <<npc $sex.npcId>><</npc>> smirks.</p>
 					"Okay, <i>that's</i> different," you protest. "I said I like the taste of your cock, not the taste of your cum."
 					<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 				<<else>>
-					<p>"Explains why you're so good at it," <<=$npcs.get($sex.npcId,'firstname')>> smirks, running his thumb across your lips. "You were gobbling it up like it was your last meal."</p>
+					<p>"Explains why you're so good at it," <<npc $sex.npcId>><</npc>> smirks, running his thumb across your lips. "You were gobbling it up like it was your last meal."</p>
 					<<gs 'sex_ev_favorite_part' 'pc_bj_fav2'>>
 					<<gs 'sex_ev_favorite_part' 'pc_bj_fav3'>>
 				<</if>>
@@ -790,7 +790,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'pc_bj_fav3'>>
 	<<actCLA 'Suck his thumb'>>
-		<p>As his thumb trails past you let it slip into your mouth. Almost instinctively, you begin sucking on it like a tiny dick, making doe eyes at <<=$npcs.get($sex.npcId,'firstname')>> for a few seconds until you let it pop from your lips.</p>
+		<p>As his thumb trails past you let it slip into your mouth. Almost instinctively, you begin sucking on it like a tiny dick, making doe eyes at <<npc $sex.npcId>><</npc>> for a few seconds until you let it pop from your lips.</p>
 		An intense silence hangs between you as you just keep staring at each other for several more moments.
 		<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 	<</actCLA>>
@@ -800,7 +800,7 @@
 		<<actCLA 'The sex'>>
 			<<if getvar("$sex_ev['virgin']") == 1>>
 				"I liked the sex," you grin, unable to contain your pleasure.
-				<p>"Not bad for your first time huh?" <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
+				<p>"Not bad for your first time huh?" <<npc $sex.npcId>><</npc>> grins back.</p>
 				<<actCLA 'Agree'>>
 					"Not bad at all," you say, with a shake of your head. "You made for a memorable first fuck."
 					<<gs 'sex_ev_pillow_talk' 'topic_route'>>
@@ -814,7 +814,7 @@
 					<<actCLA 'When we did it missionary'>>
 						<<video "shared/sex/after/pillow_talk2.mp4">>
 						"I liked it when we did it in missionary," you smile.
-						<p>"Yeah?" <<=$npcs.get($sex.npcId,'firstname')>> grins back. "That's your favorite position?"</p>
+						<p>"Yeah?" <<npc $sex.npcId>><</npc>> grins back. "That's your favorite position?"</p>
 						<<actCLA 'Not usually'>>
 							"Hmmm... It's not usually my favorite," you shrug. "But something about it was nice this time."
 							<<gs 'sex_ev_pillow_talk' 'topic_route'>>
@@ -845,7 +845,7 @@
 					<<actCLA 'When we did it doggy'>>
 						<<video "shared/sex/after/pillow_talk2.mp4">>
 						"I liked it when you fucked me doggy," you smile.
-						<p>"Yeah?" <<=$npcs.get($sex.npcId,'firstname')>> grins back. "You like it doggy?"</p>
+						<p>"Yeah?" <<npc $sex.npcId>><</npc>> grins back. "You like it doggy?"</p>
 						<<actCLA 'Not usually'>>
 							"Hmmm... It's not <i>usually</i> my favorite," you shrug. "But it was good this time. Nice to mix things up."
 							<<gs 'sex_ev_pillow_talk' 'topic_route'>>
@@ -860,7 +860,7 @@
 						<</actCLA>>
 						<<actCLA 'Feels dirty'>>
 							"It feels dirty," you grin wickedly. "And I like it dirty."
-							<p>"You dirty girl," <<=$npcs.get($sex.npcId,'firstname')>> smirks back.</p>
+							<p>"You dirty girl," <<npc $sex.npcId>><</npc>> smirks back.</p>
 							<p>"Stop!" you tease. "You're gonna make me come."</p>
 							<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 						<</actCLA>>
@@ -870,7 +870,7 @@
 					<<actCLA 'When I got to ride you'>>
 						<<video "shared/sex/after/pillow_talk2.mp4">>
 						"I liked it when I got to be on top," you smile.
-						<p>"Yeah?" <<=$npcs.get($sex.npcId,'firstname')>> grins back. "You like to ride?"</p>
+						<p>"Yeah?" <<npc $sex.npcId>><</npc>> grins back. "You like to ride?"</p>
 						<<actCLA 'Not usually'>>
 							<p>"Hmmm... It's not <i>usually</i> my favorite," you shrug. "But who doesn't like a good ride now and then?"</p>
 							<<gs 'sex_ev_pillow_talk' 'topic_route'>>
@@ -892,7 +892,7 @@
 				<<if getvar("$sex_ev['gentle_fuck']") == 1>>
 					<<actCLA 'When you were gentle'>>
 						<<image "shared/sex/after/pillow_talk1.jpg">>
-						<p>"I liked it when you were gentle, " you say, smiling warmly at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+						<p>"I liked it when you were gentle, " you say, smiling warmly at <<npc $sex.npcId>><</npc>>.</p>
 						<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 					<</actCLA>>
 				<</if>>
@@ -901,7 +901,7 @@
 						<<setinit $sex_ev['rough_pillow_talk'] = 1>>
 						<<image "shared/sex/after/pillow_talk1.jpg">>
 						"I liked it when you fucked me hard," you grin.
-						<p>"You like it that way?" <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+						<p>"You like it that way?" <<npc $sex.npcId>><</npc>> grins.</p>
 						<<actCLA 'Sometimes'>>
 							"Not always," you shrug. "But any one speed is boring if you don't mix it up. A good pounding is always welcome provided the timing is right."
 							<<gs 'sex_ev_pillow_talk' 'topic_route'>>
@@ -917,7 +917,7 @@
 							<<setinit $sex_ev['rough_pillow_talk'] = 1>>
 							<<image "shared/sex/after/pillow_talk1.jpg">>
 							"I liked it when you got rough with me," you grin.
-							<p>"You like it rough?" <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
+							<p>"You like it rough?" <<npc $sex.npcId>><</npc>> grins back.</p>
 							<<actCLA 'Sometimes'>>
 								<p>"Not always," you shrug. "But what girl doesn't like to get rough housed now and again?"</p>
 								<<gs 'sex_ev_pillow_talk' 'topic_route'>>
@@ -956,7 +956,7 @@
 		<<actCLA 'The sex (shy)'>>
 			<<if getvar("$sex_ev['virgin']") == 1>>
 				<p>"I liked- I liked the sex," you mumble, a crimson blush spreading through your cheeks.</p>
-				<p>"Not bad for your first time huh?" <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
+				<p>"Not bad for your first time huh?" <<npc $sex.npcId>><</npc>> grins back.</p>
 				<<actCLA 'Agree'>>
 					You shake your head, smiling shyly, feeling your blush intensify.
 					<i>Oh my! How embarrassing!</i>
@@ -971,7 +971,7 @@
 					<<actCLA 'When we did it missionary'>>
 						<<image "shared/sex/after/pillow_talk1.jpg">>
 						"I liked it when... when we did it in missionary," you say, a crimson blush spreading through your cheeks.
-						<p>"Yeah?" <<=$npcs.get($sex.npcId,'firstname')>> grins back. "That's your favorite position?"</p>
+						<p>"Yeah?" <<npc $sex.npcId>><</npc>> grins back. "That's your favorite position?"</p>
 						<<actCLA 'Not usually'>>
 							"Not usually my favorite," you stammer. "But something about it was nice this time."
 							<<gs 'sex_ev_pillow_talk' 'topic_route'>>
@@ -994,7 +994,7 @@
 					<<actCLA 'When we did it doggy'>>
 						<<image "shared/sex/after/pillow_talk1.jpg">>
 						"I liked it when you, uhm... when you did me from behind..." you say, a crimson blush spreading through your cheeks.
-						<p>"Yeah?" <<=$npcs.get($sex.npcId,'firstname')>> grins back. "You like it doggy?"</p>
+						<p>"Yeah?" <<npc $sex.npcId>><</npc>> grins back. "You like it doggy?"</p>
 						<<actCLA 'Not usually'>>
 							"Not usually my favorite," you stammer. "But something about it was nice this time."
 							<<gs 'sex_ev_pillow_talk' 'topic_route'>>
@@ -1009,7 +1009,7 @@
 						<</actCLA>>
 						<<actCLA 'Feels dirty'>>
 							<p>"Y-yes," you admit. "I kind of like how, uhm... <i>dirty</i>... it feels..."</p>
-							<p>"You dirty girl," <<=$npcs.get($sex.npcId,'firstname')>> replies and you feel your blush intensify.</p>
+							<p>"You dirty girl," <<npc $sex.npcId>><</npc>> replies and you feel your blush intensify.</p>
 							<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 						<</actCLA>>
 					<</actCLA>>
@@ -1018,7 +1018,7 @@
 					<<actCLA 'When I got to ride you'>>
 						<<image "shared/sex/after/pillow_talk1.jpg">>
 						"I liked it when, uhm... when I got to be on top..." you say, a crimson blush spreading through your cheeks.
-						<p>"Yeah?" <<=$npcs.get($sex.npcId,'firstname')>> grins back. "You like to ride?"</p>
+						<p>"Yeah?" <<npc $sex.npcId>><</npc>> grins back. "You like to ride?"</p>
 						<<actCLA 'Not usually'>>
 							"Not usually my favorite," you stammer. "But something about it was nice this time."
 							<<gs 'sex_ev_pillow_talk' 'topic_route'>>
@@ -1049,7 +1049,7 @@
 						<<setinit $sex_ev['rough_pillow_talk'] = 1>>
 						<<image "shared/sex/after/pillow_talk1.jpg">>
 						"I liked it when you, uhm... when you fucked me hard..." you say, a crimson blush spreading through your cheeks.
-						<p>"You like to get pounded?" <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+						<p>"You like to get pounded?" <<npc $sex.npcId>><</npc>> grins.</p>
 						<<actCLA 'Sometimes'>>
 							<p>"Not a-always," you stammer. "But it's nice now and again..."</p>
 							<<gs 'sex_ev_pillow_talk' 'topic_route'>>
@@ -1064,7 +1064,7 @@
 							<<setinit $sex_ev['rough_pillow_talk'] = 1>>
 							<<image "shared/sex/after/pillow_talk1.jpg">>
 							"I liked it when you, uhm... when you got rough with me..." you say, a crimson blush spreading through your cheeks.
-							<p>"You like it rough?" <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+							<p>"You like it rough?" <<npc $sex.npcId>><</npc>> grins.</p>
 							<<actCLA 'Sometimes'>>
 								<p>"Not a-always," you stammer. "But the variety was nice..."</p>
 								<<gs 'sex_ev_pillow_talk' 'topic_route'>>
@@ -1125,24 +1125,24 @@
 			<<image "shared/sex/after/pillow_talk1.jpg">>
 			<<if $sex_ev['boy_favorite'] == 'creampie' and $npcs.get($sex.npcId,'free_creampies') < 1 and getvar("$sex_ev['surprise_creampie_count']") > 0 and $npcs.get($sex.npcId,'ask_creampie') > 0>>
 				<<if $npcs.get($sex.npcId,'know_not_bc') == 1 and getvar("$birth_control['think_safe']") != 1>>
-					<p>"I... liked it when you came inside me," you admit, quickly holding up your finger before <<=$npcs.get($sex.npcId,'firstname')>> can say anything. "But you still need to ask before you do it! You know I'm not on birth control so it's extra important!"</p>
+					<p>"I... liked it when you came inside me," you admit, quickly holding up your finger before <<npc $sex.npcId>><</npc>> can say anything. "But you still need to ask before you do it! You know I'm not on birth control so it's extra important!"</p>
 				<<elseif getvar("$birth_control['think_safe']") != 1>>
 					<<gs 'sex_ev_stats' 'no_birth_control_know'>>
-					<p>"I... liked it when you came inside me," you admit, quickly holding up your finger before <<=$npcs.get($sex.npcId,'firstname')>> can say anything. "But you still need to ask before you do it! I'm not on birth control so it's dangerous."</p>
+					<p>"I... liked it when you came inside me," you admit, quickly holding up your finger before <<npc $sex.npcId>><</npc>> can say anything. "But you still need to ask before you do it! I'm not on birth control so it's dangerous."</p>
 				<<else>>
-					<p>"I... liked it when you came inside me," you admit, quickly holding up your finger before <<=$npcs.get($sex.npcId,'firstname')>> can say anything. "But you still need to ask before you do it! Just because it feels good doesn't mean you can't ask permission!"</p>
+					<p>"I... liked it when you came inside me," you admit, quickly holding up your finger before <<npc $sex.npcId>><</npc>> can say anything. "But you still need to ask before you do it! Just because it feels good doesn't mean you can't ask permission!"</p>
 				<</if>>
 			<<elseif $sex_ev['boy_favorite'] == 'creampie'>>
 				<<if getvar("$cum_loc['vagina']") > 0>>
-					<p>"The same as you," you smile warmly at <<=$npcs.get($sex.npcId,'firstname')>> rubbing your wet thighs together where his cum continues to leak from your pussy. "I could <i>feel</i> everything. Your cock throbbing inside me, warmth spreading through my hips, I just felt <i>full</i> when you came inside me. And it's really really good."</p>
+					<p>"The same as you," you smile warmly at <<npc $sex.npcId>><</npc>> rubbing your wet thighs together where his cum continues to leak from your pussy. "I could <i>feel</i> everything. Your cock throbbing inside me, warmth spreading through my hips, I just felt <i>full</i> when you came inside me. And it's really really good."</p>
 				<<else>>
-					<p>"The same as you," you smile warmly at <<=$npcs.get($sex.npcId,'firstname')>> rubbing your wet thighs together where his cum was leaking from your snatch just minutes ago. "I could <i>feel</i> everything. Your cock throbbing inside me, warmth spreading through my hips, I just felt <i>full</i> when you came inside me. And it's really really good."</p>
+					<p>"The same as you," you smile warmly at <<npc $sex.npcId>><</npc>> rubbing your wet thighs together where his cum was leaking from your snatch just minutes ago. "I could <i>feel</i> everything. Your cock throbbing inside me, warmth spreading through my hips, I just felt <i>full</i> when you came inside me. And it's really really good."</p>
 				<</if>>
 			<<else>>
 				<<if getvar("$cum_loc['vagina']") > 0>>
-					<p>"I liked it when you came inside me," you smile warmly at <<=$npcs.get($sex.npcId,'firstname')>> rubbing your wet thighs together where his cum continues to leak from your pussy. "I could <i>feel</i> everything. Your cock throbbing inside me, warmth spreading through my hips, I just felt <i>full</i> when you came inside me. And it's really really good."</p>
+					<p>"I liked it when you came inside me," you smile warmly at <<npc $sex.npcId>><</npc>> rubbing your wet thighs together where his cum continues to leak from your pussy. "I could <i>feel</i> everything. Your cock throbbing inside me, warmth spreading through my hips, I just felt <i>full</i> when you came inside me. And it's really really good."</p>
 				<<else>>
-					<p>"I liked it when you came inside me," you smile warmly at <<=$npcs.get($sex.npcId,'firstname')>> rubbing your wet thighs together where his cum was leaking from your snatch just minutes ago. "I could <i>feel</i> everything. Your cock throbbing inside me, warmth spreading through my hips, I just felt <i>full</i> when you came inside me. And it's really really good."</p>
+					<p>"I liked it when you came inside me," you smile warmly at <<npc $sex.npcId>><</npc>> rubbing your wet thighs together where his cum was leaking from your snatch just minutes ago. "I could <i>feel</i> everything. Your cock throbbing inside me, warmth spreading through my hips, I just felt <i>full</i> when you came inside me. And it's really really good."</p>
 				<</if>>
 			<</if>>
 			<<if getvar("$sex_ev['accidental_creampie_convo']") == 0 and ($npcs.get($sex.npcId,'know_not_bc') == 1 or getvar("$sex_ev['risky_creampie']") > 0 or $npcs.get($sex.npcId,'childfree') > 0) and getvar("$sex_ev['safe_day']") != 1 and getvar("$sex_ev['probably_safe_day']") != 1>>
@@ -1181,7 +1181,7 @@
 					<</if>>
 					<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 				<<else>>
-					<p>"I liked it when I swallowed your cum," you tell <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+					<p>"I liked it when I swallowed your cum," you tell <<npc $sex.npcId>><</npc>>.</p>
 					<p>"What did you like about it?" he asks in response, eyes gleaming with arousal and curiosity.</p>
 					<<actCLA 'The situation'>>
 						<p>"Just... doing it I guess?" you say with a shy smile. "There's just something... <i>hot</i> about swallowing a guys's load. I don't really get it myself if I'm being honest. All I know is that it turns me on."</p>
@@ -1207,7 +1207,7 @@
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				<<if $sex_ev['boy_favorite'] == 'facial'>>
 					"The same as you," you admit with a smile. "There''s something strangely hot about when a guy blows his load all over my face. I just feel... <i>sexy</i>."
-					<p>"You look sexy too," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+					<p>"You look sexy too," <<npc $sex.npcId>><</npc>> grins.</p>
 				<<else>>
 					"I liked it when you came on my face," you smile. "There''s something strangely hot about when a guy blows his load all over my face. I just feel... <i>sexy</i>."
 				<</if>>
@@ -1223,7 +1223,7 @@
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				<<if $sex_ev['boy_favorite'] == 'tit_cum'>>
 					"The same as you," you admit with a smile. "There''s something strangely hot about when a guy blows his load all over my tits. I just feel... <i>sexy</i>. And the warmth is oddly comforting..."
-					<p>"You look sexy too," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+					<p>"You look sexy too," <<npc $sex.npcId>><</npc>> grins.</p>
 				<<else>>
 					"I liked it when you came on my face," you smile. "There''s something strangely hot about when a guy blows his load all over my face. I just feel... <i>sexy</i>. And the warmth is oddly comforting..."
 				<</if>>
@@ -1234,7 +1234,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'good_for_you_too'>>
 	<<actCLA 'Satisfied'>>
-		<p>"I had fun," you say, smiling at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+		<p>"I had fun," you say, smiling at <<npc $sex.npcId>><</npc>>.</p>
 		<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 	<</actCLA>>
 	<<actCLA 'Unsatisfied'>>
@@ -1264,9 +1264,9 @@
 			<<actCLA '(in a good way)'>>
 				<<setinit $sex_ev['sore_pussy_talk'] = 1>>
 				<<if $sex_ev['cum_count'] >= $npcs.get($sex.npcId,'sexdrive')>>
-					<p>"I'm not gonna be able to walk right for a week either," you say, rubbing your thighs over your thoroughly fucked sex and grinning as you add, "I think you might've pounded my pussy into a <<=$npcs.get($sex.npcId,'firstname')>> shape."</p>
+					<p>"I'm not gonna be able to walk right for a week either," you say, rubbing your thighs over your thoroughly fucked sex and grinning as you add, "I think you might've pounded my pussy into a <<npc $sex.npcId>><</npc>> shape."</p>
 				<<else>>
-					<p>"I'm not gonna be able to walk right for a week," you say, rubbing your thighs over your thoroughly fucked sex and grinning as you add, "I think you might've pounded my pussy into a <<=$npcs.get($sex.npcId,'firstname')>> shape."</p>
+					<p>"I'm not gonna be able to walk right for a week," you say, rubbing your thighs over your thoroughly fucked sex and grinning as you add, "I think you might've pounded my pussy into a <<npc $sex.npcId>><</npc>> shape."</p>
 				<</if>>
 				<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 			<</actCLA>>
@@ -1287,10 +1287,10 @@
 				<<setinit $sex_ev['sore_pussy_talk'] = 1>>
 				"I'm a little sore," you say with a half smile, rubbing your wet thighs together over your delightfully tender sex. "But in a good way."
 				<<if $npcs.get($sex.npcId,'gymrat') == 1>>
-					<p>"Like the soreness after a workout?" <<=$npcs.get($sex.npcId,'firstname')>> asks amusedly.</p>
+					<p>"Like the soreness after a workout?" <<npc $sex.npcId>><</npc>> asks amusedly.</p>
 					"Yeah," you nod. "Something like that. But in my pussy."
 				<<else>>
-					<p>"How can you feel sore in a good way?" <<=$npcs.get($sex.npcId,'firstname')>> asks amusedly.</p>
+					<p>"How can you feel sore in a good way?" <<npc $sex.npcId>><</npc>> asks amusedly.</p>
 					"I just do," you shrug. "Besides, it's your fault for fucking me so well."
 				<</if>>
 				You both grin at that.
@@ -1305,12 +1305,12 @@
 	<</if>>
 	<<if $sex_ev['orgasm_count'] + getvar("$sex_ev['fake_orgasm_count']") > 3>>
 		<<actCLA 'Lots of orgasms'>>
-			<p>"You made me come lots," you say, flashing a tired smile at <<=$npcs.get($sex.npcId,'firstname')>>. "It was more than good."</p>
+			<p>"You made me come lots," you say, flashing a tired smile at <<npc $sex.npcId>><</npc>>. "It was more than good."</p>
 			<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 		<</actCLA>>
 	<<elseif getvar("$sex_ev['orgasm_count']") > 0>>
 		<<actCLA 'You got me off'>>
-			<p>"You made me come," you say, smiling at <<=$npcs.get($sex.npcId,'firstname')>>. "How could I complain?"</p>
+			<p>"You made me come," you say, smiling at <<npc $sex.npcId>><</npc>>. "How could I complain?"</p>
 			<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 		<</actCLA>>
 	<</if>>
@@ -1319,13 +1319,13 @@
 			"I could''ve gone a few more rounds," you say wistfully.
 			"Sorry," he says, looking a little embarrassed. "The spirit is willing, but the flesh is spongey and bruised.
 			<<actCLA 'Laugh'>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>>'s response makes you laugh out loud.</p>
+				<p><<npc $sex.npcId>><</npc>>'s response makes you laugh out loud.</p>
 				"That's okay," you giggle. "I forgive you."
 				<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 			<</actCLA>>
 			<<actCLA 'Roll your eyes'>>
 				<<video "shared/sex/after/pillow_talk_eyeroll.mp4">>
-				<p>You roll your eyes to the heavens though <<=$npcs.get($sex.npcId,'firstname')>> looks quite amused by his own joke.</p>
+				<p>You roll your eyes to the heavens though <<npc $sex.npcId>><</npc>> looks quite amused by his own joke.</p>
 				"You've endured such hardship, getting fucked by me so many times," you say flatly.
 				<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 			<</actCLA>>
@@ -1335,7 +1335,7 @@
 		<<actCLA 'I`m full (of cum)'>>
 			<<gs 'sex_ev_pillow_talk' 'talk_time_add'>>
 			<<setinit $sex_ev['creampie_pillow_talk'] = 1>>
-			<p>"I'm all full," you smile, rubbing your belly in tired satisfaction as <<=$npcs.get($sex.npcId,'firstname')>>'s cum overflows from your snatch.</p>
+			<p>"I'm all full," you smile, rubbing your belly in tired satisfaction as <<npc $sex.npcId>><</npc>>'s cum overflows from your snatch.</p>
 			<<gs 'sex_ev_pillow_talk' 'topics'>>
 		<</actCLA>>
 	<</if>>

+ 123 - 123
sugarcube/src/autogenerated/unsorted/sex_ev_foreplay.tw

@@ -43,17 +43,17 @@
 	<<if (rand(0,1) == 1 or $npcs.get($sex.npcId,'pussyeater') == 1) and getvar("$sex_ev['sensitive_cuni']") != 1>>
 		<!-- !! cunnilingus-->
 		<<if getvar("$sex_ev['start_shower']") == 1>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> drags you back into the bedroom, your hair still wet from the shower, and shoves you backwards onto the bed kneeling between your legs.</p>
+			<p><<npc $sex.npcId>><</npc>> drags you back into the bedroom, your hair still wet from the shower, and shoves you backwards onto the bed kneeling between your legs.</p>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> shoves you backwards onto onto the bed begins laying a trail of kisses, heading down between your legs.</p>
+			<p><<npc $sex.npcId>><</npc>> shoves you backwards onto onto the bed begins laying a trail of kisses, heading down between your legs.</p>
 		<</if>>
 		<<gs 'sex_ev_foreplay' 'kuni_start'>>
 	<<else>>
 		<!-- !! nipple play-->
 		<<if getvar("$sex_ev['start_shower']") == 1>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> drags you back into the bedroom and shoves you backwards onto onto the bed, starting a trail of kisses up your wet stomach, towards your breasts.</p>
+			<p><<npc $sex.npcId>><</npc>> drags you back into the bedroom and shoves you backwards onto onto the bed, starting a trail of kisses up your wet stomach, towards your breasts.</p>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> shoves you backwards onto onto the bed and begins leaving a new trail of kisses up your stomach, towards your breasts.</p>
+			<p><<npc $sex.npcId>><</npc>> shoves you backwards onto onto the bed and begins leaving a new trail of kisses up your stomach, towards your breasts.</p>
 		<</if>>
 		<<actCLA 'Continue'>>
 			<<gs 'sex_ev_foreplay' 'nipple_play'>>
@@ -66,7 +66,7 @@
 		<<gs 'sex_ev_foreplay' 'selfish_fuck_start'>>
 	<</if>>
 <<case 'selfish_bj_start'>>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> pulls you towards him and pushes you to your knees in the same motion, dangling his cock in front of your face. It's pretty obvious what he wants right now...</p>
+	<p><<npc $sex.npcId>><</npc>> pulls you towards him and pushes you to your knees in the same motion, dangling his cock in front of your face. It's pretty obvious what he wants right now...</p>
 	<<actCLA 'Don`t wanna suck cock'>>
 		$sex_ev['bed_room']
 		<p>"I don't really want to suck your dick right now," you complain. "Can we do something else?"</p>
@@ -98,7 +98,7 @@
 				<<actCLA 'How about a handy instead? (will_cost Willpower)'>>
 					<<gs 'willpower' 'bj' 'resist'>>
 					<<gs 'willpower' 'pay' 'self'>>
-					<p>"Seriously <<=$npcs.get($sex.npcId,'firstname')>>, I don't feel like it today. Can I give you a handy instead?" you ask looking up at him, gently tugging on his cock already. "Please?"</p>
+					<p>"Seriously <<npc $sex.npcId>><</npc>>, I don't feel like it today. Can I give you a handy instead?" you ask looking up at him, gently tugging on his cock already. "Please?"</p>
 					"Oh alright," he sighs. "That's fine I guess."
 					<<actCLA 'Jerk him off'>>
 						 <<gs 'sex_ev_foreplay' 'handjob_dom1'>>
@@ -143,7 +143,7 @@
 		<<if $npcs.get($sex.npcId,'fav_pos') == 'miss' or getvar("$sex_ev['position_rand']") == 1>>
 			<<setinit $sex_ev['position'] = 'miss'>>
 			<<image "shared/sex/foreplay/miss3.jpg">>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> pushes you down on the bed and spreads your legs, preparing to thrust between them.</p>
+			<p><<npc $sex.npcId>><</npc>> pushes you down on the bed and spreads your legs, preparing to thrust between them.</p>
 			<<if $pc.thinksIsVirgin and getvar("$sex_ev['fuck_count']") == 0>>
 				<<actCLA 'Stop him (virgin)'>>
 					<<setinit $sex_ev['position'] = 'miss'>> <<gt 'sex_ev_virgin' 'lover_wait'>>
@@ -161,11 +161,11 @@
 			<<if $npcs.get($sex.npcId,'fav_pos') == 'doggy' or getvar("$sex_ev['position_rand']") == 2>>
 				<<setinit $sex_ev['position'] = 'doggy'>>
 				<<image "shared/sex/foreplay/doggy1.jpg">>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> pushes you down on the bed and draws you up to your knees, preparing to thrust into you from behind.</p>
+				<p><<npc $sex.npcId>><</npc>> pushes you down on the bed and draws you up to your knees, preparing to thrust into you from behind.</p>
 			<<elseif $npcs.get($sex.npcId,'fav_pos') == 'cowgirl' or getvar("$sex_ev['position_rand']") == 3>>
 				<<setinit $sex_ev['position'] = 'cowgirl'>>
 				<<image "shared/sex/foreplay/cowgirl1.jpg">>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> drags you down on the bed with him, pulling you up so you're straddling him to ride his cock.</p>
+				<p><<npc $sex.npcId>><</npc>> drags you down on the bed with him, pulling you up so you're straddling him to ride his cock.</p>
 			<</if>>
 			<<actCLA 'Let him fuck you'>>
 				<<gt `'sex_ev_'+$sex_ev['position']` '$sex_ev['position']_goto'>>
@@ -180,7 +180,7 @@
 			<<image "shared/sex/cock/condom1.jpg">>
 			<<if $npcs.get($sex.npcId,'fav_pos') == 'miss' or getvar("$sex_ev['position_rand']") == 1>>
 				<<setinit $sex_ev['position'] = 'miss'>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> pushes you down on the bed and spreads your legs, pausing only to grab a condom and roll it onto his cock.</p>
+				<p><<npc $sex.npcId>><</npc>> pushes you down on the bed and spreads your legs, pausing only to grab a condom and roll it onto his cock.</p>
 				<<if $pc.thinksIsVirgin and getvar("$sex_ev['fuck_count']") == 0>>
 					<<actCLA 'Stop him (virgin)'>>
 						<<setinit $sex_ev['position'] = 'miss'>> <<gt 'sex_ev_virgin' 'lover_wait'>>
@@ -201,10 +201,10 @@
 			<<elseif !$pc.thinksIsVirgin or getvar("$sex_ev['fuck_count']") > 0>>
 				<<if $npcs.get($sex.npcId,'fav_pos') == 'doggy' or getvar("$sex_ev['position_rand']") == 2>>
 					<<setinit $sex_ev['position'] = 'doggy'>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> pushes you down on the bed and draws you up to your knees, preparing to thrust into you from behind.</p>
+					<p><<npc $sex.npcId>><</npc>> pushes you down on the bed and draws you up to your knees, preparing to thrust into you from behind.</p>
 				<<elseif $npcs.get($sex.npcId,'fav_pos') == 'cowgirl' or getvar("$sex_ev['position_rand']") == 3>>
 					<<setinit $sex_ev['position'] = 'cowgirl'>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> drags you down on the bed with him, pulling you up so you're straddling him to ride his cock.</p>
+					<p><<npc $sex.npcId>><</npc>> drags you down on the bed with him, pulling you up so you're straddling him to ride his cock.</p>
 				<</if>>
 				"I'm going to fuck you silly," he growls as he tears open a condom and starts rolling it onto his cock.
 				<<actCLA 'Let him fuck you'>>
@@ -225,9 +225,9 @@
 	<<actCLA 'Ask him to eat you out'>>
 		<p>"Do you think you could give me some TLC?" you ask. "A little tongue action?"</p>
 		<<if $npcs.get($sex.npcId,'pussyeater') == 1>>
-			<p>"Be careful what you ask for," <<=$npcs.get($sex.npcId,'firstname')>> grins, quickly settling between your thighs.</p>
+			<p>"Be careful what you ask for," <<npc $sex.npcId>><</npc>> grins, quickly settling between your thighs.</p>
 		<<else>>
-			<p>"I guess I could," <<=$npcs.get($sex.npcId,'firstname')>> says, moving down between your thighs.</p>
+			<p>"I guess I could," <<npc $sex.npcId>><</npc>> says, moving down between your thighs.</p>
 		<</if>>
 		<<actCLA 'Get eaten out'>>
 			<<gs 'sex_ev_foreplay' 'pussy_lick'>>
@@ -263,7 +263,7 @@
 				<</actCLA>>
 			<<else>>
 				<p>"Oh. Maybe not then. How about this insted?"</p>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> climbs up in front of you, bending his head towards your breasts.</p>
+				<p><<npc $sex.npcId>><</npc>> climbs up in front of you, bending his head towards your breasts.</p>
 				<<actCLA 'Continue'>>
 					<<gs 'sex_ev_foreplay' 'nipple_play'>>
 				<</actCLA>>
@@ -280,7 +280,7 @@
 			$sex_ev['bed_room']
 			<<if getvar("$kuni_no["+$sex.npcId+"]") == 0>>
 				<p>"Woah!" you say with wide eyes, snapping your legs closed.</p>
-				<p>"What?" <<=$npcs.get($sex.npcId,'firstname')>> looks up at you confused.</p>
+				<p>"What?" <<npc $sex.npcId>><</npc>> looks up at you confused.</p>
 				<<actCLA 'Too personal'>>
 					<<setinit $kuni_no[$sex.npcId] = 1>>
 					<<setinit $sex_ev['kuni_no'] = 1>>
@@ -292,7 +292,7 @@
 					<<actCLA 'Too sensitive'>>
 						<<setinit $sex_ev['sensitive_cuni'] = 1>>
 						"You've eaten me out too many times today already," you say with a wry smile. "My pussy is too sensitive to let you down there again."
-						<p>"Oh. Well..." <<=$npcs.get($sex.npcId,'firstname')>> smirks back at you smugly.</p>
+						<p>"Oh. Well..." <<npc $sex.npcId>><</npc>> smirks back at you smugly.</p>
 						<<gs 'sex_ev_foreplay' 'cuni_alternatives'>>
 					<</actCLA>>
 				<</if>>
@@ -348,13 +348,13 @@
 	<<arouse 'cuni' `rand(5,10)` `['no_orgasm_msg']`>>
 	<<arouse 'cuni' -10 `['no_orgasm_msg']`>>
 	<<setinit $sex_ev['position'] = 'kuni'>>
-	<p>You lay back on the bed, letting your eyes roll back in your skull. Blood and pussy juice flow like water from your cunt and <<=$npcs.get($sex.npcId,'firstname')>> laps it up like ambrosia. It feels <i>so</i> good and you relax while he goes to work on you down there.</p>
+	<p>You lay back on the bed, letting your eyes roll back in your skull. Blood and pussy juice flow like water from your cunt and <<npc $sex.npcId>><</npc>> laps it up like ambrosia. It feels <i>so</i> good and you relax while he goes to work on you down there.</p>
 	<<if $sex_ev['orgasm'] < $orgasm>>
 		<<actCLA 'Orgasm'>>
 			<<video "shared/sex/kuni/pussylickorgasm2.mp4">>
 			<<setinit $sex_ev['orgasm_count'] += 1>>
 			<<setinit $sex_ev['orgasm'] = $orgasm>>
-			<p>It doesn't take long before you're buckling under <<=$npcs.get($sex.npcId,'firstname')>>'s tongue, squirming in orgasm as he continues teasing, sucking, playing with your clit. You groan a loud ragged breath as you come hard beneath his touch.</p>
+			<p>It doesn't take long before you're buckling under <<npc $sex.npcId>><</npc>>'s tongue, squirming in orgasm as he continues teasing, sucking, playing with your clit. You groan a loud ragged breath as you come hard beneath his touch.</p>
 			<<if $npcs.get($sex.npcId,'pussyeater') == 1>>
 				<<gs 'sex_ev_foreplay' 'pussy_lick_loop'>>
 			<<else>>
@@ -400,9 +400,9 @@
 		<<setinit $sex_ev['creampie_eat'] += 1>>
 		<<set $cumspclnt = 0>>
 		<<gs 'cum_cleanup'>>
-		<p>You lay back on the bed, closing your eyes, letting them roll back in your skull, and focus on the sensation of <<=$npcs.get($sex.npcId,'firstname')>>'s tongue exploring your pussy. It playfully flicks across your clit, making you squirm. It runs up the lips of your snatch and you can feel <<=$npcs.get($sex.npcId,'firstname')>> slurping up the load he deposited inside you, sending shivers through your spine. Every once in a while, he licks the side of your thigh, prompting ticklish giggles. It feels <i>so</i> good and you relax while he goes to work on you down there.</p>
+		<p>You lay back on the bed, closing your eyes, letting them roll back in your skull, and focus on the sensation of <<npc $sex.npcId>><</npc>>'s tongue exploring your pussy. It playfully flicks across your clit, making you squirm. It runs up the lips of your snatch and you can feel <<npc $sex.npcId>><</npc>> slurping up the load he deposited inside you, sending shivers through your spine. Every once in a while, he licks the side of your thigh, prompting ticklish giggles. It feels <i>so</i> good and you relax while he goes to work on you down there.</p>
 	<<else>>
-		<p>You lay back on the bed, closing your eyes, letting them roll back in your skull, and focus on the sensation of <<=$npcs.get($sex.npcId,'firstname')>>'s tongue exploring your pussy. It playfully flicks across your clit, making you squirm. It runs up the lips of your snatch, sending shivers through your spine. Every once in a while, he licks the side of your thigh, prompting ticklish giggles. It feels <i>so</i> good and you relax while he goes to work on you down there.</p>
+		<p>You lay back on the bed, closing your eyes, letting them roll back in your skull, and focus on the sensation of <<npc $sex.npcId>><</npc>>'s tongue exploring your pussy. It playfully flicks across your clit, making you squirm. It runs up the lips of your snatch, sending shivers through your spine. Every once in a while, he licks the side of your thigh, prompting ticklish giggles. It feels <i>so</i> good and you relax while he goes to work on you down there.</p>
 	<</if>>
 	<<if $sex_ev['orgasm'] < $orgasm>>
 		<<actCLA 'Orgasm'>>
@@ -410,7 +410,7 @@
 			<<setinit $sex_ev['orgasm_count'] += 1>>
 			<<setinit $sex_ev['cuni_orgasm'] += 1>>
 			<<setinit $sex_ev['orgasm'] = $orgasm>>
-			<p>It doesn't take long before you're buckling under <<=$npcs.get($sex.npcId,'firstname')>>'s tongue, squirming in orgasm as he continues teasing, sucking, playing with your clit. You groan a loud ragged breath as you come hard beneath his touch.</p>
+			<p>It doesn't take long before you're buckling under <<npc $sex.npcId>><</npc>>'s tongue, squirming in orgasm as he continues teasing, sucking, playing with your clit. You groan a loud ragged breath as you come hard beneath his touch.</p>
 			<<if $npcs.get($sex.npcId,'pussyeater') == 1>>
 				<<gs 'sex_ev_foreplay' 'pussy_lick_loop'>>
 			<<else>>
@@ -450,7 +450,7 @@
 <<case 'pussy_lick_loop'>>
 	<<setinit $sex_ev['cuni_count'] += 1>>
 	<<if getvar("$sex_ev['consecutive_cuni_orgasm']") == 0>>
-		<p>But <<=$npcs.get($sex.npcId,'firstname')>> is relentless. Even as your climax winds down, he doesn't stop, continuing to eat you out.</p>
+		<p>But <<npc $sex.npcId>><</npc>> is relentless. Even as your climax winds down, he doesn't stop, continuing to eat you out.</p>
 	<</if>>
 	<<if getvar("$sex_ev['consecutive_cuni_orgasm']") < 4>>
 		<<actCLA 'Come again'>>
@@ -493,7 +493,7 @@
 		<!-- !! IMAGE HERE-->
 		$sex_ev['bed_room']
 		<p>"Stop! Stop! Stop!" you cry desperately, pushing his head away and snapping your legs closed, your entire body writhing uncontrollably on the bed as orgasmic tremors continue to quake through you. "I can't take it anymore!"</p>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> looks up at you, wet lips pulled back in a grin. You look at him from the corner of your eye, face half buried in the sheets, breathing hard as he stands up. You can see he's still as hard as a rock, but something about his expression says to you that he got off on this anyway.</p>
+		<p><<npc $sex.npcId>><</npc>> looks up at you, wet lips pulled back in a grin. You look at him from the corner of your eye, face half buried in the sheets, breathing hard as he stands up. You can see he's still as hard as a rock, but something about his expression says to you that he got off on this anyway.</p>
 		<<actCLA 'I`m done'>>
 			$sex_ev['bed_room']
 			"I'm done," you say, taking ragged breaths. "I'm shattered... I can't keep going after that..."
@@ -503,7 +503,7 @@
 			<<set $time.minutes += rand(1,2)>>
 			$sex_ev['bed_room']
 			"Give me a minute..." you pant. "And we can do something else..."
-			<p><<=$npcs.get($sex.npcId,'firstname')>> waits patiently for you, a satisfied looking smirk on his face.</p>
+			<p><<npc $sex.npcId>><</npc>> waits patiently for you, a satisfied looking smirk on his face.</p>
 			"Oh fuck you," you say.
 			"Ready and waiting for it," he says back, still smirking.
 			<<gs 'sex_ev_foreplay' 'foreplay_choose'>>
@@ -514,15 +514,15 @@
 	<<video "shared/sex/foreplay/nipple_play1.mp4">>
 	<<arouse 'foreplay' `rand(5,10)` `['no_orgasm_msg']`>>
 	<<setinit $sex_ev['position'] = 'nipple_play'>>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> leans forward, grabbing ahold of your breasts with his hands and uses his mouth on your nipples. He sucks them up, flicks at the tips with his tongue, sending electricity flying through them. Heat spreads through your hips and you can feel wetness pooling between your thighs.</p>
+	<p><<npc $sex.npcId>><</npc>> leans forward, grabbing ahold of your breasts with his hands and uses his mouth on your nipples. He sucks them up, flicks at the tips with his tongue, sending electricity flying through them. Heat spreads through your hips and you can feel wetness pooling between your thighs.</p>
 	<<actCLA 'Continue'>>
 		<<if rand(0,1) == 1 and getvar("$kuni_no["+$sex.npcId+"]") != 1 and (getvar("$mesec") == 0 or $npcs.get($sex.npcId,'pussyeater_know') == 1) and getvar("$sex_ev['sensitive_cuni']") != 1>>
-			<p>After a few minutes, <<=$npcs.get($sex.npcId,'firstname')>> pulls back from your chest and pushes you down, beginning to move between your legs to eat you out.</p>
+			<p>After a few minutes, <<npc $sex.npcId>><</npc>> pulls back from your chest and pushes you down, beginning to move between your legs to eat you out.</p>
 			<<gs 'sex_ev_foreplay' 'kuni_start'>>
 		<<else>>
 			<<image "shared/sex/foreplay/miss3.jpg">>
 			<<setinit $sex_ev['position_choose'] = 1>>
-			<p>After a few minutes, <<=$npcs.get($sex.npcId,'firstname')>> pulls back from your chest and pushes you down, climbing on top of you with his rock hard cock between your legs.</p>
+			<p>After a few minutes, <<npc $sex.npcId>><</npc>> pulls back from your chest and pushes you down, climbing on top of you with his rock hard cock between your legs.</p>
 			<<setinit $sex_ev['position'] = 'miss'>>
 			<<if $pc.thinksIsVirgin and getvar("$sex_ev['fuck_count']") == 0>>
 				<<actCLA 'Stop him (virgin)'>>
@@ -544,7 +544,7 @@
 	<</actCLA>>
 <!-- !! --------------------- selfish stuff ----------------------------------------------------->
 <<case 'bj_ask'>>
-	<p>"How about a blowjob?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+	<p>"How about a blowjob?" <<npc $sex.npcId>><</npc>> asks.</p>
 	<<gs 'sex_ev_foreplay' 'bj_ask2'>>
 <<case 'bj_ask2'>>
 	<<actCLA 'Reluctant'>>
@@ -582,12 +582,12 @@
 				<p>"Hmmm... I couuuuld..." you hum, pretending to think before breaking into a wide grin. "Or we could just fuck?"</p>
 			<</if>>
 			<<if $npcs.get($sex.npcId,'fav_pos') == 'doggy'>>
-				<p>Your eyes meet for just a moment before <<=$npcs.get($sex.npcId,'firstname')>> jumps you, eliciting uncontrollable giggles as he flips you onto your knees and plunges into your pussy.</p>
+				<p>Your eyes meet for just a moment before <<npc $sex.npcId>><</npc>> jumps you, eliciting uncontrollable giggles as he flips you onto your knees and plunges into your pussy.</p>
 				<<actCLA 'Get fucked'>>
 					<<gt 'sex_ev_doggy' 'doggysex_ev['speed']'>>
 				<</actCLA>>
 			<<else>>
-				<p>Your eyes meet for just a moment before <<=$npcs.get($sex.npcId,'firstname')>> jumps you, eliciting uncontrollable giggles as he forces your legs apart and plunges into your pussy.</p>
+				<p>Your eyes meet for just a moment before <<npc $sex.npcId>><</npc>> jumps you, eliciting uncontrollable giggles as he forces your legs apart and plunges into your pussy.</p>
 				<<actCLA 'Get fucked'>>
 					<<gt 'sex_ev_miss' 'misssex_ev['speed']'>>
 				<</actCLA>>
@@ -613,14 +613,14 @@
 		You grumble internally but get to work anyway, spending a few minutes bobbing your head up and down on his cock. You weren''t really in the mood to begin with, so you get bored quickly, but hopefully he'll want to do something else soon.
 	<<else>>
 		<<video "shared/sex/blowjob/bj#.mp4" 46 50>>
-		<p>You lean forward and take him in your mouth, gently sucking his cock and bobbing your head up and down on it. You take pride in your work, doing your best to make <<=$npcs.get($sex.npcId,'firstname')>> feel good.</p>
+		<p>You lean forward and take him in your mouth, gently sucking his cock and bobbing your head up and down on it. You take pride in your work, doing your best to make <<npc $sex.npcId>><</npc>> feel good.</p>
 	<</if>>
 	<<gs 'sex_ev_foreplay' 'bj_sub_cum_sort'>>
 <<case 'bj_sub1_continue'>>
 	<<actCLA 'Keep blowing'>>
 		<<setinit $sex_ev['cycle_limit'] += 1>>
 		<<video "shared/sex/blowjob/bj#.mp4" 46 50>>
-		<p>You keep blowing <<=$npcs.get($sex.npcId,'firstname')>>, working his cock with your lips and his shaft with your hand, making sure to add in lots of tongue and drool even more spit.</p>
+		<p>You keep blowing <<npc $sex.npcId>><</npc>>, working his cock with your lips and his shaft with your hand, making sure to add in lots of tongue and drool even more spit.</p>
 		<<gs 'sex_ev_foreplay' 'bj_sub_cum_sort'>>
 	<</actCLA>>
 	<<actCLA 'Pull back (sex)'>>
@@ -638,7 +638,7 @@
 	<<setinit $sex_ev['bj_count'] += 1>>
 	<<arouse 'bj' `rand(2,7)` `['no_orgasm_msg']`>>
 	<<video "shared/sex/blowjob/bj52.mp4">>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> slowly pumps his cock in and out of your mouth, plunging it all the way down your throat where you can feel it press against your windpipe. You keep it loose while he does all the work, occasionally letting your tongue snake out for a cheeky lick, but otherwise just let <<=$npcs.get($sex.npcId,'firstname')>> keep fucking your face.</p>
+	<p><<npc $sex.npcId>><</npc>> slowly pumps his cock in and out of your mouth, plunging it all the way down your throat where you can feel it press against your windpipe. You keep it loose while he does all the work, occasionally letting your tongue snake out for a cheeky lick, but otherwise just let <<npc $sex.npcId>><</npc>> keep fucking your face.</p>
 	<<gs 'sex_ev_foreplay' 'bj_sub_cum_sort'>>
 <<case 'bj_sub_cum_surprise'>>
 	<<actCLA 'Continue'>>
@@ -646,9 +646,9 @@
 		<<setinit $sex_ev['last_cum'] = 'mouth'>>
 		<<setinit $sex_ev['cum_mouth_surprise'] = 1>>
 		<<if $pc.pcs_throat <= 10>>
-			<p>Without any warning <<=$npcs.get($sex.npcId,'firstname')>> grabs your head and shoves it down to the base of his cock. It stretches your jaw wide, making you gag reflexively, and just as you're about to protest, something spurts out into your throat.</p>
+			<p>Without any warning <<npc $sex.npcId>><</npc>> grabs your head and shoves it down to the base of his cock. It stretches your jaw wide, making you gag reflexively, and just as you're about to protest, something spurts out into your throat.</p>
 		<<else>>
-			<p>Without any warning <<=$npcs.get($sex.npcId,'firstname')>> grabs your head and shoves it down to the base of his cock. You've sucked enough dick that it doesn't cause any real problems for you, though a little warning would have been nice. And then something spurts directly into the back of your throat.</p>
+			<p>Without any warning <<npc $sex.npcId>><</npc>> grabs your head and shoves it down to the base of his cock. You've sucked enough dick that it doesn't cause any real problems for you, though a little warning would have been nice. And then something spurts directly into the back of your throat.</p>
 		<</if>>
 		<<actCLA 'Take it in stride (swallow)'>>
 			<<setinit $sex_ev['bj_cum'] = 1>>
@@ -656,7 +656,7 @@
 			<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 			<<setinit $sex_ev['cum_count'] += 1>>
 			<<video "shared/sex/cum/mouth/swallow5.mp4">>
-			<p>You hum in surprise, but take it in stride anyway, continuing to suck as <<=$npcs.get($sex.npcId,'firstname')>> comes right down your throat. You swallow it all as best you can until his hips stop bucking beneath you and you slowly pull away, gulping one last time to get the last drops.</p>
+			<p>You hum in surprise, but take it in stride anyway, continuing to suck as <<npc $sex.npcId>><</npc>> comes right down your throat. You swallow it all as best you can until his hips stop bucking beneath you and you slowly pull away, gulping one last time to get the last drops.</p>
 			<<gs 'sex_ev_reactions' 'bj_warning_next_time'>>
 			<<gs 'sex_ev_reactions' 'bj_tasty'>>
 			<<gs 'sex_ev_reactions' 'bj_already'>>
@@ -667,7 +667,7 @@
 			<<gs 'cum_call' 'mouth' $sex.npcId 1>>
 			<<setinit $sex_ev['cum_count'] += 1>>
 			<<video "shared/sex/cum/mouth/spit6.mp4">>
-			<p>You hum in surprise, but take it in stride anyway, continuing to suck as <<=$npcs.get($sex.npcId,'firstname')>> straight into the back of your throat. You carefully let it pool there, waiting until his hips stop bucking beneath you. When he finally stops, you gather it to the front of your mouth and spit it out, letting it spill past your lips and all over <<=$npcs.get($sex.npcId,'firstname')>>'s dick.</p>
+			<p>You hum in surprise, but take it in stride anyway, continuing to suck as <<npc $sex.npcId>><</npc>> straight into the back of your throat. You carefully let it pool there, waiting until his hips stop bucking beneath you. When he finally stops, you gather it to the front of your mouth and spit it out, letting it spill past your lips and all over <<npc $sex.npcId>><</npc>>'s dick.</p>
 			<<gs 'sex_ev_reactions' 'bj_warning_next_time'>>
 			<<gs 'sex_ev_reactions' 'bj_already'>>
 		<</actCLA>>
@@ -677,17 +677,17 @@
 			<<setinit $sex_ev['cum_count'] += 1>>
 			<<gs 'cum_call' 'mouth' $sex.npcId 1>>
 			<<video "shared/sex/cum/mouth/spit3.mp4">>
-			<p>The moment the cum touches your throat, you gag. Your eyes water and you cough involuntarily, mouth explosively erupting with cum and spilling all over <<=$npcs.get($sex.npcId,'firstname')>>'s cock and the floor.</p>
+			<p>The moment the cum touches your throat, you gag. Your eyes water and you cough involuntarily, mouth explosively erupting with cum and spilling all over <<npc $sex.npcId>><</npc>>'s cock and the floor.</p>
 			<<actCLA 'Sorry'>>
 				<!-- !!'<<image `'shared/sex/cum/mouth/cum52.jpg'`>>'-->
 				$sex_ev['bed_room']
 				"I'm sorry," you wheeze, eyes stinging with tears as you try to clear your throat. "It was... I'll do better next time."
 				<<if $npcs.get($sex.npcId,'generous') == 1>>
 					<<run $npcs.set($sex.npcId,'bj_cum_warn',1)>>
-					<p>"No, no!" <<=$npcs.get($sex.npcId,'firstname')>> says hurriedly. "It's my fault. I should have warned you. You were just so good, I couldn't hold back. I'll be more careful next time."</p>
+					<p>"No, no!" <<npc $sex.npcId>><</npc>> says hurriedly. "It's my fault. I should have warned you. You were just so good, I couldn't hold back. I'll be more careful next time."</p>
 					<<gs 'sex_ev_sex' 'sex_end'>>
 				<<elseif $npcs.get($sex.npcId,'selfish') == 1>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> raises you by the chin, tilting your head back to look into your eyes.</p>
+					<p><<npc $sex.npcId>><</npc>> raises you by the chin, tilting your head back to look into your eyes.</p>
 					<p>"So that means you'll swallow it all next time, right?"</p>
 					<<actCLA 'I`ll try'>>
 						"I'll do my best," you say.
@@ -716,7 +716,7 @@
 <<case 'bj_sub_cum_where'>>
 	<<actCLA 'Where do you want to cum?'>>
 		<<video "shared/sex/blowjob/play1.mp4">>
-		<p>You pull your lips off <<=$npcs.get($sex.npcId,'firstname')>>'s cock with a pop.</p>
+		<p>You pull your lips off <<npc $sex.npcId>><</npc>>'s cock with a pop.</p>
 		<<if $npcs.get($sex.npcId,'lovername') == ''>>
 			<p>"Where do want to come baby?" you ask. You can feel him throbbing in your hand. He's right at the edge, kept there with your constant teasing, smattering of kisses and licks.</p>
 		<<else>>
@@ -751,7 +751,7 @@
 <<case 'bj_sub_cum_mouth1'>>
 	<<setinit $sex_ev['he_ask_mouth'] = 1>>
 	<<setinit $sex_ev['cum_choice'] = 'mouth'>>
-	<p>After a few minutes, <<=$npcs.get($sex.npcId,'firstname')>> taps you on the head."</p>
+	<p>After a few minutes, <<npc $sex.npcId>><</npc>> taps you on the head."</p>
 	<p>"I'm gonna- <i>nngh-!</i> Can I cum in your mouth?"</p>
 	<<gs 'sex_ev_foreplay' 'bj_sub_cum_mouth1.2'>>
 <<case 'bj_sub_cum_mouth1.2'>>
@@ -787,13 +787,13 @@
 		<</if>>
 		<<actCLA 'Couldn`t hurt'>>
 			<<video "shared/sex/cum/mouth/deep1.mp4">>
-			<p>"Well, it couldn't hurt I suppose..." you smile and plunge your lips all the way down to the base of <<=$npcs.get($sex.npcId,'firstname')>>'s shaft. He blows his load moments later.</p>
+			<p>"Well, it couldn't hurt I suppose..." you smile and plunge your lips all the way down to the base of <<npc $sex.npcId>><</npc>>'s shaft. He blows his load moments later.</p>
 			<<gs 'sex_ev_foreplay' 'bj_sub_cum_mouth_spit'>>
 			<<gs 'sex_ev_foreplay' 'bj_sub_cum_mouth_swallow'>>
 		<</actCLA>>
 		<<actCLA 'Just wondered (let him)'>>
 			<<video "shared/sex/cum/mouth/deep1.mp4">>
-			<p>"Just wondered if you actually had a reason," you smile. With that, you give him a few sudden and furious jerks before plunging your head all the way to the base of <<=$npcs.get($sex.npcId,'firstname')>>'s cock and cum explodes inside your mouth.</p>
+			<p>"Just wondered if you actually had a reason," you smile. With that, you give him a few sudden and furious jerks before plunging your head all the way to the base of <<npc $sex.npcId>><</npc>>'s cock and cum explodes inside your mouth.</p>
 			<<gs 'sex_ev_foreplay' 'bj_sub_cum_mouth_spit'>>
 			<<gs 'sex_ev_foreplay' 'bj_sub_cum_mouth_swallow'>>
 		<</actCLA>>
@@ -885,8 +885,8 @@
 		<<setinit $sex_ev['cum_count'] += 1>>
 		<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 		<<video "shared/sex/cum/mouth/swallow4.mp4">>
-		<p>Cum spurts into your throat and you carefully push your lips down <<=$npcs.get($sex.npcId,'firstname')>>'s shaft and pull back up, forcing a loud groan from his lips as you try to draw every last bit of sperm from inside him.</p>
-		<p>You struggle to keep the salty liquid from spilling past your lips but manage to all the way back up to his tip losing only a single drop along the way. And then, without removing your lips, you swallow the entire load in one gulp with a satisfied, "<i>Ahhh,</i>" smiling up at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+		<p>Cum spurts into your throat and you carefully push your lips down <<npc $sex.npcId>><</npc>>'s shaft and pull back up, forcing a loud groan from his lips as you try to draw every last bit of sperm from inside him.</p>
+		<p>You struggle to keep the salty liquid from spilling past your lips but manage to all the way back up to his tip losing only a single drop along the way. And then, without removing your lips, you swallow the entire load in one gulp with a satisfied, "<i>Ahhh,</i>" smiling up at <<npc $sex.npcId>><</npc>>.</p>
 		<<gs 'sex_ev_sex' 'sex_end'>>
 	<</actCLA>>
 	<<actCLA 'Swallow (gross)'>>
@@ -897,22 +897,22 @@
 		<<setinit $sex_ev['cum_count'] += 1>>
 		<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 		<<video "shared/sex/cum/mouth/yuck1.mp4">>
-		<p>Thick, salty sperm sprays into your mouth and you can't help but feel just a little bit nauseous even as you continue to suck out more cum from <<=$npcs.get($sex.npcId,'firstname')>>'s cock. But you power through regardless, and with a grimace of deep disgust, you force it down, swallowing the entire load.</p>
+		<p>Thick, salty sperm sprays into your mouth and you can't help but feel just a little bit nauseous even as you continue to suck out more cum from <<npc $sex.npcId>><</npc>>'s cock. But you power through regardless, and with a grimace of deep disgust, you force it down, swallowing the entire load.</p>
 		<<if getvar("$sex_ev['cum_swallow']") > 1>>
 			<p>"<i>Yeech</i>!" you wince. "I'm never going to get used to that!"</p>
-			<p>"But you still keep doing it anyway," <<=$npcs.get($sex.npcId,'firstname')>> smirks.</p>
+			<p>"But you still keep doing it anyway," <<npc $sex.npcId>><</npc>> smirks.</p>
 			"Yeah, yeah, shut up," you say, rolling your eyes and sticking out your tongue, trying to air it out.
 			<<gs 'sex_ev_sex' 'sex_end'>>
 		<<else>>
 			<p>"<i>Blech</i>!" you shudder. "That's awful!"</p>
 			<<if $sex_ev['cum_choice'] == 'face'>>
-				<p>"If you hate swallowing so much, then why didn't you just let me cum on your face like I wanted to?" <<=$npcs.get($sex.npcId,'firstname')>> asks quizzically.</p>
+				<p>"If you hate swallowing so much, then why didn't you just let me cum on your face like I wanted to?" <<npc $sex.npcId>><</npc>> asks quizzically.</p>
 				<<gs 'sex_ev_reactions' 'cum_mouth_swallow_why'>>
 			<<elseif $sex_ev['cum_choice'] == 'tits'>>
-				<p>"If you hate swallowing so much, then why didn't you just let me cum on your tits?" <<=$npcs.get($sex.npcId,'firstname')>> asks quizzically.</p>
+				<p>"If you hate swallowing so much, then why didn't you just let me cum on your tits?" <<npc $sex.npcId>><</npc>> asks quizzically.</p>
 				<<gs 'sex_ev_reactions' 'cum_mouth_swallow_why'>>
 			<<else>>
-				<p>"Then why'd you do it?" <<=$npcs.get($sex.npcId,'firstname')>> asks, a dumbfounded look on his face.</p>
+				<p>"Then why'd you do it?" <<npc $sex.npcId>><</npc>> asks, a dumbfounded look on his face.</p>
 				<<gs 'sex_ev_reactions' 'cum_mouth_swallow_why'>>
 				<<gs 'sex_ev_reactions' 'bj_swallow_gross2'>>
 			<</if>>
@@ -922,7 +922,7 @@
 	<!-- !! asks to come on face-->
 	<<setinit $sex_ev['he_ask_facial'] = 1>>
 	<<setinit $sex_ev['cum_choice'] = 'face'>>
-	<p>Within a few minutes, <<=$npcs.get($sex.npcId,'firstname')>> taps you on the head."</p>
+	<p>Within a few minutes, <<npc $sex.npcId>><</npc>> taps you on the head."</p>
 	<p>"<i>Ngh-!</i> $pc.name_nick-! Can I come on your face? You'd look so hot."</p>
 	<<actCLA 'No way'>>
 		"Nuh uh," you pop off his cock, giving him a disgusted look. "There''s no <i>way</i> I'm letting your spray that all over my face."
@@ -930,7 +930,7 @@
 		<<gs 'sex_ev_foreplay' 'bj_sub_cum_tits2'>>
 		<<actCLA 'How about my mouth instead?'>>
 			<p>"How about my mouth?" you smile. "Don't you want to just pump it straight down my throat instead?"</p>
-			<p><<=$npcs.get($sex.npcId,'firstname')>>'s face turns to a hungry expression. "Well, when you put it like that..."</p>
+			<p><<npc $sex.npcId>><</npc>>'s face turns to a hungry expression. "Well, when you put it like that..."</p>
 			<<gs 'sex_ev_foreplay' 'bj_sub_cum_mouth2'>>
 		<</actCLA>>
 	<</actCLA>>
@@ -942,7 +942,7 @@
 		<<setinit $sex_ev['cum_count'] += 1>>
 		<<gs 'cum_call' 'face' $sex.npcId 1>>
 		<<video "shared/sex/cum/facial/facial0,3.mp4">>
-		<p>"Alright," you sigh. <<=$npcs.get($sex.npcId,'firstname')>> eagerly sits up positioninig himself over you.</p>
+		<p>"Alright," you sigh. <<npc $sex.npcId>><</npc>> eagerly sits up positioninig himself over you.</p>
 		You close your eyes right before something warm, wet, and slimy spatters across your face. You flinch at the impact and your expression turns into a grimace as it piles up, slowly dripping down your cheeks.
 		<p>"Ugh! That's fucking disgusting!" you whine. "I can't believe I let you talk me into this."</p>
 		"You look great though." You can't see him with the cum gluing your eyelids shut, but you're pretty sure he's wearing a grin you would slap him for.
@@ -957,7 +957,7 @@
 		<<gs 'cum_call' 'face' $sex.npcId 1>>
 		<<video "shared/sex/cum/facial/facial0,3.mp4">>
 		<p>"Hmmm?" you hum around his cock before letting it pop from your mouth. "Sure. If you like."</p>
-		<p>You let him position himself over you and close your eyes. Moments later warm fluid spatters across your face and within seconds, your face is covered in <<=$npcs.get($sex.npcId,'firstname')>>'s cum. After a little bit to make sure <<=$npcs.get($sex.npcId,'firstname')>>'s finished, you crack an eye and look up at him.</p>
+		<p>You let him position himself over you and close your eyes. Moments later warm fluid spatters across your face and within seconds, your face is covered in <<npc $sex.npcId>><</npc>>'s cum. After a little bit to make sure <<npc $sex.npcId>><</npc>>'s finished, you crack an eye and look up at him.</p>
 		<p>"Happy?" you ask.</p>
 		"You have no idea how fucking hot you look right now."
 		<!-- !! add reactions later?-->
@@ -976,10 +976,10 @@
 		<p>"Hmmm?" you hum around his cock before letting it slip from your mouth. Without saying anything else, you kneel down and close your eyes, sticking out your tongue.</p>
 		<p>"Ahhhhh~!"</p>
 		"You're the fucking best."
-		<p>You can hear the wet squelching sound of his hand working his cock and after a couple seconds, you feel a shot of cum land directly on your tongue. <<=$npcs.get($sex.npcId,'firstname')>> makes sure to spread his shots around, approximately half of them spattering across your face and the other half landing in your mouth, keeping it open the entire time until you feel him shaking the last drips of his load onto the tip of your tongue.</p>
+		<p>You can hear the wet squelching sound of his hand working his cock and after a couple seconds, you feel a shot of cum land directly on your tongue. <<npc $sex.npcId>><</npc>> makes sure to spread his shots around, approximately half of them spattering across your face and the other half landing in your mouth, keeping it open the entire time until you feel him shaking the last drips of his load onto the tip of your tongue.</p>
 		<<actCLA 'Gulp'>>
 			<<video "shared/sex/cum/facial/facial26.mp4">>
-			<p>Gathering it to the back of your throat, you let his cum pool there for a moment before swallowing the whole thing in a mighty gulp. You look up at <<=$npcs.get($sex.npcId,'firstname')>> with cum glazed cheeks and smile at him.</p>
+			<p>Gathering it to the back of your throat, you let his cum pool there for a moment before swallowing the whole thing in a mighty gulp. You look up at <<npc $sex.npcId>><</npc>> with cum glazed cheeks and smile at him.</p>
 			"You're so fucking hot."
 			"Yeah, I know," you grin back.
 			<<gs 'sex_ev_sex' 'sex_end'>>
@@ -996,7 +996,7 @@
 		<<gs 'cum_call' 'mouth' $sex.npcId 1>>
 		<<video "shared/sex/cum/facial/facial29.mp4">>
 		<p>"Hmmm?" you hum around his cock before letting it pop from your mouth. "Alright. Sure."</p>
-		<p>You stick out your tongue and <<=$npcs.get($sex.npcId,'firstname')>> takes this as an invitation, grabbing you by the hair with one hand and working his shaft with the other. A huge blast of cum sprays directly across your face, most of it landing on your cheeks and some even getting in your hair. A little falls inside your mouth and you spit it out as it comes, as <<=$npcs.get($sex.npcId,'firstname')>> finishes finishing himself over your face. When the cum stops flying, you crack an eye and look up at him.</p>
+		<p>You stick out your tongue and <<npc $sex.npcId>><</npc>> takes this as an invitation, grabbing you by the hair with one hand and working his shaft with the other. A huge blast of cum sprays directly across your face, most of it landing on your cheeks and some even getting in your hair. A little falls inside your mouth and you spit it out as it comes, as <<npc $sex.npcId>><</npc>> finishes finishing himself over your face. When the cum stops flying, you crack an eye and look up at him.</p>
 		<p>"Happy?" you ask.</p>
 		"You have no idea how fucking hot you look right now."
 		<!-- !! add reactions later?-->
@@ -1018,7 +1018,7 @@
 		$sex_ev['bed_room']
 		You pull your lips back from his cock with a pop.
 		<p>"$sex_ev['cum_desc']" you ask.</p>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> sits up, working his shaft with his hand as he points it at your face. That seems like a "yes" to you.</p>
+		<p><<npc $sex.npcId>><</npc>> sits up, working his shaft with his hand as he points it at your face. That seems like a "yes" to you.</p>
 		<<gs 'sex_ev_cum' 'facial_close_eyes'>>
 		<<gs 'sex_ev_cum' 'facial_tongue_swallow'>>
 		<<gs 'sex_ev_cum' 'facial_tongue_spit'>>
@@ -1030,7 +1030,7 @@
 <<case 'bj_sub_cum_tits1'>>
 	<<setinit $sex_ev['he_ask_tits'] = 1>>
 	<<setinit $sex_ev['cum_choice'] = 'tits'>>
-	<p>Within a few minutes, <<=$npcs.get($sex.npcId,'firstname')>> taps you on the head."</p>
+	<p>Within a few minutes, <<npc $sex.npcId>><</npc>> taps you on the head."</p>
 	<p>"I'm gonna- <i>nngh-!</i> You'd look super hot with my cum on your tits. Can I?"</p>
 	<<actCLA 'No way'>>
 		"Ew." You wrinkle your nose in disgust as you pop your mouth off his cock.
@@ -1105,8 +1105,8 @@
 		<<gs 'cum_call' 'mouth' $sex.npcId 1>>
 		<<setinit $sex_ev['cum_count'] += 1>>
 		<<video "shared/sex/cum/mouth/spit3.mp4">>
-		<p>Finally, your body can't take it anymore and you begin to choke. You cough hard, cum exploding out from your lips and with the strength of a drowning woman, you force yourself off of <<=$npcs.get($sex.npcId,'firstname')>>'s cock. You retch, violently spewing the rest of his cum from your mouth, taking ragged breaths as you continue to cough.</p>
-		<p>"Why would the fuck would you do that?" you ask, looking up at <<=$npcs.get($sex.npcId,'firstname')>> with teary eyes.</p>
+		<p>Finally, your body can't take it anymore and you begin to choke. You cough hard, cum exploding out from your lips and with the strength of a drowning woman, you force yourself off of <<npc $sex.npcId>><</npc>>'s cock. You retch, violently spewing the rest of his cum from your mouth, taking ragged breaths as you continue to cough.</p>
+		<p>"Why would the fuck would you do that?" you ask, looking up at <<npc $sex.npcId>><</npc>> with teary eyes.</p>
 		"I told you I wanted to come in your mouth." He takes you by the chin and lifts your head with his finger. "It's not a request. If I want it, you do it."
 		<<gs 'sex_ev_after' 'quit'>>
 		<<gs 'sex_ev_foreplay' 'bj_force_cum_grumble'>>
@@ -1119,7 +1119,7 @@
 		<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 		<<video "shared/sex/cum/mouth/forced1.mp4">>
 		You gag but he keeps your face held all the way down to his balls. His cum overflows from your mouth and in a desperate attempt to avoid drowning, you swallow. It seems to be exactly what he was waiting for and continues to unload himself directly down your throat.
-		<p>After what seems like an eternity, his orgasm fades and fluid stops filling the back of your mouth and <<=$npcs.get($sex.npcId,'firstname')>> finally releases you.</p>
+		<p>After what seems like an eternity, his orgasm fades and fluid stops filling the back of your mouth and <<npc $sex.npcId>><</npc>> finally releases you.</p>
 		<<gs 'sex_ev_foreplay' 'bj_force_cum_wtf'>>
 		<<gs 'sex_ev_foreplay' 'be_nice'>>
 		<<gs 'sex_ev_foreplay' 'lucky_like'>>
@@ -1130,7 +1130,7 @@
 		<<setinit $sex_ev['cum_count'] += 1>>
 		<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 		<<video "shared/sex/cum/mouth/swallow5.mp4">>
-		<p>You're surprised by his force but you take it in stride, swallowing as <<=$npcs.get($sex.npcId,'firstname')>> pumps his member and his cum straight into the back of your throat. You continually swallow it as it comes until there is nothing left to suck up but your own saliva and <<=$npcs.get($sex.npcId,'firstname')>>'s cock.</p>
+		<p>You're surprised by his force but you take it in stride, swallowing as <<npc $sex.npcId>><</npc>> pumps his member and his cum straight into the back of your throat. You continually swallow it as it comes until there is nothing left to suck up but your own saliva and <<npc $sex.npcId>><</npc>>'s cock.</p>
 		<<gs 'sex_ev_foreplay' 'bj_force_cum_wtf'>>
 		<<gs 'sex_ev_foreplay' 'be_nice'>>
 		<<gs 'sex_ev_foreplay' 'lucky_like'>>
@@ -1139,7 +1139,7 @@
 	<<actCLA 'Spit (take it in stride)'>>
 		<<setinit $sex_ev['last_cum'] = 'mouth'>>
 		<<video "shared/sex/cum/mouth/spit6.mp4">>
-		<p>You're surprised by his force but you take it in stride, swallowing as <<=$npcs.get($sex.npcId,'firstname')>> pumps his member and his cum straight into the back of your throat. You let it pool there until you stop feeling him pulse between your lips and he finally releases you, allowing you to slip off his cock and take a breath as the semen spills from your lips.</p>
+		<p>You're surprised by his force but you take it in stride, swallowing as <<npc $sex.npcId>><</npc>> pumps his member and his cum straight into the back of your throat. You let it pool there until you stop feeling him pulse between your lips and he finally releases you, allowing you to slip off his cock and take a breath as the semen spills from your lips.</p>
 		<<gs 'sex_ev_foreplay' 'bj_force_cum_wtf'>>
 		<<gs 'sex_ev_foreplay' 'be_nice'>>
 		<<gs 'sex_ev_foreplay' 'lucky_like'>>
@@ -1150,7 +1150,7 @@
 		$sex_ev['bed_room']
 		<<setinit $sex_ev['mad'] = 1>>
 		<p>"What the fuck," you cough, dislodging a few stray globules at the back of your throat. "Why would you do that?"</p>
-		<p>"I told you I wanted to come in your mouth." <<=$npcs.get($sex.npcId,'firstname')>> takes you by the chin and lifts your head with his finger. "It's not a request. If I want it, you do it."</p>
+		<p>"I told you I wanted to come in your mouth." <<npc $sex.npcId>><</npc>> takes you by the chin and lifts your head with his finger. "It's not a request. If I want it, you do it."</p>
 		<<gs 'sex_ev_after' 'quit'>>
 		<<gs 'sex_ev_foreplay' 'bj_force_cum_grumble'>>
 		<<gs 'sex_ev_foreplay' 'bj_force_cum_submit'>>
@@ -1163,7 +1163,7 @@
 	<</actCLA>>
 <<case 'lucky_like'>>
 	<<actCLA 'You`re lucky I like you'>>
-		<p>Pulling back, you wipe your lips and give <<=$npcs.get($sex.npcId,'firstname')>> a dry stare.</p>
+		<p>Pulling back, you wipe your lips and give <<npc $sex.npcId>><</npc>> a dry stare.</p>
 		"You're lucky I like you," you say. "Otherwise I might get really mad about that."
 		<p>"Oh yeah?" he says. "What does that look like? Maybe I want to see that."</p>
 		<<gs 'sex_ev_sex' 'sex_end'>>
@@ -1201,21 +1201,21 @@
 						<<setinit $sex_ev['position_choose'] = 1>>
 						<<setinit $sex_ev['get_hard'] = 1>>
 						<<video "shared/sex/misc/wait.mp4">>
-						<p>You lay back on the bed, staring at the ceiling, waiting impatiently as you listen to <<=$npcs.get($sex.npcId,'firstname')>> furiously flapping his flaccid dick around, forcing it to get hard again.</p>
+						<p>You lay back on the bed, staring at the ceiling, waiting impatiently as you listen to <<npc $sex.npcId>><</npc>> furiously flapping his flaccid dick around, forcing it to get hard again.</p>
 						<<gs 'sex_ev_sex' 'sex_start'>>
 					<</actCLA>>
 					<<actCLA 'Help him out (hand)'>>
 						<<arouse 'hj' 1 `['no_orgasm_msg']`>>
 						<<video "shared/sex/handjob/hj3.mp4">>
-						<p>"Let me help you out with that," you smile, rolling over and taking <<=$npcs.get($sex.npcId,'firstname')>>'s dick in your hand. Even soft, you feel it twitch in response to your touch and you can't help but smile wider at the reaction. You begin working the shaft up and down and in no time at all, you've got nice stiff cock ready for fucking.</p>
+						<p>"Let me help you out with that," you smile, rolling over and taking <<npc $sex.npcId>><</npc>>'s dick in your hand. Even soft, you feel it twitch in response to your touch and you can't help but smile wider at the reaction. You begin working the shaft up and down and in no time at all, you've got nice stiff cock ready for fucking.</p>
 						<<setinit $sex_ev['position'] = ''>>
 						<<gs 'sex_ev_sex' 'sex_start'>>
 					<</actCLA>>
 					<<actCLA 'Help him out (mouth)'>>
 						<<arouse 'bj' 1 `['no_orgasm_msg']`>>
 						<<video "shared/sex/blowjob/play1.mp4">>
-						<p>"Let me help you out with that," you smile, rolling over and taking <<=$npcs.get($sex.npcId,'firstname')>>'s dick in your hand. Leaning down, you take the soft tip of his dick and place it between your lips, sucking gently. You instantly feel it twitch and you can't help but smirk, even with a cock in your mouth.</p>
-						<p>Through a variation of kissing, licking, and sucking, <<=$npcs.get($sex.npcId,'firstname')>> rapidly stiffens up and in no time at all, you have a nice hard cock ready for fucking.</p>
+						<p>"Let me help you out with that," you smile, rolling over and taking <<npc $sex.npcId>><</npc>>'s dick in your hand. Leaning down, you take the soft tip of his dick and place it between your lips, sucking gently. You instantly feel it twitch and you can't help but smirk, even with a cock in your mouth.</p>
+						<p>Through a variation of kissing, licking, and sucking, <<npc $sex.npcId>><</npc>> rapidly stiffens up and in no time at all, you have a nice hard cock ready for fucking.</p>
 						<<setinit $sex_ev['position'] = ''>>
 						<<gs 'sex_ev_sex' 'sex_start'>>
 					<</actCLA>>
@@ -1233,7 +1233,7 @@
 						<<else>>
 							<<video "shared/sex/handjob/hj3.mp4">>
 							"Not if I have anything to say about it," you grin.
-							<p>You forcibly grab <<=$npcs.get($sex.npcId,'firstname')>>'s dick in your hand and begin kneading it with your fingers. You work the shaft up and down and within minutes, despite his initial protests, you have a fully erect cock in your hands. Ready and waiting to be fucked.</p>
+							<p>You forcibly grab <<npc $sex.npcId>><</npc>>'s dick in your hand and begin kneading it with your fingers. You work the shaft up and down and within minutes, despite his initial protests, you have a fully erect cock in your hands. Ready and waiting to be fucked.</p>
 							<<setinit $sex_ev['position'] = ''>>
 							<<gs 'sex_ev_foreplay' 'handjob_dom1'>>
 							<<gs 'sex_ev_foreplay' 'foreplay_choose'>>
@@ -1252,7 +1252,7 @@
 						<<else>>
 							<<video "shared/sex/blowjob/play1.mp4">>
 							"Not if I have anything to say about it," you grin.
-							<p>You forcibly grab <<=$npcs.get($sex.npcId,'firstname')>>'s dick in your hand and begin kneading it with your fingers. You lean down, sucking on the tip and immediately feel life within, feel it expand and twitch inside your mouth. Continuing to kiss, lick, and suck on it, within minutes, despite his initial protests, you have a fully erect cock in your possession. Ready and waiting to be fucked.</p>
+							<p>You forcibly grab <<npc $sex.npcId>><</npc>>'s dick in your hand and begin kneading it with your fingers. You lean down, sucking on the tip and immediately feel life within, feel it expand and twitch inside your mouth. Continuing to kiss, lick, and suck on it, within minutes, despite his initial protests, you have a fully erect cock in your possession. Ready and waiting to be fucked.</p>
 							<<setinit $sex_ev['position'] = ''>>
 							<<gs 'sex_ev_foreplay' 'bj_dom1'>>
 							<<gs 'sex_ev_foreplay' 'foreplay_choose'>>
@@ -1286,7 +1286,7 @@
 		<</actCLA>>
 	<</if>>
 <<case 'bj_sub_lets_fuck'>>
-	<p>After a couple more minutes <<=$npcs.get($sex.npcId,'firstname')>> pushes your head away, your saliva trailing from his cock.</p>
+	<p>After a couple more minutes <<npc $sex.npcId>><</npc>> pushes your head away, your saliva trailing from his cock.</p>
 	<<if $pc.thinksIsVirgin and getvar("$sex_ev['fuck_count']") == 0>>
 		<<if getvar("$know_virgin["+$sex.npcId+"]") == 1>>
 			"That was great," he smiles. "That was exactly what I wanted. But I want more now."
@@ -1335,14 +1335,14 @@
 			<<else>>
 				<<setinit $sex_ev['not_today'] = 1>>
 				<<if rand(0,1) == 1>>
-					<p>"Really?" <<=$npcs.get($sex.npcId,'firstname')>> asks quizzically. "You want to <i>keep</i> blowing me?"</p>
+					<p>"Really?" <<npc $sex.npcId>><</npc>> asks quizzically. "You want to <i>keep</i> blowing me?"</p>
 				<<else>>
-					<p>"What?" <<=$npcs.get($sex.npcId,'firstname')>> asks quizzically. "Why?"</p>
+					<p>"What?" <<npc $sex.npcId>><</npc>> asks quizzically. "Why?"</p>
 				<</if>>
 				<<actCLA 'Don`t feel like it today'>>
 					<<video "shared/sex/blowjob/play1.mp4">>
 					"I don't know," you shrug, continuing to play with his cock. "I'm just not in the mood. Would rather just do this."
-					<p>"Well... if that's what you want I guess," <<=$npcs.get($sex.npcId,'firstname')>> shrugs back.</p>
+					<p>"Well... if that's what you want I guess," <<npc $sex.npcId>><</npc>> shrugs back.</p>
 					<<actCLA 'Get back to it'>>
 						<<gt 'sex_ev_foreplay' 'bj_resume'>>
 					<</actCLA>>
@@ -1356,7 +1356,7 @@
 						You give his cock another lick.
 						"I'm not really in the mood to fuck right now."
 					<</if>>
-					<p>"Well... if that's what you want I guess," <<=$npcs.get($sex.npcId,'firstname')>> says leaning back as you go back to work.</p>
+					<p>"Well... if that's what you want I guess," <<npc $sex.npcId>><</npc>> says leaning back as you go back to work.</p>
 					<<actCLA 'Get back to it'>>
 						<<gt 'sex_ev_foreplay' 'bj_resume'>>
 					<</actCLA>>
@@ -1365,7 +1365,7 @@
 					<<actCLA 'I`m on my period'>>
 						<<video "shared/sex/blowjob/play1.mp4">>
 						"I'm on my period," you sigh. "I feel all crampy and bloaty and gross. Putting something in my bloody vagina sounds like the most unsexy thing in the world right now."
-						<p>"Well... if that's what you want I guess," <<=$npcs.get($sex.npcId,'firstname')>> shrugs back.</p>
+						<p>"Well... if that's what you want I guess," <<npc $sex.npcId>><</npc>> shrugs back.</p>
 						<<actCLA 'Get back to it'>>
 							<<gt 'sex_ev_foreplay' 'bj_resume'>>
 						<</actCLA>>
@@ -1375,7 +1375,7 @@
 					<<actCLA 'My pussy needs a break'>>
 						<<video "shared/sex/blowjob/play1.mp4">>
 						"My pussy needs a break," you smile gently. "I need a little more time to rest before you fuck me again."
-						<p>"Well... if that's what you want I guess," <<=$npcs.get($sex.npcId,'firstname')>> shrugs back.</p>
+						<p>"Well... if that's what you want I guess," <<npc $sex.npcId>><</npc>> shrugs back.</p>
 						<<actCLA 'Get back to it'>>
 							<<gt 'sex_ev_foreplay' 'bj_resume'>>
 						<</actCLA>>
@@ -1387,7 +1387,7 @@
 <<case 'bj_resume'>>
 	<<arouse 'bj' `rand(5,10)` `['no_orgasm_msg']`>>
 	<<video "shared/sex/blowjob/bj47.mp4">>
-	<p>You go back to blowing <<=$npcs.get($sex.npcId,'firstname')>>, humming to yourself as you relax while bobbing your head up and down the length of his cock.</p>
+	<p>You go back to blowing <<npc $sex.npcId>><</npc>>, humming to yourself as you relax while bobbing your head up and down the length of his cock.</p>
 	<<gs 'sex_ev_foreplay' 'bj_sub_cum_sort'>>
 <<case 'bj_sub_cum_sort'>>
 	<<setinit $sex_ev['bj_cum_choice'] = rand(1,20)>>
@@ -1487,11 +1487,11 @@
 				<<video "shared/sex/foreplay/grope1.mp4">>
 			<</if>>
 			<<if getvar("$sex_ev['foreplay_change']") >= 1>>
-				<p>You crawl over <<=$npcs.get($sex.npcId,'firstname')>> kissing him passionately while his hands roam all over your body.</p>
+				<p>You crawl over <<npc $sex.npcId>><</npc>> kissing him passionately while his hands roam all over your body.</p>
 				<<setinit $sex_ev['foreplay_change'] = 2>>
 			<<else>>
 				<<setinit $sex_ev['foreplay_change'] += 1>>
-				<p>You push <<=$npcs.get($sex.npcId,'firstname')>> onto the bed, crawling over him and plunge your tongue into his mouth, kissing him with everything you've got while his hands roam all over your body.</p>
+				<p>You push <<npc $sex.npcId>><</npc>> onto the bed, crawling over him and plunge your tongue into his mouth, kissing him with everything you've got while his hands roam all over your body.</p>
 			<</if>>
 			<<actCLA 'Move your hand to his cock'>>
 				<<arouse 'kiss' `rand(2,4)` `['no_orgasm_msg']`>>
@@ -1514,11 +1514,11 @@
 	<<arouse 'kiss' `rand(2,4)` `['no_orgasm_msg']`>>
 	<<if rand(0,1) == 1>>
 		<<video "shared/sex/foreplay/makeout1.mp4">>
-		<p>You continue making out with <<=$npcs.get($sex.npcId,'firstname')>>, loving the taste of his lips and the feel of his tongue against yours.</p>
+		<p>You continue making out with <<npc $sex.npcId>><</npc>>, loving the taste of his lips and the feel of his tongue against yours.</p>
 	<<else>>
 		<<video "shared/sex/foreplay/grope1.mp4">>
 		<<arouse 'foreplay' -10 `['no_orgasm_msg']`>>
-		<p>You continue making out with <<=$npcs.get($sex.npcId,'firstname')>>, loving the taste of his lips. <<=$npcs.get($sex.npcId,'firstname')>> can't keep his hands off of you, groping your breasts while continuing to plunge his tongue down your throat.</p>
+		<p>You continue making out with <<npc $sex.npcId>><</npc>>, loving the taste of his lips. <<npc $sex.npcId>><</npc>> can't keep his hands off of you, groping your breasts while continuing to plunge his tongue down your throat.</p>
 	<</if>>
 	<<actCLA 'Keep making out'>>
 		<<gt 'sex_ev_foreplay' 'makeout_dom2'>>
@@ -1533,11 +1533,11 @@
 	<<arouse 'hj' `-rand(2,4)` `['no_orgasm_msg']`>>
 	<<if rand(0,1) == 1>>
 		<<video "shared/sex/foreplay/makeout2.mp4">>
-		<p>You continue making out with <<=$npcs.get($sex.npcId,'firstname')>> while jerking him off, loving the taste of his lips and the feel of his tongue against yours and the hard swell of his cock in your hand.</p>
+		<p>You continue making out with <<npc $sex.npcId>><</npc>> while jerking him off, loving the taste of his lips and the feel of his tongue against yours and the hard swell of his cock in your hand.</p>
 	<<else>>
 		<<arouse 'foreplay' -5 `['no_orgasm_msg']`>>
 		<<video "shared/sex/foreplay/grope1.mp4">>
-		<p>You continue making out with <<=$npcs.get($sex.npcId,'firstname')>> while jerking him off, loving the taste of his lips and the hard swell of his cock in your hand. In return, <<=$npcs.get($sex.npcId,'firstname')>> can't keep his hands off of you, endlessly groping your breasts while he continues to plunge his tongue down your throat.</p>
+		<p>You continue making out with <<npc $sex.npcId>><</npc>> while jerking him off, loving the taste of his lips and the hard swell of his cock in your hand. In return, <<npc $sex.npcId>><</npc>> can't keep his hands off of you, endlessly groping your breasts while he continues to plunge his tongue down your throat.</p>
 	<</if>>
 	<<actCLA 'Keep making out'>>
 		<<gt 'sex_ev_foreplay' 'makeout_dom2'>>
@@ -1557,7 +1557,7 @@
 			<<setinit $sex_ev['foreplay_change'] = 2>>
 		<<else>>
 			<<setinit $sex_ev['foreplay_change'] += 1>>
-			<p>You lay down beside <<=$npcs.get($sex.npcId,'firstname')>>, taking his shaft in your hand and working it with sensual tugs. He's rock hard in your grip and he moans under your touch.</p>
+			<p>You lay down beside <<npc $sex.npcId>><</npc>>, taking his shaft in your hand and working it with sensual tugs. He's rock hard in your grip and he moans under your touch.</p>
 		<</if>>
 		<<actCLA 'Make him come in your hand'>>
 			<<gt 'sex_ev_foreplay' 'hj_cum1'>>
@@ -1576,9 +1576,9 @@
 		<p>"Hang on, wai-"</p>
 		But before he can finish his sentence, you squeeze harder and speed up. Thick cum erupts from his cock, wads of it flying through the air, streams of it running down your fingers. A dirty grin is plastered across your face as you work his cock with your hand, milking him for every drop.
 	<<elseif $sex_ev['position'] == 'blowjob'>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> groans loudly and cum erupts from the tip of his cock. The thick liquid dribbles down your fingers, mixing with your saliva, making his shaft even more slippery in your hand. A dirty grin is plastered across your face the whole time as you work his cock, determined to milk him for every drop.</p>
+		<p><<npc $sex.npcId>><</npc>> groans loudly and cum erupts from the tip of his cock. The thick liquid dribbles down your fingers, mixing with your saliva, making his shaft even more slippery in your hand. A dirty grin is plastered across your face the whole time as you work his cock, determined to milk him for every drop.</p>
 	<<else>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> groans loudly and cum erupts from the tip of his cock. The thick liquid dribbles down your fingers, making his shaft incredibly slippery in your hand. A dirty grin is plastered across your face the whole time as you work his cock, determined to milk him for every drop.</p>
+		<p><<npc $sex.npcId>><</npc>> groans loudly and cum erupts from the tip of his cock. The thick liquid dribbles down your fingers, making his shaft incredibly slippery in your hand. A dirty grin is plastered across your face the whole time as you work his cock, determined to milk him for every drop.</p>
 	<</if>>
 	<<gs 'sex_ev_sex' 'sex_end'>>
 <<case 'bj_dom1'>>
@@ -1588,11 +1588,11 @@
 		<<arouse 'bj' `rand(2,3)` `['no_orgasm_msg']`>>
 		<<video "shared/sex/blowjob/play1.mp4">>
 		<<if getvar("$sex_ev['foreplay_change']") >= 1 and getvar("$sex_ev['bj_count']") >= 1>>
-			<p>You move down between <<=$npcs.get($sex.npcId,'firstname')>>'s legs, dipping your head and using your mouth to play with his cock, licking it, sucking it, kissing it, teasing it, enjoying every little twitch and reaction it elicits from him.</p>
+			<p>You move down between <<npc $sex.npcId>><</npc>>'s legs, dipping your head and using your mouth to play with his cock, licking it, sucking it, kissing it, teasing it, enjoying every little twitch and reaction it elicits from him.</p>
 			<<setinit $sex_ev['foreplay_change'] = 2>>
 		<<else>>
 			<<setinit $sex_ev['foreplay_change'] += 1>>
-			<p>You move down between <<=$npcs.get($sex.npcId,'firstname')>>'s legs, dipping your head and using your mouth to play with his cock, licking it, sucking it, kissing it, teasing it, enjoying every little twitch and reaction it elicits from him.</p>
+			<p>You move down between <<npc $sex.npcId>><</npc>>'s legs, dipping your head and using your mouth to play with his cock, licking it, sucking it, kissing it, teasing it, enjoying every little twitch and reaction it elicits from him.</p>
 		<</if>>
 		<<actCLA 'Blow him'>>
 			<<gt 'sex_ev_foreplay' 'bj_dom2'>>
@@ -1603,13 +1603,13 @@
 	<<actCLA 'Keep teasing'>>
 		<<arouse 'bj' `rand(1,3)` `['no_orgasm_msg']`>>
 		<<video "shared/sex/blowjob/play1.mp4">>
-		<p>You continue swirling your tongue around <<=$npcs.get($sex.npcId,'firstname')>>, nibbling at the edges so to speak. Every lick causes a twitch. Every kiss, a pulse. His hips roll beneath you, his cock throbs in your hand.</p>
+		<p>You continue swirling your tongue around <<npc $sex.npcId>><</npc>>, nibbling at the edges so to speak. Every lick causes a twitch. Every kiss, a pulse. His hips roll beneath you, his cock throbs in your hand.</p>
 		<<if rand(1,10) >= $npcs.get($sex.npcId,'sex_stamina')>>
-			<p>"Hey-!" <<=$npcs.get($sex.npcId,'firstname')>> grunts. "I'm gonna come if you keep that up."</p>
+			<p>"Hey-!" <<npc $sex.npcId>><</npc>> grunts. "I'm gonna come if you keep that up."</p>
 		<<elseif $npcs.get($sex.npcId,'fav_pos') == 'blowjob'>>
-			<p>"Ungh-!" <<=$npcs.get($sex.npcId,'firstname')>> moans. "Stop teasing me! I want you to blow me for real."</p>
+			<p>"Ungh-!" <<npc $sex.npcId>><</npc>> moans. "Stop teasing me! I want you to blow me for real."</p>
 		<<else>>
-			<p>"Ungh-! Fuck-!" <<=$npcs.get($sex.npcId,'firstname')>> moans. "You're driving me crazy!"</p>
+			<p>"Ungh-! Fuck-!" <<npc $sex.npcId>><</npc>> moans. "You're driving me crazy!"</p>
 		<</if>>
 		<<gs 'sex_ev_foreplay' 'bj_dom1_cum'>>
 		<<actCLA 'Blow him'>>
@@ -1620,7 +1620,7 @@
 <<case 'bj_dom1_cum'>>
 	<<actCLA 'Make him come'>>
 		<<video "shared/sex/handjob/hj3.mp4">>
-		<p><<=$npcs.get($sex.npcId,'firstname')>>'s warning only makes you want to force him to come even more and you begin rapidly jerking him off and he writhes under your touch. You feel a pulse run through his dick and you know he's going to come right now.</p>
+		<p><<npc $sex.npcId>><</npc>>'s warning only makes you want to force him to come even more and you begin rapidly jerking him off and he writhes under your touch. You feel a pulse run through his dick and you know he's going to come right now.</p>
 		<<actCLA 'Tease him to completion'>>
 			<<gs 'sex_ev_foreplay' 'bj_dom_tease_cum'>>
 			<<gs 'sex_ev_sex' 'sex_end'>>
@@ -1647,10 +1647,10 @@
 	<<arouse 'bj' `rand(2,7)` `['no_orgasm_msg']`>>
 	<<video "shared/sex/blowjob/bj#.mp4" 46 50>>
 	<<if $sex_ev['position'] == 'blowjob_tease'>>
-		<p>Deciding he's had enough teasing, you take <<=$npcs.get($sex.npcId,'firstname')>> between your lips and begin blowing him in earnest.</p>
+		<p>Deciding he's had enough teasing, you take <<npc $sex.npcId>><</npc>> between your lips and begin blowing him in earnest.</p>
 	<</if>>
 	<<setinit $sex_ev['position'] = 'blowjob'>>
-	<p>You give him your best head, taking pride in your work, bobbing up and down his shaft and putting in the effort to make <<=$npcs.get($sex.npcId,'firstname')>> feel good.</p>
+	<p>You give him your best head, taking pride in your work, bobbing up and down his shaft and putting in the effort to make <<npc $sex.npcId>><</npc>> feel good.</p>
 	<<gs 'sex_ev_foreplay' 'bj_dom_cum_sort'>>
 <<case 'bj_dom_cum_sort'>>
 	<<if rand(1,10) == $npcs.get($sex.npcId,'sex_stamina') - 1 or (rand(1,10) > $npcs.get($sex.npcId,'sex_stamina') - 2 and $npcs.get($sex.npcId,'fav_pos') == 'blowjob')>>
@@ -1672,7 +1672,7 @@
 	<<actCLA 'Keep blowing'>>
 		<<setinit $sex_ev['cycle_limit'] += 1>>
 		<<video "shared/sex/blowjob/bj#.mp4" 46 50>>
-		<p>You keep blowing <<=$npcs.get($sex.npcId,'firstname')>>, working his cock with your lips and his shaft with your hand, making sure to add in lots of tongue and drool even more spit.</p>
+		<p>You keep blowing <<npc $sex.npcId>><</npc>>, working his cock with your lips and his shaft with your hand, making sure to add in lots of tongue and drool even more spit.</p>
 		<<gs 'sex_ev_foreplay' 'bj_dom_cum_sort'>>
 	<</actCLA>>
 	<<actCLA 'Pull back (sex)'>>
@@ -1703,7 +1703,7 @@
 		You ignore his protests and redouble your efforts. His cock twitches in your mouth. His hips squirm beneath you. You can even feel him clenching his muscles through his balls. Unable to suppress a smile even with your lips still around his cock, you can tell he's about to come.
 		You pull your mouth away and you grab hold of his manhood, jerking his cock rapidly, still slick with your saliva.
 		<<if $npcs.get($sex.npcId,'lovername') == ''>>
-			<p>"I want you to come for me <<=$npcs.get($sex.npcId,'firstname')>>," you whisper sensually. "Come on <<=$npcs.get($sex.npcId,'firstname')>>! Come on, come on, come on, come on!"</p>
+			<p>"I want you to come for me <<npc $sex.npcId>><</npc>>," you whisper sensually. "Come on <<npc $sex.npcId>><</npc>>! Come on, come on, come on, come on!"</p>
 		<<else>>
 			<p>"I want you to come for me <<=$npcs.get($sex.npcId,'lovername')>>," you whisper sensually. You feel him tense up and you know he's going to blow any moment. "Come on <<=$npcs.get($sex.npcId,'lovername')>>! Come on, come on, come on, come on!"</p>
 		<</if>>
@@ -1747,12 +1747,12 @@
 	<<setinit $sex_ev['cum_choice'] = 'mouth'>>
 	<<setinit $sex_ev['cum_count'] += 1>>
 	<<video "shared/sex/cum/mouth/swallow5.mp4">>
-	<p>You quickly wrap your lips around his cock and plunge down as far as you can go. Not even a second later, he explodes in your mouth, shaft pulsing between your lips, warm liquid splashing against your tonsils. You hold yourself there, humming as <<=$npcs.get($sex.npcId,'firstname')>> buckles beneath you, waiting until he's ridden his orgasm to completion.</p>
+	<p>You quickly wrap your lips around his cock and plunge down as far as you can go. Not even a second later, he explodes in your mouth, shaft pulsing between your lips, warm liquid splashing against your tonsils. You hold yourself there, humming as <<npc $sex.npcId>><</npc>> buckles beneath you, waiting until he's ridden his orgasm to completion.</p>
 	<<gs 'sex_ev_foreplay' 'bj_dom_spit2'>>
 <<case 'bj_dom_spit2'>>
 	<<actCLA 'Spit'>>
 		<<video "shared/sex/cum/mouth/spit6.mp4">>
-		<p>Once you're pretty sure he's done, you draw your head back up <<=$npcs.get($sex.npcId,'firstname')>>'s cock, letting his cum spill from your lips along the way. You watch it run back down his shaft and look up at <<=$npcs.get($sex.npcId,'firstname')>>, giving him a cum drip smile.</p>
+		<p>Once you're pretty sure he's done, you draw your head back up <<npc $sex.npcId>><</npc>>'s cock, letting his cum spill from your lips along the way. You watch it run back down his shaft and look up at <<npc $sex.npcId>><</npc>>, giving him a cum drip smile.</p>
 		<<gs 'sex_ev_sex' 'sex_end'>>
 	<</actCLA>>
 <<case 'bj_dom_swallow1'>>
@@ -1766,7 +1766,7 @@
 		<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1>>
 		<<setinit $sex_ev['cum_count'] += 1>>
 		<<video "shared/sex/cum/mouth/deep2.mp4">>
-		<p>Carefully, very carefully, you slowly draw your lips back up <<=$npcs.get($sex.npcId,'firstname')>>'s cock, sucking the whole time to make sure not a single drop of his cum spills around your lips. It's really difficult to keep sucking and not choke on the cum pooling at the back of your throat. The effort makes your eyes water, but you still manage to draw all the way back up to his tip where you finally swallow his load and get your first gasp of clean air.</p>
+		<p>Carefully, very carefully, you slowly draw your lips back up <<npc $sex.npcId>><</npc>>'s cock, sucking the whole time to make sure not a single drop of his cum spills around your lips. It's really difficult to keep sucking and not choke on the cum pooling at the back of your throat. The effort makes your eyes water, but you still manage to draw all the way back up to his tip where you finally swallow his load and get your first gasp of clean air.</p>
 		<<actCLA 'Continue'>>
 			<<gt 'sex_ev_foreplay' 'bj_dom_swallow_react'>>
 		<</actCLA>>
@@ -1774,7 +1774,7 @@
 <<case 'bj_dom_swallow_react'>>
 	<<video "shared/sex/blowjob/play1.mp4">>
 	<<if $npcs.get($sex.npcId,'cum_pref') == 2 and $npcs.get($sex.npcId,'cum_pref_know') == 0>>
-		<p>"Holy..." <<=$npcs.get($sex.npcId,'firstname')>> lets his head fall back onto his pillow, his mind seemingly blown by your blowjob skills. Taking satisfaction in a job well done, you continue teasing his cock, running your lips up and down its shaft, peppering it with kisses. "That was incredible..."</p>
+		<p>"Holy..." <<npc $sex.npcId>><</npc>> lets his head fall back onto his pillow, his mind seemingly blown by your blowjob skills. Taking satisfaction in a job well done, you continue teasing his cock, running your lips up and down its shaft, peppering it with kisses. "That was incredible..."</p>
 		<p>"Mmmm?" you hum pleasantly. "You liked it that much?"</p>
 		"Like you sucked the soul outta me," he smiles tiredly. "I love the feeling of blowing a load in a girl''s mouth like that, but that was something else."
 		<<actCLA 'You like oral creampies?'>>
@@ -1790,7 +1790,7 @@
 				<<gs 'sex_ev_sex' 'sex_end'>>
 			<</actCLA>>
 			<<actCLA 'I`ll keep it in mind'>>
-				<p>"I'll keep that in mind then," giving <<=$npcs.get($sex.npcId,'firstname')>> a mischievous smirk and running your tongue across his tip.</p>
+				<p>"I'll keep that in mind then," giving <<npc $sex.npcId>><</npc>> a mischievous smirk and running your tongue across his tip.</p>
 				<<gs 'sex_ev_sex' 'sex_end'>>
 			<</actCLA>>
 		<</actCLA>>
@@ -1804,7 +1804,7 @@
 		<</actCLA>>
 	<<else>>
 		<<if $npcs.get($sex.npcId,'cum_pref') == 2 and $npcs.get($sex.npcId,'cum_pref_know') == $npcs.get($sex.npcId,'cum_pref')>>
-			<p>"Woah," <<=$npcs.get($sex.npcId,'firstname')>>'s head flops onto the pillow, while you continue to play with his cock, still twitching in the throes of post-orgasm bliss. "Your mouth is so fucking good."</p>
+			<p>"Woah," <<npc $sex.npcId>><</npc>>'s head flops onto the pillow, while you continue to play with his cock, still twitching in the throes of post-orgasm bliss. "Your mouth is so fucking good."</p>
 			<<actCLA 'I know you love oral creampies'>>
 				"I know how much you love coming in my mouth," you smirk, peppering his shaft with kisses. "Thought I''d give you a treat and suck you dry."
 				"You're the best," he pants.
@@ -1812,7 +1812,7 @@
 				<<gs 'sex_ev_sex' 'sex_end'>>
 			<</actCLA>>
 		<<else>>
-			<p>"Woah," <<=$npcs.get($sex.npcId,'firstname')>>'s head flops onto the pillow, while you continue to play with his cock, still twitching in the throes of post-orgasm bliss. "That was great."</p>
+			<p>"Woah," <<npc $sex.npcId>><</npc>>'s head flops onto the pillow, while you continue to play with his cock, still twitching in the throes of post-orgasm bliss. "That was great."</p>
 		<</if>>
 		<<actCLA 'I know'>>
 			"Don't need to tell me how good I am at giving head," you smirk, giving his shaft another lick. "I already know I'm the best."
@@ -1888,11 +1888,11 @@
 	'<<image `'shared/sex/69/pre1.jpg'`>>'
 	$sex_ev['position'] = '69'
 	if sex_ev['foreplay_change'] >= 1:
-	'You crawl towards <<<<=$npcs.get($sex.npcId,'firstname')>>>>, throwing your legs over his head and scooching your ass over his head. Grinning, you lower your hips down to his face while simultaneously grabbing his cock and preparing it for your mouth.'
+	'You crawl towards <<<<npc $sex.npcId>><</npc>>>>, throwing your legs over his head and scooching your ass over his head. Grinning, you lower your hips down to his face while simultaneously grabbing his cock and preparing it for your mouth.'
 	sex_ev['foreplay_change'] = 2
 	else
 	sex_ev['foreplay_change'] += 1
-	'You push <<<<=$npcs.get($sex.npcId,'firstname')>>>> back onto the bed and throw your legs over him, reversing yourself in the process, and scooch your ass back towards him. Grinning, you lower your hips down to his face while simultaneously grabbing his cock and preparing it for your mouth.'
+	'You push <<<<npc $sex.npcId>><</npc>>>> back onto the bed and throw your legs over him, reversing yourself in the process, and scooch your ass back towards him. Grinning, you lower your hips down to his face while simultaneously grabbing his cock and preparing it for your mouth.'
 	end
 	end} -->
 <<case 'facesit_1'>>
@@ -1901,12 +1901,12 @@
 		<<setinit $sex_ev['position'] = 'facesit'>>
 		<<setinit $sex_ev['facesit_count'] += 1>>
 		<<if getvar("$sex_ev['foreplay_change']") >= 1>>
-			<p>You pull away from <<=$npcs.get($sex.npcId,'firstname')>>'s cock, crawling forward until your legs are over his head. You lower your pussy down onto his mouth with a dirty grin.</p>
+			<p>You pull away from <<npc $sex.npcId>><</npc>>'s cock, crawling forward until your legs are over his head. You lower your pussy down onto his mouth with a dirty grin.</p>
 			"I think it's time for me to get a little tender loving care."
 			<<setinit $sex_ev['foreplay_change'] = 2>>
 		<<else>>
 			<<setinit $sex_ev['foreplay_change'] += 1>>
-			<p>You push <<=$npcs.get($sex.npcId,'firstname')>> back onto the bed and throw your legs over his head. You lower your pussy down onto his mouth with a dirty grin.</p>
+			<p>You push <<npc $sex.npcId>><</npc>> back onto the bed and throw your legs over his head. You lower your pussy down onto his mouth with a dirty grin.</p>
 			"I think it's time for me to go for a ride."
 		<</if>>
 		<<actCLA 'Make him eat you out'>>
@@ -1916,15 +1916,15 @@
 <<case 'facesit_2'>>
 	<<arouse 'cuni' `rand(4,8)` `['no_orgasm_msg']`>>
 	<<video "shared/sex/facesit/1.mp4">>
-	<p>You press your pussy right onto <<=$npcs.get($sex.npcId,'firstname')>>'s face, forcing it between his lips. He immediately complies, sucking gently on your sex while running his tongue through the folds of your pussy to caress your clit.</p>
+	<p>You press your pussy right onto <<npc $sex.npcId>><</npc>>'s face, forcing it between his lips. He immediately complies, sucking gently on your sex while running his tongue through the folds of your pussy to caress your clit.</p>
 	It feels so good, your eyes roll back in your skull and you can't help but grab him by the hair, trying to force his face harder into your pussy. Heat courses through your hips and somewhere in the back of your mind, you wonder if it's possible to drown a man with girl cum.
 	<<if $orgasm > $sex_ev['orgasm']>>
 		<<setinit $sex_ev['orgasm'] = $orgasm>>
 		<<actCLA 'Continue'>>
 			<<video "shared/sex/facesit/orgasm1.mp4">>
-			<p>Euphoric pressure builds and builds inside you until you can't contain it anymore. All it takes is <<=$npcs.get($sex.npcId,'firstname')>>'s tongue brushing against your clit in <i>just</i> the right way, and suddenly you're coming, body racked with spasms as you claw the bedsheets uncontrollably while you ride out your orgasm.</p>
+			<p>Euphoric pressure builds and builds inside you until you can't contain it anymore. All it takes is <<npc $sex.npcId>><</npc>>'s tongue brushing against your clit in <i>just</i> the right way, and suddenly you're coming, body racked with spasms as you claw the bedsheets uncontrollably while you ride out your orgasm.</p>
 			<<if $npcs.get($sex.npcId,'pussyeater') > 0>>
-				<p>After a short time, you feel the waves of climax subsiding but without warning, permission, or invitation, <<=$npcs.get($sex.npcId,'firstname')>> begins working your pussy with his tongue again, diving in deep and sending goosebumps across your skin.</p>
+				<p>After a short time, you feel the waves of climax subsiding but without warning, permission, or invitation, <<npc $sex.npcId>><</npc>> begins working your pussy with his tongue again, diving in deep and sending goosebumps across your skin.</p>
 				<<actCLA 'Let him keep going'>>
 					<<gt 'sex_ev_foreplay' 'facesit_3'>>
 				<</actCLA>>
@@ -1969,19 +1969,19 @@
 	<<video "shared/sex/facesit/1.mp4">>
 	<<if $orgasm > $sex_ev['orgasm_limit']>>
 		$sex_ev['bed_room']
-		<p><<=$npcs.get($sex.npcId,'firstname')>>'s tongue caresses your pussy again, but this time instead of pleasure, the shocks it sends through you are like needles through your clit. You cry out, caught between pain and ecstasy but much further towards pain. His tongue touches you again and you reflexively buck your hips away from his face. <<=$npcs.get($sex.npcId,'firstname')>> looks up at you from between your legs, confused.</p>
+		<p><<npc $sex.npcId>><</npc>>'s tongue caresses your pussy again, but this time instead of pleasure, the shocks it sends through you are like needles through your clit. You cry out, caught between pain and ecstasy but much further towards pain. His tongue touches you again and you reflexively buck your hips away from his face. <<npc $sex.npcId>><</npc>> looks up at you from between your legs, confused.</p>
 		<p>"What's wrong?" he asks. "I thought you were enjoying that."</p>
 		<p>"I- I was..." you pant. "But my pussy is too sensitive now." You manage a smile down at him. "You made me come too many times in a row. I don't think I can take it any more. I need a break."</p>
 		<<gs 'sex_ev_sex' 'sex_end'>>
 	<<else>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>>'s tongue keeps going like a pussy-eating machine, never stopping, and always making sure to give the little man in the boat the attention he deserves.</p>
+		<p><<npc $sex.npcId>><</npc>>'s tongue keeps going like a pussy-eating machine, never stopping, and always making sure to give the little man in the boat the attention he deserves.</p>
 		<<actCLA 'Come again'>>
 			<<set $orgasm_or = 'yes'>>
 			<<arouse 'cuni' `rand(2,5)` `['no_orgasm_msg']`>>
 			<<video "shared/sex/facesit/orgasm1.mp4">>
-			<p>Within minutes, <<=$npcs.get($sex.npcId,'firstname')>> has you spasming around his mouth again.</p>
+			<p>Within minutes, <<npc $sex.npcId>><</npc>> has you spasming around his mouth again.</p>
 			<<if $npcs.get($sex.npcId,'pussyeater') > 0>>
-				<p>But <<=$npcs.get($sex.npcId,'firstname')>> still doesn't stop, and continues to lap up your juices like he's dying of thirst.</p>
+				<p>But <<npc $sex.npcId>><</npc>> still doesn't stop, and continues to lap up your juices like he's dying of thirst.</p>
 				<<if getvar("$sex_ev['cuni_orgasm']") < 5>>
 					<<actCLA 'Let him keep going'>>
 						<<gt 'sex_ev_foreplay' 'facesit_3'>>
@@ -1996,7 +1996,7 @@
 				<</actCLA>>
 				<<gs 'sex_ev_sex' 'sex_start'>>
 			<<else>>
-				<p>"How about we do something else now?" <<=$npcs.get($sex.npcId,'firstname')>>asks as your orgasm winds down.</p>
+				<p>"How about we do something else now?" <<npc $sex.npcId>><</npc>>asks as your orgasm winds down.</p>
 				<<gs 'sex_ev_foreplay' 'foreplay_choose'>>
 				<<gs 'sex_ev_sex' 'sex_start'>>
 			<</if>>
@@ -2023,7 +2023,7 @@
 		<<else>>
 			<<actCLA 'Fuck instead?'>>
 				<p>"Uhh, no," you say, turning your head away with a smirk. "How about we fuck instead?"</p>
-				<p>"I won't say no to that," <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
+				<p>"I won't say no to that," <<npc $sex.npcId>><</npc>> grins back.</p>
 				<<gs 'sex_ev_sex' 'reset'>>
 				<<gs 'sex_ev_condoms' 'condoms'>>
 				<<gs 'sex_ev_sex' 'position_change'>>
@@ -2034,7 +2034,7 @@
 	<<actCLA 'End it there'>>
 		$sex_ev['bed_room']
 		"I think I'm done there," you pant.
-		<p>"What the hell?" <<=$npcs.get($sex.npcId,'firstname')>> protests. "How is that fair? Only you got off!"</p>
+		<p>"What the hell?" <<npc $sex.npcId>><</npc>> protests. "How is that fair? Only you got off!"</p>
 		<<actCLA 'Ugh, fine (blowjob)'>>
 			"Ugh," you moan irately. "<i>Fine</i>. Come here," you say rolling over and bending your head down towards his cock.
 			<<gs 'sex_ev_foreplay' 'bj_dom1'>>

+ 17 - 17
sugarcube/src/autogenerated/unsorted/sex_ev_foreplay_desc.tw

@@ -5,47 +5,47 @@
 	<<if (rand(0,1) == 1 or $npcs.get($sex.npcId,'pussyeater') == 1) and getvar("$sex_ev['sensitive_cuni']") != 1>>
 		<<if $sex_ev['loc'] == 'player home'>>
 			<<if getvar("$sex_ev['start_shower']") == 1>>
-				<p>You drag <<=$npcs.get($sex.npcId,'firstname')>> back into your bedroom. Before you can do anything, he shoves you backwards onto the bed and kneels between your legs.</p>
+				<p>You drag <<npc $sex.npcId>><</npc>> back into your bedroom. Before you can do anything, he shoves you backwards onto the bed and kneels between your legs.</p>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> shoves you backwards onto onto your bed and begins laying a trail of kisses up your thighs leading straight towards your pussy.</p>
+				<p><<npc $sex.npcId>><</npc>> shoves you backwards onto onto your bed and begins laying a trail of kisses up your thighs leading straight towards your pussy.</p>
 			<</if>>
 		<<elseif $sex_ev['loc'] == 'npc_home'>>
 			<<if getvar("$sex_ev['start_shower']") == 1>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> drags you into his bedroom, shoving you backwards onto the bed, and begins laying a trail of kisses up your thighs leading straight towards your pussy.</p>
+				<p><<npc $sex.npcId>><</npc>> drags you into his bedroom, shoving you backwards onto the bed, and begins laying a trail of kisses up your thighs leading straight towards your pussy.</p>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> shoves you backwards onto onto the bed begins laying a trail of kisses, heading down between your legs.</p>
+				<p><<npc $sex.npcId>><</npc>> shoves you backwards onto onto the bed begins laying a trail of kisses, heading down between your legs.</p>
 			<</if>>
 		<<elseif $sex_ev['loc'] == 'hotel_room'>>
 			<<if getvar("$sex_ev['start_shower']") == 1>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> drags you out of the shower and back into the room, shoving you onto the bed and begins laying a trail of kisses up your thighs leading straight towards your pussy.</p>
+				<p><<npc $sex.npcId>><</npc>> drags you out of the shower and back into the room, shoving you onto the bed and begins laying a trail of kisses up your thighs leading straight towards your pussy.</p>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> shoves you backwards onto onto the bed begins laying a trail of kisses, heading down between your legs.</p>
+				<p><<npc $sex.npcId>><</npc>> shoves you backwards onto onto the bed begins laying a trail of kisses, heading down between your legs.</p>
 			<</if>>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> shoves you backwards onto onto the bed begins laying a trail of kisses, heading down between your legs.</p>
+			<p><<npc $sex.npcId>><</npc>> shoves you backwards onto onto the bed begins laying a trail of kisses, heading down between your legs.</p>
 		<</if>>
 	<<else>>
 		<!-- !! nipple play-->
 		<<if $sex_ev['loc'] == 'player home'>>
 			<<if getvar("$sex_ev['start_shower']") == 1>>
-				<p>You drag <<=$npcs.get($sex.npcId,'firstname')>> back into your bedroom. Before you can do anything, he shoves you backwards onto the bed and begins making a line of kisses up your stomach towards your breasts.</p>
+				<p>You drag <<npc $sex.npcId>><</npc>> back into your bedroom. Before you can do anything, he shoves you backwards onto the bed and begins making a line of kisses up your stomach towards your breasts.</p>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> shoves you backwards onto onto your bed and begins making a line of kisses up your stomach towards your breasts.</p>
+				<p><<npc $sex.npcId>><</npc>> shoves you backwards onto onto your bed and begins making a line of kisses up your stomach towards your breasts.</p>
 			<</if>>
 		<<elseif $sex_ev['loc'] == 'npc_home'>>
 			<<if getvar("$sex_ev['start_shower']") == 1>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> drags you into his bedroom and shoves you backwards onto onto the bed, making a line of kisses up your wet stomach, towards your breasts.</p>
+				<p><<npc $sex.npcId>><</npc>> drags you into his bedroom and shoves you backwards onto onto the bed, making a line of kisses up your wet stomach, towards your breasts.</p>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> shoves you backwards onto onto the bed and begins making a line of kisses up your stomach towards your breasts.</p>
+				<p><<npc $sex.npcId>><</npc>> shoves you backwards onto onto the bed and begins making a line of kisses up your stomach towards your breasts.</p>
 			<</if>>
 		<<elseif $sex_ev['loc'] == 'hotel_room'>>
 			<<if getvar("$sex_ev['start_shower']") == 1>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> drags you out of the shower and back into the room, shoving you onto the bed and begins laying a trail of kisses up your stomach towards your breasts.</p>
+				<p><<npc $sex.npcId>><</npc>> drags you out of the shower and back into the room, shoving you onto the bed and begins laying a trail of kisses up your stomach towards your breasts.</p>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> shoves you backwards onto onto the bed and begins making a line of kisses up your stomach towards your breasts.</p>
+				<p><<npc $sex.npcId>><</npc>> shoves you backwards onto onto the bed and begins making a line of kisses up your stomach towards your breasts.</p>
 			<</if>>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> shoves you backwards onto onto the bed and begins making a line of kisses up your stomach towards your breasts.</p>
+			<p><<npc $sex.npcId>><</npc>> shoves you backwards onto onto the bed and begins making a line of kisses up your stomach towards your breasts.</p>
 		<</if>>
 	<</if>>
 <</if>>
@@ -65,11 +65,11 @@
 <</if>>
 <<if $location_var[$here][0] == 'transition1_desc'>>
 	<<if $sex_ev['loc'] == 'player home'>>
-		<p>You pant tiredly, laying back on your bed as your orgasm slowly winds down. Suddenly <<=$npcs.get($sex.npcId,'firstname')>>'s cock enters your view, dangling above your head, and he bends over you, trying to push it into your panting mouth.</p>
+		<p>You pant tiredly, laying back on your bed as your orgasm slowly winds down. Suddenly <<npc $sex.npcId>><</npc>>'s cock enters your view, dangling above your head, and he bends over you, trying to push it into your panting mouth.</p>
 	<<elseif $sex_ev['loc'] == 'npc_home'>>
 		<!-- !!		$sex_ev['bed_room']-->
-		<p>You pant tiredly, laying back on <<=$npcs.get($sex.npcId,'firstname')>>'s bed as your orgasm slowly winds down. Suddenly <<=$npcs.get($sex.npcId,'firstname')>>'s cock enters your view, dangling above your head, and he bends over you, trying to push it into your panting mouth.</p>
+		<p>You pant tiredly, laying back on <<npc $sex.npcId>><</npc>>'s bed as your orgasm slowly winds down. Suddenly <<npc $sex.npcId>><</npc>>'s cock enters your view, dangling above your head, and he bends over you, trying to push it into your panting mouth.</p>
 	<<else>>
-		<p>You pant tiredly, laying back on the bed as your orgasm slowly winds down. Suddenly <<=$npcs.get($sex.npcId,'firstname')>>'s cock enters your view, dangling above your head, and he bends over you, trying to push it into your panting mouth.</p>
+		<p>You pant tiredly, laying back on the bed as your orgasm slowly winds down. Suddenly <<npc $sex.npcId>><</npc>>'s cock enters your view, dangling above your head, and he bends over you, trying to push it into your panting mouth.</p>
 	<</if>>
 <</if>>

+ 19 - 19
sugarcube/src/autogenerated/unsorted/sex_ev_hookup_leave.tw

@@ -18,7 +18,7 @@
 			<<if getvar("$sex_ev['sleepover']") == 1>>
 				<p>"This has been nice," you say, $sex_ev['dress_describe']. "But I really should go."</p>
 			<<elseif getvar("$sex_ev['get_up']") == 0>>
-				<p>As nice as this is, you really can't stay and you heave yourself up and away from <<=$npcs.get($sex.npcId,'firstname')>>, getting up from the bed and moving over to where your discarded clothes were thrown.</p>
+				<p>As nice as this is, you really can't stay and you heave yourself up and away from <<npc $sex.npcId>><</npc>>, getting up from the bed and moving over to where your discarded clothes were thrown.</p>
 				<p>"I should go," you say, $sex_ev['dress_describe'].</p>
 			<<else>>
 				<p>"I should go," you say, $sex_ev['dress_describe'].</p>
@@ -51,7 +51,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'hookup_continuation'>>
 	<<if rand(1,10) > 7 and ($time.hour > 20 or $time.hour < 2) and $npcs.get($sex.npcId,'caretaker') > 0 and $npcs.get($sex.npcId,'girlfriend') == 0 and getvar("$sex_ev['cant_stay']") == 0>>
-		<p>"Really?" <<=$npcs.get($sex.npcId,'firstname')>> sits up in bed. "You don't have to. Are you sure you don't want to spend the night?"</p>
+		<p>"Really?" <<npc $sex.npcId>><</npc>> sits up in bed. "You don't have to. Are you sure you don't want to spend the night?"</p>
 		<<gs 'sex_ev_hookup_leave' 'spend_the_night'>>
 	<<elseif getvar("$sex_ev['continuation']") > 0>>
 		<<if $npcs.get($sex.npcId,'goal') == 1>>
@@ -112,7 +112,7 @@
 
 				<</if>>
 				<<image "shared/sex/after/cuddle1.jpg">>
-				<p>You slip back into bed and cuddle up with <<=$npcs.get($sex.npcId,'firstname')>>, resting your naked body on top of his. He wraps his arms around you in return and the two of your relax, listening to the sound of each other's breathing.</p>
+				<p>You slip back into bed and cuddle up with <<npc $sex.npcId>><</npc>>, resting your naked body on top of his. He wraps his arms around you in return and the two of your relax, listening to the sound of each other's breathing.</p>
 				<<gs 'sex_ev_after' 'sleep'>>
 			<</actCLA>>
 		<</actCLA>>
@@ -135,12 +135,12 @@
 		<<actCLA 'Continue'>>
 			<<gs 'sex_ev_leave' 'dress_loop'>>
 			<<if rand(1,3) == 1>>
-				<p>"Nah, this was a one time thing," <<=$npcs.get($sex.npcId,'firstname')>> replies. "I never fuck the same girl twice."</p>
+				<p>"Nah, this was a one time thing," <<npc $sex.npcId>><</npc>> replies. "I never fuck the same girl twice."</p>
 				You pause for a moment and give him a look.
 				<p>"Seriously?"</p>
 				<p>"Do I look like I'm kidding?" he grins back, clearly satisfied with himself.</p>
 				<p><i>Free access to pussy and you're just gonna turn it down? Whatever...</i> you think to yourself, $sex_ev['dress_describe'].</p>
-				<p>Once you're finished dressing, you grab your things and leave. <<=$npcs.get($sex.npcId,'firstname')>> doesn't say a word as you close the door behind you.</p>
+				<p>Once you're finished dressing, you grab your things and leave. <<npc $sex.npcId>><</npc>> doesn't say a word as you close the door behind you.</p>
 			<<else>>
 				<<gs 'sex_ev_leave' 'fuckbuddy_add'>>
 				<p>"What, like fuckbuddies?"</p>
@@ -162,12 +162,12 @@
 		<<actCLA 'Continue'>>
 			<<gs 'sex_ev_leave' 'dress_loop'>>
 			<<if rand(1,3) == 1>>
-				<p>"Nah, this was a one time thing," <<=$npcs.get($sex.npcId,'firstname')>> replies. "I never fuck the same girl twice."</p>
+				<p>"Nah, this was a one time thing," <<npc $sex.npcId>><</npc>> replies. "I never fuck the same girl twice."</p>
 				You pause for a moment and give him a look.
 				<p>"Seriously?"</p>
 				<p>"Do I look like I'm kidding?" he grins back, clearly satisfied with himself.</p>
 				<i>Wow... You can really pick em, huh <<$pc.name_nick>>?</i> you think to yourself  <<$sex_ev[''dress_describe'']>>. <i>Ugh. Whatever...</i>
-				<p>Once you're done, you grab your things and leave. <<=$npcs.get($sex.npcId,'firstname')>> doesn't say a word as you close the door behind you.</p>
+				<p>Once you're done, you grab your things and leave. <<npc $sex.npcId>><</npc>> doesn't say a word as you close the door behind you.</p>
 				<<actCLA 'Leave'>>
 					<<gt 'sex_ev_leave' 'exit'>>
 				<</actCLA>>
@@ -258,8 +258,8 @@
 		<<actCLA 'Sorry'>>
 			<<gs 'sex_ev_leave' 'dress_loop'>>
 			"Sorry..."
-			<p>"Oh. Uhh, well, it's fine I guess..." <<=$npcs.get($sex.npcId,'firstname')>> trails off and you're left in an extremely uncomfortable silence while you $sex_ev['dress_describe'].</p>
-			<p><i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<=$npcs.get($sex.npcId,'firstname')>> a strained smile and wave goodbye, quickly striding towards the door to escape.</p>
+			<p>"Oh. Uhh, well, it's fine I guess..." <<npc $sex.npcId>><</npc>> trails off and you're left in an extremely uncomfortable silence while you $sex_ev['dress_describe'].</p>
+			<p><i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<npc $sex.npcId>><</npc>> a strained smile and wave goodbye, quickly striding towards the door to escape.</p>
 			<<actCLA 'Leave'>>
 				<<gt 'sex_ev_leave' 'exit'>>
 			<</actCLA>>
@@ -269,9 +269,9 @@
 			<p>"If it were something purely physical, like fuckbuddies or something," you say, $sex_ev['dress_describe']. "I wouldn't mind getting together for some fun, but I'm not interested in a boyfriend."</p>
 			<<if rand(1,10) > 7 and $npcs.get($sex.npcId,'goal') != 3>>
 				<<gs 'sex_ev_leave' 'fuckbuddy_add'>>
-				<p>"Well... If it means I can see you again, then sure I guess." <<=$npcs.get($sex.npcId,'firstname')>> doesn't really seem satisfied with the results, but he still tells you his number while you tap it into your contact list.</p>
+				<p>"Well... If it means I can see you again, then sure I guess." <<npc $sex.npcId>><</npc>> doesn't really seem satisfied with the results, but he still tells you his number while you tap it into your contact list.</p>
 				<p>"So uhh, yeah... Call me sometime?"</p>
-				<p>With a shrug and an awkward wave goodbye, you head out the door and out of <<=$npcs.get($sex.npcId,'firstname')>>'s apartment.</p>
+				<p>With a shrug and an awkward wave goodbye, you head out the door and out of <<npc $sex.npcId>><</npc>>'s apartment.</p>
 				<<actCLA 'Leave'>>
 					<<gt 'sex_ev_leave' 'exit'>>
 				<</actCLA>>
@@ -280,7 +280,7 @@
 				<<actCLA 'It`s to be expected'>>
 					<<gs 'sex_ev_leave' 'dress_loop'>>
 					<p>You nod to yourself, continuing $sex_ev['dress_describe']. It's to be expected from a guy like him. But if he wants something more, you just can't give it to him. You're only after pleasure, you don't want to get tangled up in a relationship.</p>
-					<p>"Well, I guess I won't see you around then so... bye?" You wave to <<=$npcs.get($sex.npcId,'firstname')>> and stride out the door, unable to feel that this little bit of fun took a bit of a damper turn right at the end.</p>
+					<p>"Well, I guess I won't see you around then so... bye?" You wave to <<npc $sex.npcId>><</npc>> and stride out the door, unable to feel that this little bit of fun took a bit of a damper turn right at the end.</p>
 					<<actCLA 'Leave'>>
 						<<gt 'sex_ev_leave' 'exit'>>
 					<</actCLA>>
@@ -288,7 +288,7 @@
 				<<actCLA 'Taken aback'>>
 					<<gs 'sex_ev_leave' 'dress_loop'>>
 					<p>You blink in surprise, stopping halfway through $sex_ev['dress_describe']. That response really wasn't what you saw coming. After all, what guy just gives up free access to sex?</p>
-					<p>"Uhh well, uhh... Alright... Guess I won't see you later then..." you respond awkwardly. After giving yourself a once over, you give <<=$npcs.get($sex.npcId,'firstname')>> a strained smile and wave goodbye, quickly striding towards out the door.</p>
+					<p>"Uhh well, uhh... Alright... Guess I won't see you later then..." you respond awkwardly. After giving yourself a once over, you give <<npc $sex.npcId>><</npc>> a strained smile and wave goodbye, quickly striding towards out the door.</p>
 					<<actCLA 'Leave'>>
 						<<gt 'sex_ev_leave' 'exit'>>
 					<</actCLA>>
@@ -327,8 +327,8 @@
 			"Whatever, your loss," he shrugs.
 			<p>"Pfft-! Yeah, sure," you snigger back, pulling on the rest of your clothes. You give yourself a once over, making sure everything's in place and wave goodbye as you head towards the door.</p>
 		<<elseif getvar("$sex_ev['continuation']") == 2>>
-			<p>"Oh. Uhh, well..." <<=$npcs.get($sex.npcId,'firstname')>> trails off and you're left in an extremely uncomfortable silence while you get dressed in front of him.</p>
-			<p><i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<=$npcs.get($sex.npcId,'firstname')>> a strained smile and wave goodbye, quickly striding towards the door to escape.</p>
+			<p>"Oh. Uhh, well..." <<npc $sex.npcId>><</npc>> trails off and you're left in an extremely uncomfortable silence while you get dressed in front of him.</p>
+			<p><i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<npc $sex.npcId>><</npc>> a strained smile and wave goodbye, quickly striding towards the door to escape.</p>
 		<</if>>
 		<<actCLA 'Leave'>>
 			<<gt 'sex_ev_leave' 'exit'>>
@@ -370,8 +370,8 @@
 					<</actCLA>>
 				<</if>>
 			<<else>>
-				<p>"Oh. Uhh, well..." <<=$npcs.get($sex.npcId,'firstname')>> trails off and you're left in an extremely uncomfortable silence while you get dressed in front of him.</p>
-				<p><i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<=$npcs.get($sex.npcId,'firstname')>> a strained smile and wave goodbye, quickly striding towards the door to escape.</p>
+				<p>"Oh. Uhh, well..." <<npc $sex.npcId>><</npc>> trails off and you're left in an extremely uncomfortable silence while you get dressed in front of him.</p>
+				<p><i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<npc $sex.npcId>><</npc>> a strained smile and wave goodbye, quickly striding towards the door to escape.</p>
 				<<actCLA 'Leave'>>
 					<<gt 'sex_ev_leave' 'exit'>>
 				<</actCLA>>
@@ -412,8 +412,8 @@
 					<</actCLA>>
 				<</if>>
 			<<else>>
-				<p>"Oh. Uhh, well..." <<=$npcs.get($sex.npcId,'firstname')>> trails off and you're left in an extremely uncomfortable silence while you get dressed in front of him.</p>
-				<p><i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<=$npcs.get($sex.npcId,'firstname')>> a strained smile and wave goodbye, quickly striding towards the door to escape.</p>
+				<p>"Oh. Uhh, well..." <<npc $sex.npcId>><</npc>> trails off and you're left in an extremely uncomfortable silence while you get dressed in front of him.</p>
+				<p><i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<npc $sex.npcId>><</npc>> a strained smile and wave goodbye, quickly striding towards the door to escape.</p>
 				<<actCLA 'Leave'>>
 					<<gt 'sex_ev_leave' 'exit'>>
 				<</actCLA>>

+ 94 - 94
sugarcube/src/autogenerated/unsorted/sex_ev_leave.tw

@@ -153,7 +153,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'leaving_end'>>
 	<<if $npcs.get($sex.npcId,'rel_type') == 'sugar_daddy'>>
-		<p>Just before you go, <<=$npcs.get($sex.npcId,'firstname')>> hands you an envelope with 2000<b>₽‎</b> in it.</p>
+		<p>Just before you go, <<npc $sex.npcId>><</npc>> hands you an envelope with 2000<b>₽‎</b> in it.</p>
 	<</if>>
 	<p>"$sex_ev['leave_dialogue']," you say$sex_ev['leave_action'].</p>
 	<<actCLA 'Leave'>>
@@ -163,19 +163,19 @@
 <<if $location_var[$here][0] == 'npc_leave'>>
 	$sex_ev['bed_room']
 	<<if $npcs.get($sex.npcId,'latesleeper') == 1 and getvar("$sex_ev['boy_wakeup']") == 0>>
-		<p>Not wanting to wake <<=$npcs.get($sex.npcId,'firstname')>>, you sneak over to the door and let yourself out, closing it as gently as you can behind you.</p>
+		<p>Not wanting to wake <<npc $sex.npcId>><</npc>>, you sneak over to the door and let yourself out, closing it as gently as you can behind you.</p>
 		<<actCLA 'Leave'>>
 			<<gt 'sex_ev_leave' 'exit'>>
 		<</actCLA>>
 	<<else>>
 		<<if getvar("$sex_ev['angry_after']") == 1 or getvar("$sex_ev['annoyed']") > 0>>
 			"You should go," you say flatly.
-			<p><<=$npcs.get($sex.npcId,'firstname')>> stiffly gets out of bed and gets dressed, neither of you really looking the other in the eye as he does. After a minute or two, he's finished and leaves without another word.</p>
+			<p><<npc $sex.npcId>><</npc>> stiffly gets out of bed and gets dressed, neither of you really looking the other in the eye as he does. After a minute or two, he's finished and leaves without another word.</p>
 			<<actCLA 'Finish'>>
 				<<gt 'sex_ev_leave' 'exit'>>
 			<</actCLA>>
 		<<else>>
-			<p>"This was fun, but you should probably go," you say to <<=$npcs.get($sex.npcId,'firstname')>>, who nods and moves to start picking up his clothes and get dressed.</p>
+			<p>"This was fun, but you should probably go," you say to <<npc $sex.npcId>><</npc>>, who nods and moves to start picking up his clothes and get dressed.</p>
 			<<gt 'sex_ev_leave' 'npc_leaving_action'>>
 		<</if>>
 	<</if>>
@@ -381,7 +381,7 @@
 		<<actCLA 'Break things off'>>
 			$sex_ev['bed_room']
 			iif($sex_ev['loc'] ! 'pc_home','"This is the last time I'm coming over," you say, abruptly.','"This is the last time you can come over," you say abruptly.')
-			<p>"Huh?" <<=$npcs.get($sex.npcId,'firstname')>> looks at you oddly. "What are you talking about?"</p>
+			<p>"Huh?" <<npc $sex.npcId>><</npc>> looks at you oddly. "What are you talking about?"</p>
 			<<if $npcs.get($sex.npcId,'rel_type') == 'boyfriend'>>
 				"I'm breaking up with you."
 				<p>"What?!" he asks.</p>
@@ -462,7 +462,7 @@
 					<<actCLA 'As long as it`s just physical'>>
 						$sex_ev['bed_room']
 						"Well..." you say slowly. "As long as it's <i>just</i> physical..."
-						<p>"Thatta girl," <<=$npcs.get($sex.npcId,'firstname')>> grins from bed.</p>
+						<p>"Thatta girl," <<npc $sex.npcId>><</npc>> grins from bed.</p>
 						<<gs 'sex_ev_after' 'cheating_end'>>
 					<</actCLA>>
 					<<actCLA 'Set some rules'>>
@@ -525,7 +525,7 @@
 			<!-- !! add in rape chance later-->
 			<<video "shared/romance/misc/depart_annoyed1.mp4">>
 			"Fuck this," you say, getting up and grabbing your clothes.
-			<p>"Where the fuck are you going?" <<=$npcs.get($sex.npcId,'firstname')>> asks in bewilderment.</p>
+			<p>"Where the fuck are you going?" <<npc $sex.npcId>><</npc>> asks in bewilderment.</p>
 			"I'm not gonna be fuckbuddies with a guy who never uses condoms," you sneer at him. "<i>Don't</i> text me again."
 			The second you're dressed you stalk out the door and slam it behind you.
 			<<gs 'sex_ev_leave' 'break_up'>>
@@ -538,7 +538,7 @@
 	<</actCLA>>
 	<<actCLA 'Leave a note'>>
 		$sex_ev['hall_way']
-		<p>Not wanting to leave without saying goodbye but not wanting to wake <<=$npcs.get($sex.npcId,'firstname')>> either, you find a piece of paper and a pen and scribble out a quick message.</p>
+		<p>Not wanting to leave without saying goodbye but not wanting to wake <<npc $sex.npcId>><</npc>> either, you find a piece of paper and a pen and scribble out a quick message.</p>
 		<<gs 'sex_ev_leave' 'sneak_out_note1'>>
 	<</actCLA>>
 	<<if $wardrobe.pantyworntype != 'none'>>
@@ -547,9 +547,9 @@
 			<<gs 'panties' 'dispose'>>
 			$sex_ev['hall_way']
 			<<if getvar("$CloSkirtShortness") > 0>>
-				<p>Suddenly feeling naughty, you quickly slip your panties down your legs, leaving your pussy bare underneath your skirt. You loop your warm underwear around the handle of <<=$npcs.get($sex.npcId,'firstname')>>'s bedroom door and then quietly sneak out of his apartment, leaving only your gift behind.</p>
+				<p>Suddenly feeling naughty, you quickly slip your panties down your legs, leaving your pussy bare underneath your skirt. You loop your warm underwear around the handle of <<npc $sex.npcId>><</npc>>'s bedroom door and then quietly sneak out of his apartment, leaving only your gift behind.</p>
 			<<else>>
-				<p>Suddenly feeling naughty, you pull down your trousers down and spend a minute untangling your legs before pulling your bottoms back up back up, sans panties. You loop your warm underwear around the handle of <<=$npcs.get($sex.npcId,'firstname')>>'s bedroom door and then quietly sneak out of his apartment, leaving only your gift behind.</p>
+				<p>Suddenly feeling naughty, you pull down your trousers down and spend a minute untangling your legs before pulling your bottoms back up back up, sans panties. You loop your warm underwear around the handle of <<npc $sex.npcId>><</npc>>'s bedroom door and then quietly sneak out of his apartment, leaving only your gift behind.</p>
 			<</if>>
 			<<actCLA 'Leave'>>
 				<<gt 'sex_ev_leave' 'exit'>>
@@ -561,9 +561,9 @@
 			<<gs 'panties' 'dispose'>>
 			$sex_ev['hall_way']
 			<<if getvar("$CloSkirtShortness") > 0>>
-				<p>Not wanting to leave without saying goodbye but not wanting to wake <<=$npcs.get($sex.npcId,'firstname')>> either, you start to look for a piece of paper when a naughty thought runs through your mind. Unable to resist the thought, you quickly slip your panties down from underneath your skirt and then rummage for a big marker.</p>
+				<p>Not wanting to leave without saying goodbye but not wanting to wake <<npc $sex.npcId>><</npc>> either, you start to look for a piece of paper when a naughty thought runs through your mind. Unable to resist the thought, you quickly slip your panties down from underneath your skirt and then rummage for a big marker.</p>
 			<<else>>
-				<p>Not wanting to leave without saying goodbye but not wanting to wake <<=$npcs.get($sex.npcId,'firstname')>> either, you start to look for a piece of paper when a naughty thought runs through your mind. Unable to resist the thought, you quickly pull down your trousers down and spend a minute untangling your legs before pulling your bottoms back up, sans panties. Then you rummage for a big marker.</p>
+				<p>Not wanting to leave without saying goodbye but not wanting to wake <<npc $sex.npcId>><</npc>> either, you start to look for a piece of paper when a naughty thought runs through your mind. Unable to resist the thought, you quickly pull down your trousers down and spend a minute untangling your legs before pulling your bottoms back up, sans panties. Then you rummage for a big marker.</p>
 			<</if>>
 			You pop the cap with a grin and start scribbling.
 			<<gs 'sex_ev_leave' 'sneak_out_note1'>>
@@ -669,7 +669,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'sneak_out_note_end'>>
 	<<if getvar("$sex_ev['panty_note']") == 1>>
-		<p>Satisfied, you leave your panties on the counter and quietly slip out the door, wondering what <<=$npcs.get($sex.npcId,'firstname')>> will think when he discovers them.</p>
+		<p>Satisfied, you leave your panties on the counter and quietly slip out the door, wondering what <<npc $sex.npcId>><</npc>> will think when he discovers them.</p>
 	<<else>>
 		Satisfied, you leave your note on the counter and quietly slip out the door, letting it click shut behind you.
 	<</if>>
@@ -694,7 +694,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'sneak_out2'>>
 	$sex_ev['hall_way']
-	<p>You tip toe your way to the door, turning the handle as gently as you can so you don't disturb <<=$npcs.get($sex.npcId,'firstname')>>, closing it with a soft click behind you.</p>
+	<p>You tip toe your way to the door, turning the handle as gently as you can so you don't disturb <<npc $sex.npcId>><</npc>>, closing it with a soft click behind you.</p>
 	<<actCLA 'Leave'>>
 		<<gt 'sex_ev_leave' 'exit'>>
 	<</actCLA>>
@@ -758,15 +758,15 @@
 	<<if getvar("$sex_ev['sleepover']") == 1 and $npcs.get($sex.npcId,'latesleeper') == 1 and getvar("$sex_ev['boy_asleep']") != 0>>
 		<<if getvar("$sex_ev['towel']") == 1>>
 			<<setinit $sex_ev['towel'] = 0>>
-			<p>You drop the towel and quietly reach down for your clothes and try to pick them up without waking <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+			<p>You drop the towel and quietly reach down for your clothes and try to pick them up without waking <<npc $sex.npcId>><</npc>>.</p>
 		<<else>>
-			<p>You quietly reach down for where you left your clothes and try to pick them up without waking <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+			<p>You quietly reach down for where you left your clothes and try to pick them up without waking <<npc $sex.npcId>><</npc>>.</p>
 		<</if>>
 		<<gs 'sex_ev_leave' 'dressing2'>>
 	<<else>>
 		<<gs 'sex_ev_leave' 'dress_start_desc'>>
 		<<if getvar("$sex_ev['angry_after']") == 1 or getvar("$sex_ev['annoyed']") > 0>>
-			<p>"I have to go," you say flatly, reaching down for your clothes without looking at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+			<p>"I have to go," you say flatly, reaching down for your clothes without looking at <<npc $sex.npcId>><</npc>>.</p>
 			<<gs 'sex_ev_leave' 'dressing2'>>
 		<<elseif getvar("$sex_ev['cant_stay']") == 1>>
 			<!-- !! there is an additional dress_loop here to make it possible to give panties here-->
@@ -775,7 +775,7 @@
 			<<gs 'sex_ev_leave' 'dressing2'>>
 			<<gs 'sex_ev_leave' 'panty_gift'>>
 		<<elseif getvar("$sex_ev['npc_late']") == 0>>
-			<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you are $sex_ev['dress_describe'].</p>
+			<p>"You heading out?" <<npc $sex.npcId>><</npc>> asks as you are $sex_ev['dress_describe'].</p>
 			<<gs 'sex_ev_leave' 'not_leaving'>>
 			<<gs 'sex_ev_leave' 'leaving_soon'>>
 			<<gs 'sex_ev_leave' 'something_to_do'>>
@@ -791,7 +791,7 @@
 			<</if>>
 			<!-- !!			gs'sex_ev_leave', 'dress_talk'-->
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> starts getting dressed next to you.</p>
+			<p><<npc $sex.npcId>><</npc>> starts getting dressed next to you.</p>
 			<<gs 'sex_ev_leave' 'dressing2'>>
 		<</if>>
 		<!-- !!	act'Talk while you dress':-->
@@ -831,7 +831,7 @@
 	<<actCLA 'Not yet'>>
 		<<gs 'sex_ev_leave' 'dress_loop'>>
 		<<gs 'sex_ev_leave' 'dress_start_desc'>>
-		<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+		<p>"You heading out?" <<npc $sex.npcId>><</npc>> asks.</p>
 		<p>"Not yet," you say, $sex_ev['dress_describe']. "Just tired of hanging out naked."</p>
 		"I'm never tired of seeing you naked."
 		<<actCLA 'Roll your eyes'>>
@@ -845,7 +845,7 @@
 		<<setinit $sex_ev['leaving'] = 1>>
 		<<gs 'sex_ev_leave' 'dress_loop'>>
 		<<gs 'sex_ev_leave' 'dress_start_desc'>>
-		<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+		<p>"You heading out?" <<npc $sex.npcId>><</npc>> asks.</p>
 		<<if getvar("$sex_ev['sleepover']") < 1>>
 			<<set '"Yeah," you say, $sex_ev['dress_describe'].' + iif($sex_ev['loc'] = 'pc_home', ' "Get your clothes on so I can get out of here."', ' ')>>
 			<<gs 'sex_ev_leave' 'dressing2'>>
@@ -867,7 +867,7 @@
 			<<actCLA 'Going to the disco'>>
 				<<gs 'sex_ev_leave' 'dress_loop'>>
 				<<gs 'sex_ev_leave' 'dress_start_desc'>>
-				<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+				<p>"You heading out?" <<npc $sex.npcId>><</npc>> asks.</p>
 				<<if getvar("$sex_ev['disco_after']") == 1>>
 					<<set '"Weren't you listening to me?" you say, $sex_ev['dress_describe']. "I told you, I'm going to the disco tonight.' + iif($sex_ev['loc'] = 'pc_home', 'So get your clothes on already so I can make it!"','"')>>
 				<<else>>
@@ -881,7 +881,7 @@
 			<<actCLA 'Going to the club'>>
 				<<gs 'sex_ev_leave' 'dress_loop'>>
 				<<gs 'sex_ev_leave' 'dress_start_desc'>>
-				<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+				<p>"You heading out?" <<npc $sex.npcId>><</npc>> asks.</p>
 				<<if getvar("$sex_ev['club_after']") == 1>>
 					<<set '"Weren't you listening to me?" you say, $sex_ev['dress_describe']. "I told you, I'm going clubbing tonight."' + iif($sex_ev['loc'] = 'pc_home', 'So get your clothes on already so I can make it before it closes!"','"')>>
 				<<else>>
@@ -900,7 +900,7 @@
 			<<setinit $sex_ev['mom_kill'] = 1>>
 			<<gs 'sex_ev_leave' 'dress_loop'>>
 			<<gs 'sex_ev_leave' 'dress_start_desc'>>
-			<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+			<p>"You heading out?" <<npc $sex.npcId>><</npc>> asks.</p>
 			<<if $time.hour < 3>>
 				<p>"Yeah," you say, $sex_ev['dress_describe']. "I'm already going to be in trouble as it is, but if I don't come home at all tonight, my mom will kill me."</p>
 			<<else>>
@@ -916,7 +916,7 @@
 		<<actCLA 'Need to finish my homework'>>
 			<<gs 'sex_ev_leave' 'dress_loop'>>
 			<<gs 'sex_ev_leave' 'dress_start_desc'>>
-			<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+			<p>"You heading out?" <<npc $sex.npcId>><</npc>> asks.</p>
 			<<set '"Yeah," you say, $sex_ev['dress_describe']. "I need to do my homework.' + iif($sex_ev['loc'] = 'pc_home', 'So get dressed and skedaddle so I can get it done."','"')>>
 			<!-- !!			if rand(0,1) = 1:-->
 			<<if $npcs.get($sex.npcId,'intel') < 30 and $npcs.get($sex.npcId,'finance') < 2>>
@@ -934,7 +934,7 @@
 					<<gs 'sex_ev_leave' 'dressing2'>>
 				<</actCLA>>
 			<<else>>
-				<p>"I guess your future after school is pretty important," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+				<p>"I guess your future after school is pretty important," <<npc $sex.npcId>><</npc>> says.</p>
 				<<actCLA 'Thanks for understanding'>>
 					<<gs 'sex_ev_leave' 'dress_loop'>>
 					<<gs 'sex_ev_leave' 'dress_start_desc'>>
@@ -969,7 +969,7 @@
 		<<setinit $sex_ev['leaving'] = 1>>
 		<<gs 'sex_ev_leave' 'dress_loop'>>
 		<<gs 'sex_ev_leave' 'dress_start_desc'>>
-		<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+		<p>"You heading out?" <<npc $sex.npcId>><</npc>> asks.</p>
 		<<if getvar("$sex_ev['sleepover']") < 1>>
 			<<set '"Yeah," you say, $sex_ev['dress_describe']. "Have a few things I need to get done.' + iif($sex_ev['loc'] = 'pc_home', ' Sorry to kick you out so quickly."','"')>>
 			<<gs 'sex_ev_leave' 'dressing2'>>
@@ -990,7 +990,7 @@
 		<<setinit $sex_ev['leaving'] = 1>>
 		<<gs 'sex_ev_leave' 'dress_loop'>>
 		<<gs 'sex_ev_leave' 'dress_start_desc'>>
-		<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+		<p>"You heading out?" <<npc $sex.npcId>><</npc>> asks.</p>
 		<<if getvar("$sex_ev['sleepover']") < 1>>
 			<<set '"Yeah," you say, $sex_ev['dress_describe']. "Need to see a friend later.' + iif($sex_ev['loc'] = 'pc_home', 'Sorry to kick you out so quickly."','"')>>
 			<<gs 'sex_ev_leave' 'dressing2'>>
@@ -1012,9 +1012,9 @@
 			<<setinit $sex_ev['leaving'] = 1>>
 			<<gs 'sex_ev_leave' 'dress_loop'>>
 			<<gs 'sex_ev_leave' 'dress_start_desc'>>
-			<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+			<p>"You heading out?" <<npc $sex.npcId>><</npc>> asks.</p>
 			<p>"Yeah," you smirk, $sex_ev['dress_describe']. "Got another booty call to show up to."</p>
-			<p>"You really get around don't you?" <<=$npcs.get($sex.npcId,'firstname')>> smirks back.</p>
+			<p>"You really get around don't you?" <<npc $sex.npcId>><</npc>> smirks back.</p>
 			<<gs 'sex_ev_leave' 'dressing2'>>
 			<<gs 'sex_ev_leave' 'panty_gift'>>
 		<</actCLA>>
@@ -1025,7 +1025,7 @@
 		<<actCLA 'School'>>
 			<<gs 'sex_ev_leave' 'dress_loop'>>
 			<<gs 'sex_ev_leave' 'dress_start_desc'>>
-			<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+			<p>"You heading out?" <<npc $sex.npcId>><</npc>> asks.</p>
 			<<if $sex_ev['loc'] == 'pc_home'>>
 				<<if getvar("$sex_ev['late_for_school']") == 1 and $time.hour >= 8>>
 					<p>"I already told you, I'm late for school," you say, $sex_ev['dress_describe']. "You gotta get out of here so I can lock up."</p>
@@ -1068,7 +1068,7 @@
 		<<actCLA 'It`s a school night'>>
 			<<gs 'sex_ev_leave' 'dress_loop'>>
 			<<gs 'sex_ev_leave' 'dress_start_desc'>>
-			<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+			<p>"You heading out?" <<npc $sex.npcId>><</npc>> asks.</p>
 			<!-- !! if schoolprogul = 1:-->
 			<<if $sex_ev['loc'] == 'pc_home'>>
 				<p>"It's a school night," you say, $sex_ev['dress_describe']. "You gotta go so I can get up for class tomorrow."</p>
@@ -1104,11 +1104,11 @@
 			Just after you put on your panties, a sexy thought pops into your head.
 			"But before I go," you say mischievously. "I have a gift for you."
 			<<if $npcs.get($sex.npcId,'panty_give') == 1>>
-				<p>"A gift?" <<=$npcs.get($sex.npcId,'firstname')>> asks curiously.</p>
-				<p>In one smooth motion, you slide your panties down your legs and daintily toss them onto the rumpled sheets of the bed on which you fucked <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+				<p>"A gift?" <<npc $sex.npcId>><</npc>> asks curiously.</p>
+				<p>In one smooth motion, you slide your panties down your legs and daintily toss them onto the rumpled sheets of the bed on which you fucked <<npc $sex.npcId>><</npc>>.</p>
 				<<gs 'sex_ev_leave' 'panty_gift2'>>
 			<<else>>
-				<p>"Another pair of your panties?" <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+				<p>"Another pair of your panties?" <<npc $sex.npcId>><</npc>> grins.</p>
 				<p>"You guessed correctly," you grin back. "And your prize is-!"</p>
 				In one smooth motion, you slide your panties down your legs and daintily toss them into the rumpled sheets of the bed you were just fucked in.
 				<!-- !!'"Enjoy," you smirk.'-->
@@ -1133,7 +1133,7 @@
 				<<gs 'sex_ev_leave' 'panty_gift_girlfriend'>>
 			<</if>>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't reply, but his expression says that he isn't displeased.</p>
+			<p><<npc $sex.npcId>><</npc>> doesn't reply, but his expression says that he isn't displeased.</p>
 			<<if $sex_ev['type'] == 'hookup'>>
 				<<gs 'sex_ev_hookup_leave' 'later'>>
 			<<else>>
@@ -1160,7 +1160,7 @@
 				<<gs 'sex_ev_leave' 'panty_gift_girlfriend'>>
 			<</if>>
 		<<else>>
-			<p>"Maybe I should frame it," <<=$npcs.get($sex.npcId,'firstname')>> snickers.</p>
+			<p>"Maybe I should frame it," <<npc $sex.npcId>><</npc>> snickers.</p>
 			<<if $sex_ev['type'] == 'hookup'>>
 				<<gs 'sex_ev_hookup_leave' 'later'>>
 			<<else>>
@@ -1183,7 +1183,7 @@
 				<<gs 'sex_ev_leave' 'panty_gift_girlfriend'>>
 			<</if>>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't reply, but his expression says that he isn't displeased.</p>
+			<p><<npc $sex.npcId>><</npc>> doesn't reply, but his expression says that he isn't displeased.</p>
 			<<if $sex_ev['type'] == 'hookup'>>
 				<<gs 'sex_ev_hookup_leave' 'later'>>
 			<<else>>
@@ -1207,7 +1207,7 @@
 					<<gs 'sex_ev_leave' 'panty_gift_girlfriend'>>
 				<</if>>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't reply, but his expression says that he isn't displeased.</p>
+				<p><<npc $sex.npcId>><</npc>> doesn't reply, but his expression says that he isn't displeased.</p>
 				<<if $sex_ev['type'] == 'hookup'>>
 					<<gs 'sex_ev_hookup_leave' 'later'>>
 				<<else>>
@@ -1232,7 +1232,7 @@
 					<<gs 'sex_ev_leave' 'panty_gift_girlfriend'>>
 				<</if>>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't say anything in response, but given the lustful glint in his eyes, he seems pretty pleased.</p>
+				<p><<npc $sex.npcId>><</npc>> doesn't say anything in response, but given the lustful glint in his eyes, he seems pretty pleased.</p>
 				<<if $sex_ev['type'] == 'hookup'>>
 					<<gs 'sex_ev_hookup_leave' 'later'>>
 				<<else>>
@@ -1259,7 +1259,7 @@
 					<<gs 'sex_ev_leave' 'panty_gift_girlfriend'>>
 				<</if>>
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't say anything in response, but given the lustful glint in his eyes, he seems pretty pleased.</p>
+				<p><<npc $sex.npcId>><</npc>> doesn't say anything in response, but given the lustful glint in his eyes, he seems pretty pleased.</p>
 				<<if $sex_ev['type'] == 'hookup'>>
 					<<gs 'sex_ev_hookup_leave' 'later'>>
 				<<else>>
@@ -1283,22 +1283,22 @@
 		<p>"Tell her they're yours," you shrug with a wry smirk, $sex_ev['dress_describe']. "A guy can't wear a cute pair of panties now and then?"</p>
 		<<if $npcs.get($sex.npcId,'insecure') == 1>>
 			<<gs 'sex_ev_leave' 'dress_loop_code'>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>>'s face immediately reddens and he looks at you with an angry glare.</p>
+			<p><<npc $sex.npcId>><</npc>>'s face immediately reddens and he looks at you with an angry glare.</p>
 			<p>"What the fuck? I'm not some twink who puts on girlie panties like a fucking faggot!"</p>
 			<<actCLA 'I was kidding (amused)'>>
 				$sex_ev['bed_room']
 				"I was just kidding," you snicker, rolling your eyes. "Bad joke, sorry."
-				<p>You move to $sex_ev['dress_describe'] but <<=$npcs.get($sex.npcId,'firstname')>> continues to glare at you out of the corner of your eye for a few moments longer before looking away.</p>
+				<p>You move to $sex_ev['dress_describe'] but <<npc $sex.npcId>><</npc>> continues to glare at you out of the corner of your eye for a few moments longer before looking away.</p>
 				<<gs 'sex_ev_leave' 'dressing2'>>
 			<</actCLA>>
 			<<actCLA 'I was kidding (acerbic)'>>
 				$sex_ev['bed_room']
-				<p>"Christ, I was just kidding," you say, giving <<=$npcs.get($sex.npcId,'firstname')>> a look of exasperation. "Of course I wasn't seriously suggesting that. Take a joke, dumbass."</p>
-				<p>You start $sex_ev['dress_describe'] but <<=$npcs.get($sex.npcId,'firstname')>> continues to glare at you out of the corner of your eye for a few moments longer before looking away.</p>
+				<p>"Christ, I was just kidding," you say, giving <<npc $sex.npcId>><</npc>> a look of exasperation. "Of course I wasn't seriously suggesting that. Take a joke, dumbass."</p>
+				<p>You start $sex_ev['dress_describe'] but <<npc $sex.npcId>><</npc>> continues to glare at you out of the corner of your eye for a few moments longer before looking away.</p>
 				<<gs 'sex_ev_leave' 'dressing2'>>
 			<</actCLA>>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> laughs aloud.</p>
+			<p><<npc $sex.npcId>><</npc>> laughs aloud.</p>
 			"Yeah, I bet that''d get me off the hook."
 			<<gs 'sex_ev_leave' 'dressing2'>>
 		<</if>>
@@ -1473,10 +1473,10 @@
 			<p>"Got any plans for the rest day?" you ask, casually $sex_ev['dress_describe'].</p>
 			<<gs 'sex_ev_leave' 'dress_talk'>>
 			<<if $npcs.get($sex.npcId,'day_off') == $time.weekday>>
-				<p>"Not really," <<=$npcs.get($sex.npcId,'firstname')>> shrugs. "It's my day off so I'm just chilling."</p>
+				<p>"Not really," <<npc $sex.npcId>><</npc>> shrugs. "It's my day off so I'm just chilling."</p>
 				<<gs 'sex_ev_leave' 'pc_sex_ev_invite'>>
 			<<else>>
-				<p>"I have to go to work," <<=$npcs.get($sex.npcId,'firstname')>> replies.</p>
+				<p>"I have to go to work," <<npc $sex.npcId>><</npc>> replies.</p>
 				<<gs 'sex_ev_leave' 'when_do_you_get_off'>>
 			<</if>>
 		<</actCLA>>
@@ -1500,11 +1500,11 @@
 			<<setinit $sex_ev['good_time'] = 1>>
 			<<gs 'sex_ev_leave' 'dress_loop'>>
 			<<if getvar("$sex_ev['spend_night_thanks']") == 1>>
-				<p>"Last night was really great," you smile at <<=$npcs.get($sex.npcId,'firstname')>>. "I had a lot of fun."</p>
+				<p>"Last night was really great," you smile at <<npc $sex.npcId>><</npc>>. "I had a lot of fun."</p>
 			<<elseif getvar("$sex_ev['sleepover']") == 1>>
-				<p>"I had a great time last night," you smile at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+				<p>"I had a great time last night," you smile at <<npc $sex.npcId>><</npc>>.</p>
 			<<else>>
-				<p>"This was really fun," you smile at <<=$npcs.get($sex.npcId,'firstname')>>. "I had a great time."</p>
+				<p>"This was really fun," you smile at <<npc $sex.npcId>><</npc>>. "I had a great time."</p>
 			<</if>>
 			<<if getvar("$sex_ev['blue_ball']") == 0>>
 				<p>"Me too," he smirks back, watching you $sex_ev['dress_describe'].</p>
@@ -1525,9 +1525,9 @@
 			<<setinit $sex_ev['spend_night_thanks'] = 1>>
 			<<gs 'sex_ev_leave' 'dress_loop'>>
 			<<if getvar("$sex_ev['good_time']") == 1>>
-				<p>"Thanks for letting me stay over too," you tell <<=$npcs.get($sex.npcId,'firstname')>>. "I really appreciate it."</p>
+				<p>"Thanks for letting me stay over too," you tell <<npc $sex.npcId>><</npc>>. "I really appreciate it."</p>
 			<<else>>
-				<p>"Thanks for letting me spend the night," you tell <<=$npcs.get($sex.npcId,'firstname')>>. "I really appreciate it."</p>
+				<p>"Thanks for letting me spend the night," you tell <<npc $sex.npcId>><</npc>>. "I really appreciate it."</p>
 			<</if>>
 			<<if $npcs.get($sex.npcId,'girlfriend') == 1 and $npcs.get($sex.npcId,'fidelity') == 6>>
 				<<setinit $pc_know_npc_has_girlfriend[$sex.npcId] = 1>>
@@ -1593,10 +1593,10 @@
 <</if>>
 <<if $location_var[$here][0] == 'walk_funny2'>>
 	<<if getvar("$sex_ev['rough_enjoy']") == 1>>
-		<p>"I know you like it rough," <<=$npcs.get($sex.npcId,'firstname')>> smirks at your awkward stance.</p>
+		<p>"I know you like it rough," <<npc $sex.npcId>><</npc>> smirks at your awkward stance.</p>
 		<<gs 'sex_ev_leave' 'walk_funny3'>>
 	<<elseif $npcs.get($sex.npcId,'caretaker') == 1>>
-		<p>"Sorry," <<=$npcs.get($sex.npcId,'firstname')>> says with a guilty smile.</p>
+		<p>"Sorry," <<npc $sex.npcId>><</npc>> says with a guilty smile.</p>
 		<<if $sex_ev['walk_funny_talk'] == 'embarrassed'>>
 			"It's okay," you reply. "It's my fault too."
 		<<elseif $sex_ev['walk_funny_talk'] == 'annoyed'>>
@@ -1607,13 +1607,13 @@
 		<</if>>
 		<<gs 'sex_ev_leave' 'dress_talk'>>
 	<<elseif $npcs.get($sex.npcId,'arrogant') == 1>>
-		<p>"You know you liked it," <<=$npcs.get($sex.npcId,'firstname')>> says, proudly looking at your awkward stance.</p>
+		<p>"You know you liked it," <<npc $sex.npcId>><</npc>> says, proudly looking at your awkward stance.</p>
 		<<gs 'sex_ev_leave' 'walk_funny3'>>
 	<<elseif $npcs.get($sex.npcId,'rough_lover') == 1>>
-		<p>"It wasn't good sex if you aren't sore the next day," <<=$npcs.get($sex.npcId,'firstname')>> snickers, seemingly taking pleasure in your awkward stance.</p>
+		<p>"It wasn't good sex if you aren't sore the next day," <<npc $sex.npcId>><</npc>> snickers, seemingly taking pleasure in your awkward stance.</p>
 		<<gs 'sex_ev_leave' 'walk_funny3'>>
 	<<else>>
-		<p>"I'll take credit for that," <<=$npcs.get($sex.npcId,'firstname')>> says, smirking at your awkward stance.</p>
+		<p>"I'll take credit for that," <<npc $sex.npcId>><</npc>> says, smirking at your awkward stance.</p>
 		<<gs 'sex_ev_leave' 'walk_funny3'>>
 	<</if>>
 <</if>>
@@ -1676,10 +1676,10 @@
 				<<if getvar("$kanikuli") == 0 and $pc.isSchoolStudent and ($time.weekday < 5 or $time.weekday == 7)>>
 					<!-- !! if schoolday-->
 					<<if $sex_ev['dress_describe'] == 'pulling your panties up'>>
-						<p>"I can't believe I have to go to class like this," you scowl, pulling your panties up over your hips and immediately feel a glob of <<=$npcs.get($sex.npcId,'firstname')>>'s cum seep out to form an uncomfortable damp spot on the fabric. "I'm going to be sitting in this all day!"</p>
+						<p>"I can't believe I have to go to class like this," you scowl, pulling your panties up over your hips and immediately feel a glob of <<npc $sex.npcId>><</npc>>'s cum seep out to form an uncomfortable damp spot on the fabric. "I'm going to be sitting in this all day!"</p>
 					<<elseif $wardrobe.pantyworntype == 'none'>>
 						<<if $sex_ev['dress_describe'] == 'slipping your skirt up your legs'>>
-							<p>"I can't believe I have to go to class like this," you scowl as you slip your skirt up over your hips and feel <<=$npcs.get($sex.npcId,'firstname')>>'s cum trickle out of your pussy and down your thighs. "If my classmates see this, it's your fault."</p>
+							<p>"I can't believe I have to go to class like this," you scowl as you slip your skirt up over your hips and feel <<npc $sex.npcId>><</npc>>'s cum trickle out of your pussy and down your thighs. "If my classmates see this, it's your fault."</p>
 						<<elseif $sex_ev['dress_describe'] == 'tugging your pants over your hips'>>
 							<p>"I can't believe I have to go to class like this," you scowl, pulling your pants up over your dripping snatch and immediately feel an uncomfortable damp spot form on the fabric. "Ugh! This is going to be leaking out of me all day!"</p>
 						<<elseif getvar("$CloSkirtShortness") > 0>>
@@ -1688,7 +1688,7 @@
 							<p>"I can't believe I have to go to class like this," you scowl as you're $sex_ev['dress_describe']. The aforementioned cum has already seeped into the fabric of your pants, creating an uncomfortable damp spot between your thighs. "I'm going to be leaking all day! <i>And</i> my pants are gonna stain!"</p>
 						<</if>>
 					<<else>>
-						<p>"I can't believe I have to go to class like this," you scowl as you're $sex_ev['dress_describe']. <<=$npcs.get($sex.npcId,'firstname')>>'s cum has already seeped into your panties, creating an uncomfortable damp spot between your thighs. "I'm going to be sitting in cum soaked panties all day because of you."</p>
+						<p>"I can't believe I have to go to class like this," you scowl as you're $sex_ev['dress_describe']. <<npc $sex.npcId>><</npc>>'s cum has already seeped into your panties, creating an uncomfortable damp spot between your thighs. "I'm going to be sitting in cum soaked panties all day because of you."</p>
 					<</if>>
 				<<else>>
 					<!-- !! if not schoolday-->
@@ -1733,7 +1733,7 @@
 				<<else>>
 					<!-- !! if not schoolday-->
 					<<if $sex_ev['dress_describe'] == 'pulling your panties up'>>
-						<p>"My pussy is so full of your cum," you say with a sultry smirk, pulling your panties up over your hips and immediately feeling a glob of <<=$npcs.get($sex.npcId,'firstname')>>'s cum seep out to form a damp spot on the fabric. "You're going to be leaking out of me all day."</p>
+						<p>"My pussy is so full of your cum," you say with a sultry smirk, pulling your panties up over your hips and immediately feeling a glob of <<npc $sex.npcId>><</npc>>'s cum seep out to form a damp spot on the fabric. "You're going to be leaking out of me all day."</p>
 					<<elseif $wardrobe.pantyworntype == 'none'>>
 						<<if $sex_ev['dress_describe'] == 'slipping your skirt up your legs'>>
 							"My pussy is so full of your cum," you say with a sultry smirk as you slip your skirt up over your hips, feeling the thick liquid run down your thighs. "You're going to be leaking out of me all day."
@@ -1756,9 +1756,9 @@
 <<if $location_var[$here][0] == 'leak_all_day2'>>
 	<<if $npcs.get($sex.npcId,'caretaker') > 0>>
 		<<if $npcs.get($sex.npcId,'cum_pref') == 'creampie'>>
-			<p>"Sorry about that," <<=$npcs.get($sex.npcId,'firstname')>> replies with a guilty smile, though you can't help noticing that his eyes are fixed between your legs.</p>
+			<p>"Sorry about that," <<npc $sex.npcId>><</npc>> replies with a guilty smile, though you can't help noticing that his eyes are fixed between your legs.</p>
 		<<else>>
-			<p>"Sorry about that," <<=$npcs.get($sex.npcId,'firstname')>> replies with a guilty smile.</p>
+			<p>"Sorry about that," <<npc $sex.npcId>><</npc>> replies with a guilty smile.</p>
 		<</if>>
 	<<else>>
 	<</if>>
@@ -1795,15 +1795,15 @@
 <<if $location_var[$here][0] == 'npc_date_later_response'>>
 	<<if $npcs.get($sex.npcId,'know_cheat') == 1>>
 		<<if $npcs.get($sex.npcId,'fidelity') < 7>>
-			<p>"You're still with that stick in the mud?" <<=$npcs.get($sex.npcId,'firstname')>> scoffs.</p>
+			<p>"You're still with that stick in the mud?" <<npc $sex.npcId>><</npc>> scoffs.</p>
 		<<else>>
 		<</if>>
 	<<else>>
 		<<run $npcs.set($sex.npcId,'know_cheat',1)>>
 		<<if $npcs.get($sex.npcId,'fidelity') < 7>>
-			<p>"And you're fucking me right before your date?" <<=$npcs.get($sex.npcId,'firstname')>> snickers. "Hot."</p>
+			<p>"And you're fucking me right before your date?" <<npc $sex.npcId>><</npc>> snickers. "Hot."</p>
 		<<else>>
-			<p>"Oh." <<=$npcs.get($sex.npcId,'firstname')>> looks away uncomfortably.</p>
+			<p>"Oh." <<npc $sex.npcId>><</npc>> looks away uncomfortably.</p>
 		<</if>>
 	<</if>>
 <</if>>
@@ -1824,7 +1824,7 @@
 					<p>"Maybe. What time were you thinking?"</p>
 					<<gs 'sex_ev_leave' 'pc_sex_ev_timeset'>>
 				<<else>>
-					<p>"Twice in one day might be a little bit too much for me," <<=$npcs.get($sex.npcId,'firstname')>> smiles back ruefully.</p>
+					<p>"Twice in one day might be a little bit too much for me," <<npc $sex.npcId>><</npc>> smiles back ruefully.</p>
 					<<gs 'sex_ev_leave' 'dress_loop_code'>>
 					<p>"Damn," you sigh disappointedly, continuing $sex_ev['dress_describe']</p>
 					<<gs 'sex_ev_leave' 'pc_sex_ev_invite_denied'>>
@@ -1834,7 +1834,7 @@
 					<p>"What time were you thinking?"</p>
 					<<gs 'sex_ev_leave' 'pc_sex_ev_timeset'>>
 				<<else>>
-					<p>"Think I might be a little too tapped out from work," <<=$npcs.get($sex.npcId,'firstname')>> grunts.</p>
+					<p>"Think I might be a little too tapped out from work," <<npc $sex.npcId>><</npc>> grunts.</p>
 					<<gs 'sex_ev_leave' 'dress_loop_code'>>
 					<p>"Damn," you sigh disappointedly, continuing $sex_ev['dress_describe']</p>
 					<<gs 'sex_ev_leave' 'pc_sex_ev_invite_denied'>>
@@ -1892,12 +1892,12 @@
 			<p>"How about npc_booty_call_time[$sex.npcId]?" you ask $sex_ev['dress_describe'].</p>
 			<<if $npcs.get($sex.npcId,'booty_call_time') > $npcs.get($sex.npcId,'end_free_time') or $npcs.get($sex.npcId,'booty_call_time') < $npcs.get($sex.npcId,'start_free_time')>>
 				<<gs 'sex_ev_leave' 'dress_loop_code'>>
-				<p>"Sorry, that doesn't work for me," <<=$npcs.get($sex.npcId,'firstname')>> grunts.</p>
+				<p>"Sorry, that doesn't work for me," <<npc $sex.npcId>><</npc>> grunts.</p>
 				<<gs 'sex_ev_leave' 'dress_loop_code'>>
 				<p>"Damn," you sigh disappointedly, continuing $sex_ev['dress_describe']</p>
 				<<gs 'sex_ev_leave' 'pc_sex_ev_invite_denied'>>
 			<<else>>
-				<p>"That sounds good," <<=$npcs.get($sex.npcId,'firstname')>> grins back. "Okay, see you then."</p>
+				<p>"That sounds good," <<npc $sex.npcId>><</npc>> grins back. "Okay, see you then."</p>
 				<<gs 'sex_ev_leave' 'pc_sex_ev_invite_accepted'>>
 			<</if>>
 		<</if>>
@@ -1905,12 +1905,12 @@
 		<p>"How about npc_booty_call_time[$sex.npcId]?" you ask $sex_ev['dress_describe'].</p>
 		<<if $npcs.get($sex.npcId,'booty_call_time') > $npcs.get($sex.npcId,'end_free_time') or $npcs.get($sex.npcId,'booty_call_time') < $npcs.get($sex.npcId,'start_free_time')>>
 			<<gs 'sex_ev_leave' 'dress_loop_code'>>
-			<p>"Sorry, that doesn't work for me," <<=$npcs.get($sex.npcId,'firstname')>> grunts.</p>
+			<p>"Sorry, that doesn't work for me," <<npc $sex.npcId>><</npc>> grunts.</p>
 			<<gs 'sex_ev_leave' 'dress_loop_code'>>
 			<p>"Damn," you sigh disappointedly, continuing $sex_ev['dress_describe']</p>
 			<<gs 'sex_ev_leave' 'pc_sex_ev_invite_denied'>>
 		<<else>>
-			<p>"That sounds good," <<=$npcs.get($sex.npcId,'firstname')>> grins back. "Okay, see you then."</p>
+			<p>"That sounds good," <<npc $sex.npcId>><</npc>> grins back. "Okay, see you then."</p>
 			<<gs 'sex_ev_leave' 'pc_sex_ev_invite_accepted'>>
 		<</if>>
 	<</if>>
@@ -1940,32 +1940,32 @@
 				<<setinit $sex_ev['invite_tomorrow'] = 1>>
 				<<if $npcs.get($sex.npcId,'girlfriend') == 1 and $npcs.get($sex.npcId,'fidelity') == 6>>
 					<<setinit $pc_know_npc_has_girlfriend[$sex.npcId] = 1>>
-					<p>"You busy tomorrow?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $sex_ev['dress_describe']. "It'll be my day off and my girlfriend won't be around. Want to come over and do this again?"</p>
+					<p>"You busy tomorrow?" <<npc $sex.npcId>><</npc>> asks as you're $sex_ev['dress_describe']. "It'll be my day off and my girlfriend won't be around. Want to come over and do this again?"</p>
 				<<else>>
-					<p>"You busy tomorrow?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $sex_ev['dress_describe']. "It'll be my day off. Want to come by and do this again?"</p>
+					<p>"You busy tomorrow?" <<npc $sex.npcId>><</npc>> asks as you're $sex_ev['dress_describe']. "It'll be my day off. Want to come by and do this again?"</p>
 				<</if>>
 			<<elseif $npcs.get($sex.npcId,'day_off') == $time.weekday and (getvar("$sex_ev['sleepover']") == 1 or $time.hour < 5)>>
 				<<setinit $sex_ev['invite_today'] = 1>>
 				<<if $npcs.get($sex.npcId,'girlfriend') == 1 and $npcs.get($sex.npcId,'fidelity') == 6>>
 					<<setinit $pc_know_npc_has_girlfriend[$sex.npcId] = 1>>
-					<p>"You busy later?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $sex_ev['dress_describe']. "Today's my day off and my girlfriend won't be around. Want to come over and do this again?"</p>
+					<p>"You busy later?" <<npc $sex.npcId>><</npc>> asks as you're $sex_ev['dress_describe']. "Today's my day off and my girlfriend won't be around. Want to come over and do this again?"</p>
 				<<else>>
-					<p>"You busy later?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $sex_ev['dress_describe']. "It's my day off. Want to come by and do this again?"</p>
+					<p>"You busy later?" <<npc $sex.npcId>><</npc>> asks as you're $sex_ev['dress_describe']. "It's my day off. Want to come by and do this again?"</p>
 				<</if>>
 			<<else>>
 				<<setinit $sex_ev['invite_tomorrow'] = 1>>
 				<<if $npcs.get($sex.npcId,'girlfriend') == 1 and $npcs.get($sex.npcId,'fidelity') == 6>>
 					<<setinit $pc_know_npc_has_girlfriend[$sex.npcId] = 1>>
-					<p>"You busy tomorrow?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $sex_ev['dress_describe']. "My girlfriend won't be around. Want to come over and do this again?"</p>
+					<p>"You busy tomorrow?" <<npc $sex.npcId>><</npc>> asks as you're $sex_ev['dress_describe']. "My girlfriend won't be around. Want to come over and do this again?"</p>
 				<<else>>
-					<p>"You busy tomorrow?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $sex_ev['dress_describe']. "Want to come by and do this again?"</p>
+					<p>"You busy tomorrow?" <<npc $sex.npcId>><</npc>> asks as you're $sex_ev['dress_describe']. "Want to come by and do this again?"</p>
 				<</if>>
 			<</if>>
 			<<gs 'sex_ev_leave' 'busy_later'>>
 			<<actCLA 'What time?'>>
 				<<gs 'sex_ev_leave' 'dress_loop'>>
 				<p>"That depends," you say, $sex_ev['dress_describe']. "What time were you thinking?"</p>
-				<p>"npc_start_free_time[$sex.npcId]?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+				<p>"npc_start_free_time[$sex.npcId]?" <<npc $sex.npcId>><</npc>> asks.</p>
 				<<gs 'sex_ev_leave' 'busy_time'>>
 				<<gs 'sex_ev_leave' 'sex_ev_plan'>>
 			<</actCLA>>
@@ -1983,23 +1983,23 @@
 			<<setinit $sex_ev['invite_today'] = 1>>
 			<<if $npcs.get($sex.npcId,'girlfriend') == 1>>
 				<<setinit $pc_know_npc_has_girlfriend[$sex.npcId] = 1>>
-				<p>"You busy later?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $sex_ev['dress_describe']. "It's my day off and my girlfriend won't be around. Want to come over to my place and do this again?"</p>
+				<p>"You busy later?" <<npc $sex.npcId>><</npc>> asks as you're $sex_ev['dress_describe']. "It's my day off and my girlfriend won't be around. Want to come over to my place and do this again?"</p>
 			<<else>>
-				<p>"You busy later?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $sex_ev['dress_describe']. "It's my day off. Want to come by and do this again?"</p>
+				<p>"You busy later?" <<npc $sex.npcId>><</npc>> asks as you're $sex_ev['dress_describe']. "It's my day off. Want to come by and do this again?"</p>
 			<</if>>
 		<<elseif $npcs.get($sex.npcId,'day_off') == $time.weekday + 1 or ($time.weekday == 7 and $npcs.get($sex.npcId,'day_off') == 1)>>
 			<<setinit $sex_ev['invite_tomorrow'] = 1>>
 			<<if $npcs.get($sex.npcId,'girlfriend') == 1>>
 				<<setinit $pc_know_npc_has_girlfriend[$sex.npcId] = 1>>
-				<p>"You busy tomorrow?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $sex_ev['dress_describe']. "My girlfriend won't be around. Want to come over and do this again?"</p>
+				<p>"You busy tomorrow?" <<npc $sex.npcId>><</npc>> asks as you're $sex_ev['dress_describe']. "My girlfriend won't be around. Want to come over and do this again?"</p>
 			<<else>>
-				<p>"You busy tomorrow?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $sex_ev['dress_describe']. "It'll be my day off. Want to come by and do this again?"</p>
+				<p>"You busy tomorrow?" <<npc $sex.npcId>><</npc>> asks as you're $sex_ev['dress_describe']. "It'll be my day off. Want to come by and do this again?"</p>
 			<</if>>
 		<</if>>
 		<<gs 'sex_ev_leave' 'busy_later'>>
 		<<actCLA 'What time?'>>
 			<p>"That depends," you say, $sex_ev['dress_describe']. "What time were you thinking?"</p>
-			<p>"npc_start_free_time[$sex.npcId]?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+			<p>"npc_start_free_time[$sex.npcId]?" <<npc $sex.npcId>><</npc>> asks.</p>
 			<<gs 'sex_ev_leave' 'busy_time'>>
 			<<gs 'sex_ev_leave' 'sex_ev_plan'>>
 		<</actCLA>>
@@ -2014,7 +2014,7 @@
 		<<else>>
 			<p>"I can't, sorry," you say, $sex_ev['dress_describe']. "I'm busy today."</p>
 		<</if>>
-		<p>"Damn," <<=$npcs.get($sex.npcId,'firstname')>> says disappointedly.</p>
+		<p>"Damn," <<npc $sex.npcId>><</npc>> says disappointedly.</p>
 		<<gs 'sex_ev_leave' 'dress_talk'>>
 	<</actCLA>>
 <</if>>
@@ -2023,7 +2023,7 @@
 		<<gs 'booty_call' 'block_booty_calls'>>
 		<<gs 'sex_ev_leave' 'dress_loop'>>
 		<p>"I can't, sorry," you say, $sex_ev['dress_describe']. "I have something to do then."</p>
-		<p>"Damn," <<=$npcs.get($sex.npcId,'firstname')>> says disappointedly.</p>
+		<p>"Damn," <<npc $sex.npcId>><</npc>> says disappointedly.</p>
 		<<gs 'sex_ev_leave' 'dress_talk'>>
 		<<if getvar("$sex_ev['morning_after']") == 1>>
 			<<gs 'sex_ev_morning' 'end_morning'>>
@@ -2036,7 +2036,7 @@
 		<<gs 'booty_call' 'set_booty_call_date'>>
 		<<gs 'sex_ev_leave' 'dress_loop'>>
 		<p>"Sounds good," you grin, $sex_ev['dress_describe']. "I'll see you then."</p>
-		<p>"Great," <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
+		<p>"Great," <<npc $sex.npcId>><</npc>> grins back.</p>
 		<<gs 'sex_ev_leave' 'dress_talk'>>
 		<<if getvar("$sex_ev['morning_after']") == 1>>
 			<<gs 'sex_ev_morning' 'end_morning'>>
@@ -2047,7 +2047,7 @@
 		<<gs 'booty_call' 'set_booty_call_date'>>
 		<<gs 'sex_ev_leave' 'dress_loop'>>
 		<p>"Sure," you smirk, $sex_ev['dress_describe']. "I got nothing better to do."</p>
-		<p>"Great," <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
+		<p>"Great," <<npc $sex.npcId>><</npc>> grins back.</p>
 		<<gs 'sex_ev_leave' 'dress_talk'>>
 		<<if getvar("$sex_ev['morning_after']") == 1>>
 			<<gs 'sex_ev_morning' 'end_morning'>>
@@ -2059,9 +2059,9 @@
 		<<gs 'sex_ev_leave' 'dress_loop'>>
 		<p>"I think I can fit that in," you smirk, $sex_ev['dress_describe'].</p>
 		<<if $npcs.get($sex.npcId,'humor') == 2>>
-			<p>"You sure can," <<=$npcs.get($sex.npcId,'firstname')>> grins lewdly at you.</p>
+			<p>"You sure can," <<npc $sex.npcId>><</npc>> grins lewdly at you.</p>
 		<<else>>
-			<p>"Great," <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
+			<p>"Great," <<npc $sex.npcId>><</npc>> grins back.</p>
 		<</if>>
 		<<gs 'sex_ev_leave' 'dress_talk'>>
 		<<if getvar("$sex_ev['morning_after']") == 1>>
@@ -2092,11 +2092,11 @@
 		"Great," you say back. "I'll swing by tomorrow."
 		<<gs 'sex_ev_leave' 'pc_sex_ev_invite_accepted'>>
 	<<elseif $npcs.get($sex.npcId,'booty_call_time') > $npcs.get($sex.npcId,'end_free_time') or $npcs.get($sex.npcId,'booty_call_time') < $npcs.get($sex.npcId,'start_free_time')>>
-		<p>"No," <<=$npcs.get($sex.npcId,'firstname')>> grunts with a shake of his head. "I'll be busy then too."</p>
+		<p>"No," <<npc $sex.npcId>><</npc>> grunts with a shake of his head. "I'll be busy then too."</p>
 		<p>"Damn it all!" you curse. "Why is it so hard just to schedule a time to have sex?!"</p>
 		<<gs 'sex_ev_leave' 'pc_sex_ev_invite_denied'>>
 	<<else>>
-		<p>"I think that works for me," <<=$npcs.get($sex.npcId,'firstname')>> says with a nod of his head.</p>
+		<p>"I think that works for me," <<npc $sex.npcId>><</npc>> says with a nod of his head.</p>
 		<p>"Great," you smile back. "Then I'll see you at npc_booty_call_time[$sex.npcId]."</p>
 		<<gs 'sex_ev_leave' 'pc_sex_ev_invite_accepted'>>
 	<</if>>
@@ -2105,7 +2105,7 @@
 	<<setinit $sex_ev['ma_pill_money'] = 1>>
 	<<set $finances.cash += 1000>>
 	<<gs 'sex_ev_leave' 'dress_loop'>>
-	<p>"Hey," <<=$npcs.get($sex.npcId,'firstname')>> says as you're $sex_ev['dress_describe']. "Don't forget this."</p>
+	<p>"Hey," <<npc $sex.npcId>><</npc>> says as you're $sex_ev['dress_describe']. "Don't forget this."</p>
 	<p>He grabs his wallet and pulls out a 1000<b>₽</b note, holding it out to you.</p>
 	"For the morning after pill," he says.
 	"Oh yeah, thanks," you nod, taking it from him.

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 253 - 253
sugarcube/src/autogenerated/unsorted/sex_ev_miss.tw


+ 125 - 125
sugarcube/src/autogenerated/unsorted/sex_ev_morning.tw

@@ -36,11 +36,11 @@
 			act'<i>Ugh, my head</i>':gt'sex_ev_morning', 'hangover'
 			else} -->
 			<<if $sex_ev['loc'] == 'pc_home'>>
-				<p>Your mind stirs and you slowly come to consciousness, snuggled under your covers with <<=$npcs.get($sex.npcId,'firstname')>>'s arms wrapped around you.</p>
+				<p>Your mind stirs and you slowly come to consciousness, snuggled under your covers with <<npc $sex.npcId>><</npc>>'s arms wrapped around you.</p>
 			<<elseif $sex_ev['loc'] == 'npc_home'>>
-				<p>Your mind stirs and you slowly come to consciousness, tucked under the covers of <<=$npcs.get($sex.npcId,'firstname')>>'s bed.</p>
+				<p>Your mind stirs and you slowly come to consciousness, tucked under the covers of <<npc $sex.npcId>><</npc>>'s bed.</p>
 			<<else>>
-				<p>Your mind stirs and you slowly come to consciousness, snuggled under the covers with <<=$npcs.get($sex.npcId,'firstname')>>'s arms wrapped around you.</p>
+				<p>Your mind stirs and you slowly come to consciousness, snuggled under the covers with <<npc $sex.npcId>><</npc>>'s arms wrapped around you.</p>
 			<</if>>
 			<<actCLA '<i>Yawn</i>'>>
 				<<gt 'sex_ev_morning' 'yawn_wake'>>
@@ -95,7 +95,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'wake_alone2'>>
 	$sex_ev['bed_room']
-	<p>It's only then that you sit up in bed and realize that <<=$npcs.get($sex.npcId,'firstname')>> is gone.</p>
+	<p>It's only then that you sit up in bed and realize that <<npc $sex.npcId>><</npc>> is gone.</p>
 	You vaguely remember passing out last night. He must have left after you fell asleep. Or early this morning.
 	Either way, now it's just... you.
 	<<actCLA 'Continue'>>
@@ -118,7 +118,7 @@
 	<<elseif $cum_loc['stomach'] > $sex_ev['sleep_cum_stomach']>>
 		<i>Is that cum on me?</i>
 		<!-- !!	else-->
-		<!-- !!		'<i>Was <<<<=$npcs.get($sex.npcId,'firstname')>>>> wearing a condom when you went to sleep last night?</i>'-->
+		<!-- !!		'<i>Was <<<<npc $sex.npcId>><</npc>>>> wearing a condom when you went to sleep last night?</i>'-->
 	<</if>>
 	<<actCLA 'Continue'>>
 		<<if $cum_loc['vagina'] > $sex_ev['sleep_cum_vagina']>>
@@ -134,7 +134,7 @@
 			<<image "pc/body/cum/cumbelly/cumbelly10.jpg">>
 			You sit up, looking down to discover, yes, there is indeed fresh cum on your belly.
 			<!-- !!		else-->
-			<!-- !!			'<i>Was <<<<=$npcs.get($sex.npcId,'firstname')>>>> wearing a condom when you went to sleep last night?</i>'-->
+			<!-- !!			'<i>Was <<<<npc $sex.npcId>><</npc>>>> wearing a condom when you went to sleep last night?</i>'-->
 		<</if>>
 		<<actCLA 'Did you fuck me in my sleep?'>>
 			<p>"... did you fuck me while I was sleeping last night?" you ask.</p>
@@ -150,7 +150,7 @@
 				"Yeah. Got horny and you wouldn''t wake up."
 				<<actCLA 'Don`t make a habit out of it'>>
 					"It was fine this time," you say. "But don't make a habit out of it."
-					<p>"No promises," <<=$npcs.get($sex.npcId,'firstname')>> smirks mischievously.</p>
+					<p>"No promises," <<npc $sex.npcId>><</npc>> smirks mischievously.</p>
 					<<gs 'sex_ev_morning' 'wakeup1'>>
 				<</actCLA>>
 				<<actCLA 'Wake me up next time'>>
@@ -190,7 +190,7 @@
 			<</if>>
 		<</actCLA>>
 		<<actCLA 'Someone had fun last night'>>
-			<p>"Somebody had fun last night," you muse, looking over at <<=$npcs.get($sex.npcId,'firstname')>> who is also waking.</p>
+			<p>"Somebody had fun last night," you muse, looking over at <<npc $sex.npcId>><</npc>> who is also waking.</p>
 			<<if $npcs.get($sex.npcId,'sleep_sex_okay') == 0>>
 				<p>"Yeah. Got horny while you were asleep. Is that okay?"</p>
 				<<actCLA 'Ask next time'>>
@@ -251,13 +251,13 @@
 				<<gs 'sex_ev_morning' 'late_school_not_at_home'>>
 			<<else>>
 				<<actCLA 'Get up!'>>
-					<p>"I need to go," you say, hurriedly hauling <<=$npcs.get($sex.npcId,'firstname')>> out of your bed. "And so do you."</p>
+					<p>"I need to go," you say, hurriedly hauling <<npc $sex.npcId>><</npc>> out of your bed. "And so do you."</p>
 					<<if $npcs.get($sex.npcId,'latesleeper') == 1>>
 						<<set $time.minutes += rand(2,3)>>
-						<p><<=$npcs.get($sex.npcId,'firstname')>> groggily starts gathering his clothes as you impatiently try to get him to go faster, constantly checking the clock to see how much time he's wasting. When he's <i>finally</i> dressed you rush <<=$npcs.get($sex.npcId,'firstname')>> to the door and shove him out and slam it shut, racing to get ready for class.</p>
+						<p><<npc $sex.npcId>><</npc>> groggily starts gathering his clothes as you impatiently try to get him to go faster, constantly checking the clock to see how much time he's wasting. When he's <i>finally</i> dressed you rush <<npc $sex.npcId>><</npc>> to the door and shove him out and slam it shut, racing to get ready for class.</p>
 					<<else>>
 						<<set $time.minutes += 1>>
-						<p>At your command, <<=$npcs.get($sex.npcId,'firstname')>> starts throwing his clothes on while you impatiently keep checking the clock. Thankfully it's not more than a minute before he's fully dressed and you rush him out the door and slam it behind him, racing to get ready for class.</p>
+						<p>At your command, <<npc $sex.npcId>><</npc>> starts throwing his clothes on while you impatiently keep checking the clock. Thankfully it's not more than a minute before he's fully dressed and you rush him out the door and slam it behind him, racing to get ready for class.</p>
 					<</if>>
 					<<actCLA 'Continue'>>
 						<<gs 'sex_ev_leave' 'exit'>>
@@ -279,10 +279,10 @@
 		<<else>>
 			<p>You need to get home and change into your uniform! You're not sure if you have time for a shower, but you definitely <i>need</i> to get your uniform!</p>
 		<</if>>
-		<p>"Hey, what's wrong?" <<=$npcs.get($sex.npcId,'firstname')>> says, turning over and squinting at you with sleepy eyes.</p>
+		<p>"Hey, what's wrong?" <<npc $sex.npcId>><</npc>> says, turning over and squinting at you with sleepy eyes.</p>
 		<<actCLA 'I need to be somewhere!'>>
 			<p>"I'm gonna be late for something!" you say hurriedly. "Gotta go!"</p>
-			<p>With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<=$npcs.get($sex.npcId,'firstname')>> and your night together behind you.</p>
+			<p>With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<npc $sex.npcId>><</npc>> and your night together behind you.</p>
 			<<actCLA 'Leave'>>
 				<<gs 'sex_ev_leave' 'exit'>>
 			<</actCLA>>
@@ -343,7 +343,7 @@
 	<<if $npcs.get($sex.npcId,'earlyriser') == 1>>
 		<<if getvar("$sex_ev['boy_make_breakfast']") == 1>>
 			<<if $npcs.get($sex.npcId,'apt_type') == 2 and $sex_ev['loc'] != 'pc_home' and $sex_ev['loc'] != 'family_home'>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> is already up, doing something in his kitchen area and the smell of coffee and fresh food wafts over to you in bed.</p>
+				<p><<npc $sex.npcId>><</npc>> is already up, doing something in his kitchen area and the smell of coffee and fresh food wafts over to you in bed.</p>
 			<<else>>
 				The bed next to you is empty but the smell of coffee and cooked grains and proteins waft through the apartment.
 			<</if>>
@@ -353,10 +353,10 @@
 			Checking your phone, the time reads:
 		<</if>>
 	<<elseif $npcs.get($sex.npcId,'latesleeper') == 1>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> is still completely passed out beside you, your movement not interrupting his snoring in the slightest.</p>
+		<p><<npc $sex.npcId>><</npc>> is still completely passed out beside you, your movement not interrupting his snoring in the slightest.</p>
 		<<setinit $sex_ev['boy_asleep'] = 1>>
 	<<else>>
-		<p>Your movement causes <<=$npcs.get($sex.npcId,'firstname')>> to stir as well, blinking his eyes open. Reaching down, you grab your phone and switch on the display.</p>
+		<p>Your movement causes <<npc $sex.npcId>><</npc>> to stir as well, blinking his eyes open. Reaching down, you grab your phone and switch on the display.</p>
 	<</if>>
 	<<gs 'shortgs' 'calendar_display'>>
 	<<if getvar("$sex_ev['boy_make_breakfast']") == 1 and $sex_ev['loc'] != 'hotel_room'>>
@@ -378,9 +378,9 @@
 		<<setinit $sex_ev['npc_morning_shower'] = 1>>
 		The bed next to you is empty and the bathroom door is closed. You can hear the water running behind it.
 	<<elseif $npcs.get($sex.npcId,'apt_type') == 3 and $sex_ev['loc'] != 'pc_home'>>
-		<p>The bed next to you is empty but you can hear water running through the wall. <<=$npcs.get($sex.npcId,'firstname')>> must be in the shower.</p>
+		<p>The bed next to you is empty but you can hear water running through the wall. <<npc $sex.npcId>><</npc>> must be in the shower.</p>
 	<<else>>
-		<p>The bed next to you is empty. <<=$npcs.get($sex.npcId,'firstname')>> is nowhere to be seen.</p>
+		<p>The bed next to you is empty. <<npc $sex.npcId>><</npc>> is nowhere to be seen.</p>
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'kiss_wake'>>
@@ -390,7 +390,7 @@
 			<<setinit $sex_ev['boy_asleep'] = 0>>
 			<<run $npcs.inc($sex.npcId,'rel',1)>>
 			<<image "shared/sex/kiss/bed1.jpg">>
-			<p>You roll over onto <<=$npcs.get($sex.npcId,'firstname')>>, resting your breasts on his chest as you straddle him.</p>
+			<p>You roll over onto <<npc $sex.npcId>><</npc>>, resting your breasts on his chest as you straddle him.</p>
 			<p>"Good <i>-mmmph-</i> morning," you murmur, planting a kiss on his lips.</p>
 			<<if getvar("$cum_loc['face']") > 0>>
 				<p>"Ugch~! What the fuck is that?" he sputters, shaking his head in disgust.</p>
@@ -433,7 +433,7 @@
 				<<actCLA 'Give $npcs.get('+$sex.npcId,'firstname')+' a blowjob'>>
 					<<arouse 'bj' 1 `['no_orgasm_msg']`>>
 					<<video "shared/sex/blowjob/bj47.mp4">>
-					<p>You break the kiss from <<=$npcs.get($sex.npcId,'firstname')>>'s lips and start trailing them down his neck and then his chest and then his stomach and soon you have your lips wrapped around his morning wood.</p>
+					<p>You break the kiss from <<npc $sex.npcId>><</npc>>'s lips and start trailing them down his neck and then his chest and then his stomach and soon you have your lips wrapped around his morning wood.</p>
 					<<gs 'sex_ev_morning' 'bj_wake'>>
 				<</actCLA>>
 			<</if>>
@@ -448,7 +448,7 @@
 		"Nngh," he grunts as you start sucking his cock. "I'm gonna be late for work..."
 		<<actCLA 'Too bad (stop)'>>
 			<<video "shared/sex/blowjob/bj48.mp4">>
-			<p>You give <<=$npcs.get($sex.npcId,'firstname')>> one more good suck before you withdraw your lips.</p>
+			<p>You give <<npc $sex.npcId>><</npc>> one more good suck before you withdraw your lips.</p>
 			"Too bad," you smirk, teasing his cock with your hand while you savour his taste. "Guess it'll have to wait until later."
 			<<gs 'sex_ev_morning' 'wakeup1'>>
 		<</actCLA>>
@@ -459,7 +459,7 @@
 
 			<</if>>
 			<<video "shared/sex/blowjob/bj48.mp4">>
-			<p>You give <<=$npcs.get($sex.npcId,'firstname')>> one more good suck before you withdraw your lips to speak.</p>
+			<p>You give <<npc $sex.npcId>><</npc>> one more good suck before you withdraw your lips to speak.</p>
 			"Don't worry," you say, working his cock with your hand as a smirk spreads across your lips. "I'll be fast."
 			And you wrap your lips back around his shaft.
 			<<actCLA 'Continue'>>
@@ -504,7 +504,7 @@
 			<<actCLA 'Guess'>>
 				<<video "shared/sex/blowjob/play1.mp4">>
 				<p>"Nngh... Hey... what are you doing...?" he groans sleepily.</p>
-				<p>You pull your lips away with a pop and stare <<=$npcs.get($sex.npcId,'firstname')>> straight in the eye.</p>
+				<p>You pull your lips away with a pop and stare <<npc $sex.npcId>><</npc>> straight in the eye.</p>
 				"Guess."
 				Without waiting for a response you resume running your tongue up and down his shaft and peppering it with kisses before swallowing it whole again.
 				<<actCLA 'Continue'>>
@@ -518,7 +518,7 @@
 	<<if getvar("$sex_ev['sleep_fuck']") == 2>>
 		<<actCLA 'Nice night'>>
 			<<image "shared/sex/after/pillow_talk4.jpg">>
-			<p>"That was nice," you smile sleepily at <<=$npcs.get($sex.npcId,'firstname')>>. "Our little mid-night romp I mean. Slept like a baby after. How about you?"</p>
+			<p>"That was nice," you smile sleepily at <<npc $sex.npcId>><</npc>>. "Our little mid-night romp I mean. Slept like a baby after. How about you?"</p>
 			<<if $npcs.get($sex.npcId,'humor') == 3>>
 				"I would say that fucking you always puts me to sleep, but that feels like sending the wrong message," he smiles back.
 			<<else>>
@@ -533,9 +533,9 @@
 	<!-- !!	if npc_earlyriser[$sex.npcId] = 1 and npc_caretaker[$sex.npcId] = 1:-->
 	<<if getvar("$sex_ev['boy_make_breakfast']") == 1 and getvar("$sex_ev['breakfast_finished']") == 0 and $sex_ev['loc'] != 'hotel_room'>>
 		<<if $sex_ev['loc'] == 'pc_home'>>
-			<p>"Want some breakfast?" <<=$npcs.get($sex.npcId,'firstname')>> asks. "Least I can do for letting me stay over."</p>
+			<p>"Want some breakfast?" <<npc $sex.npcId>><</npc>> asks. "Least I can do for letting me stay over."</p>
 		<<else>>
-			<p>"Want some breakfast?" <<=$npcs.get($sex.npcId,'firstname')>> asks. "It'll just take me a few minutes."</p>
+			<p>"Want some breakfast?" <<npc $sex.npcId>><</npc>> asks. "It'll just take me a few minutes."</p>
 		<</if>>
 		<<gs 'sex_ev_morning' 'boy_breakfast_offer'>>
 	<<else>>
@@ -577,7 +577,7 @@
 				<<if getvar("$sex_ev['boy_asleep']") != 1 and getvar("$sex_ev['npc_morning_shower']") != 1 and rand(1,3) == 1 and getvar("$sex_ev['bathroom_check']") == 0>>
 					<<setinit $sex_ev['bathroom_check'] = 1>>
 					<<=$npcs.get($sex.npcId,'bedroom')>>
-					<p>You get up to pad your way towards <<=$npcs.get($sex.npcId,'firstname')>>'s bathroom and he calls from behind you.</p>
+					<p>You get up to pad your way towards <<npc $sex.npcId>><</npc>>'s bathroom and he calls from behind you.</p>
 					<p>"Hey, where you going?"</p>
 					<<actCLA 'Brush my hair'>>
 						"I need to brush my hair," you say. "It's a mess from... you know."
@@ -653,7 +653,7 @@
 		<<if getvar("$sex_ev['boy_asleep']") == 1 and getvar("$sex_ev['breakfast_finished']") == 0>>
 			<<actCLA 'Wake $npcs.get('+$sex.npcId,'firstname')+' with a blowjob'>>
 				<<video "shared/sex/blowjob/bj47.mp4">>
-				<p>You slither under the covers and wrap your lips around <<=$npcs.get($sex.npcId,'firstname')>>'s already hard cock.</p>
+				<p>You slither under the covers and wrap your lips around <<npc $sex.npcId>><</npc>>'s already hard cock.</p>
 				<<gs 'sex_ev_morning' 'bj_wake'>>
 			<</actCLA>>
 		<</if>>
@@ -662,7 +662,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'wakeup2'>>
 	$sex_ev['bed_room']
-	<p>You are in <<=$npcs.get($sex.npcId,'firstname')>>'s room.</p>
+	<p>You are in <<npc $sex.npcId>><</npc>>'s room.</p>
 	<<gs 'sex_ev_morning' 'wakeup1'>>
 <</if>>
 <<if $location_var[$here][0] == 'shower'>>
@@ -694,13 +694,13 @@
 <</if>>
 <<if $location_var[$here][0] == '2nd_shower'>>
 	$sex_ev['bed_room']
-	<p>"I need another shower because of you," you say, giving <<=$npcs.get($sex.npcId,'firstname')>> a look as you swagger your way to his bathroom.</p>
+	<p>"I need another shower because of you," you say, giving <<npc $sex.npcId>><</npc>> a look as you swagger your way to his bathroom.</p>
 	<<actCLA 'Shower'>>
 		<<video "shared/home/bathroom/dush.mp4">>
 		<<set $time.minutes += 5>>
 		<<run $inventory.inc('shampoo',1)>>
 		<<gs 'cleanBody'>>
-		<p>You get into <<=$npcs.get($sex.npcId,'firstname')>>'s shower for the <i>second</i> time this morning, washing the sex sweat from your body.</p>
+		<p>You get into <<npc $sex.npcId>><</npc>>'s shower for the <i>second</i> time this morning, washing the sex sweat from your body.</p>
 		You take a shorter one this time, mostly just rinsing off, before shutting the water off and getting out.
 		<<actCLA 'Wrap yourself in a towel'>>
 			<<gt 'sex_ev_morning' 'shower_leave'>>
@@ -737,7 +737,7 @@
 		<</if>>
 	<<else>>
 		<<if $npcs.get($sex.npcId,'latesleeper') == 1 and getvar("$sex_ev['boy_wakeup']") == 0>>
-			<p>Not wanting to wake <<=$npcs.get($sex.npcId,'firstname')>>, you sneak over to the door and let yourself out, closing it as gently as you can behind you.</p>
+			<p>Not wanting to wake <<npc $sex.npcId>><</npc>>, you sneak over to the door and let yourself out, closing it as gently as you can behind you.</p>
 			<<actCLA 'Leave'>>
 				<<gt 'sex_ev_leave' 'exit'>>
 			<</actCLA>>
@@ -754,7 +754,7 @@ if sex_ev['hangover'] = 1:
 act'I need coffee':
 cla & *nl
 '"I desperately need coffee," you wince, rubbing your brow as if will somehow make your blindingly painful headache go away.'
-'"Me too." <<<<=$npcs.get($sex.npcId,'firstname')>>>> says, seemingly in the same state.'
+'"Me too." <<<<npc $sex.npcId>><</npc>>>> says, seemingly in the same state.'
 end
 act'Can I use your shower?':
 end
@@ -787,14 +787,14 @@ end} -->
 		<<video "pc/activities/misc/dress_1.mp4">>
 	<</if>>
 	<<if $npcs.get($sex.npcId,'latesleeper') == 1 and getvar("$sex_ev['boy_wakeup']") == 0>>
-		<p>You reach down for your discarded clothes and tug them on quietly, not wanting to wake <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+		<p>You reach down for your discarded clothes and tug them on quietly, not wanting to wake <<npc $sex.npcId>><</npc>>.</p>
 		Once everything is in place, you sneak over to the door and let yourself out, closing it as gently as you can behind you.
 		<<actCLA 'Leave'>>
 			<<gt 'sex_ev_leave' 'exit'>>
 		<</actCLA>>
 	<<else>>
 		You reach down for where you left your clothes and start to pick them up.
-		<p>"You heading out?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+		<p>"You heading out?" <<npc $sex.npcId>><</npc>> asks.</p>
 		<<gs 'sex_ev_leave' 'dress_loop'>>
 		<!-- !!	act'Talk while you dress':-->
 		<!-- !!		gs'sex_ev_morning', 'dress_talk'-->
@@ -807,24 +807,24 @@ end} -->
 		<<setinit $sex_ev['invite_today'] = 1>>
 		<<if $npcs.get($sex.npcId,'girlfriend') == 1>>
 			<<setinit $pc_know_npc_has_girlfriend[$sex.npcId] = 1>>
-			<p>"You busy later?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $sex_ev['dress_describe']. "It's my day off and my girlfriend won't be around. Want to come over to my place and do this again?"</p>
+			<p>"You busy later?" <<npc $sex.npcId>><</npc>> asks as you're $sex_ev['dress_describe']. "It's my day off and my girlfriend won't be around. Want to come over to my place and do this again?"</p>
 		<<else>>
-			<p>"You busy later?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $sex_ev['dress_describe']. "It's my day off. Want to come by and do this again?"</p>
+			<p>"You busy later?" <<npc $sex.npcId>><</npc>> asks as you're $sex_ev['dress_describe']. "It's my day off. Want to come by and do this again?"</p>
 		<</if>>
 	<<elseif $npcs.get($sex.npcId,'day_off') == $time.weekday + 1 or ($time.weekday == 7 and $npcs.get($sex.npcId,'day_off') == 1)>>
 		<<setinit $sex_ev['invite_tomorrow'] = 1>>
 		<<if $npcs.get($sex.npcId,'girlfriend') == 1>>
 			<<setinit $pc_know_npc_has_girlfriend[$sex.npcId] = 1>>
-			<p>"You busy tomorrow?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $sex_ev['dress_describe']. "My girlfriend won't be around. Want to come over and do this again?"</p>
+			<p>"You busy tomorrow?" <<npc $sex.npcId>><</npc>> asks as you're $sex_ev['dress_describe']. "My girlfriend won't be around. Want to come over and do this again?"</p>
 		<<else>>
-			<p>"You busy tomorrow?" <<=$npcs.get($sex.npcId,'firstname')>> asks as you're $sex_ev['dress_describe']. "It'll be my day off. Want to come by and do this again?"</p>
+			<p>"You busy tomorrow?" <<npc $sex.npcId>><</npc>> asks as you're $sex_ev['dress_describe']. "It'll be my day off. Want to come by and do this again?"</p>
 		<</if>>
 	<</if>>
 	<<gs 'sex_ev_leave' 'dress_loop'>>
 	<<gs 'sex_ev_leave' 'busy_later'>>
 	<<actCLA 'What time?'>>
 		<p>"That depends," you say, $sex_ev['dress_describe']. "What time were you thinking?"</p>
-		<p>"npc_start_free_time[$sex.npcId]?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+		<p>"npc_start_free_time[$sex.npcId]?" <<npc $sex.npcId>><</npc>> asks.</p>
 		<<gs 'sex_ev_morning' 'busy_time'>>
 		<<gs 'sex_ev_morning' 'sex_ev_plan'>>
 	<</actCLA>>
@@ -833,7 +833,7 @@ end} -->
 	<<actCLA 'I`m busy'>>
 		<<gs 'booty_call' 'block_booty_calls'>>
 		<p>"I can't, sorry," you say, $sex_ev['dress_describe']. "I have something to do then."</p>
-		<p>"Damn," <<=$npcs.get($sex.npcId,'firstname')>> says disappointedly.</p>
+		<p>"Damn," <<npc $sex.npcId>><</npc>> says disappointedly.</p>
 		<<gs 'sex_ev_morning' 'end_morning'>>
 	<</actCLA>>
 <</if>>
@@ -841,22 +841,22 @@ end} -->
 	<<actCLA 'Sounds good'>>
 		<<gs 'booty_call' 'set_sex_ev_date'>>
 		<p>"Sounds good," you grin, $sex_ev['dress_describe']. "I'll see you then."</p>
-		<p>"Great," <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
+		<p>"Great," <<npc $sex.npcId>><</npc>> grins back.</p>
 		<<gs 'sex_ev_morning' 'end_morning'>>
 	<</actCLA>>
 	<<actCLA 'I`ve got nothing better to do'>>
 		<<gs 'booty_call' 'set_sex_ev_date'>>
 		<p>"Sure," you smirk, $sex_ev['dress_describe']. "I got nothing better to do."</p>
-		<p>"Great," <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
+		<p>"Great," <<npc $sex.npcId>><</npc>> grins back.</p>
 		<<gs 'sex_ev_morning' 'end_morning'>>
 	<</actCLA>>
 	<<actCLA 'I could fit it in'>>
 		<<gs 'booty_call' 'set_sex_ev_date'>>
 		<p>"I think I can fit that in," you smirk, $sex_ev['dress_describe'].</p>
 		<<if $npcs.get($sex.npcId,'humor') == 2>>
-			<p>"You sure can," <<=$npcs.get($sex.npcId,'firstname')>> grins lewdly at you.</p>
+			<p>"You sure can," <<npc $sex.npcId>><</npc>> grins lewdly at you.</p>
 		<<else>>
-			<p>"Great," <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
+			<p>"Great," <<npc $sex.npcId>><</npc>> grins back.</p>
 		<</if>>
 		<<gs 'sex_ev_morning' 'end_morning'>>
 	<</actCLA>>
@@ -881,18 +881,18 @@ end} -->
 <!-- !! ------------------------------------ Morning Sex Stuff --------------------------------------------------------->
 <<if $location_var[$here][0] == 'cumshot_wakeup1'>>
 	<<video "shared/sex/sleep/cumshot_wake1.mp4">>
-	<p>You gasp as you are suddenly awakened by the shock of liquid splashing across your skin. Your eyes flutter open just in time to see another spurt of cum exit <<=$npcs.get($sex.npcId,'firstname')>>'s cock and hit you square in the face.</p>
+	<p>You gasp as you are suddenly awakened by the shock of liquid splashing across your skin. Your eyes flutter open just in time to see another spurt of cum exit <<npc $sex.npcId>><</npc>>'s cock and hit you square in the face.</p>
 	<<actCLA 'What the fuck!'>>
 		<<video "shared/sex/sleep/cumshot_wake2.mp4">>
 		<p>"What the fuck are you doing?!" you exclaim, sputtering as strands of semen dribble last your lips.</p>
-		<p>"You were so hot lying there," <<=$npcs.get($sex.npcId,'firstname')>> snickers, a lewd grin smeared across his face. "I got hard just looking at you."</p>
+		<p>"You were so hot lying there," <<npc $sex.npcId>><</npc>> snickers, a lewd grin smeared across his face. "I got hard just looking at you."</p>
 		<p>"So you thought it would be a good idea to cum on my face?!"</p>
 		"Come on, don't be like that. Here, clean me off. Get the rest out." He lowers his cock, pushing it towards your lips.
 		<<gs 'sex_ev_morning' 'cumshot_wakeup_clean1'>>
 	<</actCLA>>
 	<<actCLA 'Take it in stride'>>
 		<<video "shared/sex/sleep/cumshot_wake2.mp4">>
-		<p>You sputter briefly as some of the salty sperm slips past your lips, but can't help but feel amusement when you see the lewd satisfaction on <<=$npcs.get($sex.npcId,'firstname')>>'s face.</p>
+		<p>You sputter briefly as some of the salty sperm slips past your lips, but can't help but feel amusement when you see the lewd satisfaction on <<npc $sex.npcId>><</npc>>'s face.</p>
 		<<actCLA 'Guess that means no morning BJ'>>
 			"Guess that means it's too late for a morning blowjob," you snicker.
 			"No it's not," he grins back and pushes his cock towards your lips.
@@ -924,7 +924,7 @@ end} -->
 		<<video "shared/sex/sleep/cumshot_wake3.mp4">>
 		<<arouse 'bj' 1 `['sub']`>>
 		<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1 0 5>>
-		<p>Before you can make any more protest, <<=$npcs.get($sex.npcId,'firstname')>>'s cock pushes into your mouth. Your eyes accuse him of being a jerk but your lips suck obediently, drawing the last drops of cum from his shaft.</p>
+		<p>Before you can make any more protest, <<npc $sex.npcId>><</npc>>'s cock pushes into your mouth. Your eyes accuse him of being a jerk but your lips suck obediently, drawing the last drops of cum from his shaft.</p>
 		<<gs 'sex_ev_morning' 'wakeup1'>>
 	<</actCLA>>
 <</if>>
@@ -938,7 +938,7 @@ end} -->
 		<<video "shared/sex/sleep/cumshot_wake3.mp4">>
 		<<arouse 'bj' 1 `['sub']`>>
 		<<gs 'cum_call' 'mouth_swallow' $sex.npcId 1 0 5>>
-		<p>"Oh fiiiine," you say, mock frowning as <<=$npcs.get($sex.npcId,'firstname')>>'s cock pushes past your lips and you subserviently suck out the last drops of cum from it.</p>
+		<p>"Oh fiiiine," you say, mock frowning as <<npc $sex.npcId>><</npc>>'s cock pushes past your lips and you subserviently suck out the last drops of cum from it.</p>
 		<<gs 'sex_ev_morning' 'wakeup1'>>
 	<</actCLA>>
 <</if>>
@@ -959,14 +959,14 @@ end} -->
 			<<video "shared/sex/after/wakeup_shock2.mp4">>
 			Panic begins to set in as you sit up, your breathing already at the edge of hyperventilation.
 			<<if getvar("$sex_ev['creampie_count']") > 3>>
-				<p>Not only did you forget your birth control, but <<=$npcs.get($sex.npcId,'firstname')>> came inside you last night too. <i>A lot.</i> How could you fuck up like this?</p>
+				<p>Not only did you forget your birth control, but <<npc $sex.npcId>><</npc>> came inside you last night too. <i>A lot.</i> How could you fuck up like this?</p>
 			<<elseif getvar("$sex_ev['creampie_count']") > 0>>
-				<p>Not only did you forget your birth control, but <<=$npcs.get($sex.npcId,'firstname')>> came inside you last night too. How could you fuck up like this?</p>
+				<p>Not only did you forget your birth control, but <<npc $sex.npcId>><</npc>> came inside you last night too. How could you fuck up like this?</p>
 			<<else>>
 				<<if getvar("$pharmacy_timers['birth_control']") > 0>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> didn't come inside you yesterday, but this breaks your streak. Aunt Luda said you need to take it every day or it won't work. So if you take it now, does that mean you're still not safe?</p>
+					<p><<npc $sex.npcId>><</npc>> didn't come inside you yesterday, but this breaks your streak. Aunt Luda said you need to take it every day or it won't work. So if you take it now, does that mean you're still not safe?</p>
 				<<else>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> didn't come inside you yesterday, but this breaks your streak. Are you still safe if you skip a day?</p>
+					<p><<npc $sex.npcId>><</npc>> didn't come inside you yesterday, but this breaks your streak. Are you still safe if you skip a day?</p>
 				<</if>>
 			<</if>>
 			<<if getvar("$morning_after_pill") > 0>>
@@ -984,11 +984,11 @@ end} -->
 			<<actCLA 'You can take a morning after pill'>>
 				<<if getvar("$sex_ev['creampie_count']") > 0>>
 					<<if getvar("$sex_ev['creampie_count']") > 5>>
-						<p>Okay, so <<=$npcs.get($sex.npcId,'firstname')>> came inside you last night... <i>A lot.</i> But you can still take a morning after pill. Maybe it'll be okay.</p>
+						<p>Okay, so <<npc $sex.npcId>><</npc>> came inside you last night... <i>A lot.</i> But you can still take a morning after pill. Maybe it'll be okay.</p>
 					<<elseif getvar("$sex_ev['creampie_count']") > 1>>
-						<p>Okay, so <<=$npcs.get($sex.npcId,'firstname')>> came inside you last night... More than once... A <i>few</i> times. But you can still take a morning after pill. Maybe it'll be okay.</p>
+						<p>Okay, so <<npc $sex.npcId>><</npc>> came inside you last night... More than once... A <i>few</i> times. But you can still take a morning after pill. Maybe it'll be okay.</p>
 					<<elseif getvar("$sex_ev['creampie_count']") == 1>>
-						<p>Okay, so <<=$npcs.get($sex.npcId,'firstname')>> came inside you last night... But only once. That's not too bad, right? Maybe you can still take a morning after pill. Maybe it'll be okay.</p>
+						<p>Okay, so <<npc $sex.npcId>><</npc>> came inside you last night... But only once. That's not too bad, right? Maybe you can still take a morning after pill. Maybe it'll be okay.</p>
 					<</if>>
 					<<if getvar("$morning_after_pill") > 0>>
 						<<if getvar("$LudaQW['free_condoms']") == 1 and $pc.sexStat('morning_after_pill') == 0>>
@@ -999,9 +999,9 @@ end} -->
 					<</if>>
 				<<else>>
 					<<if getvar("$pharmacy_timers['birth_control']") > 0>>
-						<p><<=$npcs.get($sex.npcId,'firstname')>> didn't come inside you yesterday, so you're not in any real danger of getting pregnant right this second. But this breaks your streak. Aunt Luda said you need to take it every day or it won't work. So if you take it now, does that mean you're still not safe?</p>
+						<p><<npc $sex.npcId>><</npc>> didn't come inside you yesterday, so you're not in any real danger of getting pregnant right this second. But this breaks your streak. Aunt Luda said you need to take it every day or it won't work. So if you take it now, does that mean you're still not safe?</p>
 					<<else>>
-						<p><<=$npcs.get($sex.npcId,'firstname')>> didn't come inside you yesterday, so you're not in any real danger of getting pregnant right this second. But does this mean you'll need to wait a few days to build up the birth control in your system again? If you take your next pill now, does that mean you're still not safe?</p>
+						<p><<npc $sex.npcId>><</npc>> didn't come inside you yesterday, so you're not in any real danger of getting pregnant right this second. But does this mean you'll need to wait a few days to build up the birth control in your system again? If you take your next pill now, does that mean you're still not safe?</p>
 					<</if>>
 				<</if>>
 				<<gs 'sex_ev_morning' 'forgot_bc_pill2'>>
@@ -1010,17 +1010,17 @@ end} -->
 				<<actCLA 'You`re not fertile right now'>>
 					<<if getvar("$sex_ev['creampie_count']") > 0>>
 						<<if getvar("$sex_ev['creampie_count']") > 5>>
-							<p>Okay, so <<=$npcs.get($sex.npcId,'firstname')>> came inside you last night... <i>A lot.</i> But it's not the fertile stage of your cycle. You should be fine, right?</p>
+							<p>Okay, so <<npc $sex.npcId>><</npc>> came inside you last night... <i>A lot.</i> But it's not the fertile stage of your cycle. You should be fine, right?</p>
 						<<elseif getvar("$sex_ev['creampie_count']") > 1>>
-							<p>Okay, so <<=$npcs.get($sex.npcId,'firstname')>> came inside you last night... More than once... A <i>few</i> times. But it's not the fertile stage of your cycle. You should be fine, right?</p>
+							<p>Okay, so <<npc $sex.npcId>><</npc>> came inside you last night... More than once... A <i>few</i> times. But it's not the fertile stage of your cycle. You should be fine, right?</p>
 						<<elseif getvar("$sex_ev['creampie_count']") == 1>>
-							<p>Okay, so <<=$npcs.get($sex.npcId,'firstname')>> came inside you last night... But only once. And it's not the fertile stage of your cycle. You should be fine, right?</p>
+							<p>Okay, so <<npc $sex.npcId>><</npc>> came inside you last night... But only once. And it's not the fertile stage of your cycle. You should be fine, right?</p>
 						<</if>>
 					<<else>>
 						<<if getvar("$pharmacy_timers['birth_control']") > 0>>
-							<p><<=$npcs.get($sex.npcId,'firstname')>> didn't come inside you yesterday, so you're not in any real danger of getting pregnant right this second. But this breaks your streak. Aunt Luda said you need to take it every day or it won't work. So if you take it now, does that mean you're still not safe?</p>
+							<p><<npc $sex.npcId>><</npc>> didn't come inside you yesterday, so you're not in any real danger of getting pregnant right this second. But this breaks your streak. Aunt Luda said you need to take it every day or it won't work. So if you take it now, does that mean you're still not safe?</p>
 						<<else>>
-							<p><<=$npcs.get($sex.npcId,'firstname')>> didn't come inside you yesterday, so you're not in any real danger of getting pregnant right this second. But does this mean you'll need to wait a few days to build up the birth control in your system again? If you take your next pill now, does that mean you're still not safe?</p>
+							<p><<npc $sex.npcId>><</npc>> didn't come inside you yesterday, so you're not in any real danger of getting pregnant right this second. But does this mean you'll need to wait a few days to build up the birth control in your system again? If you take your next pill now, does that mean you're still not safe?</p>
 						<</if>>
 					<</if>>
 					<<gs 'sex_ev_morning' 'forgot_bc_pill2'>>
@@ -1037,10 +1037,10 @@ end} -->
 			<<gs 'sex_ev_morning' 'npc_morning_shower_desc'>>
 			<<gs 'sex_ev_morning' 'wakeup1'>>
 		<<elseif $npcs.get($sex.npcId,'latesleeper') == 1>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> is still asleep next to you snoring softly, completely ignorant to the situation.</p>
+			<p><<npc $sex.npcId>><</npc>> is still asleep next to you snoring softly, completely ignorant to the situation.</p>
 			<<gs 'sex_ev_morning' 'wakeup1'>>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> stirs next to you.</p>
+			<p><<npc $sex.npcId>><</npc>> stirs next to you.</p>
 			<<if $npcs.get($sex.npcId,'selfish') != 1 and $npcs.get($sex.npcId,'abusive') != 1 and rand(1,3) == 3>>
 				<p>"Hey." He yawns, glancing over at you before blinking, a look of concern on his face. "What's up? Something wrong?"</p>
 				<<actCLA 'Don`t tell him'>>
@@ -1083,7 +1083,7 @@ end} -->
 			<<video "shared/sex/after/wakeup_shock2.mp4">>
 			Throwing your legs over the side of the bed, you sit up, hands at your sides, taking panicked breaths in your guilt.
 			<i>I just cheated on my <<$sex_ev[''cheat'']>>...</i>
-			<p>Your thoughts wander through your night with <<=$npcs.get($sex.npcId,'firstname')>>...</p>
+			<p>Your thoughts wander through your night with <<npc $sex.npcId>><</npc>>...</p>
 			<<if getvar("$sex_ev['bj']") > 0>>
 				<i>Sucking his cock...</i>
 
@@ -1154,7 +1154,7 @@ end} -->
 	<</actCLA>>
 	<<actCLA 'It`s just sex'>>
 		<<video "shared/sex/after/wakeup_shock2.mp4">>
-		<p><i>It's just sex,</i> you try to rationalize. <i>It's not like I'm falling in love with <<=$npcs.get($sex.npcId,'firstname')>> or anything. It's not cheating. It's just sex...</i>.</p>
+		<p><i>It's just sex,</i> you try to rationalize. <i>It's not like I'm falling in love with <<npc $sex.npcId>><</npc>> or anything. It's not cheating. It's just sex...</i>.</p>
 		You're not sure whether you believe yourself.
 		<<gs 'sex_ev_morning' 'guilt2'>>
 	<</actCLA>>
@@ -1192,20 +1192,20 @@ end} -->
 		<!-- !! for later: create option for him to burst in with breakfast in bed-->
 		<<if $sex_ev['loc'] == 'player_home'>>
 			<<setinit $sex_ev['npc_morning_shower'] = 1>>
-			<p>The bed next to you is empty but you can hear water running through the wall. <<=$npcs.get($sex.npcId,'firstname')>> must be in the shower.</p>
+			<p>The bed next to you is empty but you can hear water running through the wall. <<npc $sex.npcId>><</npc>> must be in the shower.</p>
 		<<else>>
 			<<gs 'sex_ev_morning' 'npc_morning_shower_desc'>>
 		<</if>>
 		<<gs 'sex_ev_morning' 'wakeup1'>>
 	<<elseif $npcs.get($sex.npcId,'latesleeper') == 1>>
 		<<if $sex_ev['type'] == 'hookup'>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>>, the guy from last night, is still asleep next to you, completely ignorant to your internal strife, snoring softly.</p>
+			<p><<npc $sex.npcId>><</npc>>, the guy from last night, is still asleep next to you, completely ignorant to your internal strife, snoring softly.</p>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> is still asleep next to you, completely ignorant to your internal strife, snoring softly.</p>
+			<p><<npc $sex.npcId>><</npc>> is still asleep next to you, completely ignorant to your internal strife, snoring softly.</p>
 		<</if>>
 		<<gs 'sex_ev_morning' 'wakeup1'>>
 	<<else>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> stirs next to you.</p>
+		<p><<npc $sex.npcId>><</npc>> stirs next to you.</p>
 		<<if $npcs.get($sex.npcId,'selfish') != 1 and $npcs.get($sex.npcId,'abusive') != 1 and rand(1,3) == 3>>
 			<p>"Hey." He yawns, glancing over at you before blinking, a look of concern on his face. "What's up? Something wrong?"</p>
 			<<actCLA 'It`s nothing'>>
@@ -1271,7 +1271,7 @@ end} -->
 			<<video "shared/sex/blowjob/bj47.mp4">>
 			"Yeah," you say crawling over to him. "I could really use some <i>meat</i> right now."
 			You slink down between his legs, wrapping your lips around his cock and slurp hard.
-			<p>"Nngh, fuck..." <<=$npcs.get($sex.npcId,'firstname')>> grunts, getting harder by the second. "Not what I had in mind but..." You cut him off as you plunge your lips back down his shaft.</p>
+			<p>"Nngh, fuck..." <<npc $sex.npcId>><</npc>> grunts, getting harder by the second. "Not what I had in mind but..." You cut him off as you plunge your lips back down his shaft.</p>
 			<<actCLA 'Continue'>>
 				<<gt 'sex_ev_foreplay' 'bj_dom2'>>
 			<</actCLA>>
@@ -1283,10 +1283,10 @@ end} -->
 	<<setinit $sex_ev['find_boy'] = 1>>
 	$sex_ev['kitchen_room']
 	<<if $npcs.get($sex.npcId,'apt_type') < 3>>
-		<p>You wait patiently in bed while <<=$npcs.get($sex.npcId,'firstname')>> whips up a full breakfast with coffee to drink and brings the tray back to you.</p>
+		<p>You wait patiently in bed while <<npc $sex.npcId>><</npc>> whips up a full breakfast with coffee to drink and brings the tray back to you.</p>
 		<p>"What can I help you with first?" he asks.</p>
 	<<else>>
-		<p>You follow <<=$npcs.get($sex.npcId,'firstname')>> into the kitchen and wait patiently while he whips up a full breakfast with coffee to drink, putting all the plates on his kitchen table.</p>
+		<p>You follow <<npc $sex.npcId>><</npc>> into the kitchen and wait patiently while he whips up a full breakfast with coffee to drink, putting all the plates on his kitchen table.</p>
 	<</if>>
 	<<gs 'sex_ev_morning' 'breakfast_in_bed_menu'>>
 <</if>>
@@ -1294,7 +1294,7 @@ end} -->
 	<<setinit $sex_ev['find_boy'] = 1>>
 	<<set $time.minutes += 1>>
 	<<video "shared/romance/misc/nude_walk1.mp4">>
-	<p>You climb out of bed and leave the bedroom, walking through the halls of <<=$npcs.get($sex.npcId,'firstname')>>'s apartment naked as you peek into various rooms searching for him.</p>
+	<p>You climb out of bed and leave the bedroom, walking through the halls of <<npc $sex.npcId>><</npc>>'s apartment naked as you peek into various rooms searching for him.</p>
 	<<actCLA 'Continue'>>
 		$sex_ev['kitchen_room']
 		You follow the smell of food and find him in the kitchen cooking breakfast.
@@ -1306,9 +1306,9 @@ end} -->
 	$sex_ev['bed_room']
 	<<setinit $sex_ev['b_i_b'] = 1>>
 	<<if $npcs.get($sex.npcId,'apt_type') == 2>>
-		<p>"Hey sleepyhead," <<=$npcs.get($sex.npcId,'firstname')>> says as you finish rubbing the sleep from your eyes. "I just finished making breakfast."</p>
+		<p>"Hey sleepyhead," <<npc $sex.npcId>><</npc>> says as you finish rubbing the sleep from your eyes. "I just finished making breakfast."</p>
 	<<else>>
-		<p>As you finish rubbing the sleep from your eyes <<=$npcs.get($sex.npcId,'firstname')>> comes in through the doorway carrying a tray.</p>
+		<p>As you finish rubbing the sleep from your eyes <<npc $sex.npcId>><</npc>> comes in through the doorway carrying a tray.</p>
 		"Hey," he smiles. "I didn''t want to wake you, so I thought I''d make breakfast and bring it to you."
 	<</if>>
 	<<actCLA 'How sweet'>>
@@ -1330,20 +1330,20 @@ end} -->
 	<<actCLA 'Coffee'>>
 		<<actCLA 'Coffee first'>>
 			"Coffee first," you say. "Definitely the coffee first."
-			<p><<=$npcs.get($sex.npcId,'firstname')>> pours a mug for you and you eagerly grab for it, taking that first wonderful sip and sigh with relief.</p>
+			<p><<npc $sex.npcId>><</npc>> pours a mug for you and you eagerly grab for it, taking that first wonderful sip and sigh with relief.</p>
 			"Okay, now food," you grin.
 			<<gs 'sex_ev_morning' 'eat_breakfast1'>>
 		<</actCLA>>
 		<<actCLA 'Just coffee (no food)'>>
 			"Coffee," you say. "Give me coffee."
-			<p><<=$npcs.get($sex.npcId,'firstname')>> pours a mug for you and you eagerly grab for it, taking that first wonderful sip and sigh with relief.</p>
+			<p><<npc $sex.npcId>><</npc>> pours a mug for you and you eagerly grab for it, taking that first wonderful sip and sigh with relief.</p>
 			<<actCLA 'Continue'>>
 				<<gs 'sex_ev_morning' 'eat_breakfast_coffee'>>
 			<</actCLA>>
 		<</actCLA>>
 	<</actCLA>>
 	<<actCLA 'Toast'>>
-		<p>"That toast looks good," you smile and <<=$npcs.get($sex.npcId,'firstname')>> hands it over.</p>
+		<p>"That toast looks good," you smile and <<npc $sex.npcId>><</npc>> hands it over.</p>
 		<<actCLA 'Plain'>>
 			<<gs 'sex_ev_morning' 'breakfast_image'>>
 			You grab the toast not bothering to put on any additional spreads or condiments and bite in. The crispy crust crunches under your teeth, the nice cooked but not burnt flavour fills your mouth.
@@ -1365,7 +1365,7 @@ end} -->
 		<<actCLA 'Sour cream'>>
 			<<gs 'sex_ev_morning' 'breakfast_image'>>
 			You grab the toast and slather sour cream across its surface before biting in. The crispy crust crunches under your teeth, the nice cooked but not burnt flavour fills your mouth, supplemented by the creaminess of your chosen condiment.
-			<p>"Isn't sour cream normally for the pancakes?" <<=$npcs.get($sex.npcId,'firstname')>> asks amused.</p>
+			<p>"Isn't sour cream normally for the pancakes?" <<npc $sex.npcId>><</npc>> asks amused.</p>
 			<p>"Isn't toast just a crispy pancake?" you shrug back, grinning at him with a full mouth.</p>
 			<<gs 'sex_ev_morning' 'eat_breakfast1'>>
 		<</actCLA>>
@@ -1373,7 +1373,7 @@ end} -->
 	<<actCLA 'Eggs'>>
 		"A bit of protein sounds good right now," you smile, reaching for the plate with fried eggs on it.
 		<<if $npcs.get($sex.npcId,'humor') == 2>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> snickers, giving you a dirty smirk, saying, "I got some protein for you to swallow if you really want some."</p>
+			<p><<npc $sex.npcId>><</npc>> snickers, giving you a dirty smirk, saying, "I got some protein for you to swallow if you really want some."</p>
 			<<actCLA 'Roll your eyes'>>
 				You sigh deeply, rolling your eyes to the heavens as you ignore his vulgar remarks and take your first bite of egg. It's perfectly fried, the edges crispy but the the yolk is runny and delicious.
 				<<gs 'sex_ev_morning' 'eat_breakfast1'>>
@@ -1388,14 +1388,14 @@ end} -->
 				<<gs 'sex_ev_morning' 'eat_breakfast1'>>
 			<</actCLA>>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> provides you with a plate and you eagerly cut it up and stab it with your fork to take your first bite of egg. It's perfectly fried, the edges crispy but the the yolk is runny and delicious.</p>
+			<p><<npc $sex.npcId>><</npc>> provides you with a plate and you eagerly cut it up and stab it with your fork to take your first bite of egg. It's perfectly fried, the edges crispy but the the yolk is runny and delicious.</p>
 			<<gs 'sex_ev_morning' 'eat_breakfast1'>>
 		<</if>>
 	<</actCLA>>
 	<<actCLA 'Kolbasa'>>
 		"A bit of protein sounds good right now," you smile, reaching for the sandwiches he made, the slice of bread with cheese and kolbasa.
 		<<if $npcs.get($sex.npcId,'humor') == 2>>
-			<p>"If it's protein you want, I got some for you..." <<=$npcs.get($sex.npcId,'firstname')>> snickers.</p>
+			<p>"If it's protein you want, I got some for you..." <<npc $sex.npcId>><</npc>> snickers.</p>
 			<<actCLA 'Roll your eyes'>>
 				You sigh deeply, rolling your eyes to the heavens as you ignore his vulgar euphemisms and bite into the sandwich. The bread is nice and soft, the cheese creamy, and the kolbasa salty and cheap but full of familiar comfort.
 				<<gs 'sex_ev_morning' 'eat_breakfast1'>>
@@ -1410,12 +1410,12 @@ end} -->
 				<<gs 'sex_ev_morning' 'eat_breakfast1'>>
 			<</actCLA>>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> provides you with a plate and you eagerly bite into the sandwich. The bread is nice and soft, the cheese creamy, and the kolbasa salty and cheap but full of familiar comfort.</p>
+			<p><<npc $sex.npcId>><</npc>> provides you with a plate and you eagerly bite into the sandwich. The bread is nice and soft, the cheese creamy, and the kolbasa salty and cheap but full of familiar comfort.</p>
 			<<gs 'sex_ev_morning' 'eat_breakfast1'>>
 		<</if>>
 	<</actCLA>>
 	<<actCLA 'Pancakes'>>
-		<p>"Those pancakes look great," you smile, eagerly reaching for them. <<=$npcs.get($sex.npcId,'firstname')>> hands you a plate and you spread raspberry jam and sour cream across the small discs of cooked batter. You take your first bite and close your eyes, savouring the sweet, sour, creamy deliciousness before opening them to grin back at <<=$npcs.get($sex.npcId,'firstname')>>. "Taste great too," you grin without swallowing.</p>
+		<p>"Those pancakes look great," you smile, eagerly reaching for them. <<npc $sex.npcId>><</npc>> hands you a plate and you spread raspberry jam and sour cream across the small discs of cooked batter. You take your first bite and close your eyes, savouring the sweet, sour, creamy deliciousness before opening them to grin back at <<npc $sex.npcId>><</npc>>. "Taste great too," you grin without swallowing.</p>
 		<<gs 'sex_ev_morning' 'eat_breakfast1'>>
 	<</actCLA>>
 <</if>>
@@ -1431,10 +1431,10 @@ end} -->
 				<</if>>
 				<p>"Hungry?" you ask. "How about I make us some breakfast?"</p>
 				<<if $npcs.get($sex.npcId,'caretaker') == 1>>
-					<p>"You don't have to do that," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+					<p>"You don't have to do that," <<npc $sex.npcId>><</npc>> says.</p>
 					"I want to," you smile back and haul yourself out of bed.
 				<<else>>
-					<p>"That'd be great," <<=$npcs.get($sex.npcId,'firstname')>> smiles. You smile back and haul yourself out of bed.</p>
+					<p>"That'd be great," <<npc $sex.npcId>><</npc>> smiles. You smile back and haul yourself out of bed.</p>
 				<</if>>
 				<<actCLA 'Make breakfast'>>
 					<<gt 'sex_ev_morning' 'pc_make_breakfast'>>
@@ -1442,15 +1442,15 @@ end} -->
 			<</actCLA>>
 			<<actCLA 'You want coffee'>>
 				<<actCLA 'Got any coffee?'>>
-					<p>"Any chance I could get some coffee?" you ask <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+					<p>"Any chance I could get some coffee?" you ask <<npc $sex.npcId>><</npc>>.</p>
 					<<gs 'sex_ev_morning' 'want_coffee_response'>>
 				<</actCLA>>
 				<<actCLA 'Would kill for some coffee'>>
-					<p>"I would <i>kill</i> for a cup of coffee right now," you say, looking suggestively at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+					<p>"I would <i>kill</i> for a cup of coffee right now," you say, looking suggestively at <<npc $sex.npcId>><</npc>>.</p>
 					<<gs 'sex_ev_morning' 'want_coffee_response'>>
 				<</actCLA>>
 				<<actCLA 'Would suck cock for some coffee'>>
-					<p>"I would suck your cock for a cup of coffee right now," you say, smirking suggestively at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+					<p>"I would suck your cock for a cup of coffee right now," you say, smirking suggestively at <<npc $sex.npcId>><</npc>>.</p>
 					<<gs 'sex_ev_morning' 'want_coffee_response'>>
 				<</actCLA>>
 			<</actCLA>>
@@ -1461,12 +1461,12 @@ end} -->
 	He glances over at the clock.
 	<<if $npc_end_free_time <= $time.hour + 2>>
 		<<setinit $sex_ev['npc_late_work'] = 1>>
-		<p>"I don't have time," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head. "I gotta get to work."</p>
+		<p>"I don't have time," <<npc $sex.npcId>><</npc>> says, shaking his head. "I gotta get to work."</p>
 		You sigh in disappointment.
 		<<gs 'sex_ev_morning' 'wakeup1'>>
 	<<else>>
 		<!-- !! make a coffee only option later-->
-		<p>"I've got some time," <<=$npcs.get($sex.npcId,'firstname')>> says. "How about breakfast instead?"</p>
+		<p>"I've got some time," <<npc $sex.npcId>><</npc>> says. "How about breakfast instead?"</p>
 		<<gs 'sex_ev_morning' 'boy_breakfast_offer'>>
 	<</if>>
 <</if>>
@@ -1474,9 +1474,9 @@ end} -->
 	<<image "pc/activities/cooking/nude_fridge1.jpg">>
 	<<set $time.minutes += rand(1,2)>>
 	<<if $npcs.get($sex.npcId,'apt_type') == 2>>
-		<p>You head over to <<=$npcs.get($sex.npcId,'firstname')>>'s kitchen area and look through his fridge. Opening it, you take a look inside, mulling over what you can make with what he's got...</p>
+		<p>You head over to <<npc $sex.npcId>><</npc>>'s kitchen area and look through his fridge. Opening it, you take a look inside, mulling over what you can make with what he's got...</p>
 	<<else>>
-		<p>You head over to the kitchen and look through <<=$npcs.get($sex.npcId,'firstname')>> fridge. Opening it, you take a look inside, mulling over what you can make with what he's got...</p>
+		<p>You head over to the kitchen and look through <<npc $sex.npcId>><</npc>> fridge. Opening it, you take a look inside, mulling over what you can make with what he's got...</p>
 	<</if>>
 	<<gs 'sex_ev_morning' 'pc_make_breakfast_choices'>>
 <</if>>
@@ -1585,7 +1585,7 @@ end} -->
 			You put the coffee into the machine and wait, drumming your fingers on the counter until the dark liquid is brewed.
 		<<elseif getvar("$sex_ev['toast_make']") == 1>>
 			<<image "pc/activities/cooking/nude_misc1.jpg">>
-			<p>You grab a couple slices of bread and toss them in the toaster. While the bread browns, you rifle through <<=$npcs.get($sex.npcId,'firstname')>>'s fridge and pantry, pulling out plates and butter and raspberry jam to spread.</p>
+			<p>You grab a couple slices of bread and toss them in the toaster. While the bread browns, you rifle through <<npc $sex.npcId>><</npc>>'s fridge and pantry, pulling out plates and butter and raspberry jam to spread.</p>
 		<<elseif getvar("$sex_ev['eggs_make']") == 1>>
 			<<image `'pc/activities/cooking/nude_stove'+rand(1,3)+'.jpg'`>>
 			You crack eggs into the pan, sending sputters and sizzles the moment it makes contact with the hot metal. A couple minutes later, they're plated and ready to eat.
@@ -1612,20 +1612,20 @@ end} -->
 		$sex_ev['bed_room']
 		<<if getvar("$sex_ev['cooking_total']") == 1 and getvar("$sex_ev['coffee_make']") == 1>>
 			<<if $npcs.get($sex.npcId,'latesleeper') == 1>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> begins to stir in bed, blearily blinking at you.</p>
+				<p><<npc $sex.npcId>><</npc>> begins to stir in bed, blearily blinking at you.</p>
 				"Hey sleepyhead," you smile, turning to face him with two steaming mugs. "I made coffee."
 			<<else>>
-				<p>"Coffee's ready," you say, turning around to walk two steaming mugs back to <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+				<p>"Coffee's ready," you say, turning around to walk two steaming mugs back to <<npc $sex.npcId>><</npc>>.</p>
 			<</if>>
 			<<actCLA 'Drink your coffee'>>
 				<<gt 'sex_ev_morning' 'coffee_together'>>
 			<</actCLA>>
 		<<else>>
 			<<if getvar("$sex_ev['boy_asleep']") == 1 and getvar("$sex_ev['wake_fuck']") == 0 and getvar("$sex_ev['morning_fuck']") == 0>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> begins to stir in bed, blearily blinking at you.</p>
+				<p><<npc $sex.npcId>><</npc>> begins to stir in bed, blearily blinking at you.</p>
 				"Hey sleepyhead," you say, turning to smile at him with plates in each hand. "I made breakfast."
 			<<else>>
-				<p>"Food's done," you tell <<=$npcs.get($sex.npcId,'firstname')>>, carefully carrying a few plates over to his table.</p>
+				<p>"Food's done," you tell <<npc $sex.npcId>><</npc>>, carefully carrying a few plates over to his table.</p>
 			<</if>>
 			<<gs 'sex_ev_morning' 'eat_breakfast1'>>
 		<</if>>
@@ -1633,10 +1633,10 @@ end} -->
 		$sex_ev['kitchen_room']
 		<<if getvar("$sex_ev['cooking_total']") == 1 and getvar("$sex_ev['coffee_make']") == 1>>
 			<<if $npcs.get($sex.npcId,'latesleeper') == 1 and getvar("$sex_ev['wake_fuck']") == 0 and getvar("$sex_ev['morning_fuck']") == 0>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> comes in right as you're pouring it out, letting out a mighty yawn.</p>
+				<p><<npc $sex.npcId>><</npc>> comes in right as you're pouring it out, letting out a mighty yawn.</p>
 				"Hey sleepyhead," you smile. "I made coffee."
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> comes in right as you're pouring it out.</p>
+				<p><<npc $sex.npcId>><</npc>> comes in right as you're pouring it out.</p>
 				"Hey. Just finished brewing," you smile, handing him a steaming mug.
 			<</if>>
 			<<actCLA 'Drink your coffee'>>
@@ -1644,10 +1644,10 @@ end} -->
 			<</actCLA>>
 		<<else>>
 			<<if $npcs.get($sex.npcId,'latesleeper') == 1>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> comes in right as you're pouring it out, letting out a mighty yawn.</p>
+				<p><<npc $sex.npcId>><</npc>> comes in right as you're pouring it out, letting out a mighty yawn.</p>
 				"Hey sleepyhead," you smile. "I made breakfast."
 			<<else>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> comes in right as you start setting the table.</p>
+				<p><<npc $sex.npcId>><</npc>> comes in right as you start setting the table.</p>
 				"Hey," you smile at him. "Just finished up. Help yourself."
 			<</if>>
 			<<gs 'sex_ev_morning' 'eat_breakfast1'>>
@@ -1660,7 +1660,7 @@ end} -->
 	<<set $time.minutes += 5>>
 	<<run $npcs.inc($sex.npcId,'rel',rand(1,3))>>
 	<<gs 'sex_ev_morning' 'breakfast_image'>>
-	<p>The two of you settle down at <<=$npcs.get($sex.npcId,'firstname')>>'s table and sip away at your coffee, casually chit-chatting with each other until there's nothing but dregs left.</p>
+	<p>The two of you settle down at <<npc $sex.npcId>><</npc>>'s table and sip away at your coffee, casually chit-chatting with each other until there's nothing but dregs left.</p>
 	<<actCLA 'Wash your mugs'>>
 		<<gt 'sex_ev_morning' 'breakfast_dishes'>>
 	<</actCLA>>
@@ -1699,13 +1699,13 @@ end} -->
 	<</if>>
 	<<if $npcs.get($sex.npcId,'apt_type') == 2>>
 		<<gs 'sex_ev_morning' 'breakfast_image'>>
-		<p>You settle down on <<=$npcs.get($sex.npcId,'firstname')>>'s bed while he pulls up a chair, nibbling on small bits of food.</p>
+		<p>You settle down on <<npc $sex.npcId>><</npc>>'s bed while he pulls up a chair, nibbling on small bits of food.</p>
 	<<elseif getvar("$sex_ev['boy_make_breakfast']") == 1 and getvar("$sex_ev['find_boy']") == 0>>
 		<<gs 'sex_ev_morning' 'breakfast_image'>>
-		<p>You sit up in <<=$npcs.get($sex.npcId,'firstname')>>'s bed and start taking small bites of food as <<=$npcs.get($sex.npcId,'firstname')>> while he pulls up a chair.</p>
+		<p>You sit up in <<npc $sex.npcId>><</npc>>'s bed and start taking small bites of food as <<npc $sex.npcId>><</npc>> while he pulls up a chair.</p>
 	<<else>>
 		<<gs 'sex_ev_morning' 'breakfast_image'>>
-		<p>The two of you settle down at <<=$npcs.get($sex.npcId,'firstname')>>'s table. You nibble at small bits of food while he digs in.</p>
+		<p>The two of you settle down at <<npc $sex.npcId>><</npc>>'s table. You nibble at small bits of food while he digs in.</p>
 	<</if>>
 	<!-- !! add chat section here later-->
 	<p>"Not hungry?" he asks curiously.</p>
@@ -1753,10 +1753,10 @@ end} -->
 	<</if>>
 	<<if $npcs.get($sex.npcId,'apt_type') == 2>>
 		<<gs 'sex_ev_morning' 'breakfast_image'>>
-		<p>You settle down on <<=$npcs.get($sex.npcId,'firstname')>>'s bed while he pulls up a chair and you both dig in, casually chatting away until you've cleared your plates.</p>
+		<p>You settle down on <<npc $sex.npcId>><</npc>>'s bed while he pulls up a chair and you both dig in, casually chatting away until you've cleared your plates.</p>
 	<<else>>
 		<<gs 'sex_ev_morning' 'breakfast_image'>>
-		<p>The two of you settle down at <<=$npcs.get($sex.npcId,'firstname')>>'s table and dig in, casually chatting away until you've cleared your plates.</p>
+		<p>The two of you settle down at <<npc $sex.npcId>><</npc>>'s table and dig in, casually chatting away until you've cleared your plates.</p>
 	<</if>>
 	<!-- !! add chat section here later-->
 	<<actCLA 'Clear your dishes'>>
@@ -1773,10 +1773,10 @@ end} -->
 	<</if>>
 	<<if $npcs.get($sex.npcId,'apt_type') == 2>>
 		<<gs 'sex_ev_morning' 'breakfast_image'>>
-		<p>You settle down on <<=$npcs.get($sex.npcId,'firstname')>>'s bed while he pulls up a chair and you both dig in, you especially, happily stuffing your face as the two of you casually chat away until you've cleared your plates.</p>
+		<p>You settle down on <<npc $sex.npcId>><</npc>>'s bed while he pulls up a chair and you both dig in, you especially, happily stuffing your face as the two of you casually chat away until you've cleared your plates.</p>
 	<<else>>
 		<<gs 'sex_ev_morning' 'breakfast_image'>>
-		<p>The two of you settle down at <<=$npcs.get($sex.npcId,'firstname')>>'s table and dig in, you especially, happily stuffing your face as the two of you casually chat away until you've cleared your plates.</p>
+		<p>The two of you settle down at <<npc $sex.npcId>><</npc>>'s table and dig in, you especially, happily stuffing your face as the two of you casually chat away until you've cleared your plates.</p>
 	<</if>>
 	<!-- !! add chat section here later-->
 	<<actCLA 'Clear your dishes'>>
@@ -1790,13 +1790,13 @@ end} -->
 	<<if $npcs.get($sex.npcId,'apt_type') == 2>>
 		<<gs 'sex_ev_morning' 'breakfast_image'>>
 		<<if getvar("$sex_ev['boy_make_breakfast']") == 1 and getvar("$sex_ev['find_boy']") == 0>>
-			<p>You sit up in <<=$npcs.get($sex.npcId,'firstname')>>'s bed while he pulls up a chair, sipping on your coffee as he digs in.</p>
+			<p>You sit up in <<npc $sex.npcId>><</npc>>'s bed while he pulls up a chair, sipping on your coffee as he digs in.</p>
 		<<else>>
-			<p>You settle down on <<=$npcs.get($sex.npcId,'firstname')>>'s bed while he pulls up a chair, sipping on your coffee as he digs in.</p>
+			<p>You settle down on <<npc $sex.npcId>><</npc>>'s bed while he pulls up a chair, sipping on your coffee as he digs in.</p>
 		<</if>>
 	<<else>>
 		<<gs 'sex_ev_morning' 'breakfast_image'>>
-		<p>The two of you settle down at <<=$npcs.get($sex.npcId,'firstname')>>'s table. You sip at your coffee while he digs in.</p>
+		<p>The two of you settle down at <<npc $sex.npcId>><</npc>>'s table. You sip at your coffee while he digs in.</p>
 	<</if>>
 	<!-- !! add chat section here later-->
 	<p>"Not going to eat?" he asks curiously.</p>
@@ -1905,17 +1905,17 @@ end} -->
 			<<setinit $sex_ev['extra_cum'] += $npcs.get($sex.npcId,'sexdrive')>>
 		<</if>>
 		<<actCLA 'You`re gonna make me late'>>
-			<p>"You're gonna make me late," you giggle uncontrollably as <<=$npcs.get($sex.npcId,'firstname')>> gets friskier, dragging you back to bed to do what he wants to you.</p>
+			<p>"You're gonna make me late," you giggle uncontrollably as <<npc $sex.npcId>><</npc>> gets friskier, dragging you back to bed to do what he wants to you.</p>
 			<<gs 'sex_ev_foreplay' 'bed_start'>>
 		<</actCLA>>
 		<<actCLA 'Let him do what he wants'>>
-			<p>You giggle uncontrollably, giving <<=$npcs.get($sex.npcId,'firstname')>> the non-verbal go ahead and you let him drag you back to the bed to do what he wants to you.</p>
+			<p>You giggle uncontrollably, giving <<npc $sex.npcId>><</npc>> the non-verbal go ahead and you let him drag you back to the bed to do what he wants to you.</p>
 			<<gs 'sex_ev_foreplay' 'bed_start'>>
 		<</actCLA>>
 		<<if getvar("$sex_ev['wake_fuck']") == 1 or getvar("$sex_ev['morning_fuck']") == 1>>
 			<<actCLA 'Again?!'>>
-				<p>"Again?!" you giggle as <<=$npcs.get($sex.npcId,'firstname')>> begins groping your breast and fingering your clit. "You're insatiable!"</p>
-				<p>But you don't protest and let <<=$npcs.get($sex.npcId,'firstname')>> drag you back to the bed to do what he wants to you.</p>
+				<p>"Again?!" you giggle as <<npc $sex.npcId>><</npc>> begins groping your breast and fingering your clit. "You're insatiable!"</p>
+				<p>But you don't protest and let <<npc $sex.npcId>><</npc>> drag you back to the bed to do what he wants to you.</p>
 				<<gs 'sex_ev_foreplay' 'bed_start'>>
 			<</actCLA>>
 		<</if>>
@@ -1926,7 +1926,7 @@ end} -->
 				<<run $npcs.dec($sex.npcId,'rel',2)>>
 
 			<</if>>
-			<p>"Ugh!" you groan, giving <<=$npcs.get($sex.npcId,'firstname')>> a look of disgust and forcibly pulling his hands off your body. "Right when I feel all gross after eating? How can you even <i>think</i> about that right now?"</p>
+			<p>"Ugh!" you groan, giving <<npc $sex.npcId>><</npc>> a look of disgust and forcibly pulling his hands off your body. "Right when I feel all gross after eating? How can you even <i>think</i> about that right now?"</p>
 			<<gs 'sex_ev_morning' 'wakeup1'>>
 		<</actCLA>>
 	<</if>>
@@ -1951,9 +1951,9 @@ end} -->
 		<!-- !! add correct travel times for each location-->
 		<<if $npcs.get($sex.npcId,'residence') == 1>>
 			<!-- !! Pav residential-->
-			<p><<=$npcs.get($sex.npcId,'firstname')>> drives you the short distance to school, stopping right outside the gates. You probably could have just walked, but it's nice to spend a little more time with him.</p>
+			<p><<npc $sex.npcId>><</npc>> drives you the short distance to school, stopping right outside the gates. You probably could have just walked, but it's nice to spend a little more time with him.</p>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> drives you from the city back to Pavlovsk, stopping right outside the school gates.</p>
+			<p><<npc $sex.npcId>><</npc>> drives you from the city back to Pavlovsk, stopping right outside the school gates.</p>
 			<<if $npcs.get($sex.npcId,'residence') == 2>>
 				<!-- !! Student dorms-->
 			<<elseif $npcs.get($sex.npcId,'residence') == 3>>
@@ -2017,9 +2017,9 @@ end} -->
 <</if>>
 <<if $location_var[$here][0] == 'classmates_see'>>
 	<<if $time.hour > 6 and rand(1,20) > rand(3,6)>>
-		<p>You step out of the car, looking around and don't see anybody who would recognize you. <<=$npcs.get($sex.npcId,'firstname')>> gives you a wave and you wave back as he drives off.</p>
+		<p>You step out of the car, looking around and don't see anybody who would recognize you. <<npc $sex.npcId>><</npc>> gives you a wave and you wave back as he drives off.</p>
 	<<else>>
 		As you exit the vehicle, some of your classmates are walking by and they glance at you stepping out of a stranger''s car. Some of them immediately look away. Others wear a look of disgust. Judging by the reactions, they must have clocked you.
-		<p><<=$npcs.get($sex.npcId,'firstname')>> gives you a small wave and drives off.</p>
+		<p><<npc $sex.npcId>><</npc>> gives you a small wave and drives off.</p>
 	<</if>>
 <</if>>

+ 129 - 129
sugarcube/src/autogenerated/unsorted/sex_ev_pillow_talk.tw

@@ -4,7 +4,7 @@
 <<if $location_var[$here][0] == 'start'>>
 	<<image "shared/sex/after/pillow_talk1.jpg">>
 	<<setinit $sex_ev['pillow_talking'] = 1>>
-	<p>You and <<=$npcs.get($sex.npcId,'firstname')>> relax on the bed together, basking in the afterglow as you idly chit chat about things.</p>
+	<p>You and <<npc $sex.npcId>><</npc>> relax on the bed together, basking in the afterglow as you idly chit chat about things.</p>
 	<<if getvar("$sex_ev['virgin']") == 1 and getvar("$sex_ev['virgin_talk']") == 0 and getvar("$sex_ev['fuck_count']") > 0>>
 		<<gs 'sex_ev_virgin' 'first_time_talk'>>
 	<<else>>
@@ -145,7 +145,7 @@
 			<<else>>
 				<p>"You're a psycho, you know that?" you say. "What kind of crazy person makes a girl come that much with just their tongue? I came so many times it <i>hurt</i>."</p>
 				"I like eating pussy," he shrugs. "I think it's fun."
-				<p>"You have a problem," you say, giving <<=$npcs.get($sex.npcId,'firstname')>> a sidelong glance, still feeling residual throbs pulsing through your clit.</p>
+				<p>"You have a problem," you say, giving <<npc $sex.npcId>><</npc>> a sidelong glance, still feeling residual throbs pulsing through your clit.</p>
 			<</if>>
 			<<gs 'sex_ev_pillow_talk' 'sex_talk'>>
 		<</actCLA>>
@@ -197,13 +197,13 @@
 			<<image "shared/sex/after/pillow_talk1.jpg">>
 			"I'm really sorry you didn''t get to come," you say. "My pussy just couldn''t take it anymore."
 			<<if $npcs.get($sex.npcId,'argumentative') > 0>>
-				<p>"You could have at least sucked me off," <<=$npcs.get($sex.npcId,'firstname')>> replies sourly.</p>
+				<p>"You could have at least sucked me off," <<npc $sex.npcId>><</npc>> replies sourly.</p>
 			<<elseif $npcs.get($sex.npcId,'arrogant') == 1>>
-				<p>"Some girls just can't handle how awesome my cock is," <<=$npcs.get($sex.npcId,'firstname')>> says with a smug shrug. "I'm used to it."</p>
+				<p>"Some girls just can't handle how awesome my cock is," <<npc $sex.npcId>><</npc>> says with a smug shrug. "I'm used to it."</p>
 			<<elseif $npcs.get($sex.npcId,'caretaker') == 1>>
-				<p>"It's okay," <<=$npcs.get($sex.npcId,'firstname')>> says, looking like he really means it. "I wouldn't want you to hurt yourself just for my sake."</p>
+				<p>"It's okay," <<npc $sex.npcId>><</npc>> says, looking like he really means it. "I wouldn't want you to hurt yourself just for my sake."</p>
 			<<else>>
-				<p>"It would have been nice..." <<=$npcs.get($sex.npcId,'firstname')>> admits, looking a little blue-balled.</p>
+				<p>"It would have been nice..." <<npc $sex.npcId>><</npc>> admits, looking a little blue-balled.</p>
 			<</if>>
 			<<gs 'sex_ev_pillow_talk' 'sex_talk'>>
 		<</actCLA>>
@@ -215,7 +215,7 @@
 			<<setinit $sex_ev['better_than_lover_talk'] = 1>>
 			<<run $npcs.set($sex.npcId,'know_have_boyfriend',1)>>
 			<<image "shared/sex/after/pillow_talk2.jpg">>
-			<p>"You're even better than my boyfriend," you tell <<=$npcs.get($sex.npcId,'firstname')>> with a satisfied smile.</p>
+			<p>"You're even better than my boyfriend," you tell <<npc $sex.npcId>><</npc>> with a satisfied smile.</p>
 			<<gs 'sex_ev_pillow_talk' 'sex_talk'>>
 		<</actCLA>>
 	<</if>>
@@ -227,20 +227,20 @@
 			<<image "shared/sex/after/pillow_talk1.jpg">>
 			You wince in discomfort as your pussy throbs between your legs, feeling very tender and more than a worn out.
 			<<actCLA 'I overdid it'>>
-				<p>"I think I might've overdone it," you say, rubbing your thighs together as you give <<=$npcs.get($sex.npcId,'firstname')>> a rueful look. "Pushed my pussy past its limits, fucking you as much as I did. Should've called it quits a lot sooner."</p>
+				<p>"I think I might've overdone it," you say, rubbing your thighs together as you give <<npc $sex.npcId>><</npc>> a rueful look. "Pushed my pussy past its limits, fucking you as much as I did. Should've called it quits a lot sooner."</p>
 				<<gs 'sex_ev_pillow_talk' 'sex_talk'>>
 			<</actCLA>>
 			<<actCLA 'We overdid it'>>
-				<p>"I think we overdid it," you say, rubbing your thighs together as you give <<=$npcs.get($sex.npcId,'firstname')>> a rueful look. "You might have fucked my pussy raw."</p>
+				<p>"I think we overdid it," you say, rubbing your thighs together as you give <<npc $sex.npcId>><</npc>> a rueful look. "You might have fucked my pussy raw."</p>
 				<<gs 'sex_ev_pillow_talk' 'sex_talk'>>
 			<</actCLA>>
 			<<actCLA 'Fucked me silly'>>
-				<p>"You really fucked me silly," you say, rubbing your thighs together as you give <<=$npcs.get($sex.npcId,'firstname')>> a rueful look. "I think I'm going to have trouble walking after this."</p>
+				<p>"You really fucked me silly," you say, rubbing your thighs together as you give <<npc $sex.npcId>><</npc>> a rueful look. "I think I'm going to have trouble walking after this."</p>
 				<<gs 'sex_ev_pillow_talk' 'sex_talk'>>
 			<</actCLA>>
 			<<if $npcs.get($sex.npcId,'dick_desc') == 'thick' or $npcs.get($sex.npcId,'dick_desc') == 'long' or $npcs.get($sex.npcId,'dick_desc') == 'huge' or $npcs.get($sex.npcId,'dick_desc') == 'enormous' or $npcs.get($sex.npcId,'dick_desc') == 'lengthy' or $npcs.get($sex.npcId,'dick_desc') == 'gigantic' or $npcs.get($sex.npcId,'dick_desc') == 'monster'>>
 				<<actCLA '$npcs.get('+$sex.npcId,'firstname')+''s cock is too big'>>
-					<p>"I think your cock is too big for me," you say, giving a rueful glance at <<=$npcs.get($sex.npcId,'firstname')>>'s enormous manhood as you rub your thighs together. "My pussy feels like it's been pounded by a sledgehammer."</p>
+					<p>"I think your cock is too big for me," you say, giving a rueful glance at <<npc $sex.npcId>><</npc>>'s enormous manhood as you rub your thighs together. "My pussy feels like it's been pounded by a sledgehammer."</p>
 					<<if $npcs.get($sex.npcId,'arrogant') == 1>>
 						<p>"It is pretty impressive, isn't it?" he replies smugly, giving his own cock an appreciative glance.</p>
 						<<actCLA 'Yeah it is'>>
@@ -259,7 +259,7 @@
 							<</actCLA>>
 						<</if>>
 					<<elseif $npcs.get($sex.npcId,'caretaker') == 1 or rand(1,2) == 1>>
-						<p>"Sorry," <<=$npcs.get($sex.npcId,'firstname')>> says with a guilty smile. "That's the one part of me I can't really control."</p>
+						<p>"Sorry," <<npc $sex.npcId>><</npc>> says with a guilty smile. "That's the one part of me I can't really control."</p>
 						<<actCLA 'Not his fault'>>
 							"I know," you reply. "It's not your fault. But it still does hurt a little."
 							You give him a small smile to let him know there''s no hard feelings.
@@ -271,7 +271,7 @@
 							<<gs 'sex_ev_pillow_talk' 'sex_talk'>>
 						<</actCLA>>
 					<<else>>
-						<p>"Hey, you're the one who wanted to fuck me," <<=$npcs.get($sex.npcId,'firstname')>> shrugs.</p>
+						<p>"Hey, you're the one who wanted to fuck me," <<npc $sex.npcId>><</npc>> shrugs.</p>
 						<<if $npcs.get($sex.npcId,'fuck_times') == 0>>
 							<<actCLA 'Didn`t know what I was getting into'>>
 								"That was before I knew what I was getting into," you respond wryly.
@@ -344,7 +344,7 @@
 				<<if $npcs.get($sex.npcId,'argumentative') > 0>>
 					<<gs 'sex_ev_pillow_talk' 'condom_buy_fight'>>
 				<<else>>
-					<p>"I'll put it on my shopping list," <<=$npcs.get($sex.npcId,'firstname')>> chuckles.</p>
+					<p>"I'll put it on my shopping list," <<npc $sex.npcId>><</npc>> chuckles.</p>
 					<<gs 'sex_ev_pillow_talk' 'sex_talk'>>
 				<</if>>
 			<<else>>
@@ -356,21 +356,21 @@
 						<<if $npcs.get($sex.npcId,'argumentative') > 0>>
 							<<gs 'sex_ev_pillow_talk' 'condom_buy_fight'>>
 						<<else>>
-							<p>"I'll put it on my shopping list," <<=$npcs.get($sex.npcId,'firstname')>> chuckles.</p>
+							<p>"I'll put it on my shopping list," <<npc $sex.npcId>><</npc>> chuckles.</p>
 							<<gs 'sex_ev_pillow_talk' 'sex_talk'>>
 						<</if>>
 					<</if>>
 				<<else>>
 					"You really need to buy more condoms," you sigh. "We shouldn''t be taking chances like this."
 					<<if $npcs.get($sex.npcId,'know_bc') == 1>>
-						<p>"Aren't you on birth control?" <<=$npcs.get($sex.npcId,'firstname')>> asks, bemused.</p>
+						<p>"Aren't you on birth control?" <<npc $sex.npcId>><</npc>> asks, bemused.</p>
 						"I just like being safe. Better to have multiple kinds of birth control in case one fails."
 						<<gs 'sex_ev_pillow_talk' 'sex_talk'>>
 					<<else>>
 						<<if $npcs.get($sex.npcId,'argumentative') > 0>>
 							<<gs 'sex_ev_pillow_talk' 'condom_buy_fight'>>
 						<<else>>
-							<p>"I'll put it on my shopping list," <<=$npcs.get($sex.npcId,'firstname')>> chuckles.</p>
+							<p>"I'll put it on my shopping list," <<npc $sex.npcId>><</npc>> chuckles.</p>
 							<<gs 'sex_ev_pillow_talk' 'sex_talk'>>
 						<</if>>
 					<</if>>
@@ -381,7 +381,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'condom_buy_fight'>>
 	<<run $npcs.dec($sex.npcId,'rel',1)>>
-	<p>"<i>You</i> could always buy more condoms," <<=$npcs.get($sex.npcId,'firstname')>> grumbles. "I don't see why it's all up to me to get the condoms!"</p>
+	<p>"<i>You</i> could always buy more condoms," <<npc $sex.npcId>><</npc>> grumbles. "I don't see why it's all up to me to get the condoms!"</p>
 	<<actCLA 'Don`t respond'>>
 		You stay silent, choosing to ignore his response and avoid a fight.
 		<<gs 'sex_ev_pillow_talk' 'sex_talk'>>
@@ -389,7 +389,7 @@
 	<<actCLA 'He`s got a point'>>
 		<<run $npcs.inc($sex.npcId,'rel',2)>>
 		<<setinit $pc_buy_condoms[$sex.npcId] = 1>>
-		<p>"I guess you've got a point," you say, giving <<=$npcs.get($sex.npcId,'firstname')>> a guilty smile. "I'll try to buy some for next time."</p>
+		<p>"I guess you've got a point," you say, giving <<npc $sex.npcId>><</npc>> a guilty smile. "I'll try to buy some for next time."</p>
 		<<gs 'sex_ev_pillow_talk' 'sex_talk'>>
 	<</actCLA>>
 	<<actCLA 'He`s the one with the dick (argue)'>>
@@ -410,7 +410,7 @@
 			<<setinit $pc_start_bc[$sex.npcId] = $time.daystart>>
 			You chew your lip for a moment, mulling it over. He's kind of right. It's a little unfair that he's the one paying for all your safe sex.
 			<p>"I guess..." you say slowly. "I could start the pill? Then we wouldn't have to worry about condoms or pregnancy."</p>
-			<p>You look at <<=$npcs.get($sex.npcId,'firstname')>>, a gentle smile on your face.</p>
+			<p>You look at <<npc $sex.npcId>><</npc>>, a gentle smile on your face.</p>
 			"That sounds... good," he says back.
 			<<gs 'sex_ev_pillow_talk' 'sex_talk'>>
 		<</actCLA>>
@@ -432,7 +432,7 @@
 		<<run $npcs.dec($sex.npcId,'rel',2)>>
 		<p>"Yeah, because <i>I'm</i> the one in danger of getting pregnant! If I have a kid, are you going to chip in then?" you shout at him.</p>
 		<<if $npcs.get($sex.npcId,'caretaker') == 1 and getvar("$npc_childfree") != 1>>
-			<p>"Of course I am!" <<=$npcs.get($sex.npcId,'firstname')>> yells back.</p>
+			<p>"Of course I am!" <<npc $sex.npcId>><</npc>> yells back.</p>
 			<<gs 'sex_ev_pillow_talk' 'condom_buy_apology'>>
 			<<actCLA 'I don`t believe you!'>>
 				<<run $npcs.dec($sex.npcId,'rel',2)>>
@@ -441,15 +441,15 @@
 				<<gs 'sex_ev_pillow_talk' 'angry_end'>>
 			<</actCLA>>
 		<<elseif getvar("$npc_childfree") == 1>>
-			<p>"No, because you're going to get an abortion if that shit happens!" <<=$npcs.get($sex.npcId,'firstname')>> growls. "I'm not taking care of a fucking kid!"</p>
+			<p>"No, because you're going to get an abortion if that shit happens!" <<npc $sex.npcId>><</npc>> growls. "I'm not taking care of a fucking kid!"</p>
 			<<gs 'sex_ev_pillow_talk' 'condom_buy_apology'>>
 			<<actCLA 'What the fuck did you just say?'>>
 				<<run $npcs.dec($sex.npcId,'rel',10)>>
 				<<run $npcs.set($sex.npcId,'big_fight',$time.daystart)>>
 				$sex_ev['bed_room']
-				<p>"What the fuck did you just say?" you say, gaping at <<=$npcs.get($sex.npcId,'firstname')>> in disbelief. "You did <i>not</i> just say that."</p>
+				<p>"What the fuck did you just say?" you say, gaping at <<npc $sex.npcId>><</npc>> in disbelief. "You did <i>not</i> just say that."</p>
 				"I sure did," he glares back. "There''s no way I'm having kids, especially unwanted ones. Because they're all unwanted."
-				<p>"It's my <i>fucking</i> body!" you scream at <<=$npcs.get($sex.npcId,'firstname')>>. "You don't get to make demands like that! You know what? I'm fucking leaving."</p>
+				<p>"It's my <i>fucking</i> body!" you scream at <<npc $sex.npcId>><</npc>>. "You don't get to make demands like that! You know what? I'm fucking leaving."</p>
 				You get up, grabbing your things in a huff.
 				<<actCLA 'Asshole!'>>
 					$sex_ev['bed_room']
@@ -488,18 +488,18 @@
 		<<run $npcs.inc($sex.npcId,'rel',4)>>
 		<<image "shared/sex/after/pillow_talk1.jpg">>
 		You open your mouth to respond but the argument dies in your throat.
-		<p>"I'm sorry," you say, looking regretfully at <<=$npcs.get($sex.npcId,'firstname')>>. "You're right. It's not fair that I'm making you spend money on something that's both our problem."</p>
+		<p>"I'm sorry," you say, looking regretfully at <<npc $sex.npcId>><</npc>>. "You're right. It's not fair that I'm making you spend money on something that's both our problem."</p>
 		<<actCLA 'You`ll buy some condoms'>>
 			<<setinit $pc_buy_condoms[$sex.npcId] = 1>>
 			<p>"I'll try to buy some condoms for next time. Does that sound fair?"</p>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> nods, accepting your apology.</p>
+			<p><<npc $sex.npcId>><</npc>> nods, accepting your apology.</p>
 			<<gs 'sex_ev_pillow_talk' 'sex_talk'>>
 		<</actCLA>>
 		<<if $finances.bank + $finances.cash <= 2000>>
 			<<actCLA 'I don`t have a lot of money'>>
 				<<setinit $pc_buy_condoms[$sex.npcId] = 1>>
 				<p>"It's just..." You sigh. "Money's really tight for me right now. As dumb as it sounds, I can't afford to buy condoms. So that's why I have to rely on you. Does that make sense?"</p>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> nods, maybe a little begrudgingly, but he seems understanding at least.</p>
+				<p><<npc $sex.npcId>><</npc>> nods, maybe a little begrudgingly, but he seems understanding at least.</p>
 				<<gs 'sex_ev_pillow_talk' 'sex_talk'>>
 			<</actCLA>>
 		<</if>>
@@ -513,9 +513,9 @@
 			<<setinit $sex_ev['better_without'] = 1>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
 			<<if getvar("$sex_ev['npc_insist_no_condom']") == 1 or getvar("$sex_ev['dont_need_condom']") == 1>>
-				<p>"By the way," you say, looking at <<=$npcs.get($sex.npcId,'firstname')>>. "You were right. It was better without the condom."</p>
+				<p>"By the way," you say, looking at <<npc $sex.npcId>><</npc>>. "You were right. It was better without the condom."</p>
 			<<else>>
-				<p>"By the way," you say, looking at <<=$npcs.get($sex.npcId,'firstname')>>. "It was nice without the condom."</p>
+				<p>"By the way," you say, looking at <<npc $sex.npcId>><</npc>>. "It was nice without the condom."</p>
 			<</if>>
 			<<if $npcs.get($sex.npcId,'childfree') == 1>>
 				<<gs 'sex_ev_talk' 'boy_accidental_creampie'>>
@@ -551,9 +551,9 @@
 					<<if getvar("$sex_ev['promise_no_creampie']") == 1 and getvar("$sex_ev['creampie_surprise']") == 1>>
 						"Sorry I... uhh... you know..." He seems embarrassed. "I promised I wouldn''t come inside you but I ended up doing it anyways."
 						<<if getvar("$cum_loc['vagina']") > 0>>
-							<p><<=$npcs.get($sex.npcId,'firstname')>> looks at your pussy still leaking his cum and blushes.</p>
+							<p><<npc $sex.npcId>><</npc>> looks at your pussy still leaking his cum and blushes.</p>
 						<<else>>
-							<p><<=$npcs.get($sex.npcId,'firstname')>> looks at your pussy and blushes.</p>
+							<p><<npc $sex.npcId>><</npc>> looks at your pussy and blushes.</p>
 						<</if>>
 					<<else>>
 						"Your pussy was amazing."
@@ -569,7 +569,7 @@
 							"Yeah," you nod. "So, no harm done."
 							<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 						<<else>>
-							<p>"Is it okay that I... you know...?" <<=$npcs.get($sex.npcId,'firstname')>> eyes your pussy, his cum still leaking from it.</p>
+							<p>"Is it okay that I... you know...?" <<npc $sex.npcId>><</npc>> eyes your pussy, his cum still leaking from it.</p>
 							<<gs 'sex_ev_pillow_talk' 'creampie_okay'>>
 						<</if>>
 					<<elseif $npcs.get($sex.npcId,'know_bc') == 1>>
@@ -626,21 +626,21 @@
 <</if>>
 <<if $location_var[$here][0] == 'wish_no_condoms2'>>
 	<<if $npcs.get($sex.npcId,'condom_conscious') > 0>>
-		<p>"Safety is important," <<=$npcs.get($sex.npcId,'firstname')>> replies sternly. "We don't want to be taking chances do we?"</p>
+		<p>"Safety is important," <<npc $sex.npcId>><</npc>> replies sternly. "We don't want to be taking chances do we?"</p>
 		<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 	<<elseif getvar("$sex_ev['no_condom']") == 1 and getvar("$sex_ev['want_creampie_talk']") == 0>>
 		<<if getvar("$sex_ev['creampie_count']") == 0>>
-			<p>"Hey, but we skipped it this time and it turned out alright, didn't it?" <<=$npcs.get($sex.npcId,'firstname')>> points out.</p>
+			<p>"Hey, but we skipped it this time and it turned out alright, didn't it?" <<npc $sex.npcId>><</npc>> points out.</p>
 			<<actCLA 'He`s right'>>
 				"That is true..." you say slowly.
-				<p>"Maybe we don't have to use them?" <<=$npcs.get($sex.npcId,'firstname')>> suggests. "Start going bareback?"</p>
+				<p>"Maybe we don't have to use them?" <<npc $sex.npcId>><</npc>> suggests. "Start going bareback?"</p>
 				<<gs 'sex_ev_talk' 'bareback_think'>>
 				<<gs 'sex_ev_talk' 'bareback_too_risky'>>
 				<<gs 'sex_ev_talk' 'bareback_agree'>>
 			<</actCLA>>
 			<<actCLA 'I guess'>>
 				"I guess so..." you say hesitantly.
-				<p>"Maybe we don't have to use them?" <<=$npcs.get($sex.npcId,'firstname')>> suggests. "Start going bareback?"</p>
+				<p>"Maybe we don't have to use them?" <<npc $sex.npcId>><</npc>> suggests. "Start going bareback?"</p>
 				<<gs 'sex_ev_talk' 'bareback_think'>>
 				<<gs 'sex_ev_talk' 'bareback_too_risky'>>
 				<<gs 'sex_ev_talk' 'bareback_agree'>>
@@ -659,7 +659,7 @@
 				<<elseif $npcs.get($sex.npcId,'know_bc_not_effective') == 1>>
 					"I can't wait until your birth control is ready," he says. "Then we can fuck without worry."
 				<<else>>
-					<p>"Guess you have a point there," <<=$npcs.get($sex.npcId,'firstname')>> says ruefully. "It can be hard to pull out sometimes."</p>
+					<p>"Guess you have a point there," <<npc $sex.npcId>><</npc>> says ruefully. "It can be hard to pull out sometimes."</p>
 				<</if>>
 				<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 			<</actCLA>>
@@ -667,22 +667,22 @@
 			<!-- !!{	if sex_ev['accidental_creampie_convo'] = 0:
 			gs'sex_ev_talk', 'boy_accidental_creampie'
 			elseif sex_ev['surprise_creampie_count'] > 0:
-			'"Sorry about that again," <<<<=$npcs.get($sex.npcId,'firstname')>>>> blushes.'
+			'"Sorry about that again," <<<<npc $sex.npcId>><</npc>>>> blushes.'
 			else
 			end} -->
 		<</if>>
 	<<elseif getvar("$sex_ev['npc_doesnt_want_condoms']") == 1>>
-		<p>"Hey, <i>I</i> said I didn't want to use them," <<=$npcs.get($sex.npcId,'firstname')>> says. "You're the one who insisted."</p>
+		<p>"Hey, <i>I</i> said I didn't want to use them," <<npc $sex.npcId>><</npc>> says. "You're the one who insisted."</p>
 		<<gs 'sex_ev_pillow_talk' 'wish_no_condoms_response_no_kids'>>
 	<<elseif $npcs.get($sex.npcId,'bareback') == 2>>
-		<p>"But you said it was a danger day, didn't you?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+		<p>"But you said it was a danger day, didn't you?" <<npc $sex.npcId>><</npc>> asks.</p>
 		"Yeah," you reply wistfully. "Had to be safe. But that doesn''t mean I have to like it."
 		<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 	<<elseif getvar("$sex_ev['pc_wants_condoms']") == 1>>
-		<p>"You're the one who asked to use them," <<=$npcs.get($sex.npcId,'firstname')>> points out.</p>
+		<p>"You're the one who asked to use them," <<npc $sex.npcId>><</npc>> points out.</p>
 		<<gs 'sex_ev_pillow_talk' 'wish_no_condoms_response_no_kids'>>
 	<<else>>
-		<p>"Tell me about it," <<=$npcs.get($sex.npcId,'firstname')>> sighs back. "At least you don't need to be the one to wrap it around your dick."</p>
+		<p>"Tell me about it," <<npc $sex.npcId>><</npc>> sighs back. "At least you don't need to be the one to wrap it around your dick."</p>
 		<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 	<</if>>
 <</if>>
@@ -729,7 +729,7 @@
 			<<setinit $sex_ev['bareback_pillowtalk'] = 1>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
 			<<if $npcs.get($sex.npcId,'bareback') > 0>>
-				<p>"I love not using condoms with you," you grin at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+				<p>"I love not using condoms with you," you grin at <<npc $sex.npcId>><</npc>>.</p>
 			<<else>>
 				"I love not using condoms," you sigh happily.
 			<</if>>
@@ -737,25 +737,25 @@
 			<<actCLA 'Feels good'>>
 				"Feels so much better bareback," you say with deep satisfaction. "There''s no better feeling than just raw, unprotected sex."
 				<<if $npcs.get($sex.npcId,'no_condoms') == 1>>
-					<p>"You got that right," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+					<p>"You got that right," <<npc $sex.npcId>><</npc>> says.</p>
 				<<elseif $npcs.get($sex.npcId,'bareback') == 2 and getvar("$sex_ev['danger_day']") != 1>>
-					<p>"Good thing today wasn't a danger day," <<=$npcs.get($sex.npcId,'firstname')>> smiles back at you.</p>
+					<p>"Good thing today wasn't a danger day," <<npc $sex.npcId>><</npc>> smiles back at you.</p>
 				<<else>>
-					<p>"Yeah, it's pretty good," <<=$npcs.get($sex.npcId,'firstname')>> agrees.</p>
+					<p>"Yeah, it's pretty good," <<npc $sex.npcId>><</npc>> agrees.</p>
 				<</if>>
 				<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 			<</actCLA>>
 			<<actCLA 'Feels natural'>>
 				<p>"Feels so much better bareback," you say with deep satisfaction. "Feels... natural. Just your cock in my pussy and nothing in-between. Using condoms feels so artificial."</p>
 				<<if $npcs.get($sex.npcId,'no_condoms') == 1>>
-					<p>"That's why I never use them," <<=$npcs.get($sex.npcId,'firstname')>> says smugly. "They're bad for the environment."</p>
+					<p>"That's why I never use them," <<npc $sex.npcId>><</npc>> says smugly. "They're bad for the environment."</p>
 				<<else>>
 					<<if $npcs.get($sex.npcId,'humor') == 1>>
 						"Well it <i>is</i> technically artificial," he chuckles to himself. "I don't think latex is a commonly occurring material in the wild."
 					<<elseif $npcs.get($sex.npcId,'bareback') == 2 and getvar("$sex_ev['danger_day']") != 1>>
-						<p>"Good thing today wasn't a danger day," <<=$npcs.get($sex.npcId,'firstname')>> smiles back at you.</p>
+						<p>"Good thing today wasn't a danger day," <<npc $sex.npcId>><</npc>> smiles back at you.</p>
 					<<else>>
-						<p>"Never thought of it that way," <<=$npcs.get($sex.npcId,'firstname')>> muses. "But I agree. It feels good."</p>
+						<p>"Never thought of it that way," <<npc $sex.npcId>><</npc>> muses. "But I agree. It feels good."</p>
 					<</if>>
 				<</if>>
 				<<gs 'sex_ev_pillow_talk' 'topic_route'>>
@@ -769,11 +769,11 @@
 					"They're not very sexy," you say with a twist of your mouth. "Like, it's just kind of weird to know when you're coming that there''s basically a balloon of cum getting filled up inside me. Not to mention the cleanup afterwards. It's all very awkward."
 				<</if>>
 				<<if $npcs.get($sex.npcId,'no_condoms') == 1>>
-					<p>"Yeah I hate condoms," <<=$npcs.get($sex.npcId,'firstname')>> says. "Glad you agree."</p>
+					<p>"Yeah I hate condoms," <<npc $sex.npcId>><</npc>> says. "Glad you agree."</p>
 				<<elseif $npcs.get($sex.npcId,'bareback') == 2 and getvar("$sex_ev['danger_day']") != 1>>
-					<p>"It <i>is</i> kind of awkward isn't it?" <<=$npcs.get($sex.npcId,'firstname')>> says, nodding along with your thoughts. "Good thing today wasn't a danger day."</p>
+					<p>"It <i>is</i> kind of awkward isn't it?" <<npc $sex.npcId>><</npc>> says, nodding along with your thoughts. "Good thing today wasn't a danger day."</p>
 				<<else>>
-					<p>"It <i>is</i> kind of awkward isn't it?" <<=$npcs.get($sex.npcId,'firstname')>> says, nodding along with your thoughts.</p>
+					<p>"It <i>is</i> kind of awkward isn't it?" <<npc $sex.npcId>><</npc>> says, nodding along with your thoughts.</p>
 				<</if>>
 				<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 			<</actCLA>>
@@ -868,18 +868,18 @@
 			<<actCLA '(Concerned)'>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				<<if getvar("$cum_loc['vagina']") > 0>>
-					<p>"We need to start being more careful about protection," you murmur, anxiously rubbing your belly as you feel <<=$npcs.get($sex.npcId,'firstname')>>'s cum continue to slowly seep from your pussy. "We've had a lot of risky creampies lately. I'm going to get knocked up at this rate."</p>
+					<p>"We need to start being more careful about protection," you murmur, anxiously rubbing your belly as you feel <<npc $sex.npcId>><</npc>>'s cum continue to slowly seep from your pussy. "We've had a lot of risky creampies lately. I'm going to get knocked up at this rate."</p>
 				<<else>>
-					<p>"We need to start being more careful about protection," you murmur, anxiously rubbing your belly, remembering the feeling of <<=$npcs.get($sex.npcId,'firstname')>>'s cum filling your pussy. "We've had a lot of risky creampies lately. I'm gonna get knocked up at this rate."</p>
+					<p>"We need to start being more careful about protection," you murmur, anxiously rubbing your belly, remembering the feeling of <<npc $sex.npcId>><</npc>>'s cum filling your pussy. "We've had a lot of risky creampies lately. I'm gonna get knocked up at this rate."</p>
 				<</if>>
 				<<if getvar("$sex_ev['broken_condom']") == 1>>
 					<<if $npcs.get($sex.npcId,'argumentative') == 1 or rand(1,3) == 1>>
-						<p>"Hey, it's not my fault the condom broke!" <<=$npcs.get($sex.npcId,'firstname')>> protests.</p>
+						<p>"Hey, it's not my fault the condom broke!" <<npc $sex.npcId>><</npc>> protests.</p>
 					<<else>>
 					<</if>>
 				<<elseif $npcs.get($sex.npcId,'bareback') > 0>>
 					<<if $npcs.get($sex.npcId,'no_condoms') != 1>>
-						<p>"Maybe you should start the pill," <<=$npcs.get($sex.npcId,'firstname')>> suggests.</p>
+						<p>"Maybe you should start the pill," <<npc $sex.npcId>><</npc>> suggests.</p>
 						<<gs 'sex_ev_pillow_talk' 'risky_creampie_care_bc'>>
 					<<else>>
 						<<if $npcs.get($sex.npcId,'condom_conscious') == 1>>
@@ -971,7 +971,7 @@
 					"It's fine. I'm on the pill," you reassure him.
 				<</if>>
 			<</if>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> seems to relax, relieved to find out you're on birth control.</p>
+			<p><<npc $sex.npcId>><</npc>> seems to relax, relieved to find out you're on birth control.</p>
 			<<gs 'sex_ev_stats' 'birth_control_know'>>
 			<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 		<</actCLA>>
@@ -979,13 +979,13 @@
 		<<actCLA 'I`m on birth control (lie)'>>
 			<<if $npcs.get($sex.npcId,'know_not_bc') == 1>>
 				"It's okay," you smile, telling a barefaced lie. "I'm on birth control."
-				<p><<=$npcs.get($sex.npcId,'firstname')>> seems to relax, relieved that you're not upset.</p>
+				<p><<npc $sex.npcId>><</npc>> seems to relax, relieved that you're not upset.</p>
 			<<else>>
 				"It's okay," you smile, telling a barefaced lie. "I'm on birth control."
-				<p><<=$npcs.get($sex.npcId,'firstname')>> seems to relax, relieved that you're not upset.</p>
+				<p><<npc $sex.npcId>><</npc>> seems to relax, relieved that you're not upset.</p>
 			<</if>>
 			<<actCLA '<i>It`ll be fine</i>'>>
-				<i>I'm not gonna get pregnant,</i> you think to yourself. <i>Why bother stressing <<<<=$npcs.get($sex.npcId,'firstname')>>>> out about it?</i>
+				<i>I'm not gonna get pregnant,</i> you think to yourself. <i>Why bother stressing <<<<npc $sex.npcId>><</npc>>>> out about it?</i>
 				<<gs 'sex_ev_stats' 'birth_control_know'>>
 				<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 			<</actCLA>>
@@ -1061,7 +1061,7 @@
 					<</if>>
 				<</if>>
 				<<if $npcs.get($sex.npcId,'bukakke_fetish') == 1>>
-					<p>"But you look so fucking hot like that," <<=$npcs.get($sex.npcId,'firstname')>> says, unabashedly leering at your cum-covered body. "Fuck, I want to walk you into the street looking like that."</p>
+					<p>"But you look so fucking hot like that," <<npc $sex.npcId>><</npc>> says, unabashedly leering at your cum-covered body. "Fuck, I want to walk you into the street looking like that."</p>
 					"You're disgusting," you say, grimacing at the slimy feeling that coats every part of you.
 				<<elseif $npcs.get($sex.npcId,'argumentative') == 1>>
 					"It's not my fault," he grumbles. "You're the one who made me come so many times."
@@ -1089,7 +1089,7 @@
 					<</if>>
 				<</if>>
 				<<if $npcs.get($sex.npcId,'bukakke_fetish') == 1>>
-					<p>"You look so fucking hot like that," <<=$npcs.get($sex.npcId,'firstname')>> says, unabashedly leering at your cum-covered body. "Fuck, I want to walk you into the street looking like that."</p>
+					<p>"You look so fucking hot like that," <<npc $sex.npcId>><</npc>> says, unabashedly leering at your cum-covered body. "Fuck, I want to walk you into the street looking like that."</p>
 					<<actCLA 'Too far'>>
 						"I get bedroom play, but that's an extreme I'm not gonna go to I think," you say, eyeballing him.
 						<<gs 'sex_ev_pillow_talk' 'topic_route'>>
@@ -1155,7 +1155,7 @@
 			<<setinit $sex_ev['creampie_pillow_talk'] = 1>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
 			<<if getvar("$cum_loc['vagina']") > 0>>
-				<p>"We made so many creampies," you murmur, shivering as you feel <<=$npcs.get($sex.npcId,'firstname')>>'s warm cum continue to ooze from your sex.</p>
+				<p>"We made so many creampies," you murmur, shivering as you feel <<npc $sex.npcId>><</npc>>'s warm cum continue to ooze from your sex.</p>
 			<<else>>
 				"We made so many creampies," you murmur, rubbing your legs together, missing the warmth that was filling you up before.
 			<</if>>
@@ -1166,7 +1166,7 @@
 					<<if getvar("$cum_loc['vagina']") > 0>>
 						"Coming inside you is the best," he says. "If I could, I''d fill you up with so much cum that you''d still be dripping next week."
 					<<else>>
-						<p>"I love coming inside you," <<=$npcs.get($sex.npcId,'firstname')>> says. "Shame you already cleaned it out. It'd be so hot if you went home with it still inside you."</p>
+						<p>"I love coming inside you," <<npc $sex.npcId>><</npc>> says. "Shame you already cleaned it out. It'd be so hot if you went home with it still inside you."</p>
 					<</if>>
 				<</if>>
 			<<else>>
@@ -1183,7 +1183,7 @@
 			<<setinit $sex_ev['creampie_pillow_talk'] = 1>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
 			<<if getvar("$cum_loc['vagina']") > 0>>
-				<p>"Did you have to come inside me so many times?" you ask, shivering as you feel <<=$npcs.get($sex.npcId,'firstname')>>'s warm cum continue to ooze from your sex.</p>
+				<p>"Did you have to come inside me so many times?" you ask, shivering as you feel <<npc $sex.npcId>><</npc>>'s warm cum continue to ooze from your sex.</p>
 			<<else>>
 				<p>"Did you have to come inside me so many times?" you ask in annoyance. "It took forever to clean out."</p>
 			<</if>>
@@ -1219,21 +1219,21 @@
 		<<actCLA 'You don`t need to ask to come inside'>>
 			<<gs 'sex_ev_pillow_talk' 'talk_time_add'>>
 			<<image "shared/sex/after/pillow_talk2.jpg">>
-			<p>"Y'know," you say, gently looking into <<=$npcs.get($sex.npcId,'firstname')>>'s eyes. "You don't need to ask to come inside me..."</p>
+			<p>"Y'know," you say, gently looking into <<npc $sex.npcId>><</npc>>'s eyes. "You don't need to ask to come inside me..."</p>
 			<<actCLA 'I don`t mind'>>
 				<<image "shared/sex/after/pillow_talk2.jpg">>
-				<p>"Y'know," you say, gently looking into <<=$npcs.get($sex.npcId,'firstname')>>'s eyes. "You don't need to ask to come inside me. I don't mind if you just come wherever you want."</p>
+				<p>"Y'know," you say, gently looking into <<npc $sex.npcId>><</npc>>'s eyes. "You don't need to ask to come inside me. I don't mind if you just come wherever you want."</p>
 				<<gs 'sex_ev_pillow_talk' 'free_creampies2'>>
 			<</actCLA>>
 			<<actCLA 'I love creampies'>>
 				<<image "shared/sex/after/pillow_talk2.jpg">>
-				<p>"Y'know," you say, gently looking into <<=$npcs.get($sex.npcId,'firstname')>>'s eyes. "You don't need to ask to come inside me. I really like it when you do. It feels good."</p>
+				<p>"Y'know," you say, gently looking into <<npc $sex.npcId>><</npc>>'s eyes. "You don't need to ask to come inside me. I really like it when you do. It feels good."</p>
 				<<gs 'sex_ev_pillow_talk' 'free_creampies2'>>
 			<</actCLA>>
 			<<if $pc_cum_pref_know[$sex.npcId] == 'creampie'>>
 				<<actCLA 'I know how much you like it'>>
 					<<image "shared/sex/after/pillow_talk2.jpg">>
-					<p>"Y'know," you say, gently looking into <<=$npcs.get($sex.npcId,'firstname')>>'s eyes. "You don't need to ask to come inside me. I know how much you like it. And I want you to feel good."</p>
+					<p>"Y'know," you say, gently looking into <<npc $sex.npcId>><</npc>>'s eyes. "You don't need to ask to come inside me. I know how much you like it. And I want you to feel good."</p>
 					<<gs 'sex_ev_pillow_talk' 'free_creampies2'>>
 				<</actCLA>>
 			<</if>>
@@ -1242,9 +1242,9 @@
 					<<run $npcs.set($sex.npcId,'free_creampies',1)>>
 					$sex_ev['temp_pic']
 					"You don't need to ask to come inside me y''know," you murmur. "As long as it's a safe day I don't mind."
-					<p>"Really?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+					<p>"Really?" <<npc $sex.npcId>><</npc>> asks.</p>
 					"Really," you reply with a gentle smile. "I'll let you know when it's safe. And then you can come inside me as much as you want."
-					<p><<=$npcs.get($sex.npcId,'firstname')>> is positively beaming back at you.</p>
+					<p><<npc $sex.npcId>><</npc>> is positively beaming back at you.</p>
 					<<gs 'sex_ev_talk' 'free_creampies_exit'>>
 				<</actCLA>>
 			<</if>>
@@ -1257,7 +1257,7 @@
 	<<if $npcs.get($sex.npcId,'abusive') == 1 and $npcs.get($sex.npcId,'childfree') != 1>>
 		<<run $npcs.set($sex.npcId,'free_creampies',2)>>
 		<<if $npcs.get($sex.npcId,'cum_pref') == 'creampie'>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> gives you a predatory grin, so full of desire that it makes you involuntarily swallow.</p>
+			<p><<npc $sex.npcId>><</npc>> gives you a predatory grin, so full of desire that it makes you involuntarily swallow.</p>
 			"Good to know..."
 		<<else>>
 			"Good to know," he smirks amusedly.
@@ -1266,7 +1266,7 @@
 	<<elseif ($npcs.get($sex.npcId,'selfish') == 1 or $npcs.get($sex.npcId,'know_bc') == 1) and $npcs.get($sex.npcId,'childfree') != 1>>
 		<<run $npcs.set($sex.npcId,'free_creampies',2)>>
 		<<if $npcs.get($sex.npcId,'cum_pref') == 'creampie'>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> gives you a look like he might just burst inside you again before giving you a delighted grin.</p>
+			<p><<npc $sex.npcId>><</npc>> gives you a look like he might just burst inside you again before giving you a delighted grin.</p>
 			"Next time, I'm gonna pump you full of so much cum, you're going to still be dripping next week," he says excitedly and you can't help but giggle at his boyish glee.
 		<<else>>
 			"Good to know," he smirks amusedly.
@@ -1274,19 +1274,19 @@
 		<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 	<<else>>
 		<<if $npcs.get($sex.npcId,'childfree') == 1 and $npcs.get($sex.npcId,'know_bc') != 1>>
-			<p>"Are you sure...?" <<=$npcs.get($sex.npcId,'firstname')>> asks hesitantly. "You're not worried you're going to get pregnant? I'm... I'm not really up for having kids..."</p>
+			<p>"Are you sure...?" <<npc $sex.npcId>><</npc>> asks hesitantly. "You're not worried you're going to get pregnant? I'm... I'm not really up for having kids..."</p>
 			<!-- !! add more options later-->
 		<<else>>
-			<p>"Is that really okay?" <<=$npcs.get($sex.npcId,'firstname')>> asks, wide-eyed.</p>
+			<p>"Is that really okay?" <<npc $sex.npcId>><</npc>> asks, wide-eyed.</p>
 		<</if>>
 		<<actCLA 'I`ll be fine'>>
 			<p>"I'll be fine," you insist, smiling gently. "What could go wrong?"</p>
 			<<if $npcs.get($sex.npcId,'childfree') == 1 or rand(1,4) == 1>>
 				<<run $npcs.set($sex.npcId,'free_creampies',-1)>>
-				<p>"I'm not comfortable with it," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head. "Maybe if you started birth control..."</p>
+				<p>"I'm not comfortable with it," <<npc $sex.npcId>><</npc>> says, shaking his head. "Maybe if you started birth control..."</p>
 			<<else>>
 				<<run $npcs.set($sex.npcId,'free_creampies',2)>>
-				<p>"Okay..." <<=$npcs.get($sex.npcId,'firstname')>> says hesitantly, but smiles back at you anyways.</p>
+				<p>"Okay..." <<npc $sex.npcId>><</npc>> says hesitantly, but smiles back at you anyways.</p>
 			<</if>>
 			<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 		<</actCLA>>
@@ -1294,15 +1294,15 @@
 			"It feels so good," you coo gently. "I <i>want</i> you to come inside me. I want you to fill me with your cum..."
 			<<if ($npcs.get($sex.npcId,'cum_pref') == 'creampie' and $npcs.get($sex.npcId,'childfree') == 1 and rand(npc_willpwr[$sex.npcId],100) <= pcs_persuas) or ($npcs.get($sex.npcId,'cum_pref') == 'creampie' and $npcs.get($sex.npcId,'childfree') != 1)>>
 				<<run $npcs.set($sex.npcId,'free_creampies',2)>>
-				<p>Desire wars with willpower within <<=$npcs.get($sex.npcId,'firstname')>>. You watch as he struggles back and forth until he leers at you with a hungry stare and you know which one won out.</p>
-				<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> says. "I won't ask anymore."</p>
+				<p>Desire wars with willpower within <<npc $sex.npcId>><</npc>>. You watch as he struggles back and forth until he leers at you with a hungry stare and you know which one won out.</p>
+				<p>"Okay." <<npc $sex.npcId>><</npc>> says. "I won't ask anymore."</p>
 			<<elseif $npcs.get($sex.npcId,'childfree') == 1>>
 				<<run $npcs.set($sex.npcId,'free_creampies',-1)>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> hesitates for a moment before shaking his head.</p>
+				<p><<npc $sex.npcId>><</npc>> hesitates for a moment before shaking his head.</p>
 				"I'm not comfortable with it," he says. "Maybe if you started birth control..."
 			<<else>>
 				<<run $npcs.set($sex.npcId,'free_creampies',2)>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> hesitates for a moment before nodding slowly.</p>
+				<p><<npc $sex.npcId>><</npc>> hesitates for a moment before nodding slowly.</p>
 				"Okay," he says, smiling. "I won''t ask anymore."
 			<</if>>
 			<<gs 'sex_ev_pillow_talk' 'topic_route'>>
@@ -1314,7 +1314,7 @@
 			<<else>>
 				"I'll let you know when it's a safe day," you smile gently. "And then you can come inside me as much as you want."
 			<</if>>
-			<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> smiles back, beaming at you.</p>
+			<p>"Okay." <<npc $sex.npcId>><</npc>> smiles back, beaming at you.</p>
 			<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 		<</actCLA>>
 		<<if getvar("$birth_control['think_safe']") == 1>>
@@ -1328,7 +1328,7 @@
 					<<gs 'sex_ev_stats' 'birth_control_know'>>
 					"I'm on birth control," you smile gently. "So you can come inside me as much as you want."
 				<</if>>
-				<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> smiles back, beaming at you.</p>
+				<p>"Okay." <<npc $sex.npcId>><</npc>> smiles back, beaming at you.</p>
 				<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 			<</actCLA>>
 		<<elseif getvar("$pillcon2") >= 20000>>
@@ -1342,7 +1342,7 @@
 					<<gs 'sex_ev_stats' 'birth_control_know'>>
 					"I'm on birth control," you smile gently. "So you can come inside me as much as you want."
 				<</if>>
-				<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> smiles back, beaming at you.</p>
+				<p>"Okay." <<npc $sex.npcId>><</npc>> smiles back, beaming at you.</p>
 				<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 			<</actCLA>>
 		<<else>>
@@ -1356,7 +1356,7 @@
 					<<gs 'sex_ev_stats' 'birth_control_know'>>
 					"I'm on birth control," you lie with a seductively gentle smile. "So you can come inside me as much as you want."
 				<</if>>
-				<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> smiles back, beaming at you.</p>
+				<p>"Okay." <<npc $sex.npcId>><</npc>> smiles back, beaming at you.</p>
 				<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 			<</actCLA>>
 		<</if>>
@@ -1371,7 +1371,7 @@
 				<<actCLA 'Be irritated'>>
 					<<image "shared/sex/after/pillow_talk3.jpg">>
 					"I can't believe you came inside me," you mutter in annoyance. "You made me break my rule."
-					<p>"You're the one who's cheating," <<=$npcs.get($sex.npcId,'firstname')>> grumbles. "Don't blame me."</p>
+					<p>"You're the one who's cheating," <<npc $sex.npcId>><</npc>> grumbles. "Don't blame me."</p>
 					<<if $npcs.get($sex.npcId,'boyfriend_creampie_rule') == 2>>
 						<p>"Well, I am <i>now</i>!" you snap. "That's why I told you not to come inside!"</p>
 					<<else>>
@@ -1383,10 +1383,10 @@
 			<<actCLA 'Regret'>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				"I guess my rule is broken," you say, twiddling your thumbs awkwardly. "You came inside me..."
-				<p>"So?" <<=$npcs.get($sex.npcId,'firstname')>> asks. "What does that mean?"</p>
+				<p>"So?" <<npc $sex.npcId>><</npc>> asks. "What does that mean?"</p>
 				<<actCLA 'One time thing'>>
 					<p>"It was a one time thing," you say, half to yourself, trying to rationalize. "It was just a mistake, it won't happen again. So it doesn't count!"</p>
-					<p>"Sure," <<=$npcs.get($sex.npcId,'firstname')>> shrugs. "Whatever you want to tell yourself..."</p>
+					<p>"Sure," <<npc $sex.npcId>><</npc>> shrugs. "Whatever you want to tell yourself..."</p>
 					<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 				<</actCLA>>
 				<<actCLA 'I guess I`m a cheater'>>
@@ -1399,14 +1399,14 @@
 			<<actCLA 'Unashamed'>>
 				<<run $npcs.set($sex.npcId,'boyfriend_creampie_rule',3)>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
-				<p>"I guess my rule is broken," you say, looking at <<=$npcs.get($sex.npcId,'firstname')>> wistfully. "You came inside me..."</p>
+				<p>"I guess my rule is broken," you say, looking at <<npc $sex.npcId>><</npc>> wistfully. "You came inside me..."</p>
 				<p>"So?" he asks. "What does that mean?"</p>
 				<<actCLA 'If it`s already broken...'>>
 					"If I already broke the rule," you smile. "Then there''s no need to hold back anymore. More creampies for me."
 					<<if $sex_ev['cum_count'] < $npcs.get($sex.npcId,'sexdrive')>>
 						<<actCLA 'Continue'>>
 							<<image "shared/sex/foreplay/miss3.jpg">>
-							<p>Hearing you say that, <<=$npcs.get($sex.npcId,'firstname')>> pounces on you, spreading your legs apart and resting his cock up against your pussy.</p>
+							<p>Hearing you say that, <<npc $sex.npcId>><</npc>> pounces on you, spreading your legs apart and resting his cock up against your pussy.</p>
 							<p>"No need to hold back, right?" he grins.</p>
 							<<actCLA 'Down boy'>>
 								<<image "shared/sex/after/pillow_talk1.jpg">>
@@ -1453,7 +1453,7 @@
 <!-- !! --------------------------------------- Boy Talk -------------------------------------------->
 <<if $location_var[$here][0] == 'high_five1'>>
 	<<gs 'sex_ev_pillow_talk' 'talk_time_add'>>
-	<p>"That was great," <<=$npcs.get($sex.npcId,'firstname')>> pants, grinning sideways at you.</p>
+	<p>"That was great," <<npc $sex.npcId>><</npc>> pants, grinning sideways at you.</p>
 	<<actCLA 'Yeah'>>
 		"Yeah," you pant back. "It was."
 		<<gs 'sex_ev_pillow_talk' 'high_five2'>>
@@ -1479,7 +1479,7 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'high_five2'>>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> holds up his hand up in the air, causing you to glance over at him.</p>
+	<p><<npc $sex.npcId>><</npc>> holds up his hand up in the air, causing you to glance over at him.</p>
 	"Come on," he says. "Don't leave me hanging."
 	<<actCLA 'Leave him hanging'>>
 		<<run $npcs.dec($sex.npcId,'rel',2)>>
@@ -1517,7 +1517,7 @@
 		<<actCLA 'Couldn`t sleep?'>>
 			<<setinit $sex_ev['couldnt_sleep_fuck'] = 1>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
-			<p>"So... couldn't sleep?" you ask <<=$npcs.get($sex.npcId,'firstname')>> amusedly.</p>
+			<p>"So... couldn't sleep?" you ask <<npc $sex.npcId>><</npc>> amusedly.</p>
 			<<if $sex_ev['cum_count'] >= $npcs.get($sex.npcId,'sexdrive')>>
 				"Hard to sleep with my cock snuggled up against your ass," he grins.
 				"Easy to get hard you mean," you snicker.
@@ -1571,9 +1571,9 @@
 		<<gs 'sex_ev_pillow_talk' 'talk_time_add'>>
 		<<image "shared/sex/after/pillow_talk1.jpg">>
 		<<if getvar("$cum_loc['vagina']") > 0>>
-			<p>"Are you going to be okay?" <<=$npcs.get($sex.npcId,'firstname')>> asks, looking worriedly at your pussy still leaking his cum. "You know, with the... broken condom and everything...?"</p>
+			<p>"Are you going to be okay?" <<npc $sex.npcId>><</npc>> asks, looking worriedly at your pussy still leaking his cum. "You know, with the... broken condom and everything...?"</p>
 		<<else>>
-			<p>"Are you going to be okay?" <<=$npcs.get($sex.npcId,'firstname')>> asks, looking worriedly at your pussy. "You know, with the... broken condom and everything...?"</p>
+			<p>"Are you going to be okay?" <<npc $sex.npcId>><</npc>> asks, looking worriedly at your pussy. "You know, with the... broken condom and everything...?"</p>
 		<</if>>
 		<<if getvar("$morning_after_pill") == 0>>
 			<<actCLA 'I`ll buy a morning after pill'>>
@@ -1591,7 +1591,7 @@
 			<<actCLA 'Take your morning after pill (shy)'>>
 				<<setinit $sex_ev['ma_pill'] = 2>>
 				"It's okay," you say. "In fact..."
-				<p><<=$npcs.get($sex.npcId,'firstname')>> watches you reach into your purse and pull out your morning after pill and you can't help but blush beneath his gaze.</p>
+				<p><<npc $sex.npcId>><</npc>> watches you reach into your purse and pull out your morning after pill and you can't help but blush beneath his gaze.</p>
 				<<if getvar("$LudaQW['free_condoms']") == 1 and $pc.sexStat('morning_after_pill') == 0>>
 					"My aunt gave me this for emergencies," you say shyly, blush intensifying as you put it in your mouth and force it down with a dry swallow.
 				<<else>>
@@ -1603,12 +1603,12 @@
 			<<actCLA 'Take your morning after pill (sexy)'>>
 				<<setinit $sex_ev['ma_pill'] = 2>>
 				"It's fine," you say, smiling mischievously. "In fact..."
-				<p>As <<=$npcs.get($sex.npcId,'firstname')>> watches you pull your morning after pill from your purse, you give him a smouldering look. Sticking out your tongue at him, you pop the pill onto your mouth, swallowing with a wide grin.</p>
+				<p>As <<npc $sex.npcId>><</npc>> watches you pull your morning after pill from your purse, you give him a smouldering look. Sticking out your tongue at him, you pop the pill onto your mouth, swallowing with a wide grin.</p>
 				<<if $sex_ev['last_cum'] == 'swallow'>>
 					"If only I thought to do this earlier," you grin. "Could''ve washed it down with your load."
 				<<elseif getvar("$LudaQW['free_condoms']") == 1 and $pc.sexStat('morning_after_pill') == 0>>
 					"My aunt gave me this," you grin.
-					<p>"She sounds like a good aunt," <<=$npcs.get($sex.npcId,'firstname')>> smirks back. "Or a slutty one."</p>
+					<p>"She sounds like a good aunt," <<npc $sex.npcId>><</npc>> smirks back. "Or a slutty one."</p>
 					"Kind of both actually," you say, causing both of you to laugh.
 				<<else>>
 					"I'm not ready to be a mom," you smirk.
@@ -1632,7 +1632,7 @@
 	<<if $pube_style['word'] == 'shaved'>>
 		<<if $npcs.get($sex.npcId,'like_pubestyle') == $pube_style['word']>>
 			<!-- !! this determines if you've already had this conversation before-->
-			<p>"I love how sexy your pussy is," <<=$npcs.get($sex.npcId,'firstname')>> says, admiringly running his fingers across the smooth skin of your pubic area.</p>
+			<p>"I love how sexy your pussy is," <<npc $sex.npcId>><</npc>> says, admiringly running his fingers across the smooth skin of your pubic area.</p>
 			<<gs 'sex_ev_pillow_talk' 'boy_likes_pubes2'>>
 		<<else>>
 			<p>"I see you keep it clean down there," he says, looking at your smooth-shaven pussy.</p>
@@ -1672,10 +1672,10 @@
 	<<elseif $pube_style['word'] == 'stubble'>>
 		<<if $npcs.get($sex.npcId,'like_pubestyle') == 'shaved'>>
 			<!-- !! this determines if you've already had this conversation before-->
-			<p>"You forget to shave today?" <<=$npcs.get($sex.npcId,'firstname')>> says eyeing your stubbly pussy.</p>
+			<p>"You forget to shave today?" <<npc $sex.npcId>><</npc>> says eyeing your stubbly pussy.</p>
 			<<gs 'sex_ev_pillow_talk' 'boy_likes_pubes2'>>
 		<<else>>
-			<p>"Looks like someone forgot to shave today," <<=$npcs.get($sex.npcId,'firstname')>> says eyeing your stubbly pussy.</p>
+			<p>"Looks like someone forgot to shave today," <<npc $sex.npcId>><</npc>> says eyeing your stubbly pussy.</p>
 			<<actCLA 'Forgot'>>
 				<<actCLA 'Shrug'>>
 					<p>"Yeah," you say with a shrug. "Happens sometimes. What of it?"</p>
@@ -1715,10 +1715,10 @@
 		<<if $npcs.get($sex.npcId,'like_pubestyle') == $pube_style['word']>>
 			<!-- !! ^^ this determines if you've already had this conversation before-->
 			<<if $npcs.get($sex.npcId,'know_pubeshape') == $pube_style['shape']>>
-				<p>"I still can't get over how sexy your bush is," <<=$npcs.get($sex.npcId,'firstname')>> says, looking admiringly at your neatly trimmed pussy hair.</p>
+				<p>"I still can't get over how sexy your bush is," <<npc $sex.npcId>><</npc>> says, looking admiringly at your neatly trimmed pussy hair.</p>
 				<<gs 'sex_ev_pillow_talk' 'boy_likes_pubes2'>>
 			<<else>>
-				<p>"Did you do something new down there?" <<=$npcs.get($sex.npcId,'firstname')>> asks, looking at your $pube_style['shape']-shaped pubic hair.</p>
+				<p>"Did you do something new down there?" <<npc $sex.npcId>><</npc>> asks, looking at your $pube_style['shape']-shaped pubic hair.</p>
 				<<gs 'sex_ev_pillow_talk' 'changed_pube_style'>>
 			<</if>>
 		<<else>>
@@ -1752,10 +1752,10 @@
 		<!-- !! find real number later-->
 		<<if $npcs.get($sex.npcId,'like_pubestyle') == $pube_style['word']>>
 			<!-- !! this determines if you've already had this conversation before-->
-			<p>"I still can't get over how sexy your bush is," <<=$npcs.get($sex.npcId,'firstname')>> says, looking admiringly at your furry pussy.</p>
+			<p>"I still can't get over how sexy your bush is," <<npc $sex.npcId>><</npc>> says, looking admiringly at your furry pussy.</p>
 			<<gs 'sex_ev_pillow_talk' 'boy_likes_pubes2'>>
 		<<else>>
-			<p>"So, you don't shave?" <<=$npcs.get($sex.npcId,'firstname')>> asks, looking at your furry pussy.</p>
+			<p>"So, you don't shave?" <<npc $sex.npcId>><</npc>> asks, looking at your furry pussy.</p>
 			<<actCLA 'I like it this way'>>
 				<<setinit $sex_ev['like_pubes'] = 1>>
 				<<actCLA 'It`s feels good'>>
@@ -1815,7 +1815,7 @@
 		<</if>>
 	<<elseif $pube_style['word'] == 'trimmed'>>
 		<<if $npcs.get($sex.npcId,'bush_pref') == 2>>
-			<p>"I think it's hot," <<=$npcs.get($sex.npcId,'firstname')>> grins. "I love it when a girl knows how to take care of her bush."</p>
+			<p>"I think it's hot," <<npc $sex.npcId>><</npc>> grins. "I love it when a girl knows how to take care of her bush."</p>
 			<<gs 'sex_ev_pillow_talk' 'boy_likes_trimmed'>>
 		<<elseif $npcs.get($sex.npcId,'bush_pref') == 3>>
 			<p>"Ever considered letting it grow out more?"</p>
@@ -1855,12 +1855,12 @@
 	<</actCLA>>
 	<<actCLA 'You think I should?'>>
 		<p>"You think I should?" you ask him, looking down and inspecting your pussy.</p>
-		<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> says. "I think you'd look super sexy without any hair down there. Just your bare beautiful pussy lips on display."</p>
+		<p>"Yeah," <<npc $sex.npcId>><</npc>> says. "I think you'd look super sexy without any hair down there. Just your bare beautiful pussy lips on display."</p>
 		<<gs 'sex_ev_pillow_talk' 'change_pubes_for_boy'>>
 	<</actCLA>>
 	<<actCLA 'You`d like that?'>>
 		<p>"You'd like it like that?" you ask, looking down and inspecting your pussy.</p>
-		<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> says. "I'd really love it if you went full clean shave. It'd be so hot."</p>
+		<p>"Yeah," <<npc $sex.npcId>><</npc>> says. "I'd really love it if you went full clean shave. It'd be so hot."</p>
 		<<gs 'sex_ev_pillow_talk' 'change_pubes_for_boy'>>
 	<</actCLA>>
 	<<gs 'sex_ev_pillow_talk' 'annoyed_shave'>>
@@ -1882,19 +1882,19 @@
 	<<actCLA 'You think I should?'>>
 		<<if $pc.pubesLength < 4>>
 			<p>"You think I should?" you ask him, looking down and inspecting your smooth pussy.</p>
-			<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> says. "I think you'd look super sexy if you had a bit of hair down there. Not a full bush or anything like that, but just a landing strip or something."</p>
+			<p>"Yeah," <<npc $sex.npcId>><</npc>> says. "I think you'd look super sexy if you had a bit of hair down there. Not a full bush or anything like that, but just a landing strip or something."</p>
 		<<elseif $pube_style['word'] == 'stubble'>>
 			<p>"You think I should?" you ask him, looking down and inspecting your stubbly pussy.</p>
-			<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> says. "I think you'd look super sexy if you had a bit of hair down there. Not a full bush or anything like that, but just a landing strip or something."</p>
+			<p>"Yeah," <<npc $sex.npcId>><</npc>> says. "I think you'd look super sexy if you had a bit of hair down there. Not a full bush or anything like that, but just a landing strip or something."</p>
 		<<else>>
 			<p>"You think I should?" you ask him, looking down and inspecting your bush.</p>
-			<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> says. "I think you'd look super sexy if you trimmed it back a little."</p>
+			<p>"Yeah," <<npc $sex.npcId>><</npc>> says. "I think you'd look super sexy if you trimmed it back a little."</p>
 		<</if>>
 		<<gs 'sex_ev_pillow_talk' 'change_pubes_for_boy'>>
 	<</actCLA>>
 	<<actCLA 'You`d like that?'>>
 		<p>"You'd like it like that?" you ask, looking down and inspecting your bush.</p>
-		<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> says. "I think you'd look super sexy if you trimmed it back a little. It'd be so hot."</p>
+		<p>"Yeah," <<npc $sex.npcId>><</npc>> says. "I think you'd look super sexy if you trimmed it back a little. It'd be so hot."</p>
 		<<gs 'sex_ev_pillow_talk' 'change_pubes_for_boy'>>
 	<</actCLA>>
 	<<gs 'sex_ev_pillow_talk' 'annoyed_shave'>>
@@ -1916,7 +1916,7 @@
 		<<else>>
 			<p>"You think I should?" you ask him, looking down and inspecting your pubic hair.</p>
 		<</if>>
-		<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> says. "I think you'd look super sexy with a full bush."</p>
+		<p>"Yeah," <<npc $sex.npcId>><</npc>> says. "I think you'd look super sexy with a full bush."</p>
 		<<gs 'sex_ev_pillow_talk' 'change_pubes_for_boy'>>
 	<</actCLA>>
 	<<actCLA 'You`d like that?'>>
@@ -1927,7 +1927,7 @@
 		<<else>>
 			<p>"You'd like it like that?" you ask him, looking down and inspecting your pubic hair.</p>
 		<</if>>
-		<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> says. "I'd love it if you went full bush."</p>
+		<p>"Yeah," <<npc $sex.npcId>><</npc>> says. "I'd love it if you went full bush."</p>
 		<<gs 'sex_ev_pillow_talk' 'change_pubes_for_boy'>>
 	<</actCLA>>
 	<<gs 'sex_ev_pillow_talk' 'annoyed_shave'>>
@@ -1941,26 +1941,26 @@
 	<</actCLA>>
 	<<actCLA 'Sure'>>
 		<<run $npcs.set($sex.npcId,'shave_promise',$time.daystart)>>
-		<p>"Sure," you smile at <<=$npcs.get($sex.npcId,'firstname')>>. "I could give it a try..."</p>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> grins back eagerly at you.</p>
+		<p>"Sure," you smile at <<npc $sex.npcId>><</npc>>. "I could give it a try..."</p>
+		<p><<npc $sex.npcId>><</npc>> grins back eagerly at you.</p>
 		<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 	<</actCLA>>
 	<<actCLA 'I guess I could'>>
 		<<run $npcs.set($sex.npcId,'shave_promise',$time.daystart)>>
 		"Well..." you say. "I guess I could give it a try..."
-		<p><<=$npcs.get($sex.npcId,'firstname')>> grins back eagerly at you.</p>
+		<p><<npc $sex.npcId>><</npc>> grins back eagerly at you.</p>
 		<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 	<</actCLA>>
 	<<actCLA 'For you (hesitant)'>>
 		<<run $npcs.set($sex.npcId,'shave_promise',$time.daystart)>>
 		<p>"Well..." you say. "I guess I could try it? For you."</p>
-		<p>You punctuate your promise with an affectionate smile, returned with an eager grin from <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+		<p>You punctuate your promise with an affectionate smile, returned with an eager grin from <<npc $sex.npcId>><</npc>>.</p>
 		<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 	<</actCLA>>
 	<<actCLA 'For you (affectionate)'>>
 		<<run $npcs.set($sex.npcId,'shave_promise',$time.daystart)>>
 		"If it will make you happy, then of course I'll do it."
-		<p>You smile affectionately at <<=$npcs.get($sex.npcId,'firstname')>>, who returns it with an eager grin.</p>
+		<p>You smile affectionately at <<npc $sex.npcId>><</npc>>, who returns it with an eager grin.</p>
 		<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 	<</actCLA>>
 <</if>>
@@ -1999,12 +1999,12 @@
 			"Well I'm glad I have your permission to shave the way I like it," you huff, acerbically rolling your eyes.
 			<<if $npcs.get($sex.npcId,'argumentative') == 1>>
 				<<run $npcs.dec($sex.npcId,'rel',2)>>
-				<p>"What the fuck is your problem?" <<=$npcs.get($sex.npcId,'firstname')>> growls. "I was trying to pay you a compliment!"</p>
+				<p>"What the fuck is your problem?" <<npc $sex.npcId>><</npc>> growls. "I was trying to pay you a compliment!"</p>
 				<<actCLA 'Apologize'>>
 					<<image "shared/sex/after/pillow_talk1.jpg">>
 					You immediately feel bad and look back at him with a guilty expression on your face.
 					"I'm sorry," you say. "I... I don't know why I snapped at you like that. You're right. I should be happy you think I'm sexy."
-					<p>You give him an apologetic smile and though <<=$npcs.get($sex.npcId,'firstname')>> still seems a little annoyed with you, he mostly calms down as well.</p>
+					<p>You give him an apologetic smile and though <<npc $sex.npcId>><</npc>> still seems a little annoyed with you, he mostly calms down as well.</p>
 					<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 				<</actCLA>>
 				<<actCLA 'I didn`t ask!'>>
@@ -2015,12 +2015,12 @@
 					<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 				<</actCLA>>
 			<<else>>
-				<p>"I didn't mean it like that," <<=$npcs.get($sex.npcId,'firstname')>> says, looking bemused. "I just wanted to let you know I think you're hot."</p>
+				<p>"I didn't mean it like that," <<npc $sex.npcId>><</npc>> says, looking bemused. "I just wanted to let you know I think you're hot."</p>
 				<<actCLA 'Apologize'>>
 					<<image "shared/sex/after/pillow_talk1.jpg">>
 					You immediately feel guilty and look back at him.
 					"I'm sorry," you say. "I... I don't know why I snapped at you like that. That was... uncalled for..."
-					<p>You give him an embarrassed smile and <<=$npcs.get($sex.npcId,'firstname')>> smiles back, letting you know he accepts your apology.</p>
+					<p>You give him an embarrassed smile and <<npc $sex.npcId>><</npc>> smiles back, letting you know he accepts your apology.</p>
 					<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 				<</actCLA>>
 				<<actCLA 'I didn't ask for a man's opinion!'>>
@@ -2096,10 +2096,10 @@
 <<if $location_var[$here][0] == 'pubes_problem'>>
 	<<actCLA 'Got a problem with that?'>>
 		<<if $pube_style['word'] == 'shaved'>>
-			<p>"Got a problem with my pussy?" you ask, giving <<=$npcs.get($sex.npcId,'firstname')>> a hard side-eye.</p>
+			<p>"Got a problem with my pussy?" you ask, giving <<npc $sex.npcId>><</npc>> a hard side-eye.</p>
 			<!-- !!			gs'sex_ev_pillow_talk', 'pubes_problem2'-->
 		<<elseif $pube_style['word'] == 'bush' or $pube_style['word'] == 'untrimmed'>>
-			<p>"Got a problem with my bush?" you ask, giving <<=$npcs.get($sex.npcId,'firstname')>> a hard side-eye.</p>
+			<p>"Got a problem with my bush?" you ask, giving <<npc $sex.npcId>><</npc>> a hard side-eye.</p>
 			<!-- !!{			if npc_bush_pref[$sex.npcId] = 1:
 			'"You''d look super sexy if you shaved it all off," he says.'
 			gs'sex_ev_pillow_talk', 'boy_asks_cleanshave'
@@ -2111,7 +2111,7 @@
 			gs'sex_ev_pillow_talk', 'boy_likes_pubes'
 			end} -->
 		<<else>>
-			<p>"Got a problem with my pubes?" you ask, giving <<=$npcs.get($sex.npcId,'firstname')>> a hard side-eye.</p>
+			<p>"Got a problem with my pubes?" you ask, giving <<npc $sex.npcId>><</npc>> a hard side-eye.</p>
 		<</if>>
 		<<gs 'sex_ev_pillow_talk' 'boy_pubes_response'>>
 	<</actCLA>>
@@ -2156,7 +2156,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'boy_no_kids'>>
 	<<if getvar("$sex_ev['no_kids']") == 1 and getvar("$npc_know_no_kids") == 1>>
-		<p>"So you don't want kids?" <<=$npcs.get($sex.npcId,'firstname')>> asks, looking over at you.</p>
+		<p>"So you don't want kids?" <<npc $sex.npcId>><</npc>> asks, looking over at you.</p>
 		<<actCLA 'Not right now'>>
 			<p>"Not right now," you shake your head. "Maybe one day, but I'm not ready to be a mother. What about you?"</p>
 			<<if $npcs.get($sex.npcId,'childfree') == 1>>
@@ -2189,7 +2189,7 @@
 				"I feel the same way," he says, nodding. "I never want to be a parent. That sounds awful."
 				<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 			<<else>>
-				<p>"Don't you think you'd get lonely?" <<=$npcs.get($sex.npcId,'firstname')>> asks. "Y'know, knowing that you wouldn't have anything to live for except yourself when you get old?"</p>
+				<p>"Don't you think you'd get lonely?" <<npc $sex.npcId>><</npc>> asks. "Y'know, knowing that you wouldn't have anything to live for except yourself when you get old?"</p>
 				<<actCLA 'I guess...'>>
 					<p>"I guess, maybe," you mumble. "I don't know. Why does everything have to be about procreation? Why can't I just live my life?"</p>
 					<<gs 'sex_ev_pillow_talk' 'topic_route'>>
@@ -2201,7 +2201,7 @@
 				<<actCLA 'Play it off'>>
 					<<image "shared/sex/after/pillow_talk1.jpg">>
 					"That's what I have guys like you for," you smirk. "To fuck me when I get lonely."
-					<p><<=$npcs.get($sex.npcId,'firstname')>> can tell you just sidestepped the question, but doesn't press the topic any further.</p>
+					<p><<npc $sex.npcId>><</npc>> can tell you just sidestepped the question, but doesn't press the topic any further.</p>
 					<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 				<</actCLA>>
 			<</if>>

+ 95 - 95
sugarcube/src/autogenerated/unsorted/sex_ev_pillow_talk2.tw

@@ -23,38 +23,38 @@
 				<<setinit $sex_ev['weather_pillow_talk'] = 1>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				"It's so hot today," you pant. "I'm sweating after that. And not just from the sex."
-				<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> nods. "I need a shower..."</p>
+				<p>"Yeah," <<npc $sex.npcId>><</npc>> nods. "I need a shower..."</p>
 				<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 			<</actCLA>>
 		<<elseif getvar("$weather.temperature") <= 10>>
 			<<actCLA 'It`s so cold'>>
 				<<setinit $sex_ev['weather_pillow_talk'] = 1>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
-				<p>"Brrr," you shiver, cuddling up closer against <<=$npcs.get($sex.npcId,'firstname')>>'s body. "It's so chilly today."</p>
-				<p>"You get cold easily?" <<=$npcs.get($sex.npcId,'firstname')>> asks, seemingly pleased by your naked body pressed up against his.</p>
+				<p>"Brrr," you shiver, cuddling up closer against <<npc $sex.npcId>><</npc>>'s body. "It's so chilly today."</p>
+				<p>"You get cold easily?" <<npc $sex.npcId>><</npc>> asks, seemingly pleased by your naked body pressed up against his.</p>
 				<<actCLA 'Not really'>>
 					<<setinit $pc_gets_chilly[$sex.npcId] = -1>>
 					"Not really," you shake your head. "I'm usually pretty tolerant of the cold. Must be the contrast from how warm I was during the sex."
 					<<actCLA 'Smile'>>
-						<p>You smile softly at <<=$npcs.get($sex.npcId,'firstname')>> who grins back confidently, wrapping his arm around you.</p>
+						<p>You smile softly at <<npc $sex.npcId>><</npc>> who grins back confidently, wrapping his arm around you.</p>
 						<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 					<</actCLA>>
 					<<actCLA 'Grin'>>
-						<p>You grin at <<=$npcs.get($sex.npcId,'firstname')>> who grins back just as wide as he wraps his arm around you.</p>
+						<p>You grin at <<npc $sex.npcId>><</npc>> who grins back just as wide as he wraps his arm around you.</p>
 						<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 					<</actCLA>>
 					<<actCLA 'Demure'>>
-						<p>You snuggle in closer to <<=$npcs.get($sex.npcId,'firstname')>> without further comment, letting the implication of your words speak for itself. You figure he got the message when he grins as he wraps his arm around you.</p>
+						<p>You snuggle in closer to <<npc $sex.npcId>><</npc>> without further comment, letting the implication of your words speak for itself. You figure he got the message when he grins as he wraps his arm around you.</p>
 						<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 					<</actCLA>>
 				<</actCLA>>
 				<<actCLA 'Sometimes'>>
-					<p>"Sometimes yes, sometimes no. I think I'm just like anybody else," you shrug, snuggling closer into <<=$npcs.get($sex.npcId,'firstname')>>'s warmth.</p>
+					<p>"Sometimes yes, sometimes no. I think I'm just like anybody else," you shrug, snuggling closer into <<npc $sex.npcId>><</npc>>'s warmth.</p>
 					<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 				<</actCLA>>
 				<<actCLA 'I`m always cold'>>
 					<<setinit $pc_gets_chilly[$sex.npcId] = 1>>
-					<p>"I'm always cold," you shiver, snuggling as far as you can into <<=$npcs.get($sex.npcId,'firstname')>>'s warmth. "I would wear a jacket in the summer."</p>
+					<p>"I'm always cold," you shiver, snuggling as far as you can into <<npc $sex.npcId>><</npc>>'s warmth. "I would wear a jacket in the summer."</p>
 					<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 				<</actCLA>>
 			<</actCLA>>
@@ -66,7 +66,7 @@
 		<<actCLA 'What do you like about my body?'>>
 			<<setinit $sex_ev['body_talk'] = 1>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
-			<p>"What do you find sexy about me?" you ask <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+			<p>"What do you find sexy about me?" you ask <<npc $sex.npcId>><</npc>>.</p>
 			<<if $npcs.get($sex.npcId,'fav_body_part') == 'tits'>>
 				<!-- !!			if npc_humor[$sex.npcId] = 2:-->
 				<!-- !!				'"Your tits," he grins, bending his head and popping your nipple into his mouth for a gentle suckle. "Definitely your tits."'-->
@@ -115,7 +115,7 @@
 				<</actCLA>>
 				<<actCLA 'Glad you think so'>>
 					<<image "shared/sex/after/pillow_talk2.jpg">>
-					<p>"Aww! Thanks," you smile fondly at <<=$npcs.get($sex.npcId,'firstname')>>. "Means a lot to me that you think so."</p>
+					<p>"Aww! Thanks," you smile fondly at <<npc $sex.npcId>><</npc>>. "Means a lot to me that you think so."</p>
 					"Boobs are great," he grins. "And your boobs are especially great because you let me fuck you."
 					<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 				<</actCLA>>
@@ -138,7 +138,7 @@
 				<</actCLA>>
 				<<actCLA 'Glad you think so'>>
 					<<image "shared/sex/after/pillow_talk2.jpg">>
-					<p>"Aww! Thanks," you smile fondly at <<=$npcs.get($sex.npcId,'firstname')>>. "Means a lot to me that you think so."</p>
+					<p>"Aww! Thanks," you smile fondly at <<npc $sex.npcId>><</npc>>. "Means a lot to me that you think so."</p>
 					"There''s something irresistible about a good ass," he grins, grabbing another handful of yours.
 					<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 				<</actCLA>>
@@ -162,24 +162,24 @@
 					<<arouse 'vaginal_finger' -5 `['no_orgasm_msg']`>>
 					<<image "shared/sex/after/pillow_talk2.jpg">>
 					<p>"You really think so?" you ask. "Not my boobs or my ass or-"</p>
-					<p>Your next words are interrupted by a gasp as <<=$npcs.get($sex.npcId,'firstname')>> drives a finger knuckle deep into your just-fucked pussy. Soft squelching sounds emanate from between your legs as he gently caresses your insides, forcing whimpers from your lips while he stares into your eyes.</p>
+					<p>Your next words are interrupted by a gasp as <<npc $sex.npcId>><</npc>> drives a finger knuckle deep into your just-fucked pussy. Soft squelching sounds emanate from between your legs as he gently caresses your insides, forcing whimpers from your lips while he stares into your eyes.</p>
 					"Yeah..." he says, giving a predatory smile as he draws his hand away trailing strands of your juices. "Your pussy is the best."
 					<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 				<</actCLA>>
 				<<actCLA 'Glad you think so'>>
 					<<image "shared/sex/after/pillow_talk2.jpg">>
 					<<if getvar("$sex_ev['fuck_count']") > 0 or $npcs.get($sex.npcId,'fuck_times') > 0>>
-						<p>"Glad you think so," you smile at <<=$npcs.get($sex.npcId,'firstname')>>. "I'd hate to find out you don't appreciate the pussy you're fucking."</p>
+						<p>"Glad you think so," you smile at <<npc $sex.npcId>><</npc>>. "I'd hate to find out you don't appreciate the pussy you're fucking."</p>
 					<<else>>
-						<p>"Glad you think so," you smile at <<=$npcs.get($sex.npcId,'firstname')>>. "Always nice to get compliments."</p>
+						<p>"Glad you think so," you smile at <<npc $sex.npcId>><</npc>>. "Always nice to get compliments."</p>
 					<</if>>
 					<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 				<</actCLA>>
 				<<actCLA 'I like it too'>>
 					<<if getvar("$sex_ev['fuck_count']") > 0 or $npcs.get($sex.npcId,'fuck_times') > 0>>
-						<p>"Me too," you grin at <<=$npcs.get($sex.npcId,'firstname')>>. "I like the way it lets me fuck you."</p>
+						<p>"Me too," you grin at <<npc $sex.npcId>><</npc>>. "I like the way it lets me fuck you."</p>
 					<<else>>
-						<p>"Me too," you grin at <<=$npcs.get($sex.npcId,'firstname')>>. "I've always thought my pussy was cute."</p>
+						<p>"Me too," you grin at <<npc $sex.npcId>><</npc>>. "I've always thought my pussy was cute."</p>
 					<</if>>
 					"Glad we're in agreement," he grins back.
 					<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
@@ -200,7 +200,7 @@
 							"You taste good," he says, licking his lips.
 						<<else>>
 							"That's not the <i>only</i> reason," he says. "There''s just something hot about them. But yours is especially hot when I'm fucking it."
-							<p><<=$npcs.get($sex.npcId,'firstname')>> grins shamelessly.</p>
+							<p><<npc $sex.npcId>><</npc>> grins shamelessly.</p>
 						<</if>>
 						<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 					<</actCLA>>
@@ -220,7 +220,7 @@
 							"But you were also really tight," he says, licking his lips. "Mmm... You taste good..."
 						<<else>>
 							"That's not the <i>only</i> reason," he says. "There''s just something hot about them. But yours is especially hot because I got to be your first."
-							<p><<=$npcs.get($sex.npcId,'firstname')>> grins shamelessly.</p>
+							<p><<npc $sex.npcId>><</npc>> grins shamelessly.</p>
 						<</if>>
 						<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 					<</actCLA>>
@@ -265,9 +265,9 @@
 			<<actCLA 'Annoyed'>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				<<if $npcs.get($sex.npcId,'last_sex') == $time.daystart>>
-					<p>"You made me late for school this morning," you grumble, eyeballing <<=$npcs.get($sex.npcId,'firstname')>>. "Again."</p>
+					<p>"You made me late for school this morning," you grumble, eyeballing <<npc $sex.npcId>><</npc>>. "Again."</p>
 				<<else>>
-					<p>"You made me late for school the last time I came over," you grumble, eyeballing  <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+					<p>"You made me late for school the last time I came over," you grumble, eyeballing  <<npc $sex.npcId>><</npc>>.</p>
 				<</if>>
 				<<gs 'sex_ev_pillow_talk2' 'made_me_late2'>>
 			<</actCLA>>
@@ -280,9 +280,9 @@
 			<<actCLA 'Annoyed'>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				<<if $npcs.get($sex.npcId,'last_sex') == $time.daystart>>
-					<p>"You made me late for school this morning," you grumble, eyeballing <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+					<p>"You made me late for school this morning," you grumble, eyeballing <<npc $sex.npcId>><</npc>>.</p>
 				<<else>>
-					<p>"You made me late for school the last time I came over," you grumble, eyeballing  <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+					<p>"You made me late for school the last time I came over," you grumble, eyeballing  <<npc $sex.npcId>><</npc>>.</p>
 				<</if>>
 				<<gs 'sex_ev_pillow_talk2' 'made_me_late2'>>
 			<</actCLA>>
@@ -307,7 +307,7 @@
 				<<else>>
 					<<if $npcs.get($sex.npcId,'end_free_time') >= $time.hour and $time.hour > 0>>
 						"I have to go to work after this," he says, checking the time. "Shit, I'm gonna be late. I gotta get going now."
-						<p><<=$npcs.get($sex.npcId,'firstname')>> hauls himself out of bed and you guess you should do the same.</p>
+						<p><<npc $sex.npcId>><</npc>> hauls himself out of bed and you guess you should do the same.</p>
 						<<setinit $sex_ev['npc_late'] = 1>>
 						<<gs 'sex_ev_after' 'after_sex2'>>
 					<<else>>
@@ -327,7 +327,7 @@
 			<<actCLA 'Doing anything else today?'>>
 				<<setinit $sex_ev['what_do_today'] = 1>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
-				<p>"So, what else have you done today? Besides me I mean," you smirk at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+				<p>"So, what else have you done today? Besides me I mean," you smirk at <<npc $sex.npcId>><</npc>>.</p>
 				<<gs 'sex_ev_pillow_talk2' 'day_events'>>
 			<</actCLA>>
 		<</if>>
@@ -429,20 +429,20 @@
 			<<elseif getvar("$sex_ev['club_after']") == 1>>
 				"Thinking about going clubbing later," you reply. "I wanna go dancing with your cum running down my thighs."
 			<</if>>
-			<p>You give <<=$npcs.get($sex.npcId,'firstname')>> a mischievous smirk, rubbing your legs together where his cum still leaks from your snatch.</p>
+			<p>You give <<npc $sex.npcId>><</npc>> a mischievous smirk, rubbing your legs together where his cum still leaks from your snatch.</p>
 			<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 		<</actCLA>>
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'day_events'>>
 	<<if $npcs.get($sex.npcId,'work_end') < $time.hour and $npcs.get($sex.npcId,'day_off') != $time.weekday>>
-		<p>"Just work," <<=$npcs.get($sex.npcId,'firstname')>> shrugs turning to look at you. "Getting together with you was my fun time today. What about you?"</p>
+		<p>"Just work," <<npc $sex.npcId>><</npc>> shrugs turning to look at you. "Getting together with you was my fun time today. What about you?"</p>
 		<<gs 'sex_ev_pillow_talk2' 'pc_day_events'>>
 		<<gs 'sex_ev_pillow_talk2' 'pc_plans_later'>>
 		<!-- !!		gs'sex_ev_work_talk1', 'job_talk'-->
 	<<else>>
 		<<if $npcs.get($sex.npcId,'girlfriend') == 1 and $npcs.get($sex.npcId,'fidelity') == 6 and rand(1,3) == 1>>
-			<p>"Went on a date with my girlfriend," <<=$npcs.get($sex.npcId,'firstname')>> responds casually.</p>
+			<p>"Went on a date with my girlfriend," <<npc $sex.npcId>><</npc>> responds casually.</p>
 			<<actCLA 'Uncomfortable'>>
 				"Oh. I see..." you murmur uncomfortably. You leave it at that, unsure of what else to say.
 				<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
@@ -486,7 +486,7 @@
 	<<if $pc.isSchoolStudent and getvar("$q.school.homeworkLeft") == 0 and getvar("$kanikuli") == 0>>
 		<<actCLA 'Homework'>>
 			"Just did my homework," you shrug. "Got the boring stuff out of the way so I could enjoy my fun without worry."
-			<p>You give <<=$npcs.get($sex.npcId,'firstname')>> an affectionate smile.</p>
+			<p>You give <<npc $sex.npcId>><</npc>> an affectionate smile.</p>
 			<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 		<</actCLA>>
 	<</if>>
@@ -555,7 +555,7 @@
 				<<if getvar("$AlbinaQW['StarletsShutDown']") == 0>>
 					<<actCLA 'Part of a dance troupe'>>
 						<<setinit $sex_ev['dance_type'] = 'starlet'>>
-						<p>"I'm part of a dance troupe in Pavlovsk. The Starlets, ever heard of us?" <<=$npcs.get($sex.npcId,'firstname')>> shakes his head. "Oh, well we do performances every few weeks. That's my practice later."</p>
+						<p>"I'm part of a dance troupe in Pavlovsk. The Starlets, ever heard of us?" <<npc $sex.npcId>><</npc>> shakes his head. "Oh, well we do performances every few weeks. That's my practice later."</p>
 						<p>"So you're saying there's a bunch of other sexy girls just like you who all dance together?" he grins. "Sounds hot."</p>
 						<<actCLA 'Keep talking'>>
 							 <<gs 'sex_ev_pillow_talk2' 'small_talk'>>
@@ -565,7 +565,7 @@
 				<<else>>
 					<<actCLA 'Used to be part of a dance troupe'>>
 						<<setinit $sex_ev['dance_type'] = 'starlet'>>
-						<p>"I used to dance as part of a troupe in Pavlovsk. The Starlets, ever heard of them?" <<=$npcs.get($sex.npcId,'firstname')>> shakes his head. "Oh, well we did performances every few weeks. But we had to shut down because of some stuff."</p>
+						<p>"I used to dance as part of a troupe in Pavlovsk. The Starlets, ever heard of them?" <<npc $sex.npcId>><</npc>> shakes his head. "Oh, well we did performances every few weeks. But we had to shut down because of some stuff."</p>
 						"Damn, I would have thought a bunch of sexy girls dancing would be impossible to get rid of," he grins. "I bet the customers rioted."
 						<<actCLA 'Keep talking'>>
 							 <<gs 'sex_ev_pillow_talk2' 'small_talk'>>
@@ -585,10 +585,10 @@
 			"Yeah... too bad..." you mumble.
 		<</if>>
 		<<if rand(1,2) == 1 and $npcs.get($sex.npcId,'seen_dance') == 1>>
-			<p>"Could you dance for me again?" <<=$npcs.get($sex.npcId,'firstname')>> asks. "It was really sexy the last time you showed me."</p>
+			<p>"Could you dance for me again?" <<npc $sex.npcId>><</npc>> asks. "It was really sexy the last time you showed me."</p>
 			<<actCLA 'Not right now'>>
 				<<image "shared/sex/after/pillow_talk2.jpg">>
-				<p>"Sorry, I can't right now. My legs are still a little wobbly," you say, giving <<=$npcs.get($sex.npcId,'firstname')>> a suggestive look as you rub your wet thighs together.</p>
+				<p>"Sorry, I can't right now. My legs are still a little wobbly," you say, giving <<npc $sex.npcId>><</npc>> a suggestive look as you rub your wet thighs together.</p>
 				<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 			<</actCLA>>
 			<<actCLA 'Dance for him'>>
@@ -608,42 +608,42 @@
 					<</if>>
 					<p>"Do you like it?" you ask with a twirl and a smile.</p>
 					<<if getvar("$sex_ev['sex_over']") == 1>>
-						<p><<=$npcs.get($sex.npcId,'firstname')>> just nods back, too busy enjoying the show.</p>
+						<p><<npc $sex.npcId>><</npc>> just nods back, too busy enjoying the show.</p>
 						<<gs 'sex_ev_pillow_talk2' 'show_dance_end'>>
 					<<else>>
-						<p>As you finish the twirl and come back around, <<=$npcs.get($sex.npcId,'firstname')>> already has his hands on you and is dragging you back into the bed.</p>
+						<p>As you finish the twirl and come back around, <<npc $sex.npcId>><</npc>> already has his hands on you and is dragging you back into the bed.</p>
 						<<gs 'sex_ev_pillow_talk2' 'show_dance_end2'>>
 					<</if>>
 				<</actCLA>>
 				<<actCLA 'A sexy one'>>
 					<<video "pc/activities/dancing/sexy_naked1.mp4">>
 					<<if getvar("$cum_loc['face']") > 0 and getvar("$cum_loc['vagina']") > 0>>
-						<p>You start swaying your hips, shaking your ass at <<=$npcs.get($sex.npcId,'firstname')>> with rolling, sensual movements, eye-fucking him as his cum drips down your face and legs.</p>
+						<p>You start swaying your hips, shaking your ass at <<npc $sex.npcId>><</npc>> with rolling, sensual movements, eye-fucking him as his cum drips down your face and legs.</p>
 					<<elseif getvar("$cum_loc['face']") > 0>>
-						<p>You start swaying your hips, shaking your ass at <<=$npcs.get($sex.npcId,'firstname')>> with rolling, sensual movements, eye-fucking him as his cum drips down your face.</p>
+						<p>You start swaying your hips, shaking your ass at <<npc $sex.npcId>><</npc>> with rolling, sensual movements, eye-fucking him as his cum drips down your face.</p>
 					<<elseif getvar("$cum_loc['vagina']") > 0>>
-						<p>You start swaying your hips, shaking your ass at <<=$npcs.get($sex.npcId,'firstname')>> with rolling, sensual movements, eye-fucking him as his cum drips down your legs.</p>
+						<p>You start swaying your hips, shaking your ass at <<npc $sex.npcId>><</npc>> with rolling, sensual movements, eye-fucking him as his cum drips down your legs.</p>
 					<<else>>
-						<p>You hop out of bed and start swaying your hips, shaking your ass at <<=$npcs.get($sex.npcId,'firstname')>> with rolling, sensual movements, not dissimilar to the movements you were making minutes ago when you were fucking him.</p>
+						<p>You hop out of bed and start swaying your hips, shaking your ass at <<npc $sex.npcId>><</npc>> with rolling, sensual movements, not dissimilar to the movements you were making minutes ago when you were fucking him.</p>
 					<</if>>
 					<p>"Happy now?" you ask with a husky voice.</p>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> just nods back, too busy enjoying the show.</p>
+					<p><<npc $sex.npcId>><</npc>> just nods back, too busy enjoying the show.</p>
 					<<gs 'sex_ev_pillow_talk2' 'show_dance_end'>>
 				<</actCLA>>
 				<<if getvar("$AlbinaQW['StarletsJoined']") > 0>>
 					<<actCLA 'A Starlets routine'>>
 						<<video "pc/activities/dancing/shuffle_naked1.mp4">>
 						<<if getvar("$cum_loc['face']") > 0 and getvar("$cum_loc['vagina']") > 0>>
-							<p>You grab your shoes from the hallway and come back, counting off time before jumping into an energetic Starlets routine, <<=$npcs.get($sex.npcId,'firstname')>>'s cum still painting your face and running down your legs.</p>
+							<p>You grab your shoes from the hallway and come back, counting off time before jumping into an energetic Starlets routine, <<npc $sex.npcId>><</npc>>'s cum still painting your face and running down your legs.</p>
 						<<elseif getvar("$cum_loc['face']") > 0>>
-							<p>You grab your shoes from the hallway and come back, counting off time before jumping into an energetic Starlets routine, <<=$npcs.get($sex.npcId,'firstname')>>'s cum still painting your face.</p>
+							<p>You grab your shoes from the hallway and come back, counting off time before jumping into an energetic Starlets routine, <<npc $sex.npcId>><</npc>>'s cum still painting your face.</p>
 						<<elseif getvar("$cum_loc['vagina']") > 0>>
-							<p>You grab your shoes from the hallway and come back, counting off time before jumping into an energetic Starlets routine, <<=$npcs.get($sex.npcId,'firstname')>>'s cum still running down your legs.</p>
+							<p>You grab your shoes from the hallway and come back, counting off time before jumping into an energetic Starlets routine, <<npc $sex.npcId>><</npc>>'s cum still running down your legs.</p>
 						<<else>>
 							You grab your shoes from the hallway and come back, counting off time before jumping into an energetic Starlets routine.
 						<</if>>
 						<p>"Happy now?" you ask with a twirl and a smile.</p>
-						<p><<=$npcs.get($sex.npcId,'firstname')>> just nods back, too busy enjoying the show.</p>
+						<p><<npc $sex.npcId>><</npc>> just nods back, too busy enjoying the show.</p>
 						<<gs 'sex_ev_pillow_talk2' 'show_dance_end'>>
 					<</actCLA>>
 				<</if>>
@@ -682,18 +682,18 @@
 		You hop out of bed and grab your shoes from where you tossed them, tugging each one on before moving to a clear space in the room.
 		<<actCLA 'Shuffle'>>
 			<<video "pc/activities/dancing/shuffle_naked1.mp4">>
-			<p>Picking a favorite song of yours in your head, you skip your way into the middle of <<=$npcs.get($sex.npcId,'firstname')>>'s floor and show him how you shuffle. With every step, your ass cheeks jiggle and your breasts bounce wildly, and the silliness of it spreads an uncontrollable grin across your lips.</p>
+			<p>Picking a favorite song of yours in your head, you skip your way into the middle of <<npc $sex.npcId>><</npc>>'s floor and show him how you shuffle. With every step, your ass cheeks jiggle and your breasts bounce wildly, and the silliness of it spreads an uncontrollable grin across your lips.</p>
 			<<if getvar("$cum_loc['face']") > 0 and getvar("$cum_loc['vagina']") > 0>>
-				<p>You're sure you must be quite a sight, shuffling naked in the middle of <<=$npcs.get($sex.npcId,'firstname')>>'s apartment, his cum all over your face and running down your legs.</p>
+				<p>You're sure you must be quite a sight, shuffling naked in the middle of <<npc $sex.npcId>><</npc>>'s apartment, his cum all over your face and running down your legs.</p>
 			<<elseif getvar("$cum_loc['face']") > 0>>
-				<p>You're sure you must be quite a sight, shuffling naked in the middle of <<=$npcs.get($sex.npcId,'firstname')>>'s apartment, his cum all over your face.</p>
+				<p>You're sure you must be quite a sight, shuffling naked in the middle of <<npc $sex.npcId>><</npc>>'s apartment, his cum all over your face.</p>
 			<<elseif getvar("$cum_loc['vagina']") > 0>>
-				<p>You're sure you must be quite a sight, shuffling naked in the middle of <<=$npcs.get($sex.npcId,'firstname')>>'s apartment, his cum dripping from your snatch and running down your legs.</p>
+				<p>You're sure you must be quite a sight, shuffling naked in the middle of <<npc $sex.npcId>><</npc>>'s apartment, his cum dripping from your snatch and running down your legs.</p>
 			<<else>>
-				<p>You're sure you must be quite a sight, shuffling in the middle of <<=$npcs.get($sex.npcId,'firstname')>>'s apartment with nothing covering you but your sneakers.</p>
+				<p>You're sure you must be quite a sight, shuffling in the middle of <<npc $sex.npcId>><</npc>>'s apartment with nothing covering you but your sneakers.</p>
 			<</if>>
 			<p>"Pretty good, right?" you say with a twirl, still grinning and still dancing.</p>
-			<p>"Oh yeah. <i>Really</i> good," <<=$npcs.get($sex.npcId,'firstname')>> replies. Though the look on his face says he's not really talking about your dance moves.</p>
+			<p>"Oh yeah. <i>Really</i> good," <<npc $sex.npcId>><</npc>> replies. Though the look on his face says he's not really talking about your dance moves.</p>
 			<<gs 'sex_ev_pillow_talk2' 'show_dance_end'>>
 		<</actCLA>>
 	<</actCLA>>
@@ -701,10 +701,10 @@
 <<if $location_var[$here][0] == 'show_sexy'>>
 	<<actCLA 'Dance sexily'>>
 		<<video "pc/activities/dancing/sexy_naked1.mp4">>
-		<p>You hop out of bed and start swaying your hips, shaking your ass at <<=$npcs.get($sex.npcId,'firstname')>> with rolling, sensual movements, not dissimilar to the movements you were making minutes ago when you were fucking him.</p>
+		<p>You hop out of bed and start swaying your hips, shaking your ass at <<npc $sex.npcId>><</npc>> with rolling, sensual movements, not dissimilar to the movements you were making minutes ago when you were fucking him.</p>
 		<p>"Pretty hot, right?"</p>
 		"Yeah..."
-		<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't say anything more. He's too busy drooling as until you finish dancing.</p>
+		<p><<npc $sex.npcId>><</npc>> doesn't say anything more. He's too busy drooling as until you finish dancing.</p>
 		<<gs 'sex_ev_pillow_talk2' 'show_dance_end'>>
 	<</actCLA>>
 <</if>>
@@ -715,19 +715,19 @@
 			<p>"Okay! Let me just put my shoes on. It's kind of hard to do this with bare feet."</p>
 			You hop out of bed and grab your shoes from where you tossed them, tugging each one on before moving to a clear space in the room.
 			<<if getvar("$AlbinaQW['StarletsShutDown']") == 0>>
-				<p>"Ready?" you ask and <<=$npcs.get($sex.npcId,'firstname')>> nods. "This is one of our routines our troupe uses for performances."</p>
+				<p>"Ready?" you ask and <<npc $sex.npcId>><</npc>> nods. "This is one of our routines our troupe uses for performances."</p>
 			<<else>>
-				<p>"Ready?" you ask and <<=$npcs.get($sex.npcId,'firstname')>> nods. "This is one of the dances my old troupe used to do."</p>
+				<p>"Ready?" you ask and <<npc $sex.npcId>><</npc>> nods. "This is one of the dances my old troupe used to do."</p>
 			<</if>>
 			<<actCLA 'Dance for him'>>
 				<<video "pc/activities/dancing/modern_naked1.mp4">>
 				Without further ado, you count off a time in your head and jump into the routine that Albina devised for the Starlets. It feels different, going through the movements in nothing but your sneakers as opposed to wearing tight spandex. Makes you wonder if Albina devised it at home naked.
-				<p>The look on <<=$npcs.get($sex.npcId,'firstname')>>'s face as you dance almost makes you burst into giggles but you somehow manage to contain it to a wide grin instead.</p>
+				<p>The look on <<npc $sex.npcId>><</npc>>'s face as you dance almost makes you burst into giggles but you somehow manage to contain it to a wide grin instead.</p>
 				<<actCLA 'Continue'>>
 					$sex_ev['bed_room']
 					You end the routine, sticking the final pose and breathing hard.
 					<p>"So?" you pant. "What did you think?"</p>
-					<p>"I think that was the sexiest dance I've ever seen," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+					<p>"I think that was the sexiest dance I've ever seen," <<npc $sex.npcId>><</npc>> grins.</p>
 					<<actCLA 'Glad you enjoyed it'>>
 						"I'm glad you enjoyed it," you smile back, finally managing to catch your breath as you stand up straight.
 						<<gs 'sex_ev_pillow_talk2' 'show_dance_end'>>
@@ -745,27 +745,27 @@
 	<<actCLA 'Back into bed'>>
 		<<image "shared/sex/after/pillow_talk1.jpg">>
 		<<if $sex_ev['dance_type'] == 'modern' or $sex_ev['dance_type'] == 'starlet'>>
-			<p>Your little performance finished, you kick off your shoes and snuggle back into the bed with <<=$npcs.get($sex.npcId,'firstname')>>, picking up your pillow talk from where you left off.</p>
+			<p>Your little performance finished, you kick off your shoes and snuggle back into the bed with <<npc $sex.npcId>><</npc>>, picking up your pillow talk from where you left off.</p>
 		<<else>>
-			<p>Your little performance finished, you snuggle back into the bed with <<=$npcs.get($sex.npcId,'firstname')>>, picking up your pillow talk from where you left off.</p>
+			<p>Your little performance finished, you snuggle back into the bed with <<npc $sex.npcId>><</npc>>, picking up your pillow talk from where you left off.</p>
 		<</if>>
 		<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 	<</actCLA>>
 	<<actCLA 'Do something else'>>
 		$sex_ev['bed_room']
-		<p>Since you've already gotten out of <<=$npcs.get($sex.npcId,'firstname')>>'s bed, you figure you ought to do something other than crawl back in.</p>
+		<p>Since you've already gotten out of <<npc $sex.npcId>><</npc>>'s bed, you figure you ought to do something other than crawl back in.</p>
 		<<gs 'sex_ev_after' 'after_sex2'>>
 	<</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'show_dance_end2'>>
 	<<actCLA 'Giggle'>>
 		$sex_ev['bed_room']
-		<p>You giggle as <<=$npcs.get($sex.npcId,'firstname')>> pulls you down, kicking off your shoes along the way as you let him pull you back into sexy times.</p>
+		<p>You giggle as <<npc $sex.npcId>><</npc>> pulls you down, kicking off your shoes along the way as you let him pull you back into sexy times.</p>
 		<<gs 'sex_ev_pillow_talk2' 'show_dance_end3'>>
 	<</actCLA>>
 	<<actCLA 'Shoes!'>>
 		$sex_ev['bed_room']
-		<p>"Wait! Shoes on the bed! Shoes on the bed!" you yelp, nearly losing your balance frantically kicking off your shoes as <<=$npcs.get($sex.npcId,'firstname')>> pulls you down back into sexy times.</p>
+		<p>"Wait! Shoes on the bed! Shoes on the bed!" you yelp, nearly losing your balance frantically kicking off your shoes as <<npc $sex.npcId>><</npc>> pulls you down back into sexy times.</p>
 		<<gs 'sex_ev_pillow_talk2' 'show_dance_end3'>>
 	<</actCLA>>
 <</if>>
@@ -776,7 +776,7 @@
 			<<setinit $sex_ev['position'] = 'miss'>>
 			<!-- !! missionary-->
 			<<image "shared/sex/foreplay/miss3.jpg">>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> forces your legs open and lines his cock up with your pussy.</p>
+			<p><<npc $sex.npcId>><</npc>> forces your legs open and lines his cock up with your pussy.</p>
 			<<if $pc.thinksIsVirgin and getvar("$sex_ev['fuck_count']") == 0>>
 				<<actCLA 'Stop him (virgin)'>>
 					<<gt 'sex_ev_virgin' 'lover_wait'>>
@@ -792,17 +792,17 @@
 		<<elseif getvar("$sex_ev['position_rand']") == 2 or $npcs.get($sex.npcId,'fav_pos') == 'doggy'>>
 			<!-- !! doggy-->
 			<<image "shared/sex/foreplay/doggy1.jpg">>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> flips you onto your stomach, pulls you up by the hips, and lines his cock up with your pussy.</p>
+			<p><<npc $sex.npcId>><</npc>> flips you onto your stomach, pulls you up by the hips, and lines his cock up with your pussy.</p>
 			<<actCLA 'Get fucked'>>
 				<<gs 'sex_ev_doggy' 'doggy_goto'>>
 			<</actCLA>>
 		<<elseif getvar("$sex_ev['position_rand']") == 3>>
 			<!-- !! blowjob-->
-			<p><<=$npcs.get($sex.npcId,'firstname')>> positions your head between his legs, pushing his manhood towards your face.</p>
+			<p><<npc $sex.npcId>><</npc>> positions your head between his legs, pushing his manhood towards your face.</p>
 			<<gs 'sex_ev_foreplay' 'bj_ask2'>>
 		<<elseif getvar("$sex_ev['position_rand']") == 4 and (getvar("$cum_loc['vagina']") == 0 or $npcs.get($sex.npcId,'pussyeater') == 1)>>
 			<<arouse 'foreplay' -5 `['no_orgasm_msg']`>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> throws you on your back and starts lightly kissing your stomach, sending shivers across your skin, as each kiss goes lower than the last, slowly heading down to your pussy.</p>
+			<p><<npc $sex.npcId>><</npc>> throws you on your back and starts lightly kissing your stomach, sending shivers across your skin, as each kiss goes lower than the last, slowly heading down to your pussy.</p>
 			<<gs 'sex_ev_foreplay' 'kuni_start'>>
 		<<else>>
 			<<gs 'sex_ev_foreplay' 'nipple_play'>>
@@ -823,23 +823,23 @@
 		<<setinit $sex_ev['dick_play'] = 1>>
 		<<if $npcs.get($sex.npcId,'dick_play') == 0>>
 			<<if $sex_ev['cum_count'] >= $npcs.get($sex.npcId,'sexdrive') + $sex_ev['extra_cum']>>
-				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it between your fingers.</p>
+				<p>You reach over to <<npc $sex.npcId>><</npc>>, gently taking hold of his cock in your hand, squeezing and playing with it between your fingers.</p>
 				"If you're trying to get me hard, I don't think I can go again," he chuckles.
 			<<elseif $sex_ev['cum_count'] < $npcs.get($sex.npcId,'sexdrive') / 2>>
-				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches under your touch, still rock hard in your grasp.</p>
+				<p>You reach over to <<npc $sex.npcId>><</npc>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches under your touch, still rock hard in your grasp.</p>
 				<p>"You trying to get me hard again?" he snickers.</p>
 			<<else>>
-				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches under your touch, still quite stiff in your grasp.</p>
+				<p>You reach over to <<npc $sex.npcId>><</npc>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches under your touch, still quite stiff in your grasp.</p>
 				<p>"You want to go again?" he grins.</p>
 			<</if>>
 			"That's not what I'm doing," you say, affectionately rolling your eyes. "I'm just... playing with it."
 		<<else>>
 			<<if $sex_ev['cum_count'] >= $npcs.get($sex.npcId,'sexdrive') + $sex_ev['extra_cum']>>
-				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his flaccid cock in your hand, squeezing and playing with it between your fingers.</p>
+				<p>You reach over to <<npc $sex.npcId>><</npc>>, gently taking hold of his flaccid cock in your hand, squeezing and playing with it between your fingers.</p>
 			<<elseif $sex_ev['cum_count'] < $npcs.get($sex.npcId,'sexdrive') / 2>>
-				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches under your touch, still rock hard in your grasp.</p>
+				<p>You reach over to <<npc $sex.npcId>><</npc>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches under your touch, still rock hard in your grasp.</p>
 			<<else>>
-				<p>You reach over to <<=$npcs.get($sex.npcId,'firstname')>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches under your touch, still quite stiff in your grasp.</p>
+				<p>You reach over to <<npc $sex.npcId>><</npc>>, gently taking hold of his cock in your hand, squeezing and playing with it. It twitches under your touch, still quite stiff in your grasp.</p>
 			<</if>>
 			<p>"Amusing yourself with my dick again?"</p>
 			"Yeah," you grin back shamelessly.
@@ -862,9 +862,9 @@
 		<<actCLA 'What`s it like having a dick?'>>
 			<<gs 'sex_ev_pillow_talk2' 'dick_grab_image'>>
 			<<if $sex_ev['cum_count'] >= $npcs.get($sex.npcId,'sexdrive') + $sex_ev['extra_cum']>>
-				<p>"What's it like having a dick?" you ask, giving <<=$npcs.get($sex.npcId,'firstname')>>'s floppy meat a funny look as you fondle it.</p>
+				<p>"What's it like having a dick?" you ask, giving <<npc $sex.npcId>><</npc>>'s floppy meat a funny look as you fondle it.</p>
 			<<else>>
-				<p>"What's it like having a dick?" you ask, giving <<=$npcs.get($sex.npcId,'firstname')>>'s stiff meat a funny look as you jerk it experimentally.</p>
+				<p>"What's it like having a dick?" you ask, giving <<npc $sex.npcId>><</npc>>'s stiff meat a funny look as you jerk it experimentally.</p>
 			<</if>>
 			<<if $npcs.get($sex.npcId,'humor') == 1>>
 				<p>"What's it like having a pussy?" he shrugs. "I don't know, it's just a dick. I have one. I don't know how to explain that."</p>
@@ -878,7 +878,7 @@
 				"Random erections can be... awkward..."
 				<p>"Random?" you ask confusedly. "What do you mean?"</p>
 				"It's like it has a mind of its own," he chuckles. "Gets hard for no reason at all."
-				<p>"That's cause all guys want is sex," you giggle but <<=$npcs.get($sex.npcId,'firstname')>> shakes his head.</p>
+				<p>"That's cause all guys want is sex," you giggle but <<npc $sex.npcId>><</npc>> shakes his head.</p>
 				<p>"No," he says. "Even when I'm not horny. Sometimes I'll just be watching TV or going to the store and suddenly, bam-! I'm hard. Gotta figure out how to stuff it down there without everybody thinking I'm a pervert."</p>
 				<p>"Really???" you ask, staring in bewilderment at his inactive cock.</p>
 			<</if>>
@@ -912,14 +912,14 @@
 		<<actCLA 'You have a great dick'>>
 			<<gs 'sex_ev_pillow_talk2' 'dick_grab_image'>>
 			<<if $sex_ev['cum_count'] >= $npcs.get($sex.npcId,'sexdrive') + $sex_ev['extra_cum']>>
-				<p>"You have a great dick, you know that?" you say while giving <<=$npcs.get($sex.npcId,'firstname')>>'s soft floppy manhood an appreciative fondle.</p>
+				<p>"You have a great dick, you know that?" you say while giving <<npc $sex.npcId>><</npc>>'s soft floppy manhood an appreciative fondle.</p>
 			<<else>>
-				<p>"You have a great dick, you know that?" you say while giving <<=$npcs.get($sex.npcId,'firstname')>>'s stiff manhood an appreciative jerk.</p>
+				<p>"You have a great dick, you know that?" you say while giving <<npc $sex.npcId>><</npc>>'s stiff manhood an appreciative jerk.</p>
 			<</if>>
-			<p>"Yeah?" <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+			<p>"Yeah?" <<npc $sex.npcId>><</npc>> grins.</p>
 			<<actCLA 'You know how to use it'>>
 				"Not every guy with a cock like yours knows how to use it," you smile. "But you sure do. Fucked me silly with this thing."
-				<p><<=$npcs.get($sex.npcId,'firstname')>> looks more than a little smug after your compliment.</p>
+				<p><<npc $sex.npcId>><</npc>> looks more than a little smug after your compliment.</p>
 				<<gs 'sex_ev_pillow_talk2' 'dick_talk_topics'>>
 			<</actCLA>>
 			<<if $npcs.get($sex.npcId,'dick_desc') == 'thick' or $npcs.get($sex.npcId,'dick_desc') == 'long' or $npcs.get($sex.npcId,'dick_desc') == 'huge' or $npcs.get($sex.npcId,'dick_desc') == 'enormous' or $npcs.get($sex.npcId,'dick_desc') == 'lengthy' or $npcs.get($sex.npcId,'dick_desc') == 'gigantic' or $npcs.get($sex.npcId,'dick_desc') == 'monster'>>
@@ -932,7 +932,7 @@
 		<<if getvar("$sex_ev['cum_count']") >= 5 and $sex_ev['cum_count'] < $npcs.get($sex.npcId,'sexdrive') + $sex_ev['extra_cum']>>
 			<<actCLA 'How are you still hard?!'>>
 				<<gs 'sex_ev_pillow_talk2' 'dick_grab_image'>>
-				<p>"How the hell are you still hard?" you say, gripping <<=$npcs.get($sex.npcId,'firstname')>>'s stiff cock in bewilderment. "You came so many times but you're still..."</p>
+				<p>"How the hell are you still hard?" you say, gripping <<npc $sex.npcId>><</npc>>'s stiff cock in bewilderment. "You came so many times but you're still..."</p>
 				<<if rand(1,2) == 1>>
 					"Maybe you bring it out of me," he smiles at you.
 				<<else>>
@@ -951,9 +951,9 @@
 			<<if $npcs.get($sex.npcId,'humor') == 1>>
 				"Like having my dick surrounded with hot sticky goo," he says, grinning childishly. "Once I'm in, I just want to keep pumping until I explode."
 			<<elseif $npcs.get($sex.npcId,'humor') == 2>>
-				<p>"Hot and wet," <<=$npcs.get($sex.npcId,'firstname')>> smiles affectionately. "Like having my dick wrapped in warm silk that squeezes me tight and pulls me in. That's what your pussy feels like."</p>
+				<p>"Hot and wet," <<npc $sex.npcId>><</npc>> smiles affectionately. "Like having my dick wrapped in warm silk that squeezes me tight and pulls me in. That's what your pussy feels like."</p>
 			<<else>>
-				<p>"It's... hot," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+				<p>"It's... hot," <<npc $sex.npcId>><</npc>> says.</p>
 				"I know it's hot," you roll your eyes. "Of course fucking is hot."
 				"No, I mean temperature hot," he replies, causing you to twerk your head in confusion. "You expect it to be wet inside, and soft, and smooth, but it's also really physically hot. It's like a pussy is an oven and my dick gets baked when I put it in."
 				<p>"<i>Really?</i>" Your eyes go wide, looking down at your own pussy in awe.</p>
@@ -986,9 +986,9 @@
 					"Well, this is a nice way to start the day," you sigh happily, stretching out on the bed.
 				<</if>>
 				<<if $npcs.get($sex.npcId,'humor') == 3>>
-					<p>"As requested Ms. $pc.name_last, your hourAM wake up call," <<=$npcs.get($sex.npcId,'firstname')>> says, doing a mock half-bow.</p>
+					<p>"As requested Ms. $pc.name_last, your hourAM wake up call," <<npc $sex.npcId>><</npc>> says, doing a mock half-bow.</p>
 				<<else>>
-					<p>"You really like it when I fuck you while you're sleeping don't you?" <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+					<p>"You really like it when I fuck you while you're sleeping don't you?" <<npc $sex.npcId>><</npc>> grins.</p>
 				<</if>>
 				<<actCLA 'It feels really good'>>
 					"It feels really good," you giggle, rubbing your thighs together, maybe still a little dick drunk.
@@ -1026,7 +1026,7 @@
 					<<actCLA 'You should do it more often'>>
 						<<run $npcs.set($sex.npcId,'sleep_sex_okay',2)>>
 						"You should do it again," you say with an erotic smirk. "Feels good to wake up with cock inside me."
-						<p>"Really?" <<=$npcs.get($sex.npcId,'firstname')>> looks surprised. "You mean I can do that whenever I want?"</p>
+						<p>"Really?" <<npc $sex.npcId>><</npc>> looks surprised. "You mean I can do that whenever I want?"</p>
 						"Just make sure I wake up before you finish," you grin.
 						<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 					<</actCLA>>
@@ -1051,10 +1051,10 @@
 				<<setinit $sex_ev['morning_sore_pussy'] = 1>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				<<if getvar("$kanikuli") == 0 and $pc.isSchoolStudent and $time.weekday < 6>>
-					<p>"How am I going to get through my classes today?" you say, giving <<=$npcs.get($sex.npcId,'firstname')>> a loopy smile. "If I fall asleep in school today, it's your fault."</p>
-					<p>"I'll take credit for that," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+					<p>"How am I going to get through my classes today?" you say, giving <<npc $sex.npcId>><</npc>> a loopy smile. "If I fall asleep in school today, it's your fault."</p>
+					<p>"I'll take credit for that," <<npc $sex.npcId>><</npc>> grins.</p>
 				<<else>>
-					<p>"We might have overdone it," you say, giving <<=$npcs.get($sex.npcId,'firstname')>> a loopy smile. "I already want to go back to bed."</p>
+					<p>"We might have overdone it," you say, giving <<npc $sex.npcId>><</npc>> a loopy smile. "I already want to go back to bed."</p>
 					<<if $npcs.get($sex.npcId,'day_off') == $time.weekday>>
 						"I just might after you leave," he replies with a mirror of your expression.
 					<<else>>
@@ -1103,9 +1103,9 @@
 			<<if $time.hour < 8>>
 				"Damn," you mutter. "I might be late for school cause of that."
 				<<if $npcs.get($sex.npcId,'caretaker') == 1>>
-					<p>"Sorry," <<=$npcs.get($sex.npcId,'firstname')>> says, looking genuinely apologetic.</p>
+					<p>"Sorry," <<npc $sex.npcId>><</npc>> says, looking genuinely apologetic.</p>
 				<<else>>
-					<p>"Sorry," <<=$npcs.get($sex.npcId,'firstname')>> says, the grin on his face making him look like he doesn't mean it at all.</p>
+					<p>"Sorry," <<npc $sex.npcId>><</npc>> says, the grin on his face making him look like he doesn't mean it at all.</p>
 				<</if>>
 				<<if $time.minutes <= 30 and $region == 'pav' and $time.hour == 7>>
 					<<actCLA 'I might still make it'>>
@@ -1135,9 +1135,9 @@
 			<<elseif $time.hour == 8>>
 				"Shit," you curse. "I'm late for school."
 				<<if $npcs.get($sex.npcId,'caretaker') == 1>>
-					<p>"Sorry," <<=$npcs.get($sex.npcId,'firstname')>> says, looking genuinely apologetic.</p>
+					<p>"Sorry," <<npc $sex.npcId>><</npc>> says, looking genuinely apologetic.</p>
 				<<else>>
-					<p>"Sorry," <<=$npcs.get($sex.npcId,'firstname')>> says, the grin on his face making him not look like he means it at all.</p>
+					<p>"Sorry," <<npc $sex.npcId>><</npc>> says, the grin on his face making him not look like he means it at all.</p>
 				<</if>>
 				<<actCLA 'I need to hurry'>>
 					"I gotta get out of here," you say. "I can't afford to be absent too many times."
@@ -1161,7 +1161,7 @@
 					<<else>>
 						"I don't even have time to shower and clean my pussy out," you say. "Your cum is going to be running down my legs all day."
 					<</if>>
-					<p>You give <<=$npcs.get($sex.npcId,'firstname')>> a wry smirk.</p>
+					<p>You give <<npc $sex.npcId>><</npc>> a wry smirk.</p>
 					<<gs 'sex_ev_pillow_talk2' 'morning_sex_talk'>>
 				<</actCLA>>
 			<</if>>
@@ -1214,7 +1214,7 @@ end
 <<if $location_var[$here][0] == 'new_with_you_boy'>>
 	<<setinit $sex_ev['new_with_you'] = 1>> <<set $sex_ev['how_was_day'] = 1>>
 	<<image "shared/sex/after/pillow_talk1.jpg">>
-	<p>"So, anything new going on with you?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+	<p>"So, anything new going on with you?" <<npc $sex.npcId>><</npc>> asks.</p>
 	<<actCLA 'Nothing new'>>
 		"Not really," you shrug. "Same old same old."
 		<<gs 'sex_ev_pillow_talk' 'topic_route'>>
@@ -1224,7 +1224,7 @@ end
 <<if $location_var[$here][0] == 'how_was_day_boy'>>
 	<<setinit $sex_ev['new_with_you'] = 1>> <<set $sex_ev['how_was_day'] = 1>>
 	<<image "shared/sex/after/pillow_talk1.jpg">>
-	<p>"How was your day?" <<=$npcs.get($sex.npcId,'firstname')>> asks.</p>
+	<p>"How was your day?" <<npc $sex.npcId>><</npc>> asks.</p>
 	<<actCLA 'It was fine'>>
 		<<gs 'sex_ev_pillow_talk2' 'share_life_menu'>>
 	<</actCLA>>
@@ -1246,14 +1246,14 @@ end
 		<<actCLA 'Single now'>>
 			<<actCLA 'Broke up with...'>>
 				<<actCLA 'My boyfriend'>>
-					<p>"I broke up with my boyfriend," you tell <<=$npcs.get($sex.npcId,'firstname')>>. "So I guess I'm single now."</p>
+					<p>"I broke up with my boyfriend," you tell <<npc $sex.npcId>><</npc>>. "So I guess I'm single now."</p>
 					<<if $npcs.get($sex.npcId,'know_have_girlfriend') == 1 or $npcs.get($sex.npcId,'know_have_boyfriend') == 1>>
 					<<else>>
 					<</if>>
 					<<gs 'sex_ev_stats' 'single_know'>>
 				<</actCLA>>
 				<<actCLA 'My girlfriend'>>
-					<p>"I broke up with my boyfriend," you tell <<=$npcs.get($sex.npcId,'firstname')>>. "So I guess I'm single now."</p>
+					<p>"I broke up with my boyfriend," you tell <<npc $sex.npcId>><</npc>>. "So I guess I'm single now."</p>
 					<<if $npcs.get($sex.npcId,'know_have_girlfriend') == 1 or $npcs.get($sex.npcId,'know_have_boyfriend') == 1>>
 					<<else>>
 					<</if>>

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 168 - 168
sugarcube/src/autogenerated/unsorted/sex_ev_reactions.tw


+ 106 - 106
sugarcube/src/autogenerated/unsorted/sex_ev_sex.tw

@@ -60,7 +60,7 @@
 			<<else>>
 				<!-- !!					cla & *clr-->
 				<!-- !!					'<<image `'shared/sex/misc/smile.jpg'`>>'-->
-				<!-- !!					'"Ready to go again?" you grin eagerly at <<<<=$npcs.get($sex.npcId,'firstname')>>>>.'-->
+				<!-- !!					'"Ready to go again?" you grin eagerly at <<<<npc $sex.npcId>><</npc>>>>.'-->
 				<!-- !!					'"Yeah, gimme a minute to get hard again," he grunts back, working himself with his hand to force some stiffness back into his cock while you decide what position you want to fuck in next.'-->
 				<<gs 'sex_ev_sex' 'reset'>>
 				<<setinit $sex_ev['must_fuck'] = 1>>
@@ -85,7 +85,7 @@
 			"Enough of the foreplay," you say with a lusty growl. "It's time to fuck."
 		<<elseif getvar("$sex_ev['not_today']") == 1>>
 			<<setinit $sex_ev['not_today'] = 2>>
-			<p>"I thought you didn't want to fuck today," <<=$npcs.get($sex.npcId,'firstname')>> says with a wry smile.</p>
+			<p>"I thought you didn't want to fuck today," <<npc $sex.npcId>><</npc>> says with a wry smile.</p>
 			"Changed my mind," you grin back.
 		<<elseif getvar("$sex_ev['position_choose']") == 0>>
 			"I want you inside me," you smile seductively.
@@ -97,12 +97,12 @@
 			After a minute or so, he starts to stiffen up again.
 			<i>Finally...</i>
 		<<else>>
-			<p>"I haven't had enough yet," you say, seductively, pulling <<=$npcs.get($sex.npcId,'firstname')>> towards you.</p>
+			<p>"I haven't had enough yet," you say, seductively, pulling <<npc $sex.npcId>><</npc>> towards you.</p>
 		<</if>>
 	<</if>>
 	<<if getvar("$know_virgin["+$sex.npcId+"]") == 1>>
 		<<setinit $know_virgin[$sex.npcId] = 2>>
-		<p>"I thought you said you were saving your virginity," <<=$npcs.get($sex.npcId,'firstname')>> says, looking a little confused but extremely excited.</p>
+		<p>"I thought you said you were saving your virginity," <<npc $sex.npcId>><</npc>> says, looking a little confused but extremely excited.</p>
 		"I accidentally lost it somewhere," you grin. "Now hurry up and fuck me."
 	<</if>>
 	<<setinit $sex_ev['position_choose'] = 1>>
@@ -178,7 +178,7 @@
 		<<if $pc.thinksIsVirgin and getvar("$sex_ev['fuck_count']") == 0>>
 			<<setinit $sex_ev['position'] = 'miss'>>
 			<<image "shared/sex/foreplay/miss3.jpg">>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> pushes you down onto the bed and puts his hands on your knees, spreading your legs apart, and lines his cock up with your pussy.</p>
+			<p><<npc $sex.npcId>><</npc>> pushes you down onto the bed and puts his hands on your knees, spreading your legs apart, and lines his cock up with your pussy.</p>
 			"I wanna fuck your pussy."
 			<<actCLA 'Stop him (virgin)'>>
 				<<gt 'sex_ev_virgin' 'lover_wait'>>
@@ -196,7 +196,7 @@
 			<<elseif $npcs.get($sex.npcId,'fav_pos') == 'blowjob' and getvar("$sex_ev['must_fuck']") != 1>>
 				<<gs 'sex_ev_foreplay' 'bj_ask'>>
 			<<elseif $npcs.get($sex.npcId,'pussyeater') == 1 and getvar("$sex_ev['must_fuck']") != 1>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> starts leading a trail of kisses down your stomach towards your pussy.</p>
+				<p><<npc $sex.npcId>><</npc>> starts leading a trail of kisses down your stomach towards your pussy.</p>
 				<<gs 'sex_ev_foreplay' 'kuni_start'>>
 			<<else>>
 				<<gs 'sex_ev_sex' 'rand_position'>>
@@ -226,7 +226,7 @@
 			<!-- !! blowjob-->
 			<<gs 'sex_ev_foreplay' 'bj_ask'>>
 		<<elseif getvar("$sex_ev['position_rand']") == 5 and getvar("$sex_ev['must_fuck']") != 1 and (getvar("$sex_ev['creampie_count']") < 1 or $npcs.get($sex.npcId,'pussyeater') == 1)>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> starts leading a trail of kisses down your stomach towards your pussy.</p>
+			<p><<npc $sex.npcId>><</npc>> starts leading a trail of kisses down your stomach towards your pussy.</p>
 			<<gs 'sex_ev_foreplay' 'kuni_start'>>
 		<<else>>
 			<!-- !! failsafe: default to missionary-->
@@ -423,22 +423,22 @@
 			<<else>>
 				<<gs 'sex_ev_sex' 'inserted_img'>>
 			<</if>>
-			<p>"Think I could blow you for a little while?" you ask, stopping <<=$npcs.get($sex.npcId,'firstname')>> mid-thrust. "My pussy could use quick break."</p>
+			<p>"Think I could blow you for a little while?" you ask, stopping <<npc $sex.npcId>><</npc>> mid-thrust. "My pussy could use quick break."</p>
 			<<if $npcs.get($sex.npcId,'selfish') == 1 and rand(1,3) < 3 and $npcs.get($sex.npcId,'fav_pos') != 'blowjob'>>
-				<p>"Come on, can't you just bear with it a little longer?" <<=$npcs.get($sex.npcId,'firstname')>> whines. "I'm really enjoying this."</p>
+				<p>"Come on, can't you just bear with it a little longer?" <<npc $sex.npcId>><</npc>> whines. "I'm really enjoying this."</p>
 				<<actCLA 'Acquiesce'>>
 					<<actCLA 'Reluctantly'>>
-						<p>"I guess we can keep going for now," you sigh reluctantly and get back to fucking <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+						<p>"I guess we can keep going for now," you sigh reluctantly and get back to fucking <<npc $sex.npcId>><</npc>>.</p>
 						<<gs 'sex_ev_sex' 'fuck_continue'>>
 					<</actCLA>>
 					<<actCLA 'Generously'>>
-						<p>"If you're really enjoying it that much..." you trail off with a smile and resume fucking <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+						<p>"If you're really enjoying it that much..." you trail off with a smile and resume fucking <<npc $sex.npcId>><</npc>>.</p>
 						<<gs 'sex_ev_sex' 'fuck_continue'>>
 					<</actCLA>>
 				<</actCLA>>
 				<<actCLA 'Insist'>>
 					<p>"Seriously," you insist. "My pussy can't take much more of this if we keep it up. Just a quick break and then we'll get right back to sex, okay?"</p>
-					<p>"Ugh, fiiiine," <<=$npcs.get($sex.npcId,'firstname')>> moans begrudgingly.</p>
+					<p>"Ugh, fiiiine," <<npc $sex.npcId>><</npc>> moans begrudgingly.</p>
 					<<actCLA 'Blow him'>>
 						<<gt 'sex_ev_foreplay' 'bj_dom2'>>
 					<</actCLA>>
@@ -446,14 +446,14 @@
 				<<if $npcs.get($sex.npcId,'dick_desc') == 'thick' or $npcs.get($sex.npcId,'dick_desc') == 'long' or $npcs.get($sex.npcId,'dick_desc') == 'huge' or $npcs.get($sex.npcId,'dick_desc') == 'enormous' or $npcs.get($sex.npcId,'dick_desc') == 'lengthy' or $npcs.get($sex.npcId,'dick_desc') == 'gigantic' or $npcs.get($sex.npcId,'dick_desc') == 'monster'>>
 					<<actCLA 'Dick too big'>>
 						<p>"You're dick is just too big for me," you moan. "My vagina is gonna have bruises tomorrow if we keep going like this. I just need a break. Please?"</p>
-						<p>"Ugh, fiiiine," <<=$npcs.get($sex.npcId,'firstname')>> moans begrudgingly.</p>
+						<p>"Ugh, fiiiine," <<npc $sex.npcId>><</npc>> moans begrudgingly.</p>
 						<<actCLA 'Blow him'>>
 							<<gt 'sex_ev_foreplay' 'bj_dom2'>>
 						<</actCLA>>
 					<</actCLA>>
 					<<actCLA 'Dick too big (appeal to his pride)'>>
 						"It's cause your dick is so big," you say with a sultry smile. "I just can't handle your <i>big <b>huge</b></i> cock. Just a quick break and then you can get right back to destroying my pussy."
-						<p>"Well," <<=$npcs.get($sex.npcId,'firstname')>> says haughtily. "I guess if you can't handle it..."</p>
+						<p>"Well," <<npc $sex.npcId>><</npc>> says haughtily. "I guess if you can't handle it..."</p>
 						<<actCLA 'Thanks'>>
 							"Thanks," you smile with gratitude and slip off his cock to take it in your mouth.
 							<<actCLA 'Blow him'>>
@@ -560,7 +560,7 @@
 			<<if getvar("$sex_ev['cock_inserted']") == 0>>
 				<<image "shared/sex/cum/vagcreampie/miss1.jpg">>
 				<<gs 'sex_ev_sex' 'break_ask'>>
-				<p>You flop down onto the bed beside <<=$npcs.get($sex.npcId,'firstname')>>, feeling his cum trickling from your pussy.</p>
+				<p>You flop down onto the bed beside <<npc $sex.npcId>><</npc>>, feeling his cum trickling from your pussy.</p>
 				A few minutes pass and your breathing slowly calms, relaxing in a moment of quiet satisfaction.
 				<<gs 'sex_ev_sex' 'break_time'>>
 			<<else>>
@@ -577,24 +577,24 @@
 					<<if $sex_ev['last_cum'] == 'creampie'>>
 						<<if $sex_ev['position'] == 'miss'>>
 							<<image "shared/sex/cum/vagcreampie/after1.jpg">>
-							<p><<=$npcs.get($sex.npcId,'firstname')>> climbs off of you and flops down beside you. You breathe slowly, letting yourself sink into the bed as you feel <<=$npcs.get($sex.npcId,'firstname')>>'s cum trickle from your pussy.</p>
+							<p><<npc $sex.npcId>><</npc>> climbs off of you and flops down beside you. You breathe slowly, letting yourself sink into the bed as you feel <<npc $sex.npcId>><</npc>>'s cum trickle from your pussy.</p>
 						<<elseif $sex_ev['position'] == 'doggy'>>
 							<<image "shared/sex/cum/vagcreampie/doggy2.jpg">>
-							<p><<=$npcs.get($sex.npcId,'firstname')>> climbs off of you and flops down beside you. You barely move, breathing slowly and let your face sink into the pillow as <<=$npcs.get($sex.npcId,'firstname')>>'s cum trickles from your pussy.</p>
+							<p><<npc $sex.npcId>><</npc>> climbs off of you and flops down beside you. You barely move, breathing slowly and let your face sink into the pillow as <<npc $sex.npcId>><</npc>>'s cum trickles from your pussy.</p>
 						<<elseif $sex_ev['position'] == 'cowgirl'>>
 							<<image "shared/sex/cum/vagcreampie/after1.jpg">>
-							<p>You climb off of <<=$npcs.get($sex.npcId,'firstname')>>, flopping down beside him and let yourself sink into the softness of the bed. His cum slowly oozes from your pussy.</p>
+							<p>You climb off of <<npc $sex.npcId>><</npc>>, flopping down beside him and let yourself sink into the softness of the bed. His cum slowly oozes from your pussy.</p>
 						<</if>>
 					<<elseif $sex_ev['last_cum'] == 'condom'>>
 						<<if $sex_ev['position'] == 'miss'>>
 							<<video "shared/sex/after/miss_after1.mp4">>
-							<p><<=$npcs.get($sex.npcId,'firstname')>> climbs off of you and flops down beside you. You breathe slowly, letting yourself sink into the bed, feeling your your pussy continue to leak as <<=$npcs.get($sex.npcId,'firstname')>> pulls off the used condom and tosses it aside.</p>
+							<p><<npc $sex.npcId>><</npc>> climbs off of you and flops down beside you. You breathe slowly, letting yourself sink into the bed, feeling your your pussy continue to leak as <<npc $sex.npcId>><</npc>> pulls off the used condom and tosses it aside.</p>
 						<<elseif $sex_ev['position'] == 'doggy'>>
 							<<video "shared/sex/after/doggy_after1.mp4">>
-							<p><<=$npcs.get($sex.npcId,'firstname')>> climbs off of you and you roll over to face him, thighs slick with your own juices and head swimming with post-fuck endorphins, while he pulls off the used condom and tosses it aside.</p>
+							<p><<npc $sex.npcId>><</npc>> climbs off of you and you roll over to face him, thighs slick with your own juices and head swimming with post-fuck endorphins, while he pulls off the used condom and tosses it aside.</p>
 						<<elseif $sex_ev['position'] == 'cowgirl'>>
 							<<video "shared/sex/after/cowgirl_after1.mp4">>
-							<p>You climb off of <<=$npcs.get($sex.npcId,'firstname')>>, flopping down beside him and let yourself sink into the softness of the bed, sighing with satisfaction as you feel post-fuck juices continue to leak from your pussy and <<=$npcs.get($sex.npcId,'firstname')>> pulls off the used condom and tosses it aside.</p>
+							<p>You climb off of <<npc $sex.npcId>><</npc>>, flopping down beside him and let yourself sink into the softness of the bed, sighing with satisfaction as you feel post-fuck juices continue to leak from your pussy and <<npc $sex.npcId>><</npc>> pulls off the used condom and tosses it aside.</p>
 						<</if>>
 					<</if>>
 					<<if getvar("$sex_ev['speed']") <= 2>>
@@ -606,11 +606,11 @@
 				<</actCLA>>
 				<<actCLA 'Stay like this'>>
 					<<if $sex_ev['position'] == 'miss'>>
-						<p>You lay still, leaving <<=$npcs.get($sex.npcId,'firstname')>>'s occasionally twitching cock stuffed inside you, your pussy full of his cum, taking deep breaths as you wind down.</p>
+						<p>You lay still, leaving <<npc $sex.npcId>><</npc>>'s occasionally twitching cock stuffed inside you, your pussy full of his cum, taking deep breaths as you wind down.</p>
 					<<elseif $sex_ev['position'] == 'doggy'>>
-						<p>You let your legs give out from under you, collapsing to the bed with <<=$npcs.get($sex.npcId,'firstname')>> still on top, his occasionally twitching cock stuffed inside you and your pussy full of his cum, taking deep breaths as you wind down.</p>
+						<p>You let your legs give out from under you, collapsing to the bed with <<npc $sex.npcId>><</npc>> still on top, his occasionally twitching cock stuffed inside you and your pussy full of his cum, taking deep breaths as you wind down.</p>
 					<<elseif $sex_ev['position'] == 'cowgirl'>>
-						<p>You collapse onto <<=$npcs.get($sex.npcId,'firstname')>>, feeling his breathing through your breasts pressed up against his chest and the occasional twitch of his cock still stuffed inside your pussy.</p>
+						<p>You collapse onto <<npc $sex.npcId>><</npc>>, feeling his breathing through your breasts pressed up against his chest and the occasional twitch of his cock still stuffed inside your pussy.</p>
 					<</if>>
 					<<if getvar("$sex_ev['speed']") <= 2>>
 						<p>The two of you just stay like that for a while, basking in the afterglow of your love-making.</p>
@@ -623,7 +623,7 @@
 		<<elseif $sex_ev['last_cum'] == 'condom'>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
 			<<if getvar("$sex_ev['cock_inserted']") == 0>>
-				<p>You flop down onto the bed, breathing hard as your body slowly unwinds, relaxing as you let yourself sink into the mattress. <<=$npcs.get($sex.npcId,'firstname')>> removes the condom from his cock, tossing it aside before laying down beside you.</p>
+				<p>You flop down onto the bed, breathing hard as your body slowly unwinds, relaxing as you let yourself sink into the mattress. <<npc $sex.npcId>><</npc>> removes the condom from his cock, tossing it aside before laying down beside you.</p>
 				<<if getvar("$sex_ev['speed']") <= 2>>
 					<p>The two of you just stay like that for a while, basking in the afterglow of your love-making.</p>
 				<<else>>
@@ -631,11 +631,11 @@
 				<</if>>
 			<<else>>
 				<<if $sex_ev['position'] == 'miss'>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> climbs off of you, removing the condom from his softening cock before flopping down beside you. You breathe slowly, letting yourself sink into the bed as your body relaxes.</p>
+					<p><<npc $sex.npcId>><</npc>> climbs off of you, removing the condom from his softening cock before flopping down beside you. You breathe slowly, letting yourself sink into the bed as your body relaxes.</p>
 				<<elseif $sex_ev['position'] == 'doggy'>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> climbs off of you, removing the condom from his softening cock before flopping down beside you. You turn over onto your back and breathe slowly, letting yourself sink into the bed as your body relaxes.</p>
+					<p><<npc $sex.npcId>><</npc>> climbs off of you, removing the condom from his softening cock before flopping down beside you. You turn over onto your back and breathe slowly, letting yourself sink into the bed as your body relaxes.</p>
 				<<elseif $sex_ev['position'] == 'cowgirl'>>
-					<p>You climb off of <<=$npcs.get($sex.npcId,'firstname')>>, flopping down beside him as he removes the condom from his softening cock, and let yourself sink into the softness of the bed. He ties off the rubber and tosses it aside.</p>
+					<p>You climb off of <<npc $sex.npcId>><</npc>>, flopping down beside him as he removes the condom from his softening cock, and let yourself sink into the softness of the bed. He ties off the rubber and tosses it aside.</p>
 				<</if>>
 				<<if getvar("$sex_ev['speed']") <= 2>>
 					<p>The two of you just stay like that for a while, basking in the afterglow of your love-making.</p>
@@ -647,26 +647,26 @@
 		<<else>>
 			<<if $sex_ev['last_cum'] == 'face_mouth'>>
 				<<image "shared/sex/cum/facial/facial35.jpg">>
-				<p>You lay back, breathing slowly as you wind down, the warm mask of <<=$npcs.get($sex.npcId,'firstname')>>'s cum across your face, its salty taste on your tongue.</p>
+				<p>You lay back, breathing slowly as you wind down, the warm mask of <<npc $sex.npcId>><</npc>>'s cum across your face, its salty taste on your tongue.</p>
 			<<elseif $sex_ev['last_cum'] == 'spit'>>
 				<<image "shared/sex/cum/facial/facial35.jpg">>
-				<p>You lay back, breathing slowly as you wind down, the salty taste of <<=$npcs.get($sex.npcId,'firstname')>>'s sperm on your tongue as it dribbles down your chin.</p>
+				<p>You lay back, breathing slowly as you wind down, the salty taste of <<npc $sex.npcId>><</npc>>'s sperm on your tongue as it dribbles down your chin.</p>
 			<<elseif $sex_ev['last_cum'] == 'swallow'>>
 				<<image "shared/sex/cum/facial/facial35.jpg">>
-				<p>You lay back, breathing slowly as you wind down, the salty taste of <<=$npcs.get($sex.npcId,'firstname')>>'s sperm still on your lips.</p>
+				<p>You lay back, breathing slowly as you wind down, the salty taste of <<npc $sex.npcId>><</npc>>'s sperm still on your lips.</p>
 			<<elseif $sex_ev['last_cum'] == 'facial'>>
 				<<image "shared/sex/cum/facial/facial35.jpg">>
-				<p>You lay back, breathing slowly as you wind down, the warm mask of <<=$npcs.get($sex.npcId,'firstname')>>'s cum across your face already beginning to cool.</p>
+				<p>You lay back, breathing slowly as you wind down, the warm mask of <<npc $sex.npcId>><</npc>>'s cum across your face already beginning to cool.</p>
 			<<elseif $sex_ev['last_cum'] == 'tits'>>
 				$sex_ev['bed_room']
-				<p>You lay back, breathing slowly as you wind down, the warm glaze of <<=$npcs.get($sex.npcId,'firstname')>>'s cum across your chest already beginning to cool.</p>
+				<p>You lay back, breathing slowly as you wind down, the warm glaze of <<npc $sex.npcId>><</npc>>'s cum across your chest already beginning to cool.</p>
 			<<elseif $sex_ev['last_cum'] == 'pullout'>>
 				<<if $sex_ev['position'] == 'miss' or $sex_ev['position'] == 'cowgirl'>>
 					<<image "shared/sex/cum/stomach/sleep1.jpg">>
 					You lay back, breathing slowly as you wind down, feeling the warm cum on your belly already beginning to cool.
 				<<elseif $sex_ev['position'] == 'doggy'>>
 					<<image "shared/sex/cum/back1.jpg">>
-					<p>You just lay there, <<=$npcs.get($sex.npcId,'firstname')>>'s cum spattered across your ass, breathing slowly as you wind down.</p>
+					<p>You just lay there, <<npc $sex.npcId>><</npc>>'s cum spattered across your ass, breathing slowly as you wind down.</p>
 				<</if>>
 			<</if>>
 			A few minutes pass and your breathing slowly calms, relaxing in a moment of quiet satisfaction.
@@ -742,10 +742,10 @@
 			<<actCLA 'Take it shyly'>>
 				$sex_ev['bed_room']
 				<<if getvar("$sex_ev['cock_inserted']") == 1>>
-					<p>You somehow manage to grab hold of your pills without extricating yourself from <<=$npcs.get($sex.npcId,'firstname')>> and pop a birth control pill from the packaging.</p>
-					<p>"This is what the pill is for after all," you blush, shyly placing it between your lips, feeling your pussy give <<=$npcs.get($sex.npcId,'firstname')>>'s cock a nice squeeze as you swallow.</p>
+					<p>You somehow manage to grab hold of your pills without extricating yourself from <<npc $sex.npcId>><</npc>> and pop a birth control pill from the packaging.</p>
+					<p>"This is what the pill is for after all," you blush, shyly placing it between your lips, feeling your pussy give <<npc $sex.npcId>><</npc>>'s cock a nice squeeze as you swallow.</p>
 				<<elseif $pc.cumAtLocation(0) > 0>>
-					<p>With <<=$npcs.get($sex.npcId,'firstname')>>'s cum still leaking from your pussy, you reach for your pills and pull out your birth control.</p>
+					<p>With <<npc $sex.npcId>><</npc>>'s cum still leaking from your pussy, you reach for your pills and pull out your birth control.</p>
 					<<if getvar("$sex_ev['risky_creampie']") == 1>>
 						"Hopefully we won''t have to worry about this stuff soon," you smile, shyly placing the pill between your lips and swallowing.
 					<<else>>
@@ -774,23 +774,23 @@
 			<</actCLA>>
 			<<actCLA 'Take it sexily'>>
 				<<if getvar("$sex_ev['cock_inserted']") == 1>>
-					<p>You somehow manage to grab hold of your pills without extricating yourself from <<=$npcs.get($sex.npcId,'firstname')>> and pop a birth control pill from the packaging.</p>
+					<p>You somehow manage to grab hold of your pills without extricating yourself from <<npc $sex.npcId>><</npc>> and pop a birth control pill from the packaging.</p>
 					<<if getvar("$sex_ev['risky_creampie']") == 1>>
-						<p>"You better hope this stuff kicks in soon," you say, placing the pill between your lips and swallowing with a grin, feeling your pussy give <<=$npcs.get($sex.npcId,'firstname')>>'s cock a nice squeeze as you swallow.</p>
+						<p>"You better hope this stuff kicks in soon," you say, placing the pill between your lips and swallowing with a grin, feeling your pussy give <<npc $sex.npcId>><</npc>>'s cock a nice squeeze as you swallow.</p>
 					<<elseif getvar("$birth_control['think_safe']") == 1>>
 						"My baby police pill," you say, placing it between your lips. "So you can keep coming inside me without worry."
-						<p>You swallow the pill, feeling your pussy give <<=$npcs.get($sex.npcId,'firstname')>>'s cock a nice squeeze as you swallow.</p>
+						<p>You swallow the pill, feeling your pussy give <<npc $sex.npcId>><</npc>>'s cock a nice squeeze as you swallow.</p>
 					<<else>>
 						"This is what the pill is for after all," you grin, placing it between your lips, feeling your pussy squeeze his cock as you swallow.
 					<</if>>
 				<<elseif $sex_ev['last_cum'] == 'swallow'>>
-					<p>You pop the pill from its packaging and stick out your tongue, placing the pill in the center of it for <<=$npcs.get($sex.npcId,'firstname')>> to see before gulping it down in a single swallow.</p>
+					<p>You pop the pill from its packaging and stick out your tongue, placing the pill in the center of it for <<npc $sex.npcId>><</npc>> to see before gulping it down in a single swallow.</p>
 					"Chaser," you wink.
 				<<elseif $pc.cumAtLocation(0) > 0>>
 					<<if $sex_ev['loc'] == 'pc_home'>>
-						<p>With <<=$npcs.get($sex.npcId,'firstname')>>'s cum still leaking from your pussy, you reach over to your nightstand and pull out your birth control.</p>
+						<p>With <<npc $sex.npcId>><</npc>>'s cum still leaking from your pussy, you reach over to your nightstand and pull out your birth control.</p>
 					<<else>>
-						<p>With <<=$npcs.get($sex.npcId,'firstname')>>'s cum still leaking from your pussy, you reach down to your purse and pull out your birth control.</p>
+						<p>With <<npc $sex.npcId>><</npc>>'s cum still leaking from your pussy, you reach down to your purse and pull out your birth control.</p>
 					<</if>>
 					<<if getvar("$sex_ev['risky_creampie']") == 1>>
 						"You better hope this stuff kicks in soon," you say, placing the pill between your lips and swallowing with a grin.
@@ -829,10 +829,10 @@
 	<<if getvar("$sex_ev['position_rand']") == 1 or $npcs.get($sex.npcId,'fav_pos') == 'miss' or ($pc.thinksIsVirgin and getvar("$sex_ev['fuck_count']") == 0 and getvar("$sex_ev['position_rand']") <= 3)>>
 		<<setinit $sex_ev['position'] = 'miss'>>
 		<!-- !! missionary-->
-		<p>After a few minutes, you glance over at <<=$npcs.get($sex.npcId,'firstname')>> and find him hungrily staring at you. You realize what's about to happen just before he jumps on top of you, eliciting...</p>
+		<p>After a few minutes, you glance over at <<npc $sex.npcId>><</npc>> and find him hungrily staring at you. You realize what's about to happen just before he jumps on top of you, eliciting...</p>
 		<<actCLA '... giggles'>>
 			<<image "shared/sex/foreplay/miss3.jpg">>
-			<p>After a few minutes, you glance over at <<=$npcs.get($sex.npcId,'firstname')>> and find him hungrily staring at you with a raging erection. You realize what's about to happen just before he jumps on top of you, eliciting uncontrollable giggles from your lips as he forces your legs open and lines his cock up with your pussy.</p>
+			<p>After a few minutes, you glance over at <<npc $sex.npcId>><</npc>> and find him hungrily staring at you with a raging erection. You realize what's about to happen just before he jumps on top of you, eliciting uncontrollable giggles from your lips as he forces your legs open and lines his cock up with your pussy.</p>
 			<<if $pc.thinksIsVirgin and getvar("$sex_ev['fuck_count']") == 0>>
 				<<actCLA 'Stop him (virgin)'>>
 					<<gt 'sex_ev_virgin' 'lover_wait'>>
@@ -848,7 +848,7 @@
 		<</actCLA>>
 		<<actCLA '... a yelp of surprise'>>
 			<<image "shared/sex/foreplay/miss3.jpg">>
-			<p>After a few minutes, you glance over at <<=$npcs.get($sex.npcId,'firstname')>> and find him hungrily staring at you with a raging erection. You realize what's about to happen just before he jumps on top of you, eliciting a yelp of surprise from your lips as he forces your legs open and lines his cock up with your pussy.</p>
+			<p>After a few minutes, you glance over at <<npc $sex.npcId>><</npc>> and find him hungrily staring at you with a raging erection. You realize what's about to happen just before he jumps on top of you, eliciting a yelp of surprise from your lips as he forces your legs open and lines his cock up with your pussy.</p>
 			<<if $pc.thinksIsVirgin and getvar("$sex_ev['fuck_count']") == 0>>
 				<<actCLA 'Stop him (virgin)'>>
 					<<gt 'sex_ev_virgin' 'lover_wait'>>
@@ -864,35 +864,35 @@
 		<</actCLA>>
 	<<elseif getvar("$sex_ev['position_rand']") == 2 or $npcs.get($sex.npcId,'fav_pos') == 'doggy'>>
 		<!-- !! doggy-->
-		<p>After a few minutes, you glance over at <<=$npcs.get($sex.npcId,'firstname')>> and find him hungrily staring at you. You realize what's about to happen just before he jumps you, eliciting...</p>
+		<p>After a few minutes, you glance over at <<npc $sex.npcId>><</npc>> and find him hungrily staring at you. You realize what's about to happen just before he jumps you, eliciting...</p>
 		<<actCLA '... giggles'>>
 			<<image "shared/sex/foreplay/doggy1.jpg">>
-			<p>After a few minutes, you glance over at <<=$npcs.get($sex.npcId,'firstname')>> and find him hungrily staring at you with a raging erection. You realize what's about to happen just before he jumps on top of you, eliciting uncontrollable giggles from your lips as flips you onto your stomach, pulls you up by the hips, and slaps your ass, lining his cock up with your pussy.</p>
+			<p>After a few minutes, you glance over at <<npc $sex.npcId>><</npc>> and find him hungrily staring at you with a raging erection. You realize what's about to happen just before he jumps on top of you, eliciting uncontrollable giggles from your lips as flips you onto your stomach, pulls you up by the hips, and slaps your ass, lining his cock up with your pussy.</p>
 			<<actCLA 'Get fucked'>>
 				<<gs 'sex_ev_doggy' 'doggy_goto'>>
 			<</actCLA>>
 		<</actCLA>>
 		<<actCLA '... a yelp of surprise'>>
 			<<image "shared/sex/foreplay/doggy1.jpg">>
-			<p>After a few minutes, you glance over at <<=$npcs.get($sex.npcId,'firstname')>> and find him hungrily staring at you with a raging erection. You realize what's about to happen just before he jumps on top of you, eliciting a yelp of surprise from from your lips as flips you onto your stomach, pulls you up by the hips, and slaps your ass before plunging his cock into your pussy.</p>
+			<p>After a few minutes, you glance over at <<npc $sex.npcId>><</npc>> and find him hungrily staring at you with a raging erection. You realize what's about to happen just before he jumps on top of you, eliciting a yelp of surprise from from your lips as flips you onto your stomach, pulls you up by the hips, and slaps your ass before plunging his cock into your pussy.</p>
 			<<actCLA 'Get fucked'>>
 				<<gs 'sex_ev_doggy' 'doggy_goto'>>
 			<</actCLA>>
 		<</actCLA>>
 	<<elseif getvar("$sex_ev['position_rand']") == 3 and getvar("$sex_ev['must_fuck']") != 1>>
 		<!-- !! blowjob-->
-		<p>After a few minutes, you glance over at <<=$npcs.get($sex.npcId,'firstname')>> and find him hungrily staring at you.</p>
+		<p>After a few minutes, you glance over at <<npc $sex.npcId>><</npc>> and find him hungrily staring at you.</p>
 		<p>"What...?" you ask hesitantly.</p>
 		"I can't stop thinking about your mouth around my cock," he says, his stare becoming even more predatory.
 		<<gs 'sex_ev_foreplay' 'bj_ask2'>>
 	<<elseif getvar("$sex_ev['position_rand']") == 4 and (getvar("$cum_loc['vagina']") == 0 or $npcs.get($sex.npcId,'pussyeater') == 1)>>
 		<<arouse 'foreplay' -5 `['no_orgasm_msg']`>>
-		<p>After a few minutes, <<=$npcs.get($sex.npcId,'firstname')>> climbs on top of you without saying anything.</p>
+		<p>After a few minutes, <<npc $sex.npcId>><</npc>> climbs on top of you without saying anything.</p>
 		<p>"Hey, what are you-" you start to ask until his head descends to your stomach. He lightly kisses it, sending shivers across your skin, before kissing again and again and again, each kiss lower than the last, slowly heading towards your thighs.</p>
 		<<gs 'sex_ev_foreplay' 'kuni_start'>>
 	<<else>>
 		<<arouse 'foreplay' -5 `['no_orgasm_msg']`>>
-		<p>After a few minutes, <<=$npcs.get($sex.npcId,'firstname')>> climbs on top of you without saying anything.</p>
+		<p>After a few minutes, <<npc $sex.npcId>><</npc>> climbs on top of you without saying anything.</p>
 		<p>"Hey, what are you-" you start to ask until his head descends to your neck. He lightly kisses your throat, sending shivers across your skin, before kissing again and again and again, each kiss lower than the last, blazing a trail down your collarbone to the breasts his hands are already thoroughly massaging.</p>
 		<<actCLA 'Continue'>>
 			<<gs 'sex_ev_foreplay' 'nipple_play'>>
@@ -909,7 +909,7 @@
 				<p>"Wanna keep going?" you ask, flexing your pussy around his cock. It twitches inside in response, feeling a little stiffer than before, causing you to grin. "That feels like a yes."</p>
 			<<else>>
 				<<video "shared/sex/misc/wait.mp4">>
-				<p>"Wanna keep going?" you ask, looking over at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+				<p>"Wanna keep going?" you ask, looking over at <<npc $sex.npcId>><</npc>>.</p>
 				"Yeah, gimme a minute to get hard again," he grunts back, working himself with his hand to force some stiffness back into his cock.
 				<!-- !!act'Sex':cla & gs'sex_ev_sex', 'position_choose' & gs 'sex_ev_condoms', 'condoms'-->
 			<</if>>
@@ -922,7 +922,7 @@
 			<<if $sex_ev['cum_choice'] != ''>>
 				"Yeah, gimme a minute to get hard again," he grunts back, working himself with his hand to force some stiffness back into his cock.
 			<<else>>
-				<p>"What do you have in mind?" <<=$npcs.get($sex.npcId,'firstname')>> grins back.</p>
+				<p>"What do you have in mind?" <<npc $sex.npcId>><</npc>> grins back.</p>
 			<</if>>
 			<<gs 'sex_ev_sex' 'reset'>>
 			<<gs 'sex_ev_sex' 'sex_menu'>>
@@ -961,23 +961,23 @@
 					<<image "shared/sex/after/bed_smoke3.jpg">>
 					<<if getvar("$sex_ev['cock_inserted']") == 0>>
 						<<if $sex_ev['loc'] == 'pc_home'>>
-							<p>You reach over and pull out your pack of cigarettes, placing one in your mouth and tossing the pack back onto your nightstand. <<=$npcs.get($sex.npcId,'firstname')>> takes the opportunity to light up as well while you take your first drag.</p>
+							<p>You reach over and pull out your pack of cigarettes, placing one in your mouth and tossing the pack back onto your nightstand. <<npc $sex.npcId>><</npc>> takes the opportunity to light up as well while you take your first drag.</p>
 						<<else>>
-							<p>You reach down and pull out your pack of cigarettes, placing one in your mouth and tossing the pack back into your purse. <<=$npcs.get($sex.npcId,'firstname')>> takes the opportunity to light up as well while you take your first drag.</p>
+							<p>You reach down and pull out your pack of cigarettes, placing one in your mouth and tossing the pack back into your purse. <<npc $sex.npcId>><</npc>> takes the opportunity to light up as well while you take your first drag.</p>
 						<</if>>
 					<<else>>
 						<<setinit $sex_ev['cock_inserted'] = 0>>
 						<<if $sex_ev['last_cum'] == 'creampie'>>
 							<<if $sex_ev['loc'] == 'pc_home'>>
-								<p>You finally pull apart, immediately feeling <<=$npcs.get($sex.npcId,'firstname')>>'s cum spill from inside you as his cock vacates your pussy before reaching for your cigarettes, placing one in your mouth and tossing the pack back onto your nightstand. <<=$npcs.get($sex.npcId,'firstname')>> takes the opportunity to light up as well while you take your first drag.</p>
+								<p>You finally pull apart, immediately feeling <<npc $sex.npcId>><</npc>>'s cum spill from inside you as his cock vacates your pussy before reaching for your cigarettes, placing one in your mouth and tossing the pack back onto your nightstand. <<npc $sex.npcId>><</npc>> takes the opportunity to light up as well while you take your first drag.</p>
 							<<else>>
-								<p>You finally pull apart, immediately feeling <<=$npcs.get($sex.npcId,'firstname')>>'s cum spill from inside you as his cock vacates your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. <<=$npcs.get($sex.npcId,'firstname')>> takes the opportunity to light up as well while you take your first drag.</p>
+								<p>You finally pull apart, immediately feeling <<npc $sex.npcId>><</npc>>'s cum spill from inside you as his cock vacates your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. <<npc $sex.npcId>><</npc>> takes the opportunity to light up as well while you take your first drag.</p>
 							<</if>>
 						<<elseif $sex_ev['last_cum'] == 'condom'>>
 							<<if $sex_ev['loc'] == 'pc_home'>>
-								<p>You finally pull apart, letting <<=$npcs.get($sex.npcId,'firstname')>>'s rubber coated cock slip from your pussy before reaching for your cigarettes, placing one in your mouth and tossing the pack back onto your nightstand. <<=$npcs.get($sex.npcId,'firstname')>> takes the opportunity to light up as well while you take your first drag.</p>
+								<p>You finally pull apart, letting <<npc $sex.npcId>><</npc>>'s rubber coated cock slip from your pussy before reaching for your cigarettes, placing one in your mouth and tossing the pack back onto your nightstand. <<npc $sex.npcId>><</npc>> takes the opportunity to light up as well while you take your first drag.</p>
 							<<else>>
-								<p>You finally pull apart, letting <<=$npcs.get($sex.npcId,'firstname')>>'s rubber coated cock slip from your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. <<=$npcs.get($sex.npcId,'firstname')>> takes the opportunity to light up as well while you take your first drag.</p>
+								<p>You finally pull apart, letting <<npc $sex.npcId>><</npc>>'s rubber coated cock slip from your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. <<npc $sex.npcId>><</npc>> takes the opportunity to light up as well while you take your first drag.</p>
 							<</if>>
 						<</if>>
 					<</if>>
@@ -985,9 +985,9 @@
 				<<else>>
 					<<image "shared/sex/after/bed_smoke1.jpg">>
 					<<if $sex_ev['last_cum'] == 'creampie'>>
-						<p>You finally pull apart, immediately feeling <<=$npcs.get($sex.npcId,'firstname')>>'s cum spill from inside you as his cock vacates your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. You spark your lighter, inhaling deeply as you take your first drag.</p>
+						<p>You finally pull apart, immediately feeling <<npc $sex.npcId>><</npc>>'s cum spill from inside you as his cock vacates your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. You spark your lighter, inhaling deeply as you take your first drag.</p>
 					<<elseif $sex_ev['last_cum'] == 'condom'>>
-						<p>You finally pull apart, letting <<=$npcs.get($sex.npcId,'firstname')>>'s rubber coated cock slip from your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. You spark your lighter, inhaling deeply as you take your first drag.</p>
+						<p>You finally pull apart, letting <<npc $sex.npcId>><</npc>>'s rubber coated cock slip from your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. You spark your lighter, inhaling deeply as you take your first drag.</p>
 					<</if>>
 					Smoke fills your lungs and you hold it there, savouring it, before exhaling slowly. As the smoke blows past your lips, it's like all your stress goes with it and you sigh happily, puffing away until there''s nothing but a charred butt left.
 				<</if>>
@@ -1002,13 +1002,13 @@
 					<<gs 'drugs' 'smoke'>>
 					<<image "shared/sex/after/bed_smoke3.jpg">>
 					<<if getvar("$sex_ev['cock_inserted']") == 0>>
-						<p>"Got any smokes?" you ask. <<=$npcs.get($sex.npcId,'firstname')>> nods and fishes out a pack, proffering the first one to you and igniting it for you. He pulls out one for himself and lights up as well while you take your first drag.</p>
+						<p>"Got any smokes?" you ask. <<npc $sex.npcId>><</npc>> nods and fishes out a pack, proffering the first one to you and igniting it for you. He pulls out one for himself and lights up as well while you take your first drag.</p>
 					<<else>>
 						<<setinit $sex_ev['cock_inserted'] = 0>>
 						<<if $sex_ev['last_cum'] == 'creampie'>>
-							<p>"Got any smokes?" you ask, feeling the cum spill from your pussy as you finally let <<=$npcs.get($sex.npcId,'firstname')>>'s cock slip from your pussy before sitting up. <<=$npcs.get($sex.npcId,'firstname')>> nods and fishes out a pack, proffering the first one to you and igniting it for you. He pulls out one for himself and lights up as well while you take your first drag.</p>
+							<p>"Got any smokes?" you ask, feeling the cum spill from your pussy as you finally let <<npc $sex.npcId>><</npc>>'s cock slip from your pussy before sitting up. <<npc $sex.npcId>><</npc>> nods and fishes out a pack, proffering the first one to you and igniting it for you. He pulls out one for himself and lights up as well while you take your first drag.</p>
 						<<else>>
-							<p>"Got any smokes?" you ask as you pull apart, finally letting <<=$npcs.get($sex.npcId,'firstname')>>'s cock slip from your pussy before sitting up. <<=$npcs.get($sex.npcId,'firstname')>> nods and fishes out a pack, proffering the first one to you and igniting it for you. He pulls out one for himself and lights up as well while you take your first drag.</p>
+							<p>"Got any smokes?" you ask as you pull apart, finally letting <<npc $sex.npcId>><</npc>>'s cock slip from your pussy before sitting up. <<npc $sex.npcId>><</npc>> nods and fishes out a pack, proffering the first one to you and igniting it for you. He pulls out one for himself and lights up as well while you take your first drag.</p>
 						<</if>>
 					<</if>>
 					Smoke fills your lungs and you hold it there, savouring it, before exhaling slowly. As the smoke blows past your lips, it's like all your stress goes with it and you sigh happily, and the two of you continue to puff away until there''s but the charred butts left.
@@ -1016,11 +1016,11 @@
 				<<else>>
 					<<image "shared/sex/after/annoyed1.jpg">>
 					<<if getvar("$sex_ev['cock_inserted']") == 0>>
-						<p>"Got any smokes?" you ask but <<=$npcs.get($sex.npcId,'firstname')>> just shakes his head.</p>
+						<p>"Got any smokes?" you ask but <<npc $sex.npcId>><</npc>> just shakes his head.</p>
 					<<elseif $sex_ev['last_cum'] == 'creampie'>>
-						<p>"Got any smokes?" you ask, feeling the cum spill from your pussy as you finally let <<=$npcs.get($sex.npcId,'firstname')>>'s cock slip from your pussy before sitting up. Unfortunately, he just shakes his head.</p>
+						<p>"Got any smokes?" you ask, feeling the cum spill from your pussy as you finally let <<npc $sex.npcId>><</npc>>'s cock slip from your pussy before sitting up. Unfortunately, he just shakes his head.</p>
 					<<else>>
-						<p>"Got any smokes?" you ask as you pull apart, finally letting <<=$npcs.get($sex.npcId,'firstname')>>'s cock slip from your pussy before sitting up. Unfortunately, he just shakes his head.</p>
+						<p>"Got any smokes?" you ask as you pull apart, finally letting <<npc $sex.npcId>><</npc>>'s cock slip from your pussy before sitting up. Unfortunately, he just shakes his head.</p>
 					<</if>>
 					<<setinit $sex_ev['cock_inserted'] = 0>>
 					<<actCLA 'Damn'>>
@@ -1052,7 +1052,7 @@
 					"Oh no you're not," you growl lustfully.
 				<</if>>
 				<<if $sex_ev['cum_choice'] == 'creampie' or $sex_ev['cum_choice'] == 'creampie_surprise'>>
-					<p>You pull away, pussy trailing semen as you get down in front of <<=$npcs.get($sex.npcId,'firstname')>> and grab his cock. You work his shaft furiously, trying to keep him hard. But despite your best efforts, his dick softens in your grasp and you can't get it to rise again. </p>
+					<p>You pull away, pussy trailing semen as you get down in front of <<npc $sex.npcId>><</npc>> and grab his cock. You work his shaft furiously, trying to keep him hard. But despite your best efforts, his dick softens in your grasp and you can't get it to rise again. </p>
 				<<else>>
 					Taking hold of his cock, you work his shaft furiously, trying to keep him hard. But despite your best efforts, his dick softens in your grasp and you can't get it to rise again.
 				<</if>>
@@ -1066,9 +1066,9 @@
 					"Oh no you're not," you growl lustfully.
 				<</if>>
 				<<if $sex_ev['cum_choice'] == 'creampie' or $sex_ev['cum_choice'] == 'creampie_surprise'>>
-					<p>You pull away, pussy trailing semen as you get down in front of <<=$npcs.get($sex.npcId,'firstname')>> and grab his cock. You work his shaft furiously, trying to keep him hard. It doesn't take long, only a minute or two, and before you know it <<=$npcs.get($sex.npcId,'firstname')>> is standing at attention once again.</p>
+					<p>You pull away, pussy trailing semen as you get down in front of <<npc $sex.npcId>><</npc>> and grab his cock. You work his shaft furiously, trying to keep him hard. It doesn't take long, only a minute or two, and before you know it <<npc $sex.npcId>><</npc>> is standing at attention once again.</p>
 				<<else>>
-					<p>Taking hold of his cock, you work his shaft furiously, trying to keep him hard. It doesn't take long, only a minute or two, and before you know it <<=$npcs.get($sex.npcId,'firstname')>> is standing at attention once again.</p>
+					<p>Taking hold of his cock, you work his shaft furiously, trying to keep him hard. It doesn't take long, only a minute or two, and before you know it <<npc $sex.npcId>><</npc>> is standing at attention once again.</p>
 				<</if>>
 				<<if getvar("$sex_ev['not_done']") == 1>>
 					"Yeah, that's right...  Just like that little guy..."
@@ -1096,11 +1096,11 @@
 					"Oh no you're not," you growl lustfully.
 				<</if>>
 				<<if ($sex_ev['last_cum'] == 'creampie' or $sex_ev['cum_choice'] == 'creampie_surprise') and getvar("$sex_ev['cock_inserted']") == 1>>
-					<p>You pull away, pussy trailing semen as you get down in front of <<=$npcs.get($sex.npcId,'firstname')>>. You take him in your mouth, tasting of cum and your own juices, and suck gently on its head, licking, teasing, playing with his softening cock. But try as you might, it's like trying to play billiards with a rope. You just can't get him hard again.</p>
+					<p>You pull away, pussy trailing semen as you get down in front of <<npc $sex.npcId>><</npc>>. You take him in your mouth, tasting of cum and your own juices, and suck gently on its head, licking, teasing, playing with his softening cock. But try as you might, it's like trying to play billiards with a rope. You just can't get him hard again.</p>
 				<<elseif $sex_ev['last_cum'] == 'condom'>>
-					<p>You pull away and get down in front of <<=$npcs.get($sex.npcId,'firstname')>>. You slip the condom from his cock and take him in your mouth, you suck gently on its head, licking, teasing, playing, cleaning the cum from with his softening cock. But try as you might, it's like trying to play billiards with a rope. You just can't get him hard again.</p>
+					<p>You pull away and get down in front of <<npc $sex.npcId>><</npc>>. You slip the condom from his cock and take him in your mouth, you suck gently on its head, licking, teasing, playing, cleaning the cum from with his softening cock. But try as you might, it's like trying to play billiards with a rope. You just can't get him hard again.</p>
 				<<else>>
-					<p>You pull away and get down in front of <<=$npcs.get($sex.npcId,'firstname')>>. Taking his cock in your mouth, you suck gently on its head, licking, teasing, playing with his softening cock. But try as you might, it's like trying to play billiards with a rope. You just can't get him hard again.</p>
+					<p>You pull away and get down in front of <<npc $sex.npcId>><</npc>>. Taking his cock in your mouth, you suck gently on its head, licking, teasing, playing with his softening cock. But try as you might, it's like trying to play billiards with a rope. You just can't get him hard again.</p>
 				<</if>>
 				<<if getvar("$sex_ev['not_done']") == 1>>
 					<p>"Goddammit!" you growl. "I still wanted more out of you!"</p>
@@ -1115,13 +1115,13 @@
 					"Oh no you're not," you growl lustfully.
 				<</if>>
 				<<if $sex_ev['last_cum'] == 'creampie' and getvar("$sex_ev['cock_inserted']") == 1>>
-					<p>You pull away, pussy trailing semen as you get down in front of <<=$npcs.get($sex.npcId,'firstname')>>. You take him in your mouth, tasting of cum and your own juices, and suck gently on its head, licking, teasing, playing, trying to keep him hard. As you do, the dick between your lips begins to stiffen up again.</p>
+					<p>You pull away, pussy trailing semen as you get down in front of <<npc $sex.npcId>><</npc>>. You take him in your mouth, tasting of cum and your own juices, and suck gently on its head, licking, teasing, playing, trying to keep him hard. As you do, the dick between your lips begins to stiffen up again.</p>
 				<<elseif $sex_ev['last_cum'] == 'creampie' and getvar("$sex_ev['cock_inserted']") == 1 and getvar("$sex_ev['force_harden']") > 0>>
-					<p>You pull away, pussy trailing semen as you get down in front of <<=$npcs.get($sex.npcId,'firstname')>>. You take him in your mouth, tasting of cum and your own juices as you lick, tease, and play with his shaft. After a few moments of softness, <<=$npcs.get($sex.npcId,'firstname')>> groans in a way that sounds almost painful and the dick between your lips begins to stiffen up again..</p>
+					<p>You pull away, pussy trailing semen as you get down in front of <<npc $sex.npcId>><</npc>>. You take him in your mouth, tasting of cum and your own juices as you lick, tease, and play with his shaft. After a few moments of softness, <<npc $sex.npcId>><</npc>> groans in a way that sounds almost painful and the dick between your lips begins to stiffen up again..</p>
 				<<elseif $sex_ev['last_cum'] == 'condom'>>
-					<p>You pull away and get down in front of <<=$npcs.get($sex.npcId,'firstname')>>. You slip the condom from his cock and take him in your mouth, you suck gently on its head, licking, teasing, playing, cleaning the cum from his shaft. As you do, the dick between your lips begins to stiffen up again.</p>
+					<p>You pull away and get down in front of <<npc $sex.npcId>><</npc>>. You slip the condom from his cock and take him in your mouth, you suck gently on its head, licking, teasing, playing, cleaning the cum from his shaft. As you do, the dick between your lips begins to stiffen up again.</p>
 				<<elseif getvar("$sex_ev['force_harden']") > 0>>
-					<p>Taking his cock in your mouth, you suck gently on its head, licking, teasing, playing, with your lips and tongue across his shaft. After a few moments of softness, <<=$npcs.get($sex.npcId,'firstname')>> groans in a way that sounds almost painful and the dick between your lips begins to stiffen up again.</p>
+					<p>Taking his cock in your mouth, you suck gently on its head, licking, teasing, playing, with your lips and tongue across his shaft. After a few moments of softness, <<npc $sex.npcId>><</npc>> groans in a way that sounds almost painful and the dick between your lips begins to stiffen up again.</p>
 				<<else>>
 					Taking his cock in your mouth, you suck gently on its head, licking, teasing, playing, with your lips and tongue across his shaft. After a few moments of softness, the dick between your lips begins to stiffen up again.
 				<</if>>
@@ -1151,18 +1151,18 @@
 			<<video "shared/sex/blowjob/play1.mp4">>
 			<<if getvar("$sex_ev['no_condom']") == 1>>
 				<<if $sex_ev['last_cum'] == 'creampie'>>
-					<p>"Here, let me take care of that for you," you say, slithering down between <<=$npcs.get($sex.npcId,'firstname')>>'s legs and taking his cock in your mouth. You run your lips up and down his shaft and give it a thorough tongue bath, lapping up your own juices and the remnants of the creampie he filled you with.</p>
+					<p>"Here, let me take care of that for you," you say, slithering down between <<npc $sex.npcId>><</npc>>'s legs and taking his cock in your mouth. You run your lips up and down his shaft and give it a thorough tongue bath, lapping up your own juices and the remnants of the creampie he filled you with.</p>
 				<<else>>
-					<p>"Here, let me take care of that for you," you say, slithering down between <<=$npcs.get($sex.npcId,'firstname')>>'s legs and taking his cock in your mouth. You run your lips up and down his shaft and give it a thorough tongue bath, lapping up your own juices and sucking any remaining cum out of the tip.</p>
+					<p>"Here, let me take care of that for you," you say, slithering down between <<npc $sex.npcId>><</npc>>'s legs and taking his cock in your mouth. You run your lips up and down his shaft and give it a thorough tongue bath, lapping up your own juices and sucking any remaining cum out of the tip.</p>
 				<</if>>
 			<<elseif getvar("$sex_ev['condoms_used']") > 0>>
 				<<if getvar("$sex_ev['cum_condom']") > 0>>
-					<p>"Here, let me take care of that for you," you say, slithering down between <<=$npcs.get($sex.npcId,'firstname')>>'s legs and taking his cock in your mouth. You run your lips up and down his shaft and give it a thorough tongue bath, lapping up your own juices and the cum that filled the inside of the condom.</p>
+					<p>"Here, let me take care of that for you," you say, slithering down between <<npc $sex.npcId>><</npc>>'s legs and taking his cock in your mouth. You run your lips up and down his shaft and give it a thorough tongue bath, lapping up your own juices and the cum that filled the inside of the condom.</p>
 				<<else>>
-					<p>"Here, let me take care of that for you," you say, slithering down between <<=$npcs.get($sex.npcId,'firstname')>>'s legs and taking his cock in your mouth. You run your lips up and down his shaft and give it a thorough tongue bath, lapping up the condom lube, your own juices, and sucking any remaining cum out of the tip.</p>
+					<p>"Here, let me take care of that for you," you say, slithering down between <<npc $sex.npcId>><</npc>>'s legs and taking his cock in your mouth. You run your lips up and down his shaft and give it a thorough tongue bath, lapping up the condom lube, your own juices, and sucking any remaining cum out of the tip.</p>
 				<</if>>
 			<</if>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> smiles at you appreciatively.</p>
+			<p><<npc $sex.npcId>><</npc>> smiles at you appreciatively.</p>
 			<<gs 'sex_ev_sex' 'sex_end'>>
 		<</actCLA>>
 	<</if>>
@@ -1336,7 +1336,7 @@
 			<i>Hang on a minute.</i>
 			Even in your sleep your brow wrinkles.
 			<i>Hammock on the water? That doesn''t make any sense. And don't hammocks swing side to side, not back and forth? And it doesn''t feel like a <b>pillow</b> between my legs, it feels like a...</i>
-			<p>Your eyes flutter open and find <<=$npcs.get($sex.npcId,'firstname')>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.</p>
+			<p>Your eyes flutter open and find <<npc $sex.npcId>><</npc>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.</p>
 			<<gs 'sex_ev_sex' 'sleep_wake_options'>>
 		<</actCLA>>
 	<</actCLA>>
@@ -1356,7 +1356,7 @@
 			<i>Hang on a minute.</i>
 			Even in your sleep your brow wrinkles.
 			<i>That doesn''t feel like wood. I'm not being impaled, I'm being...</i>
-			<p>Your eyes flutter open and find <<=$npcs.get($sex.npcId,'firstname')>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.</p>
+			<p>Your eyes flutter open and find <<npc $sex.npcId>><</npc>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.</p>
 			<<gs 'sex_ev_sex' 'sleep_wake_options'>>
 		<</actCLA>>
 	<</actCLA>>
@@ -1390,7 +1390,7 @@
 			<i>Hang on a minute.</i>
 			You moan involuntarily as a spark of pleasure jumps through your chest.
 			<i>I'm not dreaming... I'm...</i>
-			<p>Your eyes flutter open and find <<=$npcs.get($sex.npcId,'firstname')>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.</p>
+			<p>Your eyes flutter open and find <<npc $sex.npcId>><</npc>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.</p>
 			<<gs 'sex_ev_sex' 'sleep_wake_options'>>
 		<</actCLA>>
 	<</actCLA>>
@@ -1410,7 +1410,7 @@
 			<i>Hang on a minute.</i>
 			Even in your sleep your brow wrinkles.
 			<i>It <b>is</b> inside me! And that's not jelly, that's...</i>
-			<p>Your eyes flutter open and find <<=$npcs.get($sex.npcId,'firstname')>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.</p>
+			<p>Your eyes flutter open and find <<npc $sex.npcId>><</npc>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.</p>
 			<<gs 'sex_ev_sex' 'sleep_wake_options'>>
 		<</actCLA>>
 	<</actCLA>>
@@ -1422,14 +1422,14 @@
 		<</actCLA>>
 	<<elseif $npcs.get($sex.npcId,'sleep_sex_okay') == 1>>
 		<!-- !! npc_sleep_sex_okay[$sex.npcId] = 2 means you've asked him to wake you up for sleep sex-->
-		<p>"You're finally awake," <<=$npcs.get($sex.npcId,'firstname')>> smiles.</p>
+		<p>"You're finally awake," <<npc $sex.npcId>><</npc>> smiles.</p>
 	<</if>>
 	<<actCLA 'Moan'>>
 		<<setinit $sex_ev['sleep_fuck'] = 2>>
 		<<setinit $sex_ev['position'] = 'miss'>>
 		<<video "shared/sex/sleep/wake1.mp4">>
 		<i>Ahh~! Aahn~!</i>
-		<p>You moan with hoarse arousal, spreading your legs wider so <<=$npcs.get($sex.npcId,'firstname')>> can keep fucking you.</p>
+		<p>You moan with hoarse arousal, spreading your legs wider so <<npc $sex.npcId>><</npc>> can keep fucking you.</p>
 		<<if getvar("$npc_sex_speed") <= 2>>
 			<<setinit $sex_ev['speed'] = 1>>
 			<<actCLA 'Fuck $npcs.get('+$sex.npcId,'firstname')+''>>
@@ -1450,7 +1450,7 @@
 		<<set $orgasm_or = 'yes'>>
 		<<gs 'sex_ev_sex' 'fuck_arousal_cum_code'>>
 		<<video "shared/sex/vag/miss/orgasm1.mp4">>
-		<p>In your relaxed state of sleep, you didn't realize how close you were to orgasm. The instant you're aware of it, your arousal finally breaks and an orgasm rocks through your body. You whimper sleepily as you squirm beneath <<=$npcs.get($sex.npcId,'firstname')>> and your climax washes over you.</p>
+		<p>In your relaxed state of sleep, you didn't realize how close you were to orgasm. The instant you're aware of it, your arousal finally breaks and an orgasm rocks through your body. You whimper sleepily as you squirm beneath <<npc $sex.npcId>><</npc>> and your climax washes over you.</p>
 		<<actCLA 'Back to sleep'>>
 			$sex_ev['sleep_video2']
 			<i>That was... nice...</i> you think before tiredness overtakes you and you drift off back to dreamland.
@@ -1462,7 +1462,7 @@
 			<<setinit $sex_ev['position'] = 'miss'>>
 			<<video "shared/sex/sleep/wake1.mp4">>
 			<i>Ahh~! Aahn~!</i>
-			<p>You moan with hoarse arousal as your orgasm fades and control comes back to your body, spreading your legs wider so <<=$npcs.get($sex.npcId,'firstname')>> can keep fucking you.</p>
+			<p>You moan with hoarse arousal as your orgasm fades and control comes back to your body, spreading your legs wider so <<npc $sex.npcId>><</npc>> can keep fucking you.</p>
 			<<if getvar("$npc_sex_speed") <= 2>>
 				<<setinit $sex_ev['speed'] = 1>>
 				<<actCLA 'Fuck $npcs.get('+$sex.npcId,'firstname')+''>>
@@ -1483,9 +1483,9 @@
 <</if>>
 <<if $location_var[$here][0] == 'sleep_wake_wtf'>>
 	$sex_ev['bed_room']
-	<p>"<i>WHAT THE FUCK!</i>" you scream, kicking <<=$npcs.get($sex.npcId,'firstname')>> out of you and scrambling across the bed from him. "What the fuck do you think you're doing?!"</p>
+	<p>"<i>WHAT THE FUCK!</i>" you scream, kicking <<npc $sex.npcId>><</npc>> out of you and scrambling across the bed from him. "What the fuck do you think you're doing?!"</p>
 	<<if (npc_caretaker[$sex.npcId] == 1 or rand(1,3) == 1) and $npcs.get($sex.npcId,'abusive') != 1>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> looks deeply embarrassed.</p>
+		<p><<npc $sex.npcId>><</npc>> looks deeply embarrassed.</p>
 		<<if $sex_ev['cum_count'] >= $npcs.get($sex.npcId,'sexdrive')>>
 			<p>"I- I'm sorry," he stammers. "After you fell asleep, I woke up. You were right there and I was so hard. I just couldn't get back to sleep. And since we just... you know... I thought I could...</p>
 		<<else>>
@@ -1534,7 +1534,7 @@
 		$sex_ev['bed_room']
 		Your anger returns swiftly.
 		<p>"No! Did you really think I was going to say yes after you were just <i>molesting</i> me in my sleep?"</p>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> sighs disappointedly and lays back in bed.</p>
+		<p><<npc $sex.npcId>><</npc>> sighs disappointedly and lays back in bed.</p>
 		<<actCLA 'Time to leave'>>
 			$sex_ev['bed_room']
 			"Ugh." You sneer at him as you get up. "I see how it's gonna be. Not gonna get a wink of sleep with you around. I'm leaving."
@@ -1618,7 +1618,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'wakeup_sex2'>>
 	<<image "shared/sex/vag/miss/3.jpg">>
-	<p>Your eyes flutter open and find <<=$npcs.get($sex.npcId,'firstname')>> balls deep inside you, happily fucking you first thing in the morning.</p>
+	<p>Your eyes flutter open and find <<npc $sex.npcId>><</npc>> balls deep inside you, happily fucking you first thing in the morning.</p>
 	<<gs 'sex_ev_sex' 'wakeup_sex_options'>>
 <</if>>
 <<if $location_var[$here][0] == 'wakeup_sex_options'>>
@@ -1626,15 +1626,15 @@
 		<!-- !! npc_sleep_sex_okay[$sex.npcId] = 2 means you've asked him to wake you up for sleep sex-->
 		<<if $npcs.get($sex.npcId,'humor') == 1 and $npcs.get($sex.npcId,'apt_spare') == 'gaming' and rand(1,3) == 1>>
 			<<setinit $sex_ev['skyrim_joke'] = 1>>
-			<p>"You're finally awake," <<=$npcs.get($sex.npcId,'firstname')>> says, putting on a stern face and a gruff voice. "You were trying to cross the border, right?"</p>
+			<p>"You're finally awake," <<npc $sex.npcId>><</npc>> says, putting on a stern face and a gruff voice. "You were trying to cross the border, right?"</p>
 		<<else>>
-			<p>"Good morning," <<=$npcs.get($sex.npcId,'firstname')>> smiles. "Have any good dreams?"</p>
+			<p>"Good morning," <<npc $sex.npcId>><</npc>> smiles. "Have any good dreams?"</p>
 		<</if>>
 	<</if>>
 	<<actCLA 'Moan'>>
 		<<gs 'sex_ev_sex' 'morning_wake_fuck_code'>>
 		<i>Ahh~! Aahn~!</i>
-		<p>You moan with hoarse arousal, spreading your legs wider so <<=$npcs.get($sex.npcId,'firstname')>> can keep fucking you.</p>
+		<p>You moan with hoarse arousal, spreading your legs wider so <<npc $sex.npcId>><</npc>> can keep fucking you.</p>
 		<<gs 'sex_ev_sex' 'wakeup_sex_continue'>>
 	<</actCLA>>
 	<<if $npcs.get($sex.npcId,'sleep_sex_okay') < 1>>
@@ -1644,7 +1644,7 @@
 	<<elseif $npcs.get($sex.npcId,'sleep_sex_okay') == 1>>
 		<<actCLA '"You were supposed to wake me" (not mad)'>>
 			<<gs 'sex_ev_sex' 'morning_wake_fuck_code'>>
-			<p>"Weren't <i>mm-!</i> you supposed to <i>aah~!</i> wake me?" you moan with hoarse arousal, spreading your legs wider so <<=$npcs.get($sex.npcId,'firstname')>> can keep fucking you.</p>
+			<p>"Weren't <i>mm-!</i> you supposed to <i>aah~!</i> wake me?" you moan with hoarse arousal, spreading your legs wider so <<npc $sex.npcId>><</npc>> can keep fucking you.</p>
 			"I just did," he grins.
 			<<gs 'sex_ev_sex' 'wakeup_sex_continue'>>
 		<</actCLA>>
@@ -1652,7 +1652,7 @@
 	<<if getvar("$sex_ev['skyrim_joke']") == 1>>
 		<<actCLA 'Giggle'>>
 			<<gs 'sex_ev_sex' 'morning_wake_fuck_code'>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>>'s internet video game joke is stupid to be sure, but despite that you can't help but smile at it.</p>
+			<p><<npc $sex.npcId>><</npc>>'s internet video game joke is stupid to be sure, but despite that you can't help but smile at it.</p>
 			"You're such a dork," you say, your giggles turning to moans as you feel him thrust again inside you.
 			<<gs 'sex_ev_sex' 'wakeup_sex_continue'>>
 		<</actCLA>>
@@ -1692,17 +1692,17 @@
 		<<actCLA 'Are you a child?'>>
 			<<video "shared/sex/sleep/wake1.mp4">>
 			<p>"Ugh," you groan loudly. "Internet memes? Seriously? What are you? Twelve?"</p>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> seems to feel no shame at all, letting his shit eating grin widen as he keeps fucking you.</p>
+			<p><<npc $sex.npcId>><</npc>> seems to feel no shame at all, letting his shit eating grin widen as he keeps fucking you.</p>
 			<<gs 'sex_ev_sex' 'wakeup_sex_continue'>>
 		<</actCLA>>
 		<<actCLA 'That killed the mood'>>
 			<<video "shared/sex/sleep/wake1.mp4">>
 			"<i>Wow</i>," you say, cringing something awful. "You sure know how to instantly kill the mood. I think we're done here."
-			<p>"Oh come on! It wasn't that bad!" <<=$npcs.get($sex.npcId,'firstname')>> tries to protest as you push him away. "Come on, don't be like that."</p>
+			<p>"Oh come on! It wasn't that bad!" <<npc $sex.npcId>><</npc>> tries to protest as you push him away. "Come on, don't be like that."</p>
 			<<actCLA 'Yes it was'>>
 				$sex_ev['bed_room']
 				"Uhh, <i>yes</i>. It was," you say, giving him a look of contempt. "I felt the moisture in my vagina practically evaporate. There is no way I'm going to let you fuck me right after saying that with your cock <i>inside</i> me."
-				<p>You successfully push <<=$npcs.get($sex.npcId,'firstname')>> off of you, shuddering with utter disgust the moment he's out from between your legs.</p>
+				<p>You successfully push <<npc $sex.npcId>><</npc>> off of you, shuddering with utter disgust the moment he's out from between your legs.</p>
 				<<gs 'sex_ev_morning' 'wakeup1'>>
 			<</actCLA>>
 			<<actCLA 'Ugh, fine'>>
@@ -1716,9 +1716,9 @@
 <</if>>
 <<if $location_var[$here][0] == 'morning_wake_wtf'>>
 	$sex_ev['bed_room']
-	<p>"<i>WHAT THE FUCK!</i>" you scream, kicking <<=$npcs.get($sex.npcId,'firstname')>> out of you and scrambling across the bed from him. "What the fuck do you think you're doing?!"</p>
+	<p>"<i>WHAT THE FUCK!</i>" you scream, kicking <<npc $sex.npcId>><</npc>> out of you and scrambling across the bed from him. "What the fuck do you think you're doing?!"</p>
 	<<if (npc_caretaker[$sex.npcId] == 1 or rand(1,3) == 1) and $npcs.get($sex.npcId,'abusive') != 1>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> looks deeply embarrassed.</p>
+		<p><<npc $sex.npcId>><</npc>> looks deeply embarrassed.</p>
 		<p>"I- I'm sorry," he stammers. "I woke up. You were right there and... I thought it would be sexy if I... you know...</p>
 		<<actCLA 'Forgive him'>>
 			Your hard stare softens and you feel the anger slowly drain from your body.
@@ -1763,7 +1763,7 @@
 		$sex_ev['bed_room']
 		Your anger returns swiftly.
 		<p>"No! Did you really think I was going to say yes after you were just <i>molesting</i> me in my sleep?"</p>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> sighs disappointedly and lays back in bed.</p>
+		<p><<npc $sex.npcId>><</npc>> sighs disappointedly and lays back in bed.</p>
 		<<gs 'sex_ev_morning' 'wakeup1'>>
 	<</actCLA>>
 	<<actCLA 'Oh alright'>>

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 140 - 140
sugarcube/src/autogenerated/unsorted/sex_ev_shower.tw


+ 21 - 21
sugarcube/src/autogenerated/unsorted/sex_ev_start.tw

@@ -112,7 +112,7 @@
 			<<gt 'sex_ev_start' 'fb_uninvited_start'>>
 		<<else>>
 			<<gs 'sex_ev_start' 'neighborhood_image'>>
-			<p>You knock on <<=$npcs.get($sex.npcId,'firstname')>>'s door but there is no answer.</p>
+			<p>You knock on <<npc $sex.npcId>><</npc>>'s door but there is no answer.</p>
 			<<actCLA 'Leave'>>
 				<<gt $loc>>
 			<</actCLA>>
@@ -146,7 +146,7 @@
 		<<gt 'sex_ev_start' 'fb_uninvited_start'>>
 	<<else>>
 		<<gs 'sex_ev_start' 'neighborhood_image'>>
-		<p>You knock on <<=$npcs.get($sex.npcId,'firstname')>>'s door but there is no answer.</p>
+		<p>You knock on <<npc $sex.npcId>><</npc>>'s door but there is no answer.</p>
 		<<actCLA 'Leave'>>
 			<<gt $loc>>
 		<</actCLA>>
@@ -178,7 +178,7 @@
 	<<gs 'sex_ev_start' 'begin'>>
 	<<gs 'sex_ev_start' 'lover_home_start'>>
 	$sex_ev['hall_way']
-	<p>You knock on the door and <<=$npcs.get($sex.npcId,'firstname')>> opens up.</p>
+	<p>You knock on the door and <<npc $sex.npcId>><</npc>> opens up.</p>
 	<<if $pc.pcs_sweat > 29>>
 		<!-- !!		if AlbinaQW['startletsday'] = daystart:-->
 		<<actCLA 'Didn`t have time'>>
@@ -230,7 +230,7 @@
 			"Hey," he says, looking up and down at you in amusement. "You're soaking wet."
 			<<if $pc.horny >= 70>>
 				<<actCLA 'Yeah'>>
-					<p>"Yeah," you say huskily, letting your arousal seep into your voice. <<=$npcs.get($sex.npcId,'firstname')>> locks eyes with you for a split second.</p>
+					<p>"Yeah," you say huskily, letting your arousal seep into your voice. <<npc $sex.npcId>><</npc>> locks eyes with you for a split second.</p>
 					<p>"Bed?"</p>
 					"Now," you pant and rush inside.
 					<<actCLA 'Clothes. Off. Now.'>>
@@ -248,7 +248,7 @@
 		<<actCLA 'Hey'>>
 			"Hey," you smile back. "So..."
 			<<if $npcs.get($sex.npcId,'selfish') > 0 and rand(0,1) == 1>>
-				<p>"Let's get you naked," <<=$npcs.get($sex.npcId,'firstname')>> says, pulling you inside and immediately tugging at your clothes.</p>
+				<p>"Let's get you naked," <<npc $sex.npcId>><</npc>> says, pulling you inside and immediately tugging at your clothes.</p>
 			<<else>>
 				"Come on in," he says, and leads you inside.
 			<</if>>
@@ -326,7 +326,7 @@
 				<<setinit $pc_buy_condoms[$sex.npcId] = 2>>
 				"I brought condoms," you grin, holding up the rubbers for him to see.
 				<<if getvar("$know_virgin["+$sex.npcId+"]") == 1>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> stares in awe.</p>
+					<p><<npc $sex.npcId>><</npc>> stares in awe.</p>
 					<p>"Does that mean...?"</p>
 					"Come and find out," you say, moving inside.
 				<<else>>
@@ -344,7 +344,7 @@
 				<<setinit $sex_ev['ma_pill'] = 1>>
 				<<actCLA 'No condoms'>>
 					$sex_ev['bed_room']
-					<p>"I brought a morning after pill," you say, stepping inside and drawing close to <<=$npcs.get($sex.npcId,'firstname')>>. You lean in and whisper in his ear, "<i>We don't need to use a condom today.</i>"</p>
+					<p>"I brought a morning after pill," you say, stepping inside and drawing close to <<npc $sex.npcId>><</npc>>. You lean in and whisper in his ear, "<i>We don't need to use a condom today.</i>"</p>
 					<<actCLA 'Undress'>>
 						<<gt 'sex_ev_foreplay' 'undress'>>
 					<</actCLA>>
@@ -352,7 +352,7 @@
 				<<actCLA 'Come inside me'>>
 					<<setinit $sex_ev['creampie_allowance'] = 1>>
 					$sex_ev['bed_room']
-					<p>"I brought a morning after pill," you say, stepping inside and drawing close to <<=$npcs.get($sex.npcId,'firstname')>>. You lean in and whisper in his ear, "<i>That means can come inside me today.</i>"</p>
+					<p>"I brought a morning after pill," you say, stepping inside and drawing close to <<npc $sex.npcId>><</npc>>. You lean in and whisper in his ear, "<i>That means can come inside me today.</i>"</p>
 					<<actCLA 'Undress'>>
 						<<gt 'sex_ev_foreplay' 'undress'>>
 					<</actCLA>>
@@ -362,7 +362,7 @@
 		<<if getvar("$birth_control['think_safe']") == 1 and $npcs.get($sex.npcId,'know_bc') == 0>>
 			<<actCLA 'Tell him you`re on birth control'>>
 				$sex_ev['bed_room']
-				<p>You step inside and draw close to <<=$npcs.get($sex.npcId,'firstname')>>. You lean in and whisper in his ear...</p>
+				<p>You step inside and draw close to <<npc $sex.npcId>><</npc>>. You lean in and whisper in his ear...</p>
 				<<actCLA 'No condoms'>>
 					$sex_ev['bed_room']
 					<<if $npcs.get($sex.npcId,'know_bc_not_effective') == 1>>
@@ -393,7 +393,7 @@
 		<<if $npcs.get($sex.npcId,'shave_promise') > 0 and $pc.pubesLength < 4>>
 			<<actCLA 'Tell him you shaved'>>
 				$sex_ev['bed_room']
-				<p>"I have a special surprise too," you say, stepping inside and drawing close to <<=$npcs.get($sex.npcId,'firstname')>>. You lean in and whisper in his ear, "<i>I shaved my pussy for you.</i>"</p>
+				<p>"I have a special surprise too," you say, stepping inside and drawing close to <<npc $sex.npcId>><</npc>>. You lean in and whisper in his ear, "<i>I shaved my pussy for you.</i>"</p>
 				<<actCLA 'Undress'>>
 					<<gt 'sex_ev_foreplay' 'undress'>>
 				<</actCLA>>
@@ -414,7 +414,7 @@
 <<if $location_var[$here][0] == 'fuck_or_what'>>
 	<<actCLA 'Are we going to fuck or what?'>>
 		<p>"So are you going to stand here complaining or are we going to fuck?" you grin.</p>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't say anything, instead grabbing you by the arms and dragging you inside.</p>
+		<p><<npc $sex.npcId>><</npc>> doesn't say anything, instead grabbing you by the arms and dragging you inside.</p>
 		<<actCLA 'Clothes. Off. Now.'>>
 			<<gt 'sex_ev_foreplay' 'undress'>>
 		<</actCLA>>
@@ -426,7 +426,7 @@
 	$sex_ev['hall_way']
 	You knock on the door and you hear the latch unlock and the door swings open.
 	<<actCLA 'I was in the neighborhood'>>
-		<p>"Hey," you smile at <<=$npcs.get($sex.npcId,'firstname')>> who blinks in surprise. "I was in the neighborhood and I started thinking about you, wondering if you wanted to fool around some...?"</p>
+		<p>"Hey," you smile at <<npc $sex.npcId>><</npc>> who blinks in surprise. "I was in the neighborhood and I started thinking about you, wondering if you wanted to fool around some...?"</p>
 		<<if $npcs.get($sex.npcId,'booty_call') == $time.daystart>>
 			"I was just about to text you," he grins.
 			<p>So am I coming in or what?" you grin back.</p>
@@ -454,7 +454,7 @@
 	<</actCLA>>
 	<<actCLA 'Surprise!'>>
 		<<if rand(1,10) < $npcs.get($sex.npcId,'sexdrive')>>
-			<p>"Surprise!" you shout gleefully at a startled <<=$npcs.get($sex.npcId,'firstname')>>. "Just happened to be walking by and I thought I might drop in, see if you wanted to fool around?" You grin at him, bouncing your eyebrows suggestively.</p>
+			<p>"Surprise!" you shout gleefully at a startled <<npc $sex.npcId>><</npc>>. "Just happened to be walking by and I thought I might drop in, see if you wanted to fool around?" You grin at him, bouncing your eyebrows suggestively.</p>
 			"Well I won''t say no if that's what you want," he smirks, stepping aside to let you in and leering at your ass as you walk past.
 			<<actCLA 'Go to the bedroom'>>
 				<<gt 'sex_ev_foreplay' 'undress'>>
@@ -465,7 +465,7 @@
 	<</actCLA>>
 	<<actCLA 'I need a good fuck'>>
 		<<if rand(1,10) < $npcs.get($sex.npcId,'sexdrive')>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> stands there startled as you step forward, putting your hand on his chest.</p>
+			<p><<npc $sex.npcId>><</npc>> stands there startled as you step forward, putting your hand on his chest.</p>
 			"I need a good fuck and I need it right now," you say.
 			A moment passes with you staring into his eyes with a smouldering gaze before he drags you inside, slamming the door behind you.
 			<<actCLA 'Go to the bedroom'>>
@@ -478,7 +478,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'uninvited_deny'>>
 	<<run $npcs.set($sex.npcId,'no_booty_call',$time.daystart)>>
-	<p>"You should've texted," <<=$npcs.get($sex.npcId,'firstname')>> says shaking his head. "I'm not in the mood, maybe some other time."</p>
+	<p>"You should've texted," <<npc $sex.npcId>><</npc>> says shaking his head. "I'm not in the mood, maybe some other time."</p>
 	He closes the door on you abruptly and you're left standing outside horny and alone.
 	<<actCLA 'Leave'>>
 		<<gt $loc>>
@@ -487,17 +487,17 @@
 <<if $location_var[$here][0] == 'girlfriend_surprise1'>>
 	You knock on the door and you hear the latch unlock and the door swings open.
 	<<actCLA 'I was in the neighborhood'>>
-		<p>"Hey, I was in the neighborhood-" you start to smile and freeze when you realize it's not <<=$npcs.get($sex.npcId,'firstname')>>, but another woman standing in front of you.</p>
+		<p>"Hey, I was in the neighborhood-" you start to smile and freeze when you realize it's not <<npc $sex.npcId>><</npc>>, but another woman standing in front of you.</p>
 	<</actCLA>>
 	<<actCLA 'Surprise!'>>
-		<p>"Surprise!" you shout gleefully at a startled <<=$npcs.get($sex.npcId,'firstname')>>. "Just happened to be walking by and I thought I might drop in, see if you wanted to fool around?" You grin at him, bouncing your eyebrows suggestively.</p>
+		<p>"Surprise!" you shout gleefully at a startled <<npc $sex.npcId>><</npc>>. "Just happened to be walking by and I thought I might drop in, see if you wanted to fool around?" You grin at him, bouncing your eyebrows suggestively.</p>
 		"Well I won''t say no if that's what you want," he smirks, stepping aside to let you in and leering at your ass as you walk past.
 		<<actCLA 'Go to the bedroom'>>
 			<<gt 'sex_ev_foreplay' 'undress'>>
 		<</actCLA>>
 	<</actCLA>>
 	<<actCLA 'I need a good fuck'>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> stands there startled as you step forward, putting your hand on his chest.</p>
+		<p><<npc $sex.npcId>><</npc>> stands there startled as you step forward, putting your hand on his chest.</p>
 		"I need a good fuck and I need it right now," you say.
 		A moment passes with you staring into his eyes with a smouldering gaze before he drags you inside, slamming the door behind you.
 		<<actCLA 'Go to the bedroom'>>
@@ -512,11 +512,11 @@
 <<if $location_var[$here][0] == 'girlfriend_surprise2'>>
 <</if>>
 <<if $location_var[$here][0] == 'girlfriend_cheater1'>>
-	<p>You walk into <<=$npcs.get($sex.npcId,'firstname')>>'s apartment, you freeze as you enter seeing a woman standing there, clearly not expecting someone else to arrive here today.</p>
+	<p>You walk into <<npc $sex.npcId>><</npc>>'s apartment, you freeze as you enter seeing a woman standing there, clearly not expecting someone else to arrive here today.</p>
 	<p>woman: "who are you?"</p>
-	<p>Sveta: "Uhm, I'm $pc.name_nick, I'm here to see <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+	<p>Sveta: "Uhm, I'm $pc.name_nick, I'm here to see <<npc $sex.npcId>><</npc>>.</p>
 	The woman looks at you questiongly, wondering why you're here and how you got a key to the apartment. looking at her face you see she it's dawning on here why you're here.
-	<p>"oh fuck" you think inwardly realizing this is either another one of <<=$npcs.get($sex.npcId,'firstname')>> fuckbuddies who didn't know he was fucking other girls or this is a girlfriend.</p>
+	<p>"oh fuck" you think inwardly realizing this is either another one of <<npc $sex.npcId>><</npc>> fuckbuddies who didn't know he was fucking other girls or this is a girlfriend.</p>
 	<p>"why?" she says with a hint of poison to her words</p>
 	Sveta: "ehhh, I'm just here to..."
 <</if>>

+ 80 - 80
sugarcube/src/autogenerated/unsorted/sex_ev_talk.tw

@@ -10,16 +10,16 @@
 	end} -->
 	<<if $npcs.get($sex.npcId,'childfree') == 1 and getvar("$WIP_enabled") == 1>>
 		<<if getvar("$cum_loc['vagina']") > 0>>
-			<p>"Speaking of which..." <<=$npcs.get($sex.npcId,'firstname')>> says, looking intently at the cum slowly draining from your pussy. "You're going to get a morning after pill, right?"</p>
+			<p>"Speaking of which..." <<npc $sex.npcId>><</npc>> says, looking intently at the cum slowly draining from your pussy. "You're going to get a morning after pill, right?"</p>
 		<<else>>
-			<p>"Speaking of which..." <<=$npcs.get($sex.npcId,'firstname')>> asks, looking intently at your pussy, clearly thinking about when he came inside you earlier. "You're going to get a morning after pill, right?"</p>
+			<p>"Speaking of which..." <<npc $sex.npcId>><</npc>> asks, looking intently at your pussy, clearly thinking about when he came inside you earlier. "You're going to get a morning after pill, right?"</p>
 		<</if>>
 		<<gs 'sex_ev_talk' 'childfree_accidental_creampie1'>>
 	<<elseif getvar("$sex_ev['ma_pill']") == 1>>
 		<<if getvar("$cum_loc['vagina']") > 0>>
-			<p>"Speaking of which..." <<=$npcs.get($sex.npcId,'firstname')>> says, looking intently at the cum slowly draining from your pussy. "You're gonna take that pill right?"</p>
+			<p>"Speaking of which..." <<npc $sex.npcId>><</npc>> says, looking intently at the cum slowly draining from your pussy. "You're gonna take that pill right?"</p>
 		<<else>>
-			<p>"Speaking of which..." <<=$npcs.get($sex.npcId,'firstname')>> asks, looking intently at your pussy, clearly thinking about when he came inside you earlier. "You're gonna take that pill right?"</p>
+			<p>"Speaking of which..." <<npc $sex.npcId>><</npc>> asks, looking intently at your pussy, clearly thinking about when he came inside you earlier. "You're gonna take that pill right?"</p>
 		<</if>>
 		<<gs 'sex_ev_after' 'plan_b'>>
 		<<actCLA 'Tomorrow'>>
@@ -28,9 +28,9 @@
 		<</actCLA>>
 	<<else>>
 		<<if getvar("$cum_loc['vagina']") > 0>>
-			<p>"Speaking of which..." <<=$npcs.get($sex.npcId,'firstname')>> says, looking intently at the cum slowly draining from your pussy. "Are you gonna be okay...?"</p>
+			<p>"Speaking of which..." <<npc $sex.npcId>><</npc>> says, looking intently at the cum slowly draining from your pussy. "Are you gonna be okay...?"</p>
 		<<else>>
-			<p>"Speaking of which..." <<=$npcs.get($sex.npcId,'firstname')>> asks, looking intently at your pussy, clearly thinking about when he came inside you earlier. "Are you gonna be okay...?"</p>
+			<p>"Speaking of which..." <<npc $sex.npcId>><</npc>> asks, looking intently at your pussy, clearly thinking about when he came inside you earlier. "Are you gonna be okay...?"</p>
 		<</if>>
 		<<gs 'sex_ev_talk' 'boy_accidental_creampie2'>>
 	<</if>>
@@ -38,7 +38,7 @@
 <<if $location_var[$here][0] == 'boy_accidental_creampie2'>>
 	<<if getvar("$birth_control['think_safe']") == 1>>
 		<<actCLA 'I`ll be fine'>>
-			<p>"I'll be fine," you smile reassuringly. <<=$npcs.get($sex.npcId,'firstname')>> nods, relaxing a bit.</p>
+			<p>"I'll be fine," you smile reassuringly. <<npc $sex.npcId>><</npc>> nods, relaxing a bit.</p>
 			<<if getvar("$birth_control['think_safe']") == 1>>
 				<i>Besides, I'm on birth control,</i> you think to yourself. <i>But he doesn''t need to know that.</i>
 			<<else>>
@@ -169,7 +169,7 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'morning_after_money'>>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> looks at you for a moment before reaching down into his discarded trousers to grab his wallet, pulling 800<b>₽</b> out.</p>
+	<p><<npc $sex.npcId>><</npc>> looks at you for a moment before reaching down into his discarded trousers to grab his wallet, pulling 800<b>₽</b> out.</p>
 	"Here," he says, offering the cash to you. "Get a morning after pill later.
 	<<actCLA 'No, you don`t have to'>>
 		"No," you shake your head. "I can't ask you to do that."
@@ -182,10 +182,10 @@
 			$sex_ev['bed_room']
 			"No, I don't want your money," you say, shaking your head and pushing the money away.
 			<<if $npcs.get($sex.npcId,'childfree') == 1>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> stares at you for a moment, looking almost angry.</p>
+				<p><<npc $sex.npcId>><</npc>> stares at you for a moment, looking almost angry.</p>
 				<p>"Just don't fucking get pregnant, okay?" he says, tossing the cash onto his bedside table.</p>
 			<<else>>
-				<p>"If you're sure..." <<=$npcs.get($sex.npcId,'firstname')>> says hesitantly, withdrawing his hand.</p>
+				<p>"If you're sure..." <<npc $sex.npcId>><</npc>> says hesitantly, withdrawing his hand.</p>
 			<</if>>
 			<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 		<</actCLA>>
@@ -195,7 +195,7 @@
 			You take the money from him, warmed by the gesture.
 			"Thanks," you say, giving him the most grateful smile you can.
 			<<if $npcs.get($sex.npcId,'childfree') == 1>>
-				<p>"Seriously," <<=$npcs.get($sex.npcId,'firstname')>> says returning your smile with a stern look. "Take that pill."</p>
+				<p>"Seriously," <<npc $sex.npcId>><</npc>> says returning your smile with a stern look. "Take that pill."</p>
 			<<else>>
 				He just nods back in return.
 			<</if>>
@@ -221,7 +221,7 @@
 			<<if $npcs.get($sex.npcId,'childfree') == 1>>
 				"Just make sure you do," he replies. "I don't want any kids running around."
 			<<else>>
-				<p>"If you're sure..." <<=$npcs.get($sex.npcId,'firstname')>> says hesitantly, withdrawing his hand.</p>
+				<p>"If you're sure..." <<npc $sex.npcId>><</npc>> says hesitantly, withdrawing his hand.</p>
 			<</if>>
 			<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 		<</actCLA>>
@@ -310,7 +310,7 @@
 					<<run $npcs.set($sex.npcId,'free_creampies',1)>>
 					$sex_ev['temp_pic']
 					"You don't need to ask to come inside me y''know," you murmur. "Not <i>every</i> time. I'll let you know when it's a safe day," you smile gently. "And then you can come inside me as much as you want."
-					<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> smiles back, beaming at you.</p>
+					<p>"Okay." <<npc $sex.npcId>><</npc>> smiles back, beaming at you.</p>
 					<<gs 'sex_ev_talk' 'free_creampies_exit'>>
 				<</actCLA>>
 			<</if>>
@@ -322,7 +322,7 @@
 		cla & *clr
 		$sex_ev['temp_pic']
 		'"Don't worry," you smile. "It's a safe day for me. You can come inside me as much as you want today."'
-		if npc_childfree[$sex.npcId] = 1: '<<<<=$npcs.get($sex.npcId,'firstname')>>>> lets out a sigh of relief.'
+		if npc_childfree[$sex.npcId] = 1: '<<<<npc $sex.npcId>><</npc>>>> lets out a sigh of relief.'
 		gs'sex_ev_sex', 'sex_end'
 		end
 		elseif stat['probably_safe_day'] = 1:
@@ -331,7 +331,7 @@
 		cla & *clr
 		$sex_ev['temp_pic']
 		'"Don't worry," you smile. "I'm probably safe. It's okay for you to come inside me today."'
-		if npc_childfree[$sex.npcId] = 1: '<<<<=$npcs.get($sex.npcId,'firstname')>>>> lets out a sigh of relief.'
+		if npc_childfree[$sex.npcId] = 1: '<<<<npc $sex.npcId>><</npc>>>> lets out a sigh of relief.'
 		*nl
 		'<i>Probably...</i> you quietly reiterate to yourself.'
 		gs'sex_ev_sex', 'sex_end'
@@ -349,7 +349,7 @@
 		end
 		act'<i>I hope I get pregnant</i>':
 		cla & *nl
-		'<i>I really hope this gets me pregnant,</i> you think giddily to yourself. <i>I want <<<<=$npcs.get($sex.npcId,'firstname')>>>>''s babies swimming around inside me...</i>'
+		'<i>I really hope this gets me pregnant,</i> you think giddily to yourself. <i>I want <<<<npc $sex.npcId>><</npc>>>>''s babies swimming around inside me...</i>'
 		gs'sex_ev_sex', 'sex_end'
 		end
 		end
@@ -362,7 +362,7 @@
 	<<if $npcs.get($sex.npcId,'abusive') == 1 and $npcs.get($sex.npcId,'childfree') != 1>>
 		<<run $npcs.set($sex.npcId,'free_creampies',2)>>
 		<<if $npcs.get($sex.npcId,'cum_pref') == 'creampie'>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> gives you a predatory grin, so full of desire that it makes you involuntarily swallow.</p>
+			<p><<npc $sex.npcId>><</npc>> gives you a predatory grin, so full of desire that it makes you involuntarily swallow.</p>
 			"Good to know..."
 		<<else>>
 			"Good to know," he smirks amusedly.
@@ -371,7 +371,7 @@
 	<<elseif ($npcs.get($sex.npcId,'selfish') == 1 or $npcs.get($sex.npcId,'know_bc') == 1) and ($npcs.get($sex.npcId,'childfree') != 1 or $npcs.get($sex.npcId,'know_bc') == 1)>>
 		<<run $npcs.set($sex.npcId,'free_creampies',2)>>
 		<<if $npcs.get($sex.npcId,'cum_pref') == 'creampie'>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> gives you a look like he might just burst inside you again before giving you a delighted grin.</p>
+			<p><<npc $sex.npcId>><</npc>> gives you a look like he might just burst inside you again before giving you a delighted grin.</p>
 			"I'm gonna pump you full of so much cum, you're going to still be dripping next week," he says excitedly and you can't help but giggle at his boyish glee.
 		<<else>>
 			"Good to know," he smirks amusedly.
@@ -379,19 +379,19 @@
 		<<gs 'sex_ev_talk' 'free_creampies_exit'>>
 	<<else>>
 		<<if $npcs.get($sex.npcId,'childfree') == 1 and $npcs.get($sex.npcId,'know_bc') != 1>>
-			<p>"Are you sure...?" <<=$npcs.get($sex.npcId,'firstname')>> asks hesitantly. "You're not worried you're going to get pregnant? I'm... I'm not really up for having kids..."</p>
+			<p>"Are you sure...?" <<npc $sex.npcId>><</npc>> asks hesitantly. "You're not worried you're going to get pregnant? I'm... I'm not really up for having kids..."</p>
 			<!-- !! add more options later-->
 		<<else>>
-			<p>"Is that really okay?" <<=$npcs.get($sex.npcId,'firstname')>> asks, wide-eyed.</p>
+			<p>"Is that really okay?" <<npc $sex.npcId>><</npc>> asks, wide-eyed.</p>
 		<</if>>
 		<<actCLA 'I`ll be fine'>>
 			<p>"I'll be fine," you insist, smiling gently. "What could go wrong?"</p>
 			<<if $npcs.get($sex.npcId,'childfree') == 1 or rand(1,4) == 1>>
 				<<run $npcs.set($sex.npcId,'free_creampies',-1)>>
-				<p>"I'm not comfortable with it," <<=$npcs.get($sex.npcId,'firstname')>> says, shaking his head. "Maybe if you started birth control..."</p>
+				<p>"I'm not comfortable with it," <<npc $sex.npcId>><</npc>> says, shaking his head. "Maybe if you started birth control..."</p>
 			<<else>>
 				<<run $npcs.set($sex.npcId,'free_creampies',2)>>
-				<p>"Okay..." <<=$npcs.get($sex.npcId,'firstname')>> says hesitantly, but smiles back at you anyways.</p>
+				<p>"Okay..." <<npc $sex.npcId>><</npc>> says hesitantly, but smiles back at you anyways.</p>
 			<</if>>
 			<<gs 'sex_ev_talk' 'free_creampies_exit'>>
 		<</actCLA>>
@@ -399,15 +399,15 @@
 			"It feels so good," you coo gently. "I <i>want</i> you to come inside me. I want you to fill me with your cum..."
 			<<if ($npcs.get($sex.npcId,'cum_pref') == 'creampie' and $npcs.get($sex.npcId,'childfree') == 1 and rand(npc_willpwr[$sex.npcId],100) <= pcs_persuas) or ($npcs.get($sex.npcId,'cum_pref') == 'creampie' and $npcs.get($sex.npcId,'childfree') != 1)>>
 				<<run $npcs.set($sex.npcId,'free_creampies',2)>>
-				<p>Desire wars with willpower within <<=$npcs.get($sex.npcId,'firstname')>>. You watch as he struggles back and forth until he leers at you with a hungry stare and you know which one won out.</p>
-				<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> says. "I won't ask anymore."</p>
+				<p>Desire wars with willpower within <<npc $sex.npcId>><</npc>>. You watch as he struggles back and forth until he leers at you with a hungry stare and you know which one won out.</p>
+				<p>"Okay." <<npc $sex.npcId>><</npc>> says. "I won't ask anymore."</p>
 			<<elseif $npcs.get($sex.npcId,'childfree') == 1>>
 				<<run $npcs.set($sex.npcId,'free_creampies',-1)>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> hesitates for a moment before shaking his head.</p>
+				<p><<npc $sex.npcId>><</npc>> hesitates for a moment before shaking his head.</p>
 				"I'm not comfortable with it," he says. "Maybe if you started birth control..."
 			<<else>>
 				<<run $npcs.set($sex.npcId,'free_creampies',2)>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> hesitates for a moment before nodding slowly.</p>
+				<p><<npc $sex.npcId>><</npc>> hesitates for a moment before nodding slowly.</p>
 				"Okay," he says, smiling. "I won''t ask anymore."
 			<</if>>
 			<<gs 'sex_ev_talk' 'free_creampies_exit'>>
@@ -415,7 +415,7 @@
 		<<actCLA 'I'll tell you when it's safe'>>
 			<<run $npcs.set($sex.npcId,'free_creampies',1)>>
 			"I'll let you know when it's a safe day," you smile gently. "And then you can come inside me as much as you want."
-			<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> smiles back, beaming at you.</p>
+			<p>"Okay." <<npc $sex.npcId>><</npc>> smiles back, beaming at you.</p>
 			<<gs 'sex_ev_talk' 'free_creampies_exit'>>
 		<</actCLA>>
 		<<if getvar("$birth_control['think_safe']") == 1>>
@@ -429,7 +429,7 @@
 					<<gs 'sex_ev_stats' 'birth_control_know'>>
 					"I'm on birth control," you smile gently. "So you can come inside me as much as you want."
 				<</if>>
-				<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> smiles back, beaming at you.</p>
+				<p>"Okay." <<npc $sex.npcId>><</npc>> smiles back, beaming at you.</p>
 				<<gs 'sex_ev_talk' 'free_creampies_exit'>>
 			<</actCLA>>
 		<<elseif getvar("$pillcon2") >= 20000>>
@@ -442,7 +442,7 @@
 					<<gs 'sex_ev_stats' 'birth_control_know'>>
 					"I'm on birth control," you smile gently. "So you can come inside me as much as you want."
 				<</if>>
-				<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> smiles back, beaming at you.</p>
+				<p>"Okay." <<npc $sex.npcId>><</npc>> smiles back, beaming at you.</p>
 				<<gs 'sex_ev_talk' 'free_creampies_exit'>>
 			<</actCLA>>
 		<<else>>
@@ -455,7 +455,7 @@
 					<<gs 'sex_ev_stats' 'birth_control_know'>>
 					"I'm on birth control," you lie with a seductively gentle smile. "So you can come inside me as much as you want."
 				<</if>>
-				<p>"Okay." <<=$npcs.get($sex.npcId,'firstname')>> smiles back, beaming at you.</p>
+				<p>"Okay." <<npc $sex.npcId>><</npc>> smiles back, beaming at you.</p>
 				<<gs 'sex_ev_talk' 'free_creampies_exit'>>
 			<</actCLA>>
 		<</if>>
@@ -472,7 +472,7 @@
 	<<setinit $sex_ev['forgot_bc_chat'] = 1>>
 	<<if $npcs.get($sex.npcId,'childfree') > 0 and ($npcs.get($sex.npcId,'argumentative') > 0 or $npcs.get($sex.npcId,'abusive') > 0) and getvar("$sex_ev['creampie_count']") > 0>>
 		<<run $npcs.dec($sex.npcId,'rel',10)>>
-		<p>"What the fuck?!" <<=$npcs.get($sex.npcId,'firstname')>> exclaims. "Are you fucking kidding me? How could you forget? You better not get pregnant on me. I am <i>not</i> having your fucking kids."</p>
+		<p>"What the fuck?!" <<npc $sex.npcId>><</npc>> exclaims. "Are you fucking kidding me? How could you forget? You better not get pregnant on me. I am <i>not</i> having your fucking kids."</p>
 		<<actCLA 'Wallow'>>
 			<p>"I know, I know!" you moan miserably, berating yourself as much as he's berating you. "I'm a fucking idiot. I'm sorry, I'm so sorry."</p>
 			<<gs 'sex_ev_morning' 'wakeup1'>>
@@ -501,7 +501,7 @@
 			<</actCLA>>
 		<</if>>
 	<<elseif getvar("$sex_ev['creampie_count']") == 0>>
-		<p>"So what? I didn't come inside you last night," <<=$npcs.get($sex.npcId,'firstname')>> says, looking confused.</p>
+		<p>"So what? I didn't come inside you last night," <<npc $sex.npcId>><</npc>> says, looking confused.</p>
 		<<if $npcs.get($sex.npcId,'bareback') > 0>>
 			"Yeah but it may mean we need to start using condoms again for a while," you sigh.
 		<<else>>
@@ -510,7 +510,7 @@
 		<<gs 'sex_ev_talk' 'forgot_bc_exit'>>
 	<<else>>
 		<!-- !!		if npc_childfree[$sex.npcId] > 0:-->
-		<p>"Shit," <<=$npcs.get($sex.npcId,'firstname')>> says, looking concerned. "What are you gonna do?"</p>
+		<p>"Shit," <<npc $sex.npcId>><</npc>> says, looking concerned. "What are you gonna do?"</p>
 		<<actCLA 'I don`t know'>>
 			<p>"I don't know," you say, looking back at him apologetically. "Hope we get lucky I guess?"</p>
 			<<gs 'sex_ev_talk' 'forgot_bc_exit'>>
@@ -527,7 +527,7 @@
 		<<else>>
 			<<actCLA 'Buy some plan B?'>>
 				<p>"Buy a morning after pill?" you say, shrugging. "I don't know. Does it still work when you're already sort of on birth control?"</p>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> shrugs back. Great help.</p>
+				<p><<npc $sex.npcId>><</npc>> shrugs back. Great help.</p>
 				<<gs 'sex_ev_talk' 'forgot_bc_exit'>>
 			<</actCLA>>
 		<</if>>
@@ -557,24 +557,24 @@
 		<<set '"No way!" you exclaim' + iif(sex_ev['bareback_thinking'] = 1, ', dismissing the thought with a shake of your head. ', '. ') + '"That's way too risky! Just because nothing went wrong this time doesn't mean something can't go wrong in the future! We skipped it this time, but it's not becoming a regular thing."'>>
 		<<if $npcs.get($sex.npcId,'no_condoms') == 1>>
 			<<if $npcs.get($sex.npcId,'bareback_risk') == 1>>
-				<p>"You said that last time too," <<=$npcs.get($sex.npcId,'firstname')>> snickers.</p>
+				<p>"You said that last time too," <<npc $sex.npcId>><</npc>> snickers.</p>
 			<<else>>
 				<<if $npcs.get($sex.npcId,'argumentative') == 1>>
-					<p>"I don't see why," <<=$npcs.get($sex.npcId,'firstname')>> grumbles. "We both hate using them. We're only making things worse for ourselves."</p>
+					<p>"I don't see why," <<npc $sex.npcId>><</npc>> grumbles. "We both hate using them. We're only making things worse for ourselves."</p>
 				<<elseif $npcs.get($sex.npcId,'caretaker') == 1>>
-					<p>"Maybe that was asking a bit too much," <<=$npcs.get($sex.npcId,'firstname')>> replies sheepishly.</p>
+					<p>"Maybe that was asking a bit too much," <<npc $sex.npcId>><</npc>> replies sheepishly.</p>
 				<<else>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> sighs deeply.</p>
+					<p><<npc $sex.npcId>><</npc>> sighs deeply.</p>
 					"Guess that was too much to hope for..."
 				<</if>>
 			<</if>>
 		<<else>>
 			<<if $npcs.get($sex.npcId,'bareback_risk') == 1>>
-				<p>"But didn't you say that the last time after we went bareback?" <<=$npcs.get($sex.npcId,'firstname')>> says with a puzzled look.</p>
+				<p>"But didn't you say that the last time after we went bareback?" <<npc $sex.npcId>><</npc>> says with a puzzled look.</p>
 			<<elseif $npcs.get($sex.npcId,'childfree') == 1>>
-				<p>"Yeah, better safe than sorry I guess," <<=$npcs.get($sex.npcId,'firstname')>> nods. "Using condoms sucks a lot less than you getting pregnant."</p>
+				<p>"Yeah, better safe than sorry I guess," <<npc $sex.npcId>><</npc>> nods. "Using condoms sucks a lot less than you getting pregnant."</p>
 			<<else>>
-				<p>"Yeah, better safe than sorry," <<=$npcs.get($sex.npcId,'firstname')>> nods. "Sorry. Don't know what I was thinking asking that."</p>
+				<p>"Yeah, better safe than sorry," <<npc $sex.npcId>><</npc>> nods. "Sorry. Don't know what I was thinking asking that."</p>
 			<</if>>
 		<</if>>
 		<<run $npcs.set($sex.npcId,'bareback_risk',1)>>
@@ -586,7 +586,7 @@
 		<<run $npcs.set($sex.npcId,'bareback',1)>>
 		<<image "shared/sex/after/pillow_talk2.jpg">>
 		"Okay," you say with an eager smile. "Let''s stop using condoms then."
-		<p><<=$npcs.get($sex.npcId,'firstname')>> looks back at you shocked.</p>
+		<p><<npc $sex.npcId>><</npc>> looks back at you shocked.</p>
 		<p>"You really mean it?" he asks.</p>
 		<<actCLA 'You really mean it'>>
 			<<if getvar("$sex_ev['boy_pill_suggest']") == 1>>
@@ -597,7 +597,7 @@
 					<i>I'm on birth control anyways</i>, you think to yourself. <i>I probably don't need to be so extra protective.</i>
 
 				<</if>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> seems very excited.</p>
+				<p><<npc $sex.npcId>><</npc>> seems very excited.</p>
 			<</if>>
 			<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 		<</actCLA>>
@@ -608,7 +608,7 @@
 			<<else>>
 				<p>"No! No! I mean, if you're good to stop, then I'm good with it too."</p>
 			<</if>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> seems very excited.</p>
+			<p><<npc $sex.npcId>><</npc>> seems very excited.</p>
 			<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 		<</actCLA>>
 	<</actCLA>>
@@ -617,7 +617,7 @@
 			<<run $npcs.set($sex.npcId,'bareback',2)>>
 			<<image "shared/sex/after/pillow_talk2.jpg">>
 			<p>"I think it would be too risky to go bareback all the time," you say slowly. "But if it's at the right time, maybe it will be okay?"</p>
-			<p>"What are you saying?" <<=$npcs.get($sex.npcId,'firstname')>> asks. He seems to be trying not to get his hopes up before you say it out loud.</p>
+			<p>"What are you saying?" <<npc $sex.npcId>><</npc>> asks. He seems to be trying not to get his hopes up before you say it out loud.</p>
 			<p>"As long as I'm not in danger of getting pregnant, then it should be okay to skip the condom. So if I time it with my cycle, it should be fine. Right?"</p>
 			<<if $npcs.get($sex.npcId,'no_condoms') == 1>>
 				"Well... I''d prefer if we skipped the condoms altogether," he says wistfully. "But that's better than nothing."
@@ -643,7 +643,7 @@
 		<<image "shared/sex/after/pillow_talk3.jpg">>
 		"That pill costs money you know," you say irritatedly. "I'm not willing to pay for that every time you forget to pull out."
 		<<if $npcs.get($sex.npcId,'finance') == 2 and $npcs.get($sex.npcId,'selfish') < 1>>
-			<p>"How about I pay for it then?" <<=$npcs.get($sex.npcId,'firstname')>> asks. "Any time you need a morning after pill because of me, I'll give you money to pay for it."</p>
+			<p>"How about I pay for it then?" <<npc $sex.npcId>><</npc>> asks. "Any time you need a morning after pill because of me, I'll give you money to pay for it."</p>
 			He grabs his wallet and pulls out a wad of notes.
 			<p>"1000<b>₽</b> should be enough, right?" he grins. "First one can be on me."</p>
 			<<actCLA 'Refuse'>>
@@ -655,7 +655,7 @@
 					<<actCLA 'Refuse' undefined `{willpower:['misc','resist']}`>>
 							<<image "shared/sex/after/pillow_talk1.jpg">>
 							"No," you say, forcing the money away again. "I'm not taking your money for this. We'll just keep using condoms."
-							<p><<=$npcs.get($sex.npcId,'firstname')>> sighs in disappointment but does as you ask and puts the cash away.</p>
+							<p><<npc $sex.npcId>><</npc>> sighs in disappointment but does as you ask and puts the cash away.</p>
 							"Let me know if you ever change your mind," he says. "Offer will still stand."
 							<<run $npcs.set($sex.npcId,'pay_for_ma_pill_offer',1)>>
 							<<gs 'sex_ev_pillow_talk' 'topic_route'>>
@@ -665,14 +665,14 @@
 				<<actCLA 'Hormonal influence'>>
 					<<image "shared/sex/after/pillow_talk1.jpg">>
 					<p>"It's not just the money," you shake your head, pushing his hand back. "Those pills are just a bunch of hormones getting dumped into my body. It could totally throw my balance out of whack. I have enough hormonal issues as it is ' + iif(age < 20, 'as a teenage girl.', 'as a woman.') + 'I don't need more."</p>
-					<p>"Fair enough I suppose," <<=$npcs.get($sex.npcId,'firstname')>> replies ruefully and puts the money away. "Offer's always on the table if you change your mind."</p>
+					<p>"Fair enough I suppose," <<npc $sex.npcId>><</npc>> replies ruefully and puts the money away. "Offer's always on the table if you change your mind."</p>
 					<<run $npcs.set($sex.npcId,'pay_for_ma_pill_offer',1)>>
 					<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 				<</actCLA>>
 				<<actCLA 'Not a charity case'>>
 					<<image "shared/sex/after/pillow_talk3.jpg">>
 					"I'm not some kind of charity case," you say in irritation, practically slapping his hand away. "I can get by just fine on my own and <i>I</i> choose what I want to spend <i>my</i> money on."
-					<p>"Just let me know if you ever change your mind," <<=$npcs.get($sex.npcId,'firstname')>> shrugs, putting the money away. "Offer is here any time you want it."</p>
+					<p>"Just let me know if you ever change your mind," <<npc $sex.npcId>><</npc>> shrugs, putting the money away. "Offer is here any time you want it."</p>
 					<<run $npcs.set($sex.npcId,'pay_for_ma_pill_offer',1)>>
 					<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 				<</actCLA>>
@@ -712,9 +712,9 @@
 <</if>>
 <<if $location_var[$here][0] == 'boy_pays_for_ma_pills'>>
 	<<if $npcs.get($sex.npcId,'childfree') == 1>>
-		<p>"Well it would cost me a lot more money if you got pregnant and I had to pay child support," <<=$npcs.get($sex.npcId,'firstname')>> chuckles jokingly. "But I make plenty of money. The cost of a few pills is hardly going to make a dent. So you ready to stop using condoms?"</p>
+		<p>"Well it would cost me a lot more money if you got pregnant and I had to pay child support," <<npc $sex.npcId>><</npc>> chuckles jokingly. "But I make plenty of money. The cost of a few pills is hardly going to make a dent. So you ready to stop using condoms?"</p>
 	<<else>>
-		<p>"I make enough money to be able to afford the nicer things in life," <<=$npcs.get($sex.npcId,'firstname')>> shrugs somewhat smugly. "What's a few pills here and there? So you ready to stop using condoms?"</p>
+		<p>"I make enough money to be able to afford the nicer things in life," <<npc $sex.npcId>><</npc>> shrugs somewhat smugly. "What's a few pills here and there? So you ready to stop using condoms?"</p>
 	<</if>>
 	"I guess as long as you're paying for it..." you say.
 	<<run $npcs.set($sex.npcId,'pay_for_ma_pill',1)>>
@@ -729,7 +729,7 @@
 			<<if getvar("$cum_loc['vagina']") > 0>>
 				<p>"Think I could get that money for the pill now?" you ask, rubbing your thighs together over the cum still oozing from your pussy.</p>
 			<<else>>
-				<p>"Think I could get that money for the pill now?" you ask, rubbing your thighs together as you remember the feeling of <<=$npcs.get($sex.npcId,'firstname')>>'s cum oozing from your pussy.</p>
+				<p>"Think I could get that money for the pill now?" you ask, rubbing your thighs together as you remember the feeling of <<npc $sex.npcId>><</npc>>'s cum oozing from your pussy.</p>
 			<</if>>
 			<p>"Sure thing," he says, quickly reaching over to his wallet and pulling out a 1000<b>₽</b note and handing it to you.</p>
 			"Thanks," you say as you take it.
@@ -750,17 +750,17 @@
 				<<gs 'sex_ev_stats' 'birth_control_know'>>
 				<p>"I <i>am</i> on birth control," you sigh. "But hormonal birth control isn't 100% effective. I really don't want to get pregnant so gotta use condoms, even if I hate them."</p>
 				<<if $npcs.get($sex.npcId,'no_condoms') == 1>>
-					<p>"Seriously?" <<=$npcs.get($sex.npcId,'firstname')>> says, giving you an exasperated look. "You've been on birth control this whole time and we're still using condoms? What the hell!"</p>
+					<p>"Seriously?" <<npc $sex.npcId>><</npc>> says, giving you an exasperated look. "You've been on birth control this whole time and we're still using condoms? What the hell!"</p>
 					<p>"I just told you, I don't want to get pregnant!"</p>
 					<p>"You're not going to get pregnant while you're on birth control! Stop being so paranoid and let's just go bareback already!"</p>
 					<<actCLA 'No way'>>
 						<p>"No way!" you exclaim. "Just because nothing went wrong this time doesn't mean something can't go wrong in the future!"</p>
-						<p>"This is fucking dumb," <<=$npcs.get($sex.npcId,'firstname')>> grumbles.</p>
+						<p>"This is fucking dumb," <<npc $sex.npcId>><</npc>> grumbles.</p>
 						<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 					<</actCLA>>
 					<<gs 'sex_ev_talk' 'bareback_agree'>>
 				<<else>>
-					<p>"Seems a little excessive, don't you think?" <<=$npcs.get($sex.npcId,'firstname')>> says giving you an odd look.</p>
+					<p>"Seems a little excessive, don't you think?" <<npc $sex.npcId>><</npc>> says giving you an odd look.</p>
 					"Better than getting pregnant," you shrug back.
 				<</if>>
 			<</if>>
@@ -786,10 +786,10 @@
 			<<else>>
 				$sex_ev['bed_room']
 			<</if>>
-			<p>"Hey, can I borrow some money?" you ask <<=$npcs.get($sex.npcId,'firstname')>>. "I need it for the morning after pill."</p>
+			<p>"Hey, can I borrow some money?" you ask <<npc $sex.npcId>><</npc>>. "I need it for the morning after pill."</p>
 			<<if rand(1,4) == 1 and $npcs.get($sex.npcId,'finance') == 0>>
 				<<if $npcs.get($sex.npcId,'selfish') == 1>>
-					<p>"Are you kidding? I barely have any money myself," <<=$npcs.get($sex.npcId,'firstname')>> scowls. "I got nothing to give to you."</p>
+					<p>"Are you kidding? I barely have any money myself," <<npc $sex.npcId>><</npc>> scowls. "I got nothing to give to you."</p>
 				<<else>>
 					"Actually, I'm a little strapped for cash myself," he mumbles embarrassedly. "I need every ruble right now. Sorry."
 				<</if>>
@@ -808,7 +808,7 @@
 					<<gs 'sex_ev_talk' 'borrow_money_exit'>>
 				<<elseif $npcs.get($sex.npcId,'childfree') == 1>>
 					<<if $npcs.get($sex.npcId,'selfish') == 1>>
-						<p>"Ugh, how much do you need?" <<=$npcs.get($sex.npcId,'firstname')>> grumbles reaching for his wallet.</p>
+						<p>"Ugh, how much do you need?" <<npc $sex.npcId>><</npc>> grumbles reaching for his wallet.</p>
 					<<else>>
 						<p>"How much do you need?" he asks.</p>
 					<</if>>
@@ -828,7 +828,7 @@
 		<<set $finances.cash += 740>>
 		<p>"I don't have any money right now," you admit. "So I need the full 740 <b>₽</b> </p>
 		<<if $npcs.get($sex.npcId,'selfish') == 1>>
-			<p>"Seriously?" <<=$npcs.get($sex.npcId,'firstname')>> scowls as hands over the notes. "You don't have <i>any</i> money? Get a job or something."</p>
+			<p>"Seriously?" <<npc $sex.npcId>><</npc>> scowls as hands over the notes. "You don't have <i>any</i> money? Get a job or something."</p>
 		<<else>>
 			<p></p>
 		<</if>>
@@ -846,7 +846,7 @@
 	<<actCLA 'Done'>>
 		$sex_ev['bed_room']
 		"Those are the rules," you say. "So as long as we follow those, we can keep doing this."
-		<p>"I can agree to that," <<=$npcs.get($sex.npcId,'firstname')>> smiles.</p>
+		<p>"I can agree to that," <<npc $sex.npcId>><</npc>> smiles.</p>
 		<<gs 'sex_ev_after' 'after_sex_dressed'>>
 	<</actCLA>>
 	<<if $npcs.get($sex.npcId,'no_kiss') != 1>>
@@ -854,7 +854,7 @@
 			<<run $npcs.set($sex.npcId,'no_kiss',1)>>
 			$sex_ev['bed_room']
 			"No kissing," you say.
-			<p>"That's fine," <<=$npcs.get($sex.npcId,'firstname')>> nods.</p>
+			<p>"That's fine," <<npc $sex.npcId>><</npc>> nods.</p>
 			<<gs 'sex_ev_talk' 'cheating_rules'>>
 		<</actCLA>>
 	<</if>>
@@ -864,18 +864,18 @@
 			$sex_ev['bed_room']
 			"You can't come inside me," you say. "That's too far."
 			<<if $npcs.get($sex.npcId,'condom_conscious') > 0>>
-				<p>"We always use condoms anyways," <<=$npcs.get($sex.npcId,'firstname')>> shrugs.</p>
+				<p>"We always use condoms anyways," <<npc $sex.npcId>><</npc>> shrugs.</p>
 			<<elseif $npcs.get($npclastgenerated,'cum_pref') == 'creampie'>>
-				<p>"But that's the best part about fucking you," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+				<p>"But that's the best part about fucking you," <<npc $sex.npcId>><</npc>> grins.</p>
 				"I'm serious," you say sternly. "No creampies."
 			<<elseif $npcs.get($npclastgenerated,'cum_pref') == 'mouth'>>
-				<p>"So long as I can watch you swallow," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+				<p>"So long as I can watch you swallow," <<npc $sex.npcId>><</npc>> grins.</p>
 			<<elseif $npcs.get($npclastgenerated,'cum_pref') == 'facial'>>
-				<p>"So long as I can come all over your pretty face," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+				<p>"So long as I can come all over your pretty face," <<npc $sex.npcId>><</npc>> grins.</p>
 			<<elseif $npcs.get($npclastgenerated,'cum_pref') == 'tits'>>
-				<p>"So long as I can come all over your beautiful tits," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+				<p>"So long as I can come all over your beautiful tits," <<npc $sex.npcId>><</npc>> grins.</p>
 			<<elseif $npcs.get($npclastgenerated,'cum_pref') == 'pullout'>>
-				<p>"I prefer the pullout method anyways," <<=$npcs.get($sex.npcId,'firstname')>> grins.</p>
+				<p>"I prefer the pullout method anyways," <<npc $sex.npcId>><</npc>> grins.</p>
 			<</if>>
 			<<gs 'sex_ev_talk' 'cheating_rules'>>
 		<</actCLA>>
@@ -889,11 +889,11 @@
 				<p>"Oh, come on. We don-"</p>
 				<p>"I'm serious!" you say sternly. "No condoms, no deal."</p>
 			<<elseif $npcs.get($sex.npcId,'condom_conscious') > 0>>
-				<p>"We already do," <<=$npcs.get($sex.npcId,'firstname')>> smiles.</p>
+				<p>"We already do," <<npc $sex.npcId>><</npc>> smiles.</p>
 			<<elseif $npcs.get($sex.npcId,'boyfriend_creampie_rule') > 0>>
-				<p>"A little redundant, don't you think?" <<=$npcs.get($sex.npcId,'firstname')>> smirks.</p>
+				<p>"A little redundant, don't you think?" <<npc $sex.npcId>><</npc>> smirks.</p>
 			<<else>>
-				<p>"I guess that's fair," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+				<p>"I guess that's fair," <<npc $sex.npcId>><</npc>> says.</p>
 			<</if>>
 			<<gs 'sex_ev_talk' 'cheating_rules'>>
 		<</actCLA>>
@@ -924,32 +924,32 @@
 <</if>>
 <<if $location_var[$here][0] == 'boy_date_ask'>>
 	<!-- !! asks to become a couple-->
-	<p>"We've been having fun, right?" <<=$npcs.get($sex.npcId,'firstname')>> asks slowly.</p>
+	<p>"We've been having fun, right?" <<npc $sex.npcId>><</npc>> asks slowly.</p>
 	<<if getvar("$sex_ev['simultaneous_orgasm_count']") > 0>>
 		<<actCLA 'They`re called simultaneous orgasms'>>
-			<p>"They're called simultaneous orgasms, <<=$npcs.get($sex.npcId,'firstname')>>," you grin back. </p>
+			<p>"They're called simultaneous orgasms, <<npc $sex.npcId>><</npc>>," you grin back. </p>
 		<</actCLA>>
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'rape_explain'>>
 	$sex_ev['bed_room']
 	<<if $pc.sexStat('rape_count') == 1>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. The images and sensations of that time come flooding back to you, invading your mind. It's as if you're back in that moment, being violated all over again.</p>
+		<p><<npc $sex.npcId>><</npc>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. The images and sensations of that time come flooding back to you, invading your mind. It's as if you're back in that moment, being violated all over again.</p>
 	<<elseif $pc.sexStat('rape_count') < 5>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. The images and sensations come flooding back to you, invading your mind. The memories of your various attackers won't stop flashing before your eyes, memories of your body being violated like a montage you can't escape.</p>
+		<p><<npc $sex.npcId>><</npc>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. The images and sensations come flooding back to you, invading your mind. The memories of your various attackers won't stop flashing before your eyes, memories of your body being violated like a montage you can't escape.</p>
 	<<elseif $pc.sexStat('rape_count') < 10>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. Images and sensations flood through you, invading your mind. The memories of your attackers all blur together, combining into one horrible sensation like they're all violating you at once.</p>
+		<p><<npc $sex.npcId>><</npc>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. Images and sensations flood through you, invading your mind. The memories of your attackers all blur together, combining into one horrible sensation like they're all violating you at once.</p>
 	<<else>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. Images and sensations flood through you, invading your mind. Your countless rapes leave you a shuddering mess as the trauma threatens to overwhelm you.</p>
+		<p><<npc $sex.npcId>><</npc>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. Images and sensations flood through you, invading your mind. Your countless rapes leave you a shuddering mess as the trauma threatens to overwhelm you.</p>
 	<</if>>
-	<p>"What just...?" <<=$npcs.get($sex.npcId,'firstname')>> stammers confusedly.</p>
+	<p>"What just...?" <<npc $sex.npcId>><</npc>> stammers confusedly.</p>
 	<<actCLA 'Try to hide it'>>
 		"I... I just don't like it rough," you whimper, tears running down your cheeks as you sniff, pathetically trying to wipe them away with the back of your hand.
 	<</actCLA>>
 	<<actCLA 'Tell him what happened'>>
 		<<run $npcs.set($sex.npcId,'knows_rape_victim',1)>>
 		<<image "shared/sex/after/pillow_talk1.jpg">>
-		<p>You crawl up beside <<=$npcs.get($sex.npcId,'firstname')>>, still shivering as you wipe the tears from your eyes that won't stop flowing.</p>
+		<p>You crawl up beside <<npc $sex.npcId>><</npc>>, still shivering as you wipe the tears from your eyes that won't stop flowing.</p>
 		<<if $pc.sexStat('rape_count') == 1>>
 			"Listen," you sniff, rubbing your hand across your cheek again. "I was raped once... It was awful and horrible and I... well I... I had a flashback about it just now..."
 		<<elseif $pc.sexStat('rape_count') < 5>>
@@ -959,12 +959,12 @@
 		<<else>>
 			"I've never told you this but..." you sniff, rubbing your hand across your cheek again. "I've been raped... A lot... I don't know why it keeps happening but I've been raped so many times I've lost count... And sometimes the trauma just comes out..."
 		<</if>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> is taken aback and goes quiet. Its several minutes before he finally speaks again.</p>
+		<p><<npc $sex.npcId>><</npc>> is taken aback and goes quiet. Its several minutes before he finally speaks again.</p>
 		<<actCLA 'Continue'>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
 			"I'm... I'm so sorry for what happened to you," he says. "I had no idea."
 			"It's not your fault," you sniff again. "You couldn''t have known. I never told you. Until now."
-			<p>"So... I should lay off the rough sex in the future?" <<=$npcs.get($sex.npcId,'firstname')>> asks hesitantly.</p>
+			<p>"So... I should lay off the rough sex in the future?" <<npc $sex.npcId>><</npc>> asks hesitantly.</p>
 			<<actCLA 'Just tonight'>>
 				"You don't have to stop getting rough," you say, rubbing your eyes again. "I just... it doesn''t always happen to me during this kind of sex, but I guess something triggered me. I like it rough sometimes, I promise. Just not... tonight..."
 				The conversation trails off.

+ 8 - 8
sugarcube/src/autogenerated/unsorted/sex_ev_talk2.tw

@@ -4,22 +4,22 @@
 <<if $location_var[$here][0] == 'rape_explain'>>
 	$sex_ev['bed_room']
 	<<if $pc.sexStat('rape_count') == 1>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. The images and sensations of that time come flooding back to you, invading your mind. It's as if you're back in that moment, being violated all over again.</p>
+		<p><<npc $sex.npcId>><</npc>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. The images and sensations of that time come flooding back to you, invading your mind. It's as if you're back in that moment, being violated all over again.</p>
 	<<elseif $pc.sexStat('rape_count') < 5>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. The images and sensations come flooding back to you, invading your mind. The memories of your various attackers won't stop flashing before your eyes, memories of your body being violated like a montage you can't escape.</p>
+		<p><<npc $sex.npcId>><</npc>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. The images and sensations come flooding back to you, invading your mind. The memories of your various attackers won't stop flashing before your eyes, memories of your body being violated like a montage you can't escape.</p>
 	<<elseif $pc.sexStat('rape_count') < 10>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. Images and sensations flood through you, invading your mind. The memories of your attackers all blur together, combining into one horrible sensation like they're all violating you at once.</p>
+		<p><<npc $sex.npcId>><</npc>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. Images and sensations flood through you, invading your mind. The memories of your attackers all blur together, combining into one horrible sensation like they're all violating you at once.</p>
 	<<else>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. Images and sensations flood through you, invading your mind. Your countless rapes leave you a shuddering mess as the trauma threatens to overwhelm you.</p>
+		<p><<npc $sex.npcId>><</npc>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. Images and sensations flood through you, invading your mind. Your countless rapes leave you a shuddering mess as the trauma threatens to overwhelm you.</p>
 	<</if>>
-	<p>"What just...?" <<=$npcs.get($sex.npcId,'firstname')>> stammers confusedly.</p>
+	<p>"What just...?" <<npc $sex.npcId>><</npc>> stammers confusedly.</p>
 	<<actCLA 'Try to hide it'>>
 		"I... I just don't like it rough," you sniff, tears running down your cheeks.
 	<</actCLA>>
 	<<actCLA 'Tell him what happened'>>
 		<<run $npcs.set($sex.npcId,'knows_rape_victim',1)>>
 		<<image "shared/sex/after/pillow_talk1.jpg">>
-		<p>You crawl up beside <<=$npcs.get($sex.npcId,'firstname')>>, still shivering as you wipe the tears from your eyes that won't stop flowing.</p>
+		<p>You crawl up beside <<npc $sex.npcId>><</npc>>, still shivering as you wipe the tears from your eyes that won't stop flowing.</p>
 		<<if $pc.sexStat('rape_count') == 1>>
 			"Listen," you sniff, rubbing your hand across your cheek again. "I was raped once... It was awful and horrible and I... well I... I had a flashback about it just now..."
 		<<elseif $pc.sexStat('rape_count') < 5>>
@@ -29,12 +29,12 @@
 		<<else>>
 			"I've never told you this but..." you sniff, rubbing your hand across your cheek again. "I've been raped... A lot... I don't know why it keeps happening but I've been raped so many times I've lost count... And sometimes the trauma just comes out..."
 		<</if>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> is taken aback and goes quiet. Its several minutes before he finally speaks again.</p>
+		<p><<npc $sex.npcId>><</npc>> is taken aback and goes quiet. Its several minutes before he finally speaks again.</p>
 		<<actCLA 'Continue'>>
 			<<image "shared/sex/after/pillow_talk1.jpg">>
 			"I'm... I'm so sorry for what happened to you," he says. "I had no idea."
 			"It's not your fault," you sniff again. "You couldn''t have known. I never told you."
-			<p>"So... I should lay off the rough sex then?" <<=$npcs.get($sex.npcId,'firstname')>> asks hesitantly.</p>
+			<p>"So... I should lay off the rough sex then?" <<npc $sex.npcId>><</npc>> asks hesitantly.</p>
 			<<actCLA 'Just tonight'>>
 				"You don't have to stop getting rough," you say, rubbing your eyes. "I just... it doesn''t always happen to me during this kind of sex, but I guess something triggered me. I like it rough sometimes, I promise. Just not... tonight..."
 				The conversation trails off.

+ 135 - 135
sugarcube/src/autogenerated/unsorted/sex_ev_virgin.tw

@@ -5,8 +5,8 @@
 	<!-- !! player initiated-->
 	<<setinit $sex_ev['virgin'] = 1>>
 	$sex_ev['bed_room']
-	<p>With a fast beating heart, you turn to look at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
-	<p>"<<=$npcs.get($sex.npcId,'firstname')>>... I want you to take my virginity."</p>
+	<p>With a fast beating heart, you turn to look at <<npc $sex.npcId>><</npc>>.</p>
+	<p>"<<npc $sex.npcId>><</npc>>... I want you to take my virginity."</p>
 	<<gs 'sex_ev_virgin' 'start_flavor'>>
 	<<gs 'sex_ev_virgin' 'start_options'>>
 <</if>>
@@ -21,7 +21,7 @@
 <<if $location_var[$here][0] == 'start3'>>
 	<!-- !! NPC initiated, player doesn''t stop them-->
 	<<setinit $sex_ev['virgin'] = 1>>
-	<p>Your breath catches in your throat as <<=$npcs.get($sex.npcId,'firstname')>> moves closer and closer. Your pussy feels like it's on fire. You want it so badly that it <i>hurts</i>.</p>
+	<p>Your breath catches in your throat as <<npc $sex.npcId>><</npc>> moves closer and closer. Your pussy feels like it's on fire. You want it so badly that it <i>hurts</i>.</p>
 	"Okay," you whisper, spreading your legs, gasping when his fingers find your dripping lips. "You can have it. Take my virginity."
 	<<gs 'sex_ev_virgin' 'start_flavor'>>
 	<<gs 'sex_ev_virgin' 'start_options'>>
@@ -31,7 +31,7 @@
 	<<setinit $sex_ev['virgin'] = 1>>
 	<<set $pc.horny += 20>>
 	$sex_ev['bed_room']
-	<p>Your breath catches in your throat as <<=$npcs.get($sex.npcId,'firstname')>> moves closer and closer. You know what you told him before. You know that you want to save it. But right now, you just can't hold yourself back. Your pussy feels like it's on fire. You want it so badly that it <i>hurts</i>.</p>
+	<p>Your breath catches in your throat as <<npc $sex.npcId>><</npc>> moves closer and closer. You know what you told him before. You know that you want to save it. But right now, you just can't hold yourself back. Your pussy feels like it's on fire. You want it so badly that it <i>hurts</i>.</p>
 	"Okay," you whisper, spreading your legs, gasping when his fingers find your dripping lips. "You can have me."
 	<<gs 'sex_ev_virgin' 'start_flavor'>>
 	<<gs 'sex_ev_virgin' 'start_options'>>
@@ -112,19 +112,19 @@
 		<<gs 'sex_ev_condoms' 'npc_condom_use_stats'>>
 	<</if>>
 	<<if $npcs.get($sex.npcId,'caretaker') == 1 or $npcs.get($sex.npcId,'generous') == 1 or (rand(1,2) == 1 and $npcs.get($sex.npcId,'selfish') != 1 and $npcs.get($sex.npcId,'abusive') != 1)>>
-		<p>With the condom securely wrapped around <<=$npcs.get($sex.npcId,'firstname')>>'s cock, he moves back in between your legs before he stops, hesitating.</p>
+		<p>With the condom securely wrapped around <<npc $sex.npcId>><</npc>>'s cock, he moves back in between your legs before he stops, hesitating.</p>
 		<<gs 'sex_ev_virgin' 'start_options2'>>
 	<<else>>
-		<p>With the condom securely wrapped around <<=$npcs.get($sex.npcId,'firstname')>>'s cock, he moves back in between your legs. Moments later, he takes your virginity.</p>
+		<p>With the condom securely wrapped around <<npc $sex.npcId>><</npc>>'s cock, he moves back in between your legs. Moments later, he takes your virginity.</p>
 		<<gs 'sex_ev_virgin' 'miss_virg_start'>>
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'start_without_condom'>>
 	<<if $npcs.get($sex.npcId,'caretaker') == 1 or $npcs.get($sex.npcId,'generous') == 1 or (rand(1,3) == 1 and $npcs.get($sex.npcId,'selfish') != 1 and $npcs.get($sex.npcId,'abusive') != 1)>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> moves back in between your legs before he stops, hesitating.</p>
+		<p><<npc $sex.npcId>><</npc>> moves back in between your legs before he stops, hesitating.</p>
 		<<gs 'sex_ev_virgin' 'start_options2'>>
 	<<else>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> moves back in, lining his naked cock up with your pussy. Moments later, he takes your virginity.</p>
+		<p><<npc $sex.npcId>><</npc>> moves back in, lining his naked cock up with your pussy. Moments later, he takes your virginity.</p>
 		<<gs 'sex_ev_virgin' 'miss_virg_start'>>
 	<</if>>
 <</if>>
@@ -177,17 +177,17 @@
 		<<actCLA 'Well...'>>
 			<<setinit $sex_ev['orgasm'] = $orgasm>>
 			<<video "shared/sex/vag/miss/pussyhump.mp4">>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't wait for your permission and starts rubbing his cock against your pussy lips.</p>
+			<p><<npc $sex.npcId>><</npc>> doesn't wait for your permission and starts rubbing his cock against your pussy lips.</p>
 			You're about to protest when his tip rubs right against your clit and a wave of pleasure flushes through your hips, causing an involuntary moan.  Your judgement starts to get clouded, your willpower eroded.
 			<i>Well...</i> You moan softly under his touch. It feels <b>so good.</b> <i>What if... I just... let him...</i>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> gently pushes your legs open. You can feel his hardon rubbing right against your clit.</p>
+			<p><<npc $sex.npcId>><</npc>> gently pushes your legs open. You can feel his hardon rubbing right against your clit.</p>
 			<<actCLA 'Let $npcs.get('+$sex.npcId,'firstname')+' take your virginity'>>
 				"Okay," you whisper. "Put it in."
 				<<if $npcs.get($sex.npcId,'condom_conscious') > 0>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> grabs a condom off his nightstand.</p>
+					<p><<npc $sex.npcId>><</npc>> grabs a condom off his nightstand.</p>
 					<<gs 'sex_ev_condoms' 'virgin_condom1'>>
 				<<else>>
-					<p>You spread your legs for him and moments later, <<=$npcs.get($sex.npcId,'firstname')>> takes your virginity.</p>
+					<p>You spread your legs for him and moments later, <<npc $sex.npcId>><</npc>> takes your virginity.</p>
 					<<gs 'sex_ev_virgin' 'miss_virg_start'>>
 				<</if>>
 			<</actCLA>>
@@ -195,7 +195,7 @@
 		<</actCLA>>
 	<<else>>
 		<<setinit $sex_ev['no_sex'] = 1>>
-		<p>"Oh," <<=$npcs.get($sex.npcId,'firstname')>> seems taken aback. "Sorry, I didn't realize. Did you want to do something else then?"</p>
+		<p>"Oh," <<npc $sex.npcId>><</npc>> seems taken aback. "Sorry, I didn't realize. Did you want to do something else then?"</p>
 		<<gs 'sex_ev_foreplay' 'foreplay_choose'>>
 	<</if>>
 <</if>>
@@ -203,37 +203,37 @@
 	<<setinit $know_virgin[$sex.npcId] = 1>>
 	$sex_ev['bed_room']
 	<<if $sex_ev['position'] == 'miss'>>
-		<p>"Wait!" you yelp, closing up your legs halfway. <<=$npcs.get($sex.npcId,'firstname')>> freezes up, body over yours, his cock resting against your pussy.</p>
+		<p>"Wait!" you yelp, closing up your legs halfway. <<npc $sex.npcId>><</npc>> freezes up, body over yours, his cock resting against your pussy.</p>
 		"I... I'm a virgin..."
 		"Oh." He slumps backwards, not sure where you're going with this.
 		<<gs 'sex_ev_virgin' 'not_ready'>>
 		<<actCLA 'Go slow okay?'>>
 			<p>"Just... go slow, okay? I'm new at this," you smile nervously, spreading your legs again.</p>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> nods and gently pushes cock into your pussy.</p>
+			<p><<npc $sex.npcId>><</npc>> nods and gently pushes cock into your pussy.</p>
 			<<actCLA 'Lose your virginity'>>
 				<<gt 'sex_ev_virgin' 'miss_virg_norm1'>>
 			<</actCLA>>
 		<</actCLA>>
 	<<elseif $sex_ev['position'] == 'doggy'>>
-		<p>"Wait!" you yelp. <<=$npcs.get($sex.npcId,'firstname')>> freezes up, hands on your ass, and you can feel his cock pressing right against your pussy lips.</p>
+		<p>"Wait!" you yelp. <<npc $sex.npcId>><</npc>> freezes up, hands on your ass, and you can feel his cock pressing right against your pussy lips.</p>
 		Sitting up and looking over your shoulder to face him, you stammer out, "I... I'm a virgin..."
 		"Oh." He slumps backwards, not sure where you're going with this.
 		<<gs 'sex_ev_virgin' 'not_ready'>>
 		<<actCLA 'Go slow okay?'>>
 			<p>"Just... go slow, okay? I'm new at this," you smile nervously.</p>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> nods and you turn back around and hold your breath, feeling him gently push his cock into your pussy.</p>
+			<p><<npc $sex.npcId>><</npc>> nods and you turn back around and hold your breath, feeling him gently push his cock into your pussy.</p>
 			<<actCLA 'Lose your virginity'>>
 				<<gt 'sex_ev_virgin' 'doggy_virg_norm1'>>
 			<</actCLA>>
 		<</actCLA>>
 	<<elseif $sex_ev['position'] == 'cowgirl'>>
-		<p>"Wait!" you yelp. <<=$npcs.get($sex.npcId,'firstname')>> freezes up, putting his hands up, .</p>
+		<p>"Wait!" you yelp. <<npc $sex.npcId>><</npc>> freezes up, putting his hands up, .</p>
 		Still resting your thighs on top of his, you stammer out, "I... I'm a virgin..."
 		"Oh." He relaxes back onto the bed underneath you, not sure where you're going with this.
 		<<gs 'sex_ev_virgin' 'not_ready'>>
 		<<actCLA 'Go slow okay?'>>
 			<p>"Just... go slow, okay? I'm new at this," you smile nervously.</p>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> nods and you raise your hips again, biting your lip in apprehension as you slowly lower yourself down onto his cock.</p>
+			<p><<npc $sex.npcId>><</npc>> nods and you raise your hips again, biting your lip in apprehension as you slowly lower yourself down onto his cock.</p>
 			<<actCLA 'Lose your virginity'>>
 				<<gt 'sex_ev_virgin' 'cowgirl_virg_norm1'>>
 			<</actCLA>>
@@ -251,7 +251,7 @@
 		<<image "shared/sex/vag/miss/3.jpg">>
 		<<if getvar("$know_virgin["+$sex.npcId+"]") == 1>>
 			<p>"Wait!" you yelp. "Knock it off! You know I'm saving my virg-!"</p>
-			<p>Your protests cut off in a choked scream as <<=$npcs.get($sex.npcId,'firstname')>> rams his cock full force into you, stabbing it through your hymen and sending waves of agony through you. Tears well up in your eyes as you look up at <<=$npcs.get($sex.npcId,'firstname')>>, horrified at what he's done.</p>
+			<p>Your protests cut off in a choked scream as <<npc $sex.npcId>><</npc>> rams his cock full force into you, stabbing it through your hymen and sending waves of agony through you. Tears well up in your eyes as you look up at <<npc $sex.npcId>><</npc>>, horrified at what he's done.</p>
 			<<if getvar("$sex_ev['virgin_deny']") >= 10>>
 				"I'm so fucking sick of you blueballing me," he says. "So we're gonna fuck today, whether you like it or not."
 			<<elseif getvar("$sex_ev['virgin_deny']") > 0>>
@@ -261,7 +261,7 @@
 			<</if>>
 		<<else>>
 			<p>"Wait!" you yelp. "I'm a-"</p>
-			<p>Your protests cut off in a choked scream as <<=$npcs.get($sex.npcId,'firstname')>> rams his cock full force into you, stabbing it through your hymen and sending waves of agony through you.</p>
+			<p>Your protests cut off in a choked scream as <<npc $sex.npcId>><</npc>> rams his cock full force into you, stabbing it through your hymen and sending waves of agony through you.</p>
 			"... virgin..." you whimper helplessly, tears running down your cheeks.
 		<</if>>
 	<<elseif rand(1,10) > $npcs.get($sex.npcId,'sexdrive')>>
@@ -286,7 +286,7 @@
 			<p>"Wait!" you yelp. "I'm a virgin! You can't!"</p>
 		<</if>>
 		<<arouse 'foreplay' -5 >>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> can't stop moving, rubbing his cock against your pussy lips.</p>
+		<p><<npc $sex.npcId>><</npc>> can't stop moving, rubbing his cock against your pussy lips.</p>
 		<<if $npcs.get($sex.npcId,'selfish') == 1>>
 			"Come on," he whispers. "I'm so fucking hard right now... Just let me fuck you already..."
 		<<elseif $npcs.get($sex.npcId,'gentle_lover') == 1 or $npcs.get($sex.npcId,'caretaker') == 1>>
@@ -306,14 +306,14 @@
 			<<setinit $sex_ev['orgasm'] = $orgasm>>
 			<<video "shared/sex/vag/miss/pussyhump.mp4">>
 			<i>Well...</i> You moan softly under his touch. It feels <i>so good.</i> What if... you just... let him...
-			<p><<=$npcs.get($sex.npcId,'firstname')>> gently pushes your legs open. You can feel his hardon rubbing right against your clit.</p>
+			<p><<npc $sex.npcId>><</npc>> gently pushes your legs open. You can feel his hardon rubbing right against your clit.</p>
 			<<actCLA 'Let $npcs.get('+$sex.npcId,'firstname')+' take your virginity'>>
 				"Okay," you whisper. "Put it in."
 				<<if $npcs.get($sex.npcId,'condom_conscious') > 0>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> grabs a condom off his nightstand.</p>
+					<p><<npc $sex.npcId>><</npc>> grabs a condom off his nightstand.</p>
 					<<gs 'sex_ev_condoms' 'virgin_condom1'>>
 				<<else>>
-					<p>You spread your legs for him and moments later, <<=$npcs.get($sex.npcId,'firstname')>> takes your virginity.</p>
+					<p>You spread your legs for him and moments later, <<npc $sex.npcId>><</npc>> takes your virginity.</p>
 					<<gs 'sex_ev_virgin' 'miss_virg_start'>>
 				<</if>>
 			<</actCLA>>
@@ -338,7 +338,7 @@
 					<p>"Are you sure?" you ask. "I feel kind of bad now... we got this far and all..."</p>
 					"Yeah of course. It's your body, your choice."
 					"If it's really okay then..."
-					<p>"Maybe..." <<=$npcs.get($sex.npcId,'firstname')>> seems hesitant to say something. "Maybe you could give me a blowjob?"</p>
+					<p>"Maybe..." <<npc $sex.npcId>><</npc>> seems hesitant to say something. "Maybe you could give me a blowjob?"</p>
 					<<actCLA 'Sounds fair'>>
 						"Yeah," you smile. "That sounds fair."
 						You wiggle down the bed and lean down to get between his legs.
@@ -351,7 +351,7 @@
 			<<gs 'sex_ev_virgin' 'want_to'>>
 			<<gs 'sex_ev_virgin' 'bj_instead'>>
 		<<elseif $npcs.get($sex.npcId,'selfish') == 1>>
-			<p>"Seriously? We get right here and you're going to call it quits?" <<=$npcs.get($sex.npcId,'firstname')>> seems furious.</p>
+			<p>"Seriously? We get right here and you're going to call it quits?" <<npc $sex.npcId>><</npc>> seems furious.</p>
 			<<actCLA 'I`m just scared!'>>
 				<p>"I'm jus-" you try to protest before he interrupts, shouting at you.</p>
 				<i><b>"Are you fucking kidding me?!"</b></i>
@@ -375,7 +375,7 @@
 			<<gs 'sex_ev_virgin' 'bj_instead'>>
 		<<else>>
 			"Uhh... well..."
-			<p><<=$npcs.get($sex.npcId,'firstname')>> looks down at himself, almost as if contemplating what to do with his solidly erect dick.</p>
+			<p><<npc $sex.npcId>><</npc>> looks down at himself, almost as if contemplating what to do with his solidly erect dick.</p>
 			<p>"Soooo... you <i>don't</i> want to have sex...?</p>
 			<<gs 'sex_ev_virgin' 'want_to'>>
 			<<gs 'sex_ev_virgin' 'bj_instead'>>
@@ -387,7 +387,7 @@
 		<<if $sex_ev['position'] == 'miss'>>
 			<<image "shared/sex/foreplay/miss1.jpg">>
 			"No, no," you shake your head. "I want to. I was just getting cold feet."
-			<p>You spread your legs wider, tugging on <<=$npcs.get($sex.npcId,'firstname')>>'s cock, beckoning him in.</p>
+			<p>You spread your legs wider, tugging on <<npc $sex.npcId>><</npc>>'s cock, beckoning him in.</p>
 			<<actCLA 'Lose your virginity'>>
 				<<if rand(0,1) == 1 or $npcs.get($sex.npcId,'generous') == 1>>
 					<<gt 'sex_ev_virgin' 'miss_virg_norm1'>>
@@ -452,13 +452,13 @@
 					<<setinit $sex_ev['orgasm'] = $orgasm>>
 					<<if $sex_ev['position'] == 'miss'>>
 						<<image "shared/sex/foreplay/miss1.jpg">>
-						<p>Unable to summon the will to say no, you nod and spread your legs, allowing <<=$npcs.get($sex.npcId,'firstname')>> to eagerly push his cock inside you.</p>
+						<p>Unable to summon the will to say no, you nod and spread your legs, allowing <<npc $sex.npcId>><</npc>> to eagerly push his cock inside you.</p>
 						<<actCLA 'Lose your virginity'>>
 							<<gt 'sex_ev_virgin' 'miss_virg_hard1'>>
 						<</actCLA>>
 					<<elseif $sex_ev['position'] == 'doggy'>>
 						<<image "shared/sex/foreplay/doggy1.jpg">>
-						<p>Unable to summon the will to say no, you nod and turn around. You bite your lip in apprehension as you feel <<=$npcs.get($sex.npcId,'firstname')>> push his cock inside you.</p>
+						<p>Unable to summon the will to say no, you nod and turn around. You bite your lip in apprehension as you feel <<npc $sex.npcId>><</npc>> push his cock inside you.</p>
 						<<actCLA 'Lose your virginity'>>
 							<<gt 'sex_ev_virgin' 'doggy_virg_hard1'>>
 						<</actCLA>>
@@ -600,7 +600,7 @@
 	<<arouse 'vaginal' 1 `['no_orgasm_msg']`>>
 	<<setinit $sex_ev['position'] = 'miss'>>
 	<<video "shared/sex/vag/miss/enter1.mp4">>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> presses his cock inside you slowly, centimeter by centimeter. It fills you up, stretching your walls until you feel it bump against your hymen. He doesn't stop though, and keeps pushing until you feel him tear straight through your maidenhood, eliciting a gasp from your mouth. Whether in excitement or pain, you aren't really sure.</p>
+	<p><<npc $sex.npcId>><</npc>> presses his cock inside you slowly, centimeter by centimeter. It fills you up, stretching your walls until you feel it bump against your hymen. He doesn't stop though, and keeps pushing until you feel him tear straight through your maidenhood, eliciting a gasp from your mouth. Whether in excitement or pain, you aren't really sure.</p>
 	<p>"You okay?"</p>
 	<<actCLA 'It hurts'>>
 		<<setinit $sex_ev['virgin_react'] = 'hurt'>>
@@ -630,7 +630,7 @@
 			<<setinit $sex_ev['pos_speed'] = 'miss1'>>
 			<<setinit $sex_ev['virgin_media'] = '<<video "shared/sex/vag/miss/slow1.mp4">>'>>
 			$sex_ev['virgin_media']
-			<p>As promised, <<=$npcs.get($sex.npcId,'firstname')>> fucks you very gently, slowly pumping his cock in and out of you. He displays what you can only imagine is incredible patience, as he maintains this slow and gentle pace for several minutes, at which point you think...</p>
+			<p>As promised, <<npc $sex.npcId>><</npc>> fucks you very gently, slowly pumping his cock in and out of you. He displays what you can only imagine is incredible patience, as he maintains this slow and gentle pace for several minutes, at which point you think...</p>
 			<<gs 'sex_ev_virgin' 'virgin_enjoyment'>>
 		<</actCLA>>
 	<</actCLA>>
@@ -642,9 +642,9 @@
 	<<arouse 'kiss' -10 `['no_orgasm_msg']`>>
 	<<setinit $sex_ev['kiss'] = 1>>
 	<<if $npcs.get($sex.npcId,'no_kiss') == 1>>
-		<p>Unable to contain yourself, you forget your rules and reach up, pulling <<=$npcs.get($sex.npcId,'firstname')>>'s face down to press it against yours. Your eyes roll back in your head, feeling the thrust of his cock in your pussy and the invasion of his tongue in your mouth. You moan into his mouth and he moans back.</p>
+		<p>Unable to contain yourself, you forget your rules and reach up, pulling <<npc $sex.npcId>><</npc>>'s face down to press it against yours. Your eyes roll back in your head, feeling the thrust of his cock in your pussy and the invasion of his tongue in your mouth. You moan into his mouth and he moans back.</p>
 	<<else>>
-		<p>Caught up in the moment, you reach up and grab <<=$npcs.get($sex.npcId,'firstname')>>'s face, pulling it down to kiss him. Your eyes roll back in your head, feeling the thrust of his cock in your pussy and the invasion of his tongue in your mouth. You moan into his mouth and he moans back.</p>
+		<p>Caught up in the moment, you reach up and grab <<npc $sex.npcId>><</npc>>'s face, pulling it down to kiss him. Your eyes roll back in your head, feeling the thrust of his cock in your pussy and the invasion of his tongue in your mouth. You moan into his mouth and he moans back.</p>
 	<</if>>
 	<<actCLA 'Continue'>>
 		 <<gs 'sex_ev_cum' 'fuck_cum'>>
@@ -652,7 +652,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'miss_virg_norm2'>>
 	<<video "shared/sex/vag/miss/slow1.mp4">>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> slows down and you sigh in relief.</p>
+	<p><<npc $sex.npcId>><</npc>> slows down and you sigh in relief.</p>
 	Now that he isn''t trying to tear you in half, you close your eyes, trying to focus on the sensations and you...
 	<<gs 'sex_ev_virgin' 'virgin_enjoyment'>>
 <</if>>
@@ -674,16 +674,16 @@
 	<<else>>
 		<<image "shared/sex/vag/miss/blood1.jpg">>
 	<</if>>
-	<p>You half gasp half shriek as <<=$npcs.get($sex.npcId,'firstname')>> slams his cock inside you, tearing straight through your hymen in one thrust and your eyes water at the intense stab of pain.</p>
+	<p>You half gasp half shriek as <<npc $sex.npcId>><</npc>> slams his cock inside you, tearing straight through your hymen in one thrust and your eyes water at the intense stab of pain.</p>
 	<<if getvar("$know_virgin["+$sex.npcId+"]") == 1>>
-		<p>Despite telling <<=$npcs.get($sex.npcId,'firstname')>> how important your first time is to you, he doesn't seem to care about taking it easy on you. You scream in pain as he rams his cock in and out of you with tremendous force, pistoning with jackhammer like intensity.</p>
+		<p>Despite telling <<npc $sex.npcId>><</npc>> how important your first time is to you, he doesn't seem to care about taking it easy on you. You scream in pain as he rams his cock in and out of you with tremendous force, pistoning with jackhammer like intensity.</p>
 	<<else>>
-		<p>If you thought that <<=$npcs.get($sex.npcId,'firstname')>> was going to take it easy on you for your first time, you were sorely mistaken. Literally. You scream in pain as he rams his cock in and out of you with tremendous force, pistoning with jackhammer like intensity.</p>
+		<p>If you thought that <<npc $sex.npcId>><</npc>> was going to take it easy on you for your first time, you were sorely mistaken. Literally. You scream in pain as he rams his cock in and out of you with tremendous force, pistoning with jackhammer like intensity.</p>
 	<</if>>
 	<<actCLA 'Scream'>>
 		<<video "shared/sex/vag/miss/hard2.mp4">>
 		<i>"Ahh! Ahh!! AH! AHH!!"</i>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> fucks you roughly and with high intensity. It hurts so much. Every time his cock stabs into you, you wonder if you're going to die. The force of his thrusts bounce your breasts so violently they hurt. It feels like your pussy is being fucked into an open wound and you question if you're going to have internal bruises tomorrow morning.</p>
+		<p><<npc $sex.npcId>><</npc>> fucks you roughly and with high intensity. It hurts so much. Every time his cock stabs into you, you wonder if you're going to die. The force of his thrusts bounce your breasts so violently they hurt. It feels like your pussy is being fucked into an open wound and you question if you're going to have internal bruises tomorrow morning.</p>
 		<<actCLA 'Endure it'>>
 			<<gs 'sex_ev_sex' 'fuck_no_cum_code'>>
 			You decided to give him your virginity and you don't want to be a sour puss by trying to back out now. You grit your teeth and endure, spending every second hoping it will end soon.
@@ -692,7 +692,7 @@
 			<</actCLA>>
 		<</actCLA>>
 		<<actCLA 'Can we slow down?'>>
-			<p>"Can we-! Slow down-! A little-?" you whimper under <<=$npcs.get($sex.npcId,'firstname')>>'s relentless pounding. "This is-! A bit-! Rough-!"</p>
+			<p>"Can we-! Slow down-! A little-?" you whimper under <<npc $sex.npcId>><</npc>>'s relentless pounding. "This is-! A bit-! Rough-!"</p>
 			<<if (rand(1,10) >= 7 or $npcs.get($sex.npcId,'selfish') == 1 or $npcs.get($sex.npcId,'abusive') == 1) and $npcs.get($sex.npcId,'generous') != 1>>
 				<<set $orgasm_or = 'no'>>
 				"This is what sex is like," he grins. "You'll get used to it soon, then it'll feel really good."
@@ -717,9 +717,9 @@
 	<<gs 'sex_ev_sex' 'fuck_arousal_code'>>
 	<<arouse 'vaginal' -15 `['no_orgasm_msg']`>>
 	<<video "shared/sex/vag/miss/med1.mp4">>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> picks up the pace as you command and you instinctively arch your back, getting him to thrust deeper into you. The heightened pace feels even better than it did when he was being gentle and you moan loudly with intense pleasure.</p>
+	<p><<npc $sex.npcId>><</npc>> picks up the pace as you command and you instinctively arch your back, getting him to thrust deeper into you. The heightened pace feels even better than it did when he was being gentle and you moan loudly with intense pleasure.</p>
 	<<if $sex_ev['orgasm'] < $orgasm>>
-		<p>You're so caught up in the enjoyment of it that your orgasm catches you by surprise. The pressure inside you builds and builds with each time <<=$npcs.get($sex.npcId,'firstname')>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut and you realize you're about to come.</p>
+		<p>You're so caught up in the enjoyment of it that your orgasm catches you by surprise. The pressure inside you builds and builds with each time <<npc $sex.npcId>><</npc>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut and you realize you're about to come.</p>
 	<<else>>
 		<p>It's your first time having sex, but it's mindblowingly good. Why didn't you do this sooner?!</p>
 	<</if>>
@@ -732,7 +732,7 @@
 	<<gs 'sex_ev_sex' 'fuck_arousal_code'>>
 	<<arouse 'vaginal' -15 `['no_orgasm_msg']`>>
 	<<video "shared/sex/vag/miss/rough1.mp4">>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> picks up the pace as you command and you groan loudly, face contorting in a mixture of pain and pleasure. Maybe sensing something within you, he reaches up and grabs a fistful of your hair, using it to pull himself into you even harder.</p>
+	<p><<npc $sex.npcId>><</npc>> picks up the pace as you command and you groan loudly, face contorting in a mixture of pain and pleasure. Maybe sensing something within you, he reaches up and grabs a fistful of your hair, using it to pull himself into you even harder.</p>
 	It hurts. But that makes it feel even better.
 	<<actCLA 'Continue'>>
 		 <<gs 'sex_ev_cum' 'fuck_cum'>>
@@ -752,7 +752,7 @@
 	<<setinit $sex_ev['position'] = 'doggy'>>
 	<<setinit $sex_ev['pos_speed'] = 'doggy1'>>
 	<<image "shared/sex/vag/doggy/blood1.jpg">>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> slowly presses his cock inside you from behind. It fills you up, stretching your walls before bumping against your hymen. After a brief pause, he pushes through, tearing your maidenhood and causing you to gasp. Whether in excitement or pain, you aren't really sure yet.</p>
+	<p><<npc $sex.npcId>><</npc>> slowly presses his cock inside you from behind. It fills you up, stretching your walls before bumping against your hymen. After a brief pause, he pushes through, tearing your maidenhood and causing you to gasp. Whether in excitement or pain, you aren't really sure yet.</p>
 	<p>"You okay?"</p>
 	<<actCLA 'It hurts'>>
 		<<setinit $sex_ev['virgin_react'] = 'hurt'>>
@@ -778,7 +778,7 @@
 			<<setinit $sex_ev['pos_speed'] = 'doggy1'>>
 			<<setinit $sex_ev['virgin_media'] = '<<video "shared/sex/vag/doggy/slow1.mp4">>'>>
 			$sex_ev['virgin_media']
-			<p>As promised, <<=$npcs.get($sex.npcId,'firstname')>> fucks you very gently, slowly pumping his cock in and out of you. He displays what you can only imagine is incredible patience, as he maintains this slow and gentle pace for several minutes, at which point you think...</p>
+			<p>As promised, <<npc $sex.npcId>><</npc>> fucks you very gently, slowly pumping his cock in and out of you. He displays what you can only imagine is incredible patience, as he maintains this slow and gentle pace for several minutes, at which point you think...</p>
 			<<gs 'sex_ev_virgin' 'virgin_enjoyment'>>
 		<</actCLA>>
 	<</actCLA>>
@@ -786,7 +786,7 @@
 <<if $location_var[$here][0] == 'doggy_virg_norm2'>>
 	<<setinit $sex_ev['pos_speed'] = 'doggy1'>>
 	<<video "shared/sex/vag/doggy/slow1.mp4">>
-	<p>As <<=$npcs.get($sex.npcId,'firstname')>> changes his pace, you sigh deeply, feeling like you can breathe again.</p>
+	<p>As <<npc $sex.npcId>><</npc>> changes his pace, you sigh deeply, feeling like you can breathe again.</p>
 	Now that you aren''t worried about being literally fucked to death, you feel like you can focus on the sensations of your first time and you...
 	<<gs 'sex_ev_virgin' 'virgin_enjoyment'>>
 <</if>>
@@ -804,18 +804,18 @@
 	<<setinit $sex_ev['fuck_enjoyment'] = -1>>
 	<<image "shared/sex/vag/doggy/blood2.jpg">>
 	<<if getvar("$know_virgin["+$sex.npcId+"]") == 1>>
-		<p>Without warning, <<=$npcs.get($sex.npcId,'firstname')>> plunges his entire cock all the way inside you. He tears straight through your hymen, eliciting a uncontainable shriek of pain from your lips and tears immediately filling your eyes. If he understood how much saving your virginity meant to you, then he doesn't show it as he throws his full weight against you and bears you down onto the bed. Your arms and legs buckle beneath you, and his cock drives all the way inside you. </p>
+		<p>Without warning, <<npc $sex.npcId>><</npc>> plunges his entire cock all the way inside you. He tears straight through your hymen, eliciting a uncontainable shriek of pain from your lips and tears immediately filling your eyes. If he understood how much saving your virginity meant to you, then he doesn't show it as he throws his full weight against you and bears you down onto the bed. Your arms and legs buckle beneath you, and his cock drives all the way inside you. </p>
 		He doesn''t give you even a moment to adjust and begins fucking you full force, absolutely <i>pounding</i> your pussy.
 	<<else>>
-		<p>Without warning, <<=$npcs.get($sex.npcId,'firstname')>> plunges his entire cock all the way inside you. He tears straight through your hymen, eliciting a uncontainable shriek of pain from your lips and tears immediately filling your eyes. If he understood how much saving your virginity meant to you, then he doesn't show it as he throws his full weight against you and bears you down onto the bed. Your arms and legs buckle beneath you, and his cock drives all the way inside you.</p>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> doesn't stop for even a second and begins fucking you <i>hard</i>.</p>
+		<p>Without warning, <<npc $sex.npcId>><</npc>> plunges his entire cock all the way inside you. He tears straight through your hymen, eliciting a uncontainable shriek of pain from your lips and tears immediately filling your eyes. If he understood how much saving your virginity meant to you, then he doesn't show it as he throws his full weight against you and bears you down onto the bed. Your arms and legs buckle beneath you, and his cock drives all the way inside you.</p>
+		<p><<npc $sex.npcId>><</npc>> doesn't stop for even a second and begins fucking you <i>hard</i>.</p>
 	<</if>>
 	<<actCLA 'Scream'>>
 		<<arouse 'vaginal' `rand(4,8)` `['rough','no_orgasm_msg']`>>
 		<!-- !!		gs 'pain', 2, 'breasts', 'stretch'-->
 		<<video "shared/sex/vag/doggy/laying_down1.mp4">>
 		<i>"Mmmm! Mmm!! MM!! MMM!!"</i>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> fucks you roughly and without mercy or restraint. It hurts so much. Every time his cock slams back in to you, you feel like you're going to die. It's like your pussy is being torn in half and you wonder if you're going to piss blood after this. He lets all of his weight rest on top of you, driving the breath from your lungs. You can't even scream. All you can do is squirm beneath <<=$npcs.get($sex.npcId,'firstname')>> as he pounds your virgin pussy over and over again.</p>
+		<p><<npc $sex.npcId>><</npc>> fucks you roughly and without mercy or restraint. It hurts so much. Every time his cock slams back in to you, you feel like you're going to die. It's like your pussy is being torn in half and you wonder if you're going to piss blood after this. He lets all of his weight rest on top of you, driving the breath from your lungs. You can't even scream. All you can do is squirm beneath <<npc $sex.npcId>><</npc>> as he pounds your virgin pussy over and over again.</p>
 		<<actCLA 'Endure it'>>
 			<<set $orgasm_or = 'no'>>
 			<<arouse 'vaginal' `rand(4,8)` `['rough','no_orgasm_msg']`>>
@@ -825,7 +825,7 @@
 			<</actCLA>>
 		<</actCLA>>
 		<<actCLA 'Can we slow down?'>>
-			<p>"Can we-! Slow down-! A little-?" you manage to gasp under <<=$npcs.get($sex.npcId,'firstname')>>'s relentless pounding. "This is-! Too-! Rough-!"</p>
+			<p>"Can we-! Slow down-! A little-?" you manage to gasp under <<npc $sex.npcId>><</npc>>'s relentless pounding. "This is-! Too-! Rough-!"</p>
 			<<if (rand(1,10) >= 7 or $npcs.get($sex.npcId,'selfish') == 1 or getvar("$npc_abusive") == 1) and $npcs.get($sex.npcId,'generous') != 1>>
 				<<set $orgasm_or = 'no'>>
 				"This is what sex is like," he grins. "You'll get used to it soon, then it'll feel really good."
@@ -837,7 +837,7 @@
 			<<else>>
 				<<setinit $sex_ev['speed_change'] = 1>>
 				<p>"Oh! Sorry! I just... I thought it would make you feel good..."</p>
-				<p>He stops and pulls back for a moment. You take a breath of relief, pulling yourself back up to your arms and knees again and <<=$npcs.get($sex.npcId,'firstname')>> re-enters you. Slowly this time, and much more gently.</p>
+				<p>He stops and pulls back for a moment. You take a breath of relief, pulling yourself back up to your arms and knees again and <<npc $sex.npcId>><</npc>> re-enters you. Slowly this time, and much more gently.</p>
 				<<actCLA 'Continue'>>
 					<<gt 'sex_ev_virgin' 'doggy_virg_norm2'>>
 				<</actCLA>>
@@ -851,9 +851,9 @@
 	<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 	<<arouse 'vaginal' -15 `['no_orgasm_msg']`>>
 	<<video "shared/sex/vag/doggy/med2.mp4">>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> picks up the pace as you command and you start to push your hips back in times with his. The sound of your ass being clapped echoes off the walls. The heightened pace feels even better than it did when he was being gentle and you moan loudly with intense pleasure.</p>
+	<p><<npc $sex.npcId>><</npc>> picks up the pace as you command and you start to push your hips back in times with his. The sound of your ass being clapped echoes off the walls. The heightened pace feels even better than it did when he was being gentle and you moan loudly with intense pleasure.</p>
 	<<if $sex_ev['orgasm'] < $orgasm>>
-		<p>You're so caught up in the enjoyment of it that your orgasm catches you by surprise. The pressure inside you builds and builds with each time <<=$npcs.get($sex.npcId,'firstname')>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut and you realize you're about to come.</p>
+		<p>You're so caught up in the enjoyment of it that your orgasm catches you by surprise. The pressure inside you builds and builds with each time <<npc $sex.npcId>><</npc>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut and you realize you're about to come.</p>
 	<<else>>
 		<p>It's your first time having sex, but it's mind-blowingly good. Why didn't you do this sooner?!</p>
 	<</if>>
@@ -867,7 +867,7 @@
 	<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 	<<arouse 'vaginal' -15 `['no_orgasm_msg']`>>
 	<<video "shared/sex/vag/doggy/rough1.mp4">>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> picks up the pace as you command and you groan loudly, face contorting in a mixture of pain and pleasure. Maybe sensing something within you, he reaches up and grabs a fistful of your hair, using it to pull himself into you even harder.</p>
+	<p><<npc $sex.npcId>><</npc>> picks up the pace as you command and you groan loudly, face contorting in a mixture of pain and pleasure. Maybe sensing something within you, he reaches up and grabs a fistful of your hair, using it to pull himself into you even harder.</p>
 	It hurts. But that makes it feel even better.
 	<<actCLA 'Continue'>>
 		 <<gs 'sex_ev_cum' 'fuck_cum'>>
@@ -884,26 +884,26 @@
 	<<setinit $sex_ev['position'] = 'cowgirl'>>
 	<<setinit $sex_ev['pos_speed'] = 'cowgirl1'>>
 	<<video "shared/sex/vag/cowgirl/enter1.mp4">>
-	<p>Grabbing hold of <<=$npcs.get($sex.npcId,'firstname')>>'s cock, you try to guide it in with your hand as you ease yourself down onto it. It's kind of awkward to do and you have a lot of difficulty getting it to enter your pussy straight.</p>
+	<p>Grabbing hold of <<npc $sex.npcId>><</npc>>'s cock, you try to guide it in with your hand as you ease yourself down onto it. It's kind of awkward to do and you have a lot of difficulty getting it to enter your pussy straight.</p>
 	<<if $npcs.get($sex.npcId,'generous') == 1>>
-		<p>"It's okay, take your time," <<=$npcs.get($sex.npcId,'firstname')>> assures you. "Hard to get it in, isn't it?"</p>
+		<p>"It's okay, take your time," <<npc $sex.npcId>><</npc>> assures you. "Hard to get it in, isn't it?"</p>
 		<p>"Y-yeah," you blush, embarrassed at your obvious lack of experience.</p>
 		Finally, you manage to get the tip inside your pussy and carefully lower yourself down. You feel your walls stretch slowly and keep going lower until you feel yourself bump into something, some kind of resistance. It takes a moment, but then you realize it's your hymen.
-		<p>"Ready?" <<=$npcs.get($sex.npcId,'firstname')>> asks gently.</p>
+		<p>"Ready?" <<npc $sex.npcId>><</npc>> asks gently.</p>
 		"Mhmm," you nod. With a deep breath, you lift yourself up slightly and bounce straight down, tearing through your virginity.
 		<<actCLA '<b>!!!!</b>'>>
 			<<set $orgasm_or = 'no'>>
 			<<arouse 'vaginal' 1 `['no_orgasm_msg']`>>
 			<<image "shared/sex/vag/cowgirl/blood1.jpg">>
-			<p>The pain of <<=$npcs.get($sex.npcId,'firstname')>>'s cock ripping through your hymen is enough to make your eyes water.</p>
+			<p>The pain of <<npc $sex.npcId>><</npc>>'s cock ripping through your hymen is enough to make your eyes water.</p>
 			<p>"Fuck!" you involuntarily squeak. "Fuckfuckfuckfuckfuckfuckfuck! That hurts!"</p>
-			<p>"It's okay," <<=$npcs.get($sex.npcId,'firstname')>> says, assuring you, putting his hands on your hips. "Take it slow, alright?"</p>
+			<p>"It's okay," <<npc $sex.npcId>><</npc>> says, assuring you, putting his hands on your hips. "Take it slow, alright?"</p>
 			<<actCLA 'Take his advice'>>
 				<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 				<<video "shared/sex/vag/cowgirl/slow1.mp4">>
 				You nod in response, taking deep breaths trying to adjust to feeling this... <i>thing</i> impaling you, filling you up, stretching you to your limits. Once you feel ready, you start to move.
 				<p>Clenching your jaw, you slowly lift yourself up before sliding back down on his cock. And then again. And again. And again. Your legs feel slick with something running down your thighs, but it doesn't feel like your juices. In fact it's hard to feel aroused at all right now. Suddenly you realize; it's blood. You did just pop your cherry after all...</p>
-				<p>You soldier onwards, continuing to ride <<=$npcs.get($sex.npcId,'firstname')>>. A few minutes pass and you work yourself up to a slow but steady rhythm, bouncing up and down on his cock. And soon, you realize you...</p>
+				<p>You soldier onwards, continuing to ride <<npc $sex.npcId>><</npc>>. A few minutes pass and you work yourself up to a slow but steady rhythm, bouncing up and down on his cock. And soon, you realize you...</p>
 				<<gs 'sex_ev_virgin' 'virgin_enjoyment'>>
 			<</actCLA>>
 			<<actCLA 'Go hard, power through'>>
@@ -918,20 +918,20 @@
 				<p>"AHH! FUCK!" you shout, leaning back and bouncing again.</p>
 				<p>"Hey! Slow down! I-!"</p>
 				<p>"SHUT THE FUCK UP!" you scream. "I'M GONNA FUCK YOU AND I'M GONNA LIKE IT!"</p>
-				<p>You soldier onwards, continuing to fuck <<=$npcs.get($sex.npcId,'firstname')>> with relentless fervor, riding him like your life depends on it. Soon, you realize...</p>
+				<p>You soldier onwards, continuing to fuck <<npc $sex.npcId>><</npc>> with relentless fervor, riding him like your life depends on it. Soon, you realize...</p>
 				<<gs 'sex_ev_virgin' 'virgin_enjoyment'>>
 			<</actCLA>>
 		<</actCLA>>
 	<<elseif $npcs.get($sex.npcId,'selfish') == 1>>
-		<p>"Come on, hurry up," <<=$npcs.get($sex.npcId,'firstname')>> complains loudly.</p>
+		<p>"Come on, hurry up," <<npc $sex.npcId>><</npc>> complains loudly.</p>
 		<p>"I'm <i>trying!</i>" you yelp, blushing hard at your obvious lack of experience.</p>
 		Finally, you manage to get the tip inside your pussy and carefully lower yourself down. You feel your walls stretch slowly and keep going lower until you feel yourself bump into something, some kind of resistance. It takes a moment, but then you realize it's your hymen and you sit there for a moment, pausing.
-		<p>"Come on already!" <<=$npcs.get($sex.npcId,'firstname')>> doesn't wait for a response and thrusts his hips up, sending his cock tearing through your virginity.</p>
+		<p>"Come on already!" <<npc $sex.npcId>><</npc>> doesn't wait for a response and thrusts his hips up, sending his cock tearing through your virginity.</p>
 		<<actCLA '<b>!!!!</b>'>>
 			<<set $orgasm_or = 'no'>>
 			<<arouse 'vaginal' 1 `['no_orgasm_msg']`>>
 			<<image "shared/sex/vag/cowgirl/blood1.jpg">>
-			<p>The pain of <<=$npcs.get($sex.npcId,'firstname')>>'s cock ripping through your hymen is enough to make your eyes water.</p>
+			<p>The pain of <<npc $sex.npcId>><</npc>>'s cock ripping through your hymen is enough to make your eyes water.</p>
 			<p>"<i><b>FUCK!</b></i>" you shout. "Cocksucker! Motherfuck! Piece of shit, <i>bastard!</i>"</p>
 			You continue to scream obscenities at him even as he grabs your hips.
 			"You were taking too long, decided to help you take the plunge," he grins, trying to guide you back up again.
@@ -942,7 +942,7 @@
 				<<else>>
 					<<video "shared/sex/vag/cowgirl/slow1.mp4">>
 				<</if>>
-				<p>Deciding you're already this far, you let him, slowly lifting yourself up and sliding back down on his cock. And then again. And again. And again. A few minutes pass and you've worked yourself up to a steady rhythm, bouncing up and down on <<=$npcs.get($sex.npcId,'firstname')>>'s cock. And soon, you realize you...</p>
+				<p>Deciding you're already this far, you let him, slowly lifting yourself up and sliding back down on his cock. And then again. And again. And again. A few minutes pass and you've worked yourself up to a steady rhythm, bouncing up and down on <<npc $sex.npcId>><</npc>>'s cock. And soon, you realize you...</p>
 				<<gs 'sex_ev_virgin' 'virgin_enjoyment'>>
 			<</actCLA>>
 			<<actCLA 'Fuck him angrily'>>
@@ -955,28 +955,28 @@
 					<<video "shared/sex/vag/cowgirl/hard2.mp4">>
 				<</if>>
 				<p>"FINE!" you shout, leaning back and bouncing again. "You want me to take the plunge?! I'LL FUCKING PLUNGE THEN!"</p>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> grins back at you and pulls you back down with equal eagerness, and soon you're riding <<=$npcs.get($sex.npcId,'firstname')>> with relentless fervor, fucking him like there's no tomorrow. Somewhere in the back of your mind, you realize your first time is turning into some kind of hate fuck but the anger that burns within refuses to let you back down. Soon, you realize...</p>
+				<p><<npc $sex.npcId>><</npc>> grins back at you and pulls you back down with equal eagerness, and soon you're riding <<npc $sex.npcId>><</npc>> with relentless fervor, fucking him like there's no tomorrow. Somewhere in the back of your mind, you realize your first time is turning into some kind of hate fuck but the anger that burns within refuses to let you back down. Soon, you realize...</p>
 				<<gs 'sex_ev_virgin' 'virgin_enjoyment'>>
 			<</actCLA>>
 		<</actCLA>>
 	<<else>>
-		<p>"You okay up there?" <<=$npcs.get($sex.npcId,'firstname')>> asks, a quizzical look on his face.</p>
+		<p>"You okay up there?" <<npc $sex.npcId>><</npc>> asks, a quizzical look on his face.</p>
 		<p>"Y-yeah," you stammer. "I'm just having a hard time... getting it in..." You blush hard, embarrassed at your obvious lack of experience.</p>
 		Finally, you manage to get the tip inside your pussy and carefully lower yourself down. You feel your walls stretch slowly and keep going lower until you feel yourself bump into something, some kind of resistance. It takes a moment, but then you realize it's your hymen.
-		<p>"Whenever you're ready," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+		<p>"Whenever you're ready," <<npc $sex.npcId>><</npc>> says.</p>
 		You nod back at him and take a deep breath. You lift yourself up slightly, and then force yourself straight down, tearing through your virginity.
 		<<actCLA '<b>!!!!</b>'>>
 			<<set $orgasm_or = 'no'>>
 			<<arouse 'vaginal' 1 `['no_orgasm_msg']`>>
 			<<image "shared/sex/vag/cowgirl/blood1.jpg">>
-			<p>The pain of <<=$npcs.get($sex.npcId,'firstname')>>'s cock ripping through your hymen is enough to make your eyes water.</p>
+			<p>The pain of <<npc $sex.npcId>><</npc>>'s cock ripping through your hymen is enough to make your eyes water.</p>
 			<p>"Fuck!" you involuntarily squeak. "Fuckfuckfuckfuckfuckfuckfuck! That hurts!"</p>
-			<p>"Keep moving, it'll get better," <<=$npcs.get($sex.npcId,'firstname')>> says, assuring you, putting his hands on your hips.</p>
+			<p>"Keep moving, it'll get better," <<npc $sex.npcId>><</npc>> says, assuring you, putting his hands on your hips.</p>
 			<<actCLA 'Take his advice'>>
 				<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 				<<video "shared/sex/vag/cowgirl/slow1.mp4">>
 				<p>You nod in response and clench your jaw, slowly lifting yourself up before sliding back down on his cock. You slowly go up and down a few more times when you feel something running down your thighs. It takes you a moment, as you don't feel very aroused right now so you figure it can't be your juices. And then you realize; it's blood. The last mark of your virginity.</p>
-				<p>You soldier onwards, continuing to ride <<=$npcs.get($sex.npcId,'firstname')>>. A few minutes pass and you work yourself up to a slow but steady rhythm, bouncing up and down on his cock. And soon, you realize you...</p>
+				<p>You soldier onwards, continuing to ride <<npc $sex.npcId>><</npc>>. A few minutes pass and you work yourself up to a slow but steady rhythm, bouncing up and down on his cock. And soon, you realize you...</p>
 				<<gs 'sex_ev_virgin' 'virgin_enjoyment'>>
 			<</actCLA>>
 			<<actCLA 'Go hard, power through'>>
@@ -991,7 +991,7 @@
 				<p>"AHH! FUCK!" you shout, leaning back and bouncing again.</p>
 				<p>"Hey!" he grunts in surprise. "You don't have to do it like-</p>
 				<p>"SHUT THE FUCK UP!" you scream. "You said it'll get better if I keep moving right?! So I'm gonna fucking keep moving!"</p>
-				<p>You pound yourself down on <<=$npcs.get($sex.npcId,'firstname')>>'s cock, fucking him with reckless abandon, riding him like your life depends on it, trying to plow your way past the hard part to the "good part." <i>Whatever that's supposed to feel like,</i> you think to yourself with gritted teeth. Soon, you realize...</p>
+				<p>You pound yourself down on <<npc $sex.npcId>><</npc>>'s cock, fucking him with reckless abandon, riding him like your life depends on it, trying to plow your way past the hard part to the "good part." <i>Whatever that's supposed to feel like,</i> you think to yourself with gritted teeth. Soon, you realize...</p>
 				<<gs 'sex_ev_virgin' 'virgin_enjoyment'>>
 			<</actCLA>>
 		<</actCLA>>
@@ -1004,7 +1004,7 @@
 	<<setinit $sex_ev['speed'] = 2>>
 	<<setinit $sex_ev['pos_speed'] = 'cowgirl2'>>
 	<<video "shared/sex/vag/cowgirl/med3.mp4">>
-	<p>Feeling good, you pick up the pace, bouncing up and down on <<=$npcs.get($sex.npcId,'firstname')>>'s cock with giddy excitement. Going a little harder feels even better than before and without warning you begin bursting into giggles.</p>
+	<p>Feeling good, you pick up the pace, bouncing up and down on <<npc $sex.npcId>><</npc>>'s cock with giddy excitement. Going a little harder feels even better than before and without warning you begin bursting into giggles.</p>
 	<p>Who knew that sex was so much fun?</p>
 	<<actCLA 'Continue'>>
 		 <<gs 'sex_ev_cum' 'fuck_cum'>>
@@ -1018,7 +1018,7 @@
 	<<arouse 'vaginal' `rand(4,8)` `['rough','no_orgasm_msg']`>>
 	<<arouse 'vaginal' -10 `['no_orgasm_msg']`>>
 	<<video "shared/sex/vag/cowgirl/hard2.mp4">>
-	<p>With no warning other than a sudden cry, you throw yourself down on <<=$npcs.get($sex.npcId,'firstname')>>'s cock with as much force as you can. The impact reverberates through you flaring both the pain and the pleasure inside of your cunt. You raise yourself up and impale yourself again and again and again until you're riding him like a bucking stallion. Tears stream down your face and protracted groans of exertion escape from behind your teeth, clenched in a fierce grin. Your pussy hurts so much, and you never want this pain to end.</p>
+	<p>With no warning other than a sudden cry, you throw yourself down on <<npc $sex.npcId>><</npc>>'s cock with as much force as you can. The impact reverberates through you flaring both the pain and the pleasure inside of your cunt. You raise yourself up and impale yourself again and again and again until you're riding him like a bucking stallion. Tears stream down your face and protracted groans of exertion escape from behind your teeth, clenched in a fierce grin. Your pussy hurts so much, and you never want this pain to end.</p>
 	<<actCLA 'Continue'>>
 		 <<gs 'sex_ev_cum' 'fuck_cum'>>
 	<</actCLA>>
@@ -1056,21 +1056,21 @@
 	<<if $sex_ev['cum_choice'] == 'warn'>>
 		<<if getvar("$sex_ev['boy_cum']") == 2 and getvar("$sex_ev['kiss']") == 1>>
 			$sex_ev['virgin_media']
-			<p>A short while later, <<=$npcs.get($sex.npcId,'firstname')>> reaches his limit.</p>
+			<p>A short while later, <<npc $sex.npcId>><</npc>> reaches his limit.</p>
 			<p>"I'm-! Almost there!" he says, breaking away from your lips, panting heavily.</p>
 		<<elseif getvar("$sex_ev['boy_cum']") == 2>>
 			$sex_ev['virgin_media']
-			<p>A short while later, <<=$npcs.get($sex.npcId,'firstname')>> reaches his limit.</p>
+			<p>A short while later, <<npc $sex.npcId>><</npc>> reaches his limit.</p>
 			<p>"I'm-! Almost there!" he says, panting heavily.</p>
 		<<elseif getvar("$sex_ev['kiss']") == 1>>
-			<p>A short while later, <<=$npcs.get($sex.npcId,'firstname')>> reaches his limit.</p>
+			<p>A short while later, <<npc $sex.npcId>><</npc>> reaches his limit.</p>
 			<p>"I'm-! Almost there!" he says, breaking away from your lips, panting heavily.</p>
 			<<if $sex_ev['orgasm'] < $orgasm>>
 				You barely register what he's saying. The feeling of his cock stretching your walls, the tension that keeps tightening and tightening inside you. You feel like you're about to burst. It's all so new to you that when you realize what''s happening, it startles you.
 				"I think am too," you whisper, on the verge of orgasming from your first time, barely able to speak.
 			<</if>>
 		<<else>>
-			<p>A short while later, <<=$npcs.get($sex.npcId,'firstname')>> reaches his limit.</p>
+			<p>A short while later, <<npc $sex.npcId>><</npc>> reaches his limit.</p>
 			<p>"I'm-! Almost there!"</p>
 			<<if $sex_ev['orgasm'] < $orgasm>>
 				You barely register what he's saying. The feeling of his cock stretching your walls, the tension that keeps tightening and tightening inside you. You feel like you're about to burst. It's all so new to you that when you realize what''s happening, it startles you.
@@ -1082,19 +1082,19 @@
 			<<if $npcs.get($sex.npcId,'cum_pref') == 'creampie'>>
 				<<setinit $sex_ev['he_ask_creampie'] = 1>>
 				<<if $sex_ev['orgasm'] < $orgasm>>
-					<p>"Let's come together," <<=$npcs.get($sex.npcId,'firstname')>> says, smiling at you.</p>
+					<p>"Let's come together," <<npc $sex.npcId>><</npc>> says, smiling at you.</p>
 				<<else>>
-					<p>"I wanna come inside you so bad," <<=$npcs.get($sex.npcId,'firstname')>> says, grunting with the effort of holding himself back from blowing his load inside you right now.</p>
+					<p>"I wanna come inside you so bad," <<npc $sex.npcId>><</npc>> says, grunting with the effort of holding himself back from blowing his load inside you right now.</p>
 				<</if>>
 			<<elseif $npcs.get($sex.npcId,'cum_pref') == 'mouth'>>
 				<<setinit $sex_ev['he_ask_mouth'] = 1>>
-				<p>"Let me come in your mouth," <<=$npcs.get($sex.npcId,'firstname')>> says, grunting with the effort of holding himself back from blowing his load right now.</p>
+				<p>"Let me come in your mouth," <<npc $sex.npcId>><</npc>> says, grunting with the effort of holding himself back from blowing his load right now.</p>
 			<<elseif $npcs.get($sex.npcId,'cum_pref') == 'face'>>
 				<<setinit $sex_ev['he_ask_facial'] = 1>>
-				<p>"I wanna come on your face," <<=$npcs.get($sex.npcId,'firstname')>> says, grunting with the effort of holding himself back from blowing his load right now. "I want to see my cum all over you."</p>
+				<p>"I wanna come on your face," <<npc $sex.npcId>><</npc>> says, grunting with the effort of holding himself back from blowing his load right now. "I want to see my cum all over you."</p>
 			<<elseif $npcs.get($sex.npcId,'cum_pref') == 'tits'>>
 				<<setinit $sex_ev['he_ask_tits'] = 1>>
-				<p>"I wanna come on your tits," <<=$npcs.get($sex.npcId,'firstname')>> says, grunting with the effort of holding himself back from blowing his load right now.</p>
+				<p>"I wanna come on your tits," <<npc $sex.npcId>><</npc>> says, grunting with the effort of holding himself back from blowing his load right now.</p>
 			<</if>>
 		<</if>>
 		<<actCLA 'Come wherever you want'>>
@@ -1105,7 +1105,7 @@
 				"Come wherever you want," you grunt, still numbly going along with the motion of his thrusting.
 			<<elseif getvar("$sex_ev['fuck_enjoyment']") >= 1>>
 				<<if $sex_ev['position'] == 'doggy'>>
-					<p>You turn your head over your shoulder to look at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+					<p>You turn your head over your shoulder to look at <<npc $sex.npcId>><</npc>>.</p>
 				<</if>>
 				"Come wherever you want," you smile.
 			<</if>>
@@ -1204,12 +1204,12 @@
 			<<video "shared/sex/vag/miss/slow2.mp4">>
 			<p>"Ugh! Ugh! Ugh! <i>Ughhhh!!</i>"</p>
 			<<if $pc.horny >= 80>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> is doing a good job, even if he's not quite getting you off. You don't think you'll manage to come this time, but you don't want him to feel bad about it either. So...</p>
+				<p><<npc $sex.npcId>><</npc>> is doing a good job, even if he's not quite getting you off. You don't think you'll manage to come this time, but you don't want him to feel bad about it either. So...</p>
 			<<elseif $pc.horny >= 40>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> isn't doing bad, but he's nowhere near to really getting you off. But you also don't want him to feel bad, so...</p>
+				<p><<npc $sex.npcId>><</npc>> isn't doing bad, but he's nowhere near to really getting you off. But you also don't want him to feel bad, so...</p>
 			<</if>>
-			<p>You moan loudly despite the distinct <i>lack</i> of pleasure you feel right now before crying out and clenching down on <<=$npcs.get($sex.npcId,'firstname')>>'s cock with your pussy as hard as you can, dramatically tensing all your muscles as hard as you can, forcing your body to quiver.</p>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> slows down even more for a beat.</p>
+			<p>You moan loudly despite the distinct <i>lack</i> of pleasure you feel right now before crying out and clenching down on <<npc $sex.npcId>><</npc>>'s cock with your pussy as hard as you can, dramatically tensing all your muscles as hard as you can, forcing your body to quiver.</p>
+			<p><<npc $sex.npcId>><</npc>> slows down even more for a beat.</p>
 			<p>"Did you just...?"</p>
 			"Yeah," you pant with feigned breathlessness and smile at him. "You're incredible."
 			He smiles back and gets right on back to fucking you.
@@ -1236,7 +1236,7 @@
 		<<video "shared/sex/vag/miss/med1.mp4">>
 	<<else>>
 		<<video "shared/sex/vag/miss/med1.mp4">>
-		<p>The feeling of <<=$npcs.get($sex.npcId,'firstname')>>'s cock inside you is so wonderful, your pussy tightens on him with every gentle thrust. The feeling is so sublime and the experience is so new, you don't realize you're about to orgasm until right before it happens. The pleasure that was building inside you suddenly releases and you find yourself caught in the throes of it, shuddering uncontrollably beneath <<=$npcs.get($sex.npcId,'firstname')>> with his cock in a vice grip inside you.</p>
+		<p>The feeling of <<npc $sex.npcId>><</npc>>'s cock inside you is so wonderful, your pussy tightens on him with every gentle thrust. The feeling is so sublime and the experience is so new, you don't realize you're about to orgasm until right before it happens. The pleasure that was building inside you suddenly releases and you find yourself caught in the throes of it, shuddering uncontrollably beneath <<npc $sex.npcId>><</npc>> with his cock in a vice grip inside you.</p>
 	<</if>>
 	<<actCLA 'Continue'>>
 		<<if $sex_ev['pos_speed'] == 'miss3'>>
@@ -1251,7 +1251,7 @@
 			Eventually, your orgasm fades and you're left panting heavily, trying to catch your breath.
 			<<setinit $sex_ev['virgin_media'] = '<<video "shared/sex/vag/miss/slow2.mp4">>'>>
 		<</if>>
-		<p><i>Woah... Orgasming from real sex is... really different...</i> you think, groans coming from your mouth as <<=$npcs.get($sex.npcId,'firstname')>> continues fucking your still-sensitive pussy.</p>
+		<p><i>Woah... Orgasming from real sex is... really different...</i> you think, groans coming from your mouth as <<npc $sex.npcId>><</npc>> continues fucking your still-sensitive pussy.</p>
 		<<actCLA 'Continue'>>
 			<<gt 'sex_ev_virgin' 'fuck_cum'>>
 		<</actCLA>>
@@ -1294,8 +1294,8 @@ end} -->
 <</if>>
 <<if $location_var[$here][0] == 'hurt_react2'>>
 	He keeps pushing inside, eliciting more grunts of discomfort from you, until he finally stops moving. You wriggle uncomfortably beneath him. Having a penis inside you is <i>not</i> what you expected. It fills you completely and you can feel it pressing against the walls of your pussy, straining against them and forcing them to stretch. That feeling leaves you like you're being torn in half and you wonder why any girl would ever say she enjoys sex.
-	<p>"Let's just take a minute. Give you some time to adjust," <<=$npcs.get($sex.npcId,'firstname')>> says. Just after he says that, you feel something running down the curve of your thigh. <i>What is tha-</i> you start to wonder before it hits you; it's blood. The final sign of the loss of your virginity.</p>
-	<p>After a minute or two of letting <<=$npcs.get($sex.npcId,'firstname')>>'s cock stretch your pussy, you nod for him to move again.</p>
+	<p>"Let's just take a minute. Give you some time to adjust," <<npc $sex.npcId>><</npc>> says. Just after he says that, you feel something running down the curve of your thigh. <i>What is tha-</i> you start to wonder before it hits you; it's blood. The final sign of the loss of your virginity.</p>
+	<p>After a minute or two of letting <<npc $sex.npcId>><</npc>>'s cock stretch your pussy, you nod for him to move again.</p>
 	"Okay. You can keep going," you grimance, hoping this horrible experience ends soon.
 <</if>>
 <<if $location_var[$here][0] == 'fine_react1'>>
@@ -1304,8 +1304,8 @@ end} -->
 <</if>>
 <<if $location_var[$here][0] == 'fine_react2'>>
 	He keeps pushing inside, eliciting more grunts of discomfort from you, until he finally stops moving and you think he's fully inside you. Having a penis inside you is a decidedly strange experience. You can feel his cock pressing against your pussy, stretching it to its limits and straining against them. You feel "full", and you can't think of another way to describe it at the moment.
-	<p>"Let's just take a minute. Give you some time to adjust," <<=$npcs.get($sex.npcId,'firstname')>> says. Just after he says that, you feel something running down the curve of your thigh. <i>What is tha-</i> you start to wonder before it hits you; it's blood. The final sign of the loss of your virginity.</p>
-	<p>After a minute or two of letting <<=$npcs.get($sex.npcId,'firstname')>>'s cock stretch your pussy, you nod for him to move again.</p>
+	<p>"Let's just take a minute. Give you some time to adjust," <<npc $sex.npcId>><</npc>> says. Just after he says that, you feel something running down the curve of your thigh. <i>What is tha-</i> you start to wonder before it hits you; it's blood. The final sign of the loss of your virginity.</p>
+	<p>After a minute or two of letting <<npc $sex.npcId>><</npc>>'s cock stretch your pussy, you nod for him to move again.</p>
 	"Okay. You can keep going," you nod.
 <</if>>
 <<if $location_var[$here][0] == 'mmm_react1'>>
@@ -1314,8 +1314,8 @@ end} -->
 <</if>>
 <<if $location_var[$here][0] == 'mmm_react2'>>
 	He keeps pushing inside, eliciting more grunts of discomfort from you, until he finally stops moving and you think he's fully inside you. Having a penis inside you is a decidedly strange experience. You can feel his cock pressing against your pussy, stretching it to its limits and straining against them. You feel "full", and you can't think of another way to describe it at the moment.
-	<p>"Let's just take a minute. Give you some time to adjust," <<=$npcs.get($sex.npcId,'firstname')>> says. Just after he says that, you feel something running down the curve of your thigh. <i>What is tha-</i> you start to wonder before it hits you; it's blood. The final sign of the loss of your virginity.</p>
-	<p>After a minute or two of letting <<=$npcs.get($sex.npcId,'firstname')>>'s cock stretch your pussy, you nod for him to move again.</p>
+	<p>"Let's just take a minute. Give you some time to adjust," <<npc $sex.npcId>><</npc>> says. Just after he says that, you feel something running down the curve of your thigh. <i>What is tha-</i> you start to wonder before it hits you; it's blood. The final sign of the loss of your virginity.</p>
+	<p>After a minute or two of letting <<npc $sex.npcId>><</npc>>'s cock stretch your pussy, you nod for him to move again.</p>
 	"Okay. You can keep going," you nod.
 <</if>>
 <<if $location_var[$here][0] == 'virgin_enjoyment'>>
@@ -1327,7 +1327,7 @@ end} -->
 			<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 			<<set $pc.horny -= 50>>
 			... still find it really painful.
-			<p>Maybe it's just the after effect of being too rough with you before carrying over, but this <i>really fucking hurts!</i> Every time <<=$npcs.get($sex.npcId,'firstname')>> thrusts into you, it feels like your vagina is going to split in half. Everything about it hurts. Your insides hurt, your vulva hurts, your cervix hurts, it feels like your pussy is literally being stabbed. You keep expecting it to get better, for the pain to go away and the enjoyment to start, but it never does. All you can do is clench your teeth, squeeze your eyes shut, and keep enduring until it's over.</p>
+			<p>Maybe it's just the after effect of being too rough with you before carrying over, but this <i>really fucking hurts!</i> Every time <<npc $sex.npcId>><</npc>> thrusts into you, it feels like your vagina is going to split in half. Everything about it hurts. Your insides hurt, your vulva hurts, your cervix hurts, it feels like your pussy is literally being stabbed. You keep expecting it to get better, for the pain to go away and the enjoyment to start, but it never does. All you can do is clench your teeth, squeeze your eyes shut, and keep enduring until it's over.</p>
 			<<actCLA 'Continue'>>
 				 <<gs 'sex_ev_cum' 'fuck_cum'>>
 			<</actCLA>>
@@ -1339,7 +1339,7 @@ end} -->
 			<<arouse 'vaginal' 1 `['no_orgasm_msg']`>>
 			<<set $time.minutes += rand(3,4)>>
 			... still don't really enjoy it...
-			<p>It hurt when <<=$npcs.get($sex.npcId,'firstname')>> first entered you and when he was just pounding on you with no regard for your comfort, but now that he's slowed down, it's just a sort of pressure you feel inside you. The sensation isn't painful but it you're not getting any pleasure from it either. After his previous speed, maybe your pussy just went numb...?</p>
+			<p>It hurt when <<npc $sex.npcId>><</npc>> first entered you and when he was just pounding on you with no regard for your comfort, but now that he's slowed down, it's just a sort of pressure you feel inside you. The sensation isn't painful but it you're not getting any pleasure from it either. After his previous speed, maybe your pussy just went numb...?</p>
 			<<actCLA 'Continue'>>
 				 <<gs 'sex_ev_cum' 'fuck_cum'>>
 			<</actCLA>>
@@ -1352,7 +1352,7 @@ end} -->
 			... start to feel really good...
 			The pain of the previous form of fucking begins to fade and pleasure takes its place. Like an itch you've never been able to scratch or a "fullness" you've never experienced, you can feel his cock deep inside you and it feels <i>so good</i>, causing you to openly moan as he fucks you.
 			<<if $sex_ev['orgasm'] < $orgasm>>
-				<p>You're so caught up in the enjoyment of it, you almost don't realize when you're about to come. The pressure inside you building and building with each time <<=$npcs.get($sex.npcId,'firstname')>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut as you cum hard on <<=$npcs.get($sex.npcId,'firstname')>>'s dick.</p>
+				<p>You're so caught up in the enjoyment of it, you almost don't realize when you're about to come. The pressure inside you building and building with each time <<npc $sex.npcId>><</npc>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut as you cum hard on <<npc $sex.npcId>><</npc>>'s dick.</p>
 			<<else>>
 				<p>You spend the next several minutes fucking joyously, wondering why you waited so long to feel this good!</p>
 			<</if>>
@@ -1370,13 +1370,13 @@ end} -->
 			<<set $time.minutes += rand(3,4)>>
 			<i>... this is really painful.</i>
 			<<if $sex_ev['pos_speed'] == 'cowgirl3'>>
-				<p>This was a fucking terrible idea! Why did you think that you could lose your virginity like this? Why are you even trying? Tears well up in your eyes as you continue to impale yourself on <<=$npcs.get($sex.npcId,'firstname')>>'s cock, wondering to yourself why you're so fucking stupid.</p>
+				<p>This was a fucking terrible idea! Why did you think that you could lose your virginity like this? Why are you even trying? Tears well up in your eyes as you continue to impale yourself on <<npc $sex.npcId>><</npc>>'s cock, wondering to yourself why you're so fucking stupid.</p>
 			<<elseif $sex_ev['virgin_react'] == 'hurt'>>
-				<p>What initially started as a painful experience continues to be one. Every time <<=$npcs.get($sex.npcId,'firstname')>>'s cock moves inside you, it feels like your vagina is going to split in half. Everything about it hurts. Your insides hurt, your vulva hurts, your cervix hurts, it feels like your pussy is literally being stabbed. You spend each moment praying he'll just cum already and your agony can end.</p>
+				<p>What initially started as a painful experience continues to be one. Every time <<npc $sex.npcId>><</npc>>'s cock moves inside you, it feels like your vagina is going to split in half. Everything about it hurts. Your insides hurt, your vulva hurts, your cervix hurts, it feels like your pussy is literally being stabbed. You spend each moment praying he'll just cum already and your agony can end.</p>
 			<<elseif $sex_ev['virgin_react'] == 'fine'>>
-				<p>It wasn't so bad when he first entered you, but what started as mild discomfort has become full blown agony. Every time <<=$npcs.get($sex.npcId,'firstname')>>'s cock moves inside you, it feels like your vagina is going to split in half. Everything about it hurts. Your insides hurt, your vulva hurts, your cervix hurts, it feels like your pussy is literally being stabbed. You keep expecting it to get better, for the pain to go away and the enjoyment to start, but it never does. All you can do is clench your teeth, squeeze your eyes shut, and keep enduring until it's over.</p>
+				<p>It wasn't so bad when he first entered you, but what started as mild discomfort has become full blown agony. Every time <<npc $sex.npcId>><</npc>>'s cock moves inside you, it feels like your vagina is going to split in half. Everything about it hurts. Your insides hurt, your vulva hurts, your cervix hurts, it feels like your pussy is literally being stabbed. You keep expecting it to get better, for the pain to go away and the enjoyment to start, but it never does. All you can do is clench your teeth, squeeze your eyes shut, and keep enduring until it's over.</p>
 			<<elseif $sex_ev['virgin_react'] == 'mmm'>>
-				<p>It wasn't so bad when he first entered you, but what started as mild discomfort has become full blown agony. Every time <<=$npcs.get($sex.npcId,'firstname')>>'s cock moves inside you, it feels like your vagina is going to split in half. Everything about it hurts. Your insides hurt, your vulva hurts, your cervix hurts, it feels like your pussy is literally being stabbed. You keep expecting it to get better, for the pain to go away and the enjoyment to start, but it never does. All you can do is clench your teeth, squeeze your eyes shut, and keep enduring until it's over.</p>
+				<p>It wasn't so bad when he first entered you, but what started as mild discomfort has become full blown agony. Every time <<npc $sex.npcId>><</npc>>'s cock moves inside you, it feels like your vagina is going to split in half. Everything about it hurts. Your insides hurt, your vulva hurts, your cervix hurts, it feels like your pussy is literally being stabbed. You keep expecting it to get better, for the pain to go away and the enjoyment to start, but it never does. All you can do is clench your teeth, squeeze your eyes shut, and keep enduring until it's over.</p>
 			<</if>>
 			<<actCLA 'Continue'>>
 				 <<gs 'sex_ev_cum' 'fuck_cum'>>
@@ -1390,9 +1390,9 @@ end} -->
 			<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 			<i>... you aren''t really enjoying this...</i>
 			<<if $sex_ev['pos_speed'] == 'cowgirl3'>>
-				<p>It takes you a few minutes, but at some point you realize it doesn't really hurt anymore. Actually, you don't really feel anything. You keep slamming your hips down on <<=$npcs.get($sex.npcId,'firstname')>>, expecting to feel something pleasurable, but all you really feel is a vague pressure inside you that ebbs and flows with the motions of your hips. Despite how hard you're riding him, you can't help but feel the experience is... boring?</p>
+				<p>It takes you a few minutes, but at some point you realize it doesn't really hurt anymore. Actually, you don't really feel anything. You keep slamming your hips down on <<npc $sex.npcId>><</npc>>, expecting to feel something pleasurable, but all you really feel is a vague pressure inside you that ebbs and flows with the motions of your hips. Despite how hard you're riding him, you can't help but feel the experience is... boring?</p>
 			<<else>>
-				<p>It hurt when <<=$npcs.get($sex.npcId,'firstname')>> first entered you, but now that your pussy has adjusted but that pain has taken a back seat and become nothing more than a dull throb. But other than that, it's just a sort of pressure you feel inside you that comes and goes with the motions of his cock. The sensation isn't painful but it you're not getting any pleasure from it either. The experience is just sort of... bland.</p>
+				<p>It hurt when <<npc $sex.npcId>><</npc>> first entered you, but now that your pussy has adjusted but that pain has taken a back seat and become nothing more than a dull throb. But other than that, it's just a sort of pressure you feel inside you that comes and goes with the motions of his cock. The sensation isn't painful but it you're not getting any pleasure from it either. The experience is just sort of... bland.</p>
 			<</if>>
 			<<actCLA 'Continue'>>
 				 <<gs 'sex_ev_cum' 'fuck_cum'>>
@@ -1408,14 +1408,14 @@ end} -->
 			<<if $sex_ev['virgin_react'] == 'hurt'>>
 				The initial pain you felt is still there, but now there''s something else that's going along with it. Like an itch you've never been able to scratch or a "fullness" you've never experienced. Your arousal flows like water from your pussy and his cock is slick with your blood and juices. It reaches deep inside you and it feels <i>so good</i>, causing you to openly moan.
 			<<elseif $sex_ev['virgin_react'] == 'fine'>>
-				<p>That "fullness" you remarked upon earlier has somehow become even more full as <<=$npcs.get($sex.npcId,'firstname')>> has continued to fuck you. Your arousal flows like water from your pussy and his cock is slick with your blood and juices. It reaches deep inside you and it feels <i>so good</i>, causing you to openly moan.</p>
+				<p>That "fullness" you remarked upon earlier has somehow become even more full as <<npc $sex.npcId>><</npc>> has continued to fuck you. Your arousal flows like water from your pussy and his cock is slick with your blood and juices. It reaches deep inside you and it feels <i>so good</i>, causing you to openly moan.</p>
 			<<elseif $sex_ev['virgin_react'] == 'mmm'>>
-				<p>That "fullness" you remarked upon earlier has somehow become even more full as <<=$npcs.get($sex.npcId,'firstname')>> has continued to fuck you. Your arousal flows like water from your pussy and his cock is slick with your blood and juices. It reaches deep inside you and it feels <i>so good</i>, causing you to openly moan.</p>
+				<p>That "fullness" you remarked upon earlier has somehow become even more full as <<npc $sex.npcId>><</npc>> has continued to fuck you. Your arousal flows like water from your pussy and his cock is slick with your blood and juices. It reaches deep inside you and it feels <i>so good</i>, causing you to openly moan.</p>
 			<</if>>
 			<<actCLA 'Continue at this pace'>>
 				$sex_ev['virgin_media']
 				<<if $sex_ev['orgasm'] < $orgasm>>
-					<p>You're so caught up in the enjoyment of it that your orgasm catches you by surprise. The pressure inside you builds and builds with each time <<=$npcs.get($sex.npcId,'firstname')>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut and you realize you're about to come.</p>
+					<p>You're so caught up in the enjoyment of it that your orgasm catches you by surprise. The pressure inside you builds and builds with each time <<npc $sex.npcId>><</npc>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut and you realize you're about to come.</p>
 				<<else>>
 					<p>You spend the next several minutes fucking joyously, wondering why you waited so long to feel this good!</p>
 				<</if>>
@@ -1426,7 +1426,7 @@ end} -->
 			<<if $sex_ev['position'] != 'cowgirl'>>
 				<<actCLA '"Fuck me harder"'>>
 					$sex_ev['virgin_media']
-					<p>"<<=$npcs.get($sex.npcId,'firstname')>>," you say. "I want you to fuck me harder."</p>
+					<p>"<<npc $sex.npcId>><</npc>>," you say. "I want you to fuck me harder."</p>
 					<p>"You're sure?" he asks.</p>
 					<p>"Yeah, I'm sure," you grin lustfully. "I can take it. I <i>want</i> it. Give me your dick!"</p>
 					<<actCLA 'Continue'>>
@@ -1452,12 +1452,12 @@ end} -->
 			<<set $orgasm_or = ''>>
 			<<arouse 'vaginal' `rand(4,8)` `['no_orgasm_msg']`>>
 			<<arouse 'vaginal' -15 `['no_orgasm_msg']`>>
-			<p>The initial pain you felt is still there, but somehhow it's evolved. <<=$npcs.get($sex.npcId,'firstname')>>'s cock is slick with your blood cock and every time moves inside you, it feels like your vagina is going to split in half. It reaches deep inside you, like a knife stabbing into your cervix. And it feels <i>so good</i>.</p>
+			<p>The initial pain you felt is still there, but somehhow it's evolved. <<npc $sex.npcId>><</npc>>'s cock is slick with your blood cock and every time moves inside you, it feels like your vagina is going to split in half. It reaches deep inside you, like a knife stabbing into your cervix. And it feels <i>so good</i>.</p>
 			It hurts like fire, but somehow it burns you in all the best ways. And you want nothing more than for it to continue. There are tears in your eyes, but you honestly can't tell anymore if they're tears of pain or tears of joy.
 			<<actCLA 'Continue at this pace'>>
 				$sex_ev['virgin_media']
 				<<if $sex_ev['orgasm'] < $orgasm>>
-					<p>You're so caught up in the enjoyment of it that your orgasm catches you by surprise. The pressure inside you builds and builds with each time <<=$npcs.get($sex.npcId,'firstname')>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut and you realize you're about to come.</p>
+					<p>You're so caught up in the enjoyment of it that your orgasm catches you by surprise. The pressure inside you builds and builds with each time <<npc $sex.npcId>><</npc>>'s cock fills you up. One moment you're thinking, <i>More! More! More!</i> and the next, every muscle in your body goes taut and you realize you're about to come.</p>
 				<<else>>
 					<p>You spend the next several minutes fucking joyously, wondering why you waited so long to feel this good!</p>
 				<</if>>
@@ -1468,7 +1468,7 @@ end} -->
 			<<if $sex_ev['position'] != 'cowgirl'>>
 				<<actCLA '"Fuck me harder"'>>
 					$sex_ev['virgin_media']
-					<p>"<<=$npcs.get($sex.npcId,'firstname')>>," you say, tears now streaming down your face. "I want you to fuck me harder."</p>
+					<p>"<<npc $sex.npcId>><</npc>>," you say, tears now streaming down your face. "I want you to fuck me harder."</p>
 					<p>"You're sure?" he asks hesitantly.</p>
 					<p>"Yes! I'm sure!" you cry even harder. "I <i>want</i> it. Give me your dick. Split me in half!"</p>
 					<<actCLA 'Continue'>>
@@ -1494,21 +1494,21 @@ end} -->
 			"It gets better. You were probably too tight because you were a virgin."
 			<<actCLA 'Really?'>>
 				<p>"Really?" you ask, voice heavy with sketicism.</p>
-				<p>"Yeah, really," <<=$npcs.get($sex.npcId,'firstname')>> laughs back. "Some girls I know said their first time hurt. But those same girls love it now."</p>
+				<p>"Yeah, really," <<npc $sex.npcId>><</npc>> laughs back. "Some girls I know said their first time hurt. But those same girls love it now."</p>
 				"Wish you could''ve warned me."
 				"If it's any consolation, your pussy felt great."
 				"It's not," you harumph, crossing your arms and he laughs again.
 				<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 			<</actCLA>>
 			<<actCLA 'I hope so'>>
-				<p>"I hope so," you groan, throwing your head back as <<=$npcs.get($sex.npcId,'firstname')>> laughs.</p>
+				<p>"I hope so," you groan, throwing your head back as <<npc $sex.npcId>><</npc>> laughs.</p>
 				"If it's any consolation, your pussy felt great."
 				"It's not," you harumph, crossing your arms and he laughs again.
 				<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 			<</actCLA>>
 			<<actCLA 'How would you know?'>>
 				<p>"How would you know?" you ask, giving him a dirty look. "Have you ever taken a cock inside you?"</p>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> laughs in reply but holds his hands up in surrender.</p>
+				<p><<npc $sex.npcId>><</npc>> laughs in reply but holds his hands up in surrender.</p>
 				<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 			<</actCLA>>
 		<</actCLA>>
@@ -1544,10 +1544,10 @@ end} -->
 			<<actCLA 'Disappointed'>>
 				"It was pretty disappointing if I'm being honest," you say. "I was expecting more."
 				<<if $npcs.get($sex.npcId,'caretaker') == 1>>
-					<p>"Sorry I couldn't live up to expectation," <<=$npcs.get($sex.npcId,'firstname')>> says with a rueful smile.</p>
+					<p>"Sorry I couldn't live up to expectation," <<npc $sex.npcId>><</npc>> says with a rueful smile.</p>
 					You blush at how sweet he's being, but you don't say anything else and leave it there.
 				<<else>>
-					<p>"This is why first times suck," <<=$npcs.get($sex.npcId,'firstname')>> shrugs. "You'll feel better next time, now that you're not a virgin."</p>
+					<p>"This is why first times suck," <<npc $sex.npcId>><</npc>> shrugs. "You'll feel better next time, now that you're not a virgin."</p>
 					"I hope so," you say, not really sure how else to respond.
 				<</if>>
 				<<gs 'sex_ev_pillow_talk' 'topic_route'>>
@@ -1564,7 +1564,7 @@ end} -->
 			<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
 			"It was... nice," you say, giving a genuine smile. "Felt really good. I just felt... <i>full</i>. Like my insides were getting massaged but like, better than a massage."
 			<<if $npcs.get($sex.npcId,'generous') == 1>>
-				<p>"I'm glad I was able to give you a good first time," <<=$npcs.get($sex.npcId,'firstname')>> smiles back, leaning in to kiss you.</p>
+				<p>"I'm glad I was able to give you a good first time," <<npc $sex.npcId>><</npc>> smiles back, leaning in to kiss you.</p>
 				<<gs 'sex_ev_virgin' 'kiss_turn_head'>>
 				<<actCLA 'Kiss him back'>>
 					You smile and let him press his lips against yours, leaning in to steal another one when he pulls away.
@@ -1572,7 +1572,7 @@ end} -->
 					<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 				<</actCLA>>
 			<<else>>
-				<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
+				<p>"Yeah," <<npc $sex.npcId>><</npc>> grins. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
 				<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 			<</if>>
 		<</actCLA>>
@@ -1581,7 +1581,7 @@ end} -->
 			<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
 			<p>"It was amazing!" you gush with a shameless grin. "It was like I've been missing something this entire time. And you being inside me made me feel <i>full</i>. I can't believe I waited this long to have sex! I need to be careful or I could get addicted to this!"</p>
 			<<if $npcs.get($sex.npcId,'generous') == 1>>
-				<p>Perhaps spurred by your words, <<=$npcs.get($sex.npcId,'firstname')>> quickly moves in to kiss you.</p>
+				<p>Perhaps spurred by your words, <<npc $sex.npcId>><</npc>> quickly moves in to kiss you.</p>
 				<<gs 'sex_ev_virgin' 'kiss_turn_head'>>
 				<<actCLA 'Kiss him back'>>
 					You smile and let him. He presses his lips against you passionately and your eyes go wide in surprise when you feel his tongue snake between your lips and press against yours. You push back with your own, enjoying the way it feels, savoring the taste of his mouth. It's not as good as the sex you just experienced, but it feels <i>damn</i> nice. You even lean in to steal another kiss when he pulls away.
@@ -1591,7 +1591,7 @@ end} -->
 					<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 				<</actCLA>>
 			<<else>>
-				<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
+				<p>"Yeah," <<npc $sex.npcId>><</npc>> grins. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
 				<<actCLA 'Thought: Really?!'>>
 					<i>Fuck, really?!</i> you think to yourself. <i>This isn''t how it always feels? Shit!</i>
 					<<gs 'sex_ev_pillow_talk' 'topic_route'>>
@@ -1628,7 +1628,7 @@ end} -->
 			"It was... nice," you say, giving a forced smile. Actually, it didn''t feel like very much at all. All you really felt was a weird pressure moving inside you. Didn''t feel bad, but it didn''t feel good either. But you don't want to hurt his feelings so you just lie instead. "Felt really good."
 		<</if>>
 		<<if $npcs.get($sex.npcId,'generous') == 1>>
-			<p>"I'm glad I was able to give you a good first time," <<=$npcs.get($sex.npcId,'firstname')>> smiles back, leaning in to kiss you.</p>
+			<p>"I'm glad I was able to give you a good first time," <<npc $sex.npcId>><</npc>> smiles back, leaning in to kiss you.</p>
 			<<gs 'sex_ev_virgin' 'kiss_turn_head'>>
 			<<actCLA 'Kiss him back'>>
 				You smile and let him press his lips against yours, leaning in to steal another one when he pulls away. Unlike the experience you just had, this <i>does</i> feel nice.
@@ -1640,7 +1640,7 @@ end} -->
 				<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 			<</actCLA>>
 		<<else>>
-			<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
+			<p>"Yeah," <<npc $sex.npcId>><</npc>> grins. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
 			<<if getvar("$sex_ev['fuck_enjoyment']") == -1>>
 				<i>Fuck, I hope so,</i> you think to yourself. <i>That was fucking torture!</i>
 			<<elseif getvar("$sex_ev['fuck_enjoyment']") == 0>>
@@ -1662,10 +1662,10 @@ end} -->
 			"It was... nice," you say, giving a forced smile, boredly ignoring his hand between your legs. Actually, it didn''t feel like very much at all. All you really felt was a weird pressure moving inside you. Didn''t feel bad, but it didn''t feel good either. But you don't want to hurt his feelings so you just lie instead. "Felt really good."
 		<</if>>
 		<<if $npcs.get($sex.npcId,'generous') == 1>>
-			<p>"I'm glad I was able to give you a good first time," <<=$npcs.get($sex.npcId,'firstname')>> smiles back, leaning in to kiss you.</p>
+			<p>"I'm glad I was able to give you a good first time," <<npc $sex.npcId>><</npc>> smiles back, leaning in to kiss you.</p>
 			<<gs 'sex_ev_virgin' 'kiss_turn_head'>>
 			<<actCLA 'Kiss him back'>>
-				<p>You smile and let <<=$npcs.get($sex.npcId,'firstname')>> press his lips against yours, gasping into his mouth when you feel his fingers thumb over your clit again before pulling away. Unlike the experience you just had, this <i>does</i> feel nice.</p>
+				<p>You smile and let <<npc $sex.npcId>><</npc>> press his lips against yours, gasping into his mouth when you feel his fingers thumb over your clit again before pulling away. Unlike the experience you just had, this <i>does</i> feel nice.</p>
 				<<if getvar("$sex_ev['fuck_enjoyment']") == -1>>
 					Losing your virginity was painful, but at least he's sweet.
 				<<elseif getvar("$sex_ev['fuck_enjoyment']") == 0>>
@@ -1674,7 +1674,7 @@ end} -->
 				<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 			<</actCLA>>
 		<<else>>
-			<p>"Yeah," <<=$npcs.get($sex.npcId,'firstname')>> grins, giving your clit a hard rub before pulling away. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
+			<p>"Yeah," <<npc $sex.npcId>><</npc>> grins, giving your clit a hard rub before pulling away. "Might not always be that way though. Not every guy's as good a lay as I am."</p>
 			<<if getvar("$sex_ev['fuck_enjoyment']") == -1>>
 				<i>Fuck, I hope so,</i> you think to yourself. <i>That was fucking torture!</i>
 			<<elseif getvar("$sex_ev['fuck_enjoyment']") == 0>>
@@ -1696,7 +1696,7 @@ end} -->
 			<p>"It was amazing!" you say, giving a fake smile. Actually, it didn't feel like very much at all. All you really felt was a weird pressure moving inside you. Didn't feel bad, but it didn't feel good either. But you don't want to hurt his feelings so you just lie instead. "I loved the way it felt when you were inside me. I could get addicted to this if I'm not careful."</p>
 		<</if>>
 		<<if $npcs.get($sex.npcId,'generous') == 1>>
-			<p>Perhaps spurred by your words, <<=$npcs.get($sex.npcId,'firstname')>> quickly moves in to kiss you.</p>
+			<p>Perhaps spurred by your words, <<npc $sex.npcId>><</npc>> quickly moves in to kiss you.</p>
 			<<gs 'sex_ev_virgin' 'kiss_turn_head'>>
 			<<actCLA 'Kiss him back'>>
 				You smile and let him. He presses his lips against you passionately and your eyes go wide in surprise when you feel his tongue snake between your lips and press against yours. You push back with your own, enjoying the way it feels, savoring the taste of his mouth. Unlike the experience you just had, this <i>does</i> feel nice. You even lean in to steal another kiss when he pulls away.
@@ -1704,12 +1704,12 @@ end} -->
 				<<if getvar("$sex_ev['fuck_enjoyment']") == -1>>
 					Losing your virginity was painful, but at least he's sweet.
 				<<elseif getvar("$sex_ev['fuck_enjoyment']") == 0>>
-					<p>Losing your virginity didn't feel like much in the end, but at least <<=$npcs.get($sex.npcId,'firstname')>> is sweet.</p>
+					<p>Losing your virginity didn't feel like much in the end, but at least <<npc $sex.npcId>><</npc>> is sweet.</p>
 				<</if>>
 				<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 			<</actCLA>>
 		<<else>>
-			<p>"Better hope you don't," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Not every guy's as good a lay as I am. Could be hard for you to get your fix."</p>
+			<p>"Better hope you don't," <<npc $sex.npcId>><</npc>> grins. "Not every guy's as good a lay as I am. Could be hard for you to get your fix."</p>
 			<<if getvar("$sex_ev['fuck_enjoyment']") == -1>>
 				<i>Fuck, I hope so,</i> you think to yourself. <i>That was fucking torture!</i>
 			<<elseif getvar("$sex_ev['fuck_enjoyment']") == 0>>
@@ -1731,7 +1731,7 @@ end} -->
 			<p>"It was amazing!" you say, giving a forced grin, boredly ignoring hand between your legs. Actually, it didn't feel like very much at all. All in all, the experience was pretty boring. Practically numb. But you don't want to hurt his feelings so you just lie instead. "I loved the way it felt when you were inside me. I could get addicted to this if I'm not careful."</p>
 		<</if>>
 		<<if $npcs.get($sex.npcId,'generous') == 1>>
-			<p>Perhaps spurred by your words, <<=$npcs.get($sex.npcId,'firstname')>> quickly moves in to kiss you.</p>
+			<p>Perhaps spurred by your words, <<npc $sex.npcId>><</npc>> quickly moves in to kiss you.</p>
 			<<gs 'sex_ev_virgin' 'kiss_turn_head'>>
 			<<actCLA 'Kiss him back'>>
 				You smile and let him. He presses his lips against you passionately and your eyes go wide in surprise when you feel his tongue snake between your lips and press against yours. You push back with your own, enjoying the way it feels, savoring the taste of his mouth. Then you feel his fingers give your clit another good rub, making you moan directly into his mouth. Unlike the experience you just had, this <i>does</i> feel nice. You bite your lip, letting the pleasure roll through you.
@@ -1739,12 +1739,12 @@ end} -->
 				<<if getvar("$sex_ev['fuck_enjoyment']") == -1>>
 					Losing your virginity was painful, but at least he's sweet.
 				<<elseif getvar("$sex_ev['fuck_enjoyment']") == 0>>
-					<p>Losing your virginity didn't feel like much in the end, but at least <<=$npcs.get($sex.npcId,'firstname')>> is sweet.</p>
+					<p>Losing your virginity didn't feel like much in the end, but at least <<npc $sex.npcId>><</npc>> is sweet.</p>
 				<</if>>
 				<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 			<</actCLA>>
 		<<else>>
-			<p>"Better hope you don't," <<=$npcs.get($sex.npcId,'firstname')>> grins. "Not every guy's as good a lay as I am. Could be hard for you to get your fix."</p>
+			<p>"Better hope you don't," <<npc $sex.npcId>><</npc>> grins. "Not every guy's as good a lay as I am. Could be hard for you to get your fix."</p>
 			<<if getvar("$sex_ev['fuck_enjoyment']") == -1>>
 				<i>Fuck, I hope so,</i> you think to yourself. <i>That was fucking torture!</i>
 			<<elseif getvar("$sex_ev['fuck_enjoyment']") == 0>>
@@ -1778,7 +1778,7 @@ end} -->
 			<<actCLA 'It took a while to feel good'>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
 				"It didn''t actually feel like much at first," you confess. "A little bit of pain when you put it in, and then my pussy went almost numb for a while. I couldn''t really feel anything. But after a while I started feeling really good. Thanks for keeping it up until then."
-				<p>You smile gratefully at <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+				<p>You smile gratefully at <<npc $sex.npcId>><</npc>>.</p>
 				<<gs 'sex_ev_pillow_talk' 'topic_route'>>
 			<</actCLA>>
 		<</if>>

+ 29 - 29
sugarcube/src/autogenerated/unsorted/sex_ev_work_talk1.tw

@@ -18,7 +18,7 @@
 		<<image "shared/sex/after/pillow_talk1.jpg">>
 		<p>"Hey, I never asked," you muse. "What is it you do for work again?"</p>
 		<<if $npcs.get($sex.npcId,'occupation') == 'cashier_supermarket'>>
-			<p>"Nothing special, just a cashier at a generic supermarket," <<=$npcs.get($sex.npcId,'firstname')>> shrugs.</p>
+			<p>"Nothing special, just a cashier at a generic supermarket," <<npc $sex.npcId>><</npc>> shrugs.</p>
 			<p>"Pyaterochka?" you ask and he nods.</p>
 			"That's the one."
 			<<if $region == 'pav'>>
@@ -26,27 +26,27 @@
 			<</if>>
 			<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'cashier_liquor'>>
-			<p>"Cashier at a liquor store," <<=$npcs.get($sex.npcId,'firstname')>> shrugs. "Pretty boring."</p>
+			<p>"Cashier at a liquor store," <<npc $sex.npcId>><</npc>> shrugs. "Pretty boring."</p>
 			<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'cashier_coffee'>>
-			<p>"I work the register at a coffee shop," <<=$npcs.get($sex.npcId,'firstname')>> says. "It gets pretty hectic in there sometimes. Especially mornings."</p>
+			<p>"I work the register at a coffee shop," <<npc $sex.npcId>><</npc>> says. "It gets pretty hectic in there sometimes. Especially mornings."</p>
 			<p>"That's cool. Is the coffee any good?"</p>
 			"It's fine I guess," he shrugs. "Nothing special. Just generic shit."
 			<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'barista'>>
-			<p>"I work as a barista at a coffee shop," <<=$npcs.get($sex.npcId,'firstname')>> says. "It gets pretty hectic in there sometimes. Especially mornings.</p>
+			<p>"I work as a barista at a coffee shop," <<npc $sex.npcId>><</npc>> says. "It gets pretty hectic in there sometimes. Especially mornings.</p>
 			<p>"That's cool. Is the coffee any good?"</p>
 			"It is when I make it," he smirks.
 			<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'fast_food'>>
-			<p>"I flip burgers at this chain fast food joint," <<=$npcs.get($sex.npcId,'firstname')>> says. " Pay sucks and customers are all assholes. Service industry is shit."</p>
+			<p>"I flip burgers at this chain fast food joint," <<npc $sex.npcId>><</npc>> says. " Pay sucks and customers are all assholes. Service industry is shit."</p>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'taxi_driver'>>
-			<p>"I drive a cab in the city," <<=$npcs.get($sex.npcId,'firstname')>> says. "Not much, but it pays the bills.</p>
+			<p>"I drive a cab in the city," <<npc $sex.npcId>><</npc>> says. "Not much, but it pays the bills.</p>
 			<!-- !! if taxi_bj > 10:-->
 			<!-- !! '"I like giving taxi guys blowjobs," you smirk mischievously.'-->
 			<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'masseuse'>>
-			<p>"I work as a masseuse in the city," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+			<p>"I work as a masseuse in the city," <<npc $sex.npcId>><</npc>> says.</p>
 			<<actCLA 'That`s cool'>>
 				"That's cool. You'll have to show me your skills sometime," you smile.
 				<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
@@ -55,7 +55,7 @@
 				<p>"That's cool. So, you give happy endings to dirty old guys?" you smirk, making a jerk-off motion with your hand.</p>
 				<<if $npcs.get($sex.npcId,'insecure') == 1>>
 					<<run $npcs.dec($sex.npcId,'rel',5)>>
-					<p>"What the fuck?" <<=$npcs.get($sex.npcId,'firstname')>> gives you a deep frown of disgust. "What do you think I am, some kind of faggot?"</p>
+					<p>"What the fuck?" <<npc $sex.npcId>><</npc>> gives you a deep frown of disgust. "What do you think I am, some kind of faggot?"</p>
 					"I was just joking," you say.
 					"Jokes are supposed to be funny."
 				<<elseif getvar("$npc_humor") == 2>>
@@ -68,7 +68,7 @@
 				<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 			<</actCLA>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'masseuse_sexual'>>
-			<p>"I work as a masseuse in the city," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+			<p>"I work as a masseuse in the city," <<npc $sex.npcId>><</npc>> says.</p>
 			<<actCLA 'That`s cool'>>
 				"That's cool. You'll have to show me your skills sometime," you smile.
 				<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
@@ -100,9 +100,9 @@
 			<</actCLA>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'factory'>>
 			<<if $region == 'pav'>>
-				<p>"I work at the textile factory," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+				<p>"I work at the textile factory," <<npc $sex.npcId>><</npc>> says.</p>
 			<<else>>
-				<p>"I work at the textile factory in the next town over," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+				<p>"I work at the textile factory in the next town over," <<npc $sex.npcId>><</npc>> says.</p>
 				<<if mid($start_type,1,2) == 'sg'>>
 					<p>"The one in Pavlovsk?"</p>
 					<p>"Yeah, how'd you know?"</p>
@@ -112,25 +112,25 @@
 			<</if>>
 			<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'bartender'>>
-			<p>"Bartender," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+			<p>"Bartender," <<npc $sex.npcId>><</npc>> says.</p>
 			<p>"That's pretty cool. So you have to know how to make a lot of fancy drinks?"</p>
 			"Yeah, but everyone just orders vodka anyways," he snickers.
 			<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'mechanic'>>
-			<p>"I work on cars," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+			<p>"I work on cars," <<npc $sex.npcId>><</npc>> says.</p>
 			<p>"Oh cool, like a mechanic?"</p>
 			"Yeah, exactly."
 			<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'line_cook'>>
-			<p>"I work in a kitchen," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+			<p>"I work in a kitchen," <<npc $sex.npcId>><</npc>> says.</p>
 			<p>"Oh, cool. Like a chef?"</p>
 			"No, I'm just a line cook. Nothing fancy."
 			<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'waiter'>>
-			<p>"I wait tables," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+			<p>"I wait tables," <<npc $sex.npcId>><</npc>> says.</p>
 			<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'personal_trainer'>>
-			<p>"I work at a gym as a personal trainer," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+			<p>"I work at a gym as a personal trainer," <<npc $sex.npcId>><</npc>> says.</p>
 			<<actCLA 'That`s cool'>>
 				<p>"Oh, that's cool. So you know how to get people in shape? Got any tips to keep a girl's figure?"</p>
 				<<if $npcs.get($sex.npcId,'humor') == 2>>
@@ -146,7 +146,7 @@
 				<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 			<</actCLA>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'programmer'>>
-			<p>"I work in tech," <<=$npcs.get($sex.npcId,'firstname')>> says. "Do the programming for an IT company in the city."</p>
+			<p>"I work in tech," <<npc $sex.npcId>><</npc>> says. "Do the programming for an IT company in the city."</p>
 			<p>"So you can fix my computer if I have a problem?"</p>
 			"Oh fuck," he groans. "Not you too."
 			<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
@@ -154,7 +154,7 @@
 			<<if $npcs.get($sex.npcId,'criminal_open') == 1>>
 				<<run $npcs.set($sex.npcId,'criminal_known',1)>>
 				<<if $npcs.get($sex.npcId,'crime_type') == 'drug_dealer'>>
-					<p>"I sell drugs," <<=$npcs.get($sex.npcId,'firstname')>> says blatantly.</p>
+					<p>"I sell drugs," <<npc $sex.npcId>><</npc>> says blatantly.</p>
 					<<actCLA 'Uncomfortable'>>
 						<<run $npcs.set($sex.npcId,'criminal_discomfort',1)>>
 						"Oh." You gulp uncomfortably, unsure of what else to say.
@@ -176,7 +176,7 @@
 						<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 					<</actCLA>>
 				<<elseif $npcs.get($sex.npcId,'crime_type') == 'enforcer'>>
-					<p>"I'm an enforcer for a gang," <<=$npcs.get($sex.npcId,'firstname')>> says blatantly.</p>
+					<p>"I'm an enforcer for a gang," <<npc $sex.npcId>><</npc>> says blatantly.</p>
 					<<actCLA 'Uncomfortable'>>
 						<<run $npcs.set($sex.npcId,'criminal_discomfort',1)>>
 						"Oh." You gulp uncomfortably, unsure of what else to say.
@@ -199,7 +199,7 @@
 					<</actCLA>>
 				<<else>>
 					<!-- !!<<=$npcs.get($sex.npcId,'crime_type')>> = 'thief'-->
-					<p>"I steal things," <<=$npcs.get($sex.npcId,'firstname')>> says blatantly.</p>
+					<p>"I steal things," <<npc $sex.npcId>><</npc>> says blatantly.</p>
 					<<actCLA 'Uncomfortable'>>
 						<<run $npcs.set($sex.npcId,'criminal_discomfort',1)>>
 						"Oh." You gulp uncomfortably, unsure of what else to say.
@@ -223,7 +223,7 @@
 				<</if>>
 			<<else>>
 				<<if $npcs.get($sex.npcId,'crime_type') == 'drug_dealer'>>
-					<p>"I work in pharmaceuticals," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+					<p>"I work in pharmaceuticals," <<npc $sex.npcId>><</npc>> says.</p>
 					<<if mid($start_type,1,2) == 'sg'>>
 						"That's cool. My aunt is a pharmacist too."
 						"Oh. Good to know."
@@ -232,42 +232,42 @@
 						"Like being a drug dealer," he snickers.
 					<</if>>
 				<<elseif $npcs.get($sex.npcId,'crime_type') == 'enforcer'>>
-					<p>"I'm a sort of fixer," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+					<p>"I'm a sort of fixer," <<npc $sex.npcId>><</npc>> says.</p>
 					<p>"Fixer? You mean like a handyman?"</p>
 					"Not really," he shrugs. "It's more like I'm on call to help people out. When someone calls me, I head over and give them a hand."
 					"Sounds... chaotic."
 					"Yeah, a little. Never know exactly what the problem is until I get there."
 				<<else>>
 					<!-- !!<<=$npcs.get($sex.npcId,'crime_type')>> = 'thief'-->
-					<p>"I work in acquisitions and sales," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+					<p>"I work in acquisitions and sales," <<npc $sex.npcId>><</npc>> says.</p>
 					<p>"So... like a salesman?"</p>
 					<p>"Sort of? I'm kind of a middle man. I get things from people and then sell them to other people."</p>
 				<</if>>
 				<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 			<</if>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'businessman'>>
-			<p>"I run a company I founded," <<=$npcs.get($sex.npcId,'firstname')>> says casually.</p>
+			<p>"I run a company I founded," <<npc $sex.npcId>><</npc>> says casually.</p>
 			<p>"Oh wow. Explains the apartment. What do you sell?"</p>
 			"Imported cars from China. Everybody needs cars."
 			"Very practical," you nod."
 			<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'lawyer'>>
-			<p>"I'm the partner at a law firm here in the city," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+			<p>"I'm the partner at a law firm here in the city," <<npc $sex.npcId>><</npc>> says.</p>
 			"Oh wow. Impressive. Explains the condo."
 			<<gs 'sex_ev_pillow_talk2' 'small_talk'>>
 		<<elseif $npcs.get($sex.npcId,'occupation') == 'investment_banker'>>
 			<<if $sex_ev['loc'] != 'pc_home'>>
-				<p>"I work for one of the big banks here in the city," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+				<p>"I work for one of the big banks here in the city," <<npc $sex.npcId>><</npc>> says.</p>
 				<p>"Oh wow. Impressive. Explains the condo," you smirk. "So if I'm looking to start a career in finance I should come to you?"</p>
 			<<elseif $sex_ev['loc'] == 'pc_home'>>
-				<p>"I work for one of the big banks here in the city," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+				<p>"I work for one of the big banks here in the city," <<npc $sex.npcId>><</npc>> says.</p>
 				<p>"And you come over to my place instead of inviting me over to yours?" you smirk. "So if I'm looking to start a career in finance I should come to you?"</p>
 			<<elseif $sex_ev['loc'] == 'hotel'>>
 				<<if $region == 'pav'>>
-					<p>"I work for one of the big banks in the city," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+					<p>"I work for one of the big banks in the city," <<npc $sex.npcId>><</npc>> says.</p>
 					<p>"Oh wow. Impressive. Explains this fancy hotel room," you smirk sarcastically at the cheap decor of the motel. "So if I'm looking to start a career in finance I should come to you?"</p>
 				<<else>>
-					<p>"I work for one of the big banks here in the city," <<=$npcs.get($sex.npcId,'firstname')>> says.</p>
+					<p>"I work for one of the big banks here in the city," <<npc $sex.npcId>><</npc>> says.</p>
 					<p>"Oh wow. Impressive. Explains this fancy hotel room," you smirk. "So if I'm looking to start a career in finance I should come to you?"</p>
 				<</if>>
 			<</if>>

+ 14 - 14
sugarcube/src/locations/pavlov/disco/pav_disco.tw

@@ -800,30 +800,30 @@
 		<<set $hookupboy = $bmNane[$Tboynum]>>
 		<<run $npcs.set($npclastcalled,'usedname',$npcs.get($npclastcalled,'nickname'))>>
 		<<if $npcs.get($sex.npcId,'virgin_take') == 1>>
-			<p>"Remember me? I'm <<=$npcs.get($sex.npcId,'firstname')>>. I took your virginity."</p>
+			<p>"Remember me? I'm <<npc $sex.npcId>><</npc>>. I took your virginity."</p>
 		<<elseif $npcs.get($sex.npcId,'hookup') > 0>>
 			<<if $npcs.get($sex.npcId,'last_sex') >= $time.daystart - 7>>
-				<p>"Remember me? I'm <<=$npcs.get($sex.npcId,'firstname')>>. We hooked up the other day."</p>
+				<p>"Remember me? I'm <<npc $sex.npcId>><</npc>>. We hooked up the other day."</p>
 			<<elseif $npcs.get($sex.npcId,'last_sex') >= $time.daystart - 30>>
-				<p>"Remember me? I'm <<=$npcs.get($sex.npcId,'firstname')>>. We hooked up a few weeks ago."</p>
+				<p>"Remember me? I'm <<npc $sex.npcId>><</npc>>. We hooked up a few weeks ago."</p>
 			<<else>>
-				<p>"Remember me? I'm <<=$npcs.get($sex.npcId,'firstname')>>. We hooked up a while back."</p>
+				<p>"Remember me? I'm <<npc $sex.npcId>><</npc>>. We hooked up a while back."</p>
 			<</if>>
 		<<elseif getvar("$bmHJ["+$sex.npcId+"]") > 0>>
-			<p>"Remember me? I'm <<=$npcs.get($sex.npcId,'firstname')>>. You gave me a hand job."</p>
+			<p>"Remember me? I'm <<npc $sex.npcId>><</npc>>. You gave me a hand job."</p>
 		<<elseif getvar("$bmBJ["+$sex.npcId+"]") > 0>>
-			<p>"Remember me? I'm <<=$npcs.get($sex.npcId,'firstname')>>. You gave me a blowjob."</p>
+			<p>"Remember me? I'm <<npc $sex.npcId>><</npc>>. You gave me a blowjob."</p>
 		<<elseif getvar("$bmSEX["+$sex.npcId+"]") > 0>>
-			<p>"Remember me? I'm <<=$npcs.get($sex.npcId,'firstname')>>. You let me fuck you."</p>
+			<p>"Remember me? I'm <<npc $sex.npcId>><</npc>>. You let me fuck you."</p>
 		<<elseif getvar("$bmANAL["+$sex.npcId+"]") > 0>>
-			<p>"Remember me? I'm <<=$npcs.get($sex.npcId,'firstname')>>. You let me fuck you in the ass."</p>
+			<p>"Remember me? I'm <<npc $sex.npcId>><</npc>>. You let me fuck you in the ass."</p>
 		<<elseif getvar("$bmGANG["+$sex.npcId+"]") > 0>>
-			<p>"Remember me? I'm <<=$npcs.get($sex.npcId,'firstname')>>. You let me and my friend fuck you."</p>
+			<p>"Remember me? I'm <<npc $sex.npcId>><</npc>>. You let me and my friend fuck you."</p>
 		<<else>>
 			<<if getvar("$bmKISS["+$sex.npcId+"]") > 0 or getvar("$bmTITS["+$sex.npcId+"]") > 0>>
-				<p>"Remember me? I'm <<=$npcs.get($sex.npcId,'firstname')>>. We hung out and drank together beer."</p>
+				<p>"Remember me? I'm <<npc $sex.npcId>><</npc>>. We hung out and drank together beer."</p>
 			<<else>>
-				<p>"Remember me? I'm <<=$npcs.get($sex.npcId,'firstname')>>.  We danced together."</p>
+				<p>"Remember me? I'm <<npc $sex.npcId>><</npc>>.  We danced together."</p>
 			<</if>>
 		<</if>>
 		<<if getvar("$bmTip["+$Tboynum+"]") == 0>>
@@ -954,11 +954,11 @@
 <<if $location_var[$here][0] == 'hookup_nice'>>
 	<<setinit $hookup['pickup'] = 'pav_disco'>>
 	<<image `'locations/pavlovsk/community/disco/outside_talk.jpg'`>>
-	<p>"Hey," <<=$npcs.get($sex.npcId,'firstname')>> says. "I had a really good time dancing with you tonight and I was wondering... would you maybe want to come back to my place? I could get you a drink and maybe..."</p>
+	<p>"Hey," <<npc $sex.npcId>><</npc>> says. "I had a really good time dancing with you tonight and I was wondering... would you maybe want to come back to my place? I could get you a drink and maybe..."</p>
 	<<actCLA 'Sorry'>>
 		<<image `'locations/pavlovsk/community/disco/outside_talk.jpg'`>>
 		"Oh, uhh, I uhh... I don't know if I'm really up for that. Sorry..."
-		<p>"Oh, sure. That's okay. You don't have to be sorry." <<=$npcs.get($sex.npcId,'firstname')>> says with a hint of disappointment. "Well at least I gave it my best shot. Who knows, maybe I'll see you here again."</p>
+		<p>"Oh, sure. That's okay. You don't have to be sorry." <<npc $sex.npcId>><</npc>> says with a hint of disappointment. "Well at least I gave it my best shot. Who knows, maybe I'll see you here again."</p>
 		<<actCLA 'Leave'>>
 			<<gt $location>>
 		<</actCLA>>
@@ -994,7 +994,7 @@
 		<p>"... fuck?" you ask.</p>
 		He looks dumb founded by your words. "Uhh..."
 		<p>"Fuck," you repeat. "Wanna go back to your place and fuck? We can skip the drinks too."</p>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> seems stunned by your straightforwardness, but eventually answers, "Yes!"</p>
+		<p><<npc $sex.npcId>><</npc>> seems stunned by your straightforwardness, but eventually answers, "Yes!"</p>
 		<p>"Great! Lead the way!" you grin. The two of you hurry through the streets together to a nearby apartment complex.</p>
 		<<actCLA 'Go to his place'>>
 			<<gt 'sex_ev_start' 'hookup_npc_home_start'>>

+ 113 - 113
sugarcube/src/locations/pavlov/disco/pav_disco_sex.tw

@@ -17,7 +17,7 @@
 	<<set $time.minutes += 5>>
 	<<set $boydesc = $npcs.get($npclastcalled,'firstname')>>
 	<<image "locations/pavlovsk/community/dk_night.jpg">>
-	<p>You leave the disco with <<=$npcs.get($sex.npcId,'firstname')>> and walk into a quiet garden area.</p>
+	<p>You leave the disco with <<npc $sex.npcId>><</npc>> and walk into a quiet garden area.</p>
 	<<if (getvar("$gdk_nice_guy") == 1 and $pc.fame('pav_slut') < 70) or (getvar("$gdk_nice_guy") == 0 and $pc.fame('pav_slut') < 30)>>
 		He pulls out a six pack and offers you a beer as you both sit down on a fallen tree.
 		<<gs 'willpower' 'drink' 'resist'>>
@@ -32,11 +32,11 @@
 					<p>"No, I don't thi-*hic* think I should... *hic*" you manage to drunkenly mumble.</p>
 
 				<</if>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> offers you a disarming smile. "Alright, no problem! We can just chat!"</p>
+				<p><<npc $sex.npcId>><</npc>> offers you a disarming smile. "Alright, no problem! We can just chat!"</p>
 				<<actCLA 'Chat with him'>>
 					<<set $time.minutes += 10>>
 					<<image "locations/pavlovsk/community/disco/outside_talk.jpg">>
-					<p>You spend some time getting to know <<=$npcs.get($sex.npcId,'firstname')>> a bit better before he checks his watch. "I have to get going, but I really enjoyed chatting with you!"</p>
+					<p>You spend some time getting to know <<npc $sex.npcId>><</npc>> a bit better before he checks his watch. "I have to get going, but I really enjoyed chatting with you!"</p>
 					<<set $randvnesh = rand(40,120)>>
 					<<set $deystrand = rand(0,2)>>
 					<<if getvar("$deystrand") == 0 and $pc.pcs_apprnc >= $randvnesh>>
@@ -59,7 +59,7 @@
 							<</actCLA>>
 						<</actCLA>>
 					<<elseif getvar("$deystrand") > 0 or $pc.pcs_apprnc < $randvnesh>>
-						<p><<=$npcs.get($sex.npcId,'firstname')>> scoots over until he's right next to you and kisses you.</p>
+						<p><<npc $sex.npcId>><</npc>> scoots over until he's right next to you and kisses you.</p>
 						<<actCLA 'Go back to the disco'>>
 							<<gt 'pav_disco'>>
 						<</actCLA>>
@@ -77,10 +77,10 @@
 			<<gs 'drugs' 'alcohol' 'beer'>>
 			<<set $time.minutes += 10>>
 			<<image "locations/pavlovsk/community/drink_beer.jpg">>
-			<p>You accept the beer and chat with <<=$npcs.get($sex.npcId,'firstname')>> as you drink it. He's amusing and tells you some hilarious stories.</p>
+			<p>You accept the beer and chat with <<npc $sex.npcId>><</npc>> as you drink it. He's amusing and tells you some hilarious stories.</p>
 			<<if $pc.alko >= 6>>
 				<<set $pc.horny += 20>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> scoots over until he's right next to you and closes his arms around you. He pulls you in and kisses your lips passionately, making your heart flutter. Wow, he's a good kisser!</p>
+				<p><<npc $sex.npcId>><</npc>> scoots over until he's right next to you and closes his arms around you. He pulls you in and kisses your lips passionately, making your heart flutter. Wow, he's a good kisser!</p>
 				You then feel his hands on your chest...
 				<<if $pc.fame('pav_slut') < 50>>
 					<<actCLA 'Ask him to stop' undefined `{willpower:['sex','resist']}`>>
@@ -121,7 +121,7 @@
 							<<else>>
 								<<set $pc.horny += 10>>
 								<<image "locations/pavlovsk/community/disco/sex/tits.jpg">>
-								<p><<=$npcs.get($sex.npcId,'firstname')>>'s head slumps for a moment, and his movements slow down, but he's unwilling to let go of your breasts.</p>
+								<p><<npc $sex.npcId>><</npc>>'s head slumps for a moment, and his movements slow down, but he's unwilling to let go of your breasts.</p>
 								<<if $pc.fame('pav_slut') < 150>>
 									<<gs 'willpower' 'bj' 'resist'>>
 									<<if $will_cost <= $pc.pcs_willpwr>>
@@ -192,7 +192,7 @@
 							<</actCLA>>
 						<</actCLA>>
 					<<elseif getvar("$deystrand") == 1 or $pc.pcs_apprnc < $randvnesh>>
-						<p><<=$npcs.get($sex.npcId,'firstname')>> scoots over until he's right next to you and kisses you.</p>
+						<p><<npc $sex.npcId>><</npc>> scoots over until he's right next to you and kisses you.</p>
 						<<if $pc.fame('pav_slut') < 50>>
 							<<actCLA 'Go back to the disco' undefined `{willpower:['mast','resist']}`>>
 									<<gs 'willpower' 'mast' 'resist'>>
@@ -205,7 +205,7 @@
 					<</if>>
 				<<elseif getvar("$DPtipe") == 2>>
 					<<set $pc.horny += 5>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> scoots over until he's right next to you and kisses you.</p>
+					<p><<npc $sex.npcId>><</npc>> scoots over until he's right next to you and kisses you.</p>
 					<<if $pc.fame('pav_slut') < 50>>
 						<<actCLA 'Go back to the disco' undefined `{willpower:['mast','resist']}`>>
 								<<gs 'willpower' 'mast' 'resist'>>
@@ -222,7 +222,7 @@
 		<<gs 'drugs' 'alcohol' 'beer'>>
 		<<set $time.minutes += 15>>
 		<p>He pulls out a six-pack and offers you a beer as you sit down on a fallen tree.</p>
-		<p>You accept the beer and chat with <<=$npcs.get($sex.npcId,'firstname')>> as you drink it. He's amusing and tells you some hilarious stories.</p>
+		<p>You accept the beer and chat with <<npc $sex.npcId>><</npc>> as you drink it. He's amusing and tells you some hilarious stories.</p>
 		He then scoots next to you and kisses you on the lips.
 		<<gs 'pav_disco_sex' 'decline' 70>>
 		<<gs 'pav_disco_sex' 'kissing'>>
@@ -282,9 +282,9 @@
 				
 				<<image "pc/reactions/fuckoff3.jpg">>
 				<p>"What the fuck!?" you shout angrily. "What kind of idiot are you!? You can't just tell a girl to do that!"</p>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> is taken aback by your sudden outburst. "But... the boys said that yo-"</p>
+				<p><<npc $sex.npcId>><</npc>> is taken aback by your sudden outburst. "But... the boys said that yo-"</p>
 				<p>"That doesn't make it true! Men can be so gullible sometimes!" you tell him, barely holding yourself back from screaming it at him.</p>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> is seriously rattled now and quickly apologizes. "Look, I'm sorry! I didn't know they were having a laugh!"</p>
+				<p><<npc $sex.npcId>><</npc>> is seriously rattled now and quickly apologizes. "Look, I'm sorry! I didn't know they were having a laugh!"</p>
 				You shrug and leave without saying another word, secretly smiling to yourself. Men really <i>are</i> gullible sometimes.
 				While walking back to the disco, several guys give you confused looks. The word spreads fast, and guys get a message that you're no easy lay after all. Your reputation improves a little as a result.
 				<<actCLA 'Go back to the disco'>>
@@ -311,7 +311,7 @@
 					<p>You've done worse. "200<b>₽</b>." is all you say.</p>
 
 				<</if>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> looks a little confused but gives you 200<b>₽</b>.</p>
+				<p><<npc $sex.npcId>><</npc>> looks a little confused but gives you 200<b>₽</b>.</p>
 				<<actCLA 'Squat down before him'>>
 					<<gt 'pav_disco_sex' 'blowjob' 'paid'>>
 				<</actCLA>>
@@ -355,7 +355,7 @@
 			<<arouse 'foreplay' 3 >>
 			<<setinit $bmTITS[$Tboynum] += 1>>
 			<<image "locations/pavlovsk/community/disco/sex/tits.jpg">>
-			<p>You ignore <<=$npcs.get($sex.npcId,'firstname')>>'s hands and kiss him, letting him pull your clothes aside, so your $pc.titsize breasts fall out. He kneads them eagerly and continues to kiss and lick them, making your nipples poke out fiercely in the evening air.</p>
+			<p>You ignore <<npc $sex.npcId>><</npc>>'s hands and kiss him, letting him pull your clothes aside, so your $pc.titsize breasts fall out. He kneads them eagerly and continues to kiss and lick them, making your nipples poke out fiercely in the evening air.</p>
 			You moan under his touch, letting your leg slide between his. You can feel his cock brushing up against your thigh, stiff as a rock.
 			<<if rand(0,1) == 1>>
 				<p>"Hey," he breathes between kisses. "Why don't we take this back to my place?"</p>
@@ -388,7 +388,7 @@
 					<<actCLA 'Let him finger you'>>
 						<<arouse 'vaginal_finger' 3 >>
 						<<image "locations/pavlovsk/community/disco/sex/petting.jpg">>
-						<p>As soon as you pull your hand away from his groin, <<=$npcs.get($sex.npcId,'firstname')>> slips his hand underneath your clothes, rubbing two fingers against your pussy. You were already somewhat turned on and softly moaned when he slid his finger back and forth over your wet lips.</p>
+						<p>As soon as you pull your hand away from his groin, <<npc $sex.npcId>><</npc>> slips his hand underneath your clothes, rubbing two fingers against your pussy. You were already somewhat turned on and softly moaned when he slid his finger back and forth over your wet lips.</p>
 						<<if $pc.fame('pav_slut') < 200>>
 							<<actCLA 'Remove his hands and walk away' undefined `{willpower:['mast','resist','hard']}`>>
 									
@@ -404,8 +404,8 @@
 									<<set $pc.horny += 5>>
 									<<set $time.minutes += 3>>
 									<<image "shared/sex/cock/cock3.jpg">>
-									<p>Once the most intense part of your orgasm is over, you relax and moan softly with pleasure. In your daze, your legs can't support your weight, and you drop to your knees in front of <<=$npcs.get($sex.npcId,'firstname')>>.</p>
-									<p>When you catch your breath, you see <<=$npcs.get($sex.npcId,'firstname')>>'s erect cock directly in front of your face!</p>
+									<p>Once the most intense part of your orgasm is over, you relax and moan softly with pleasure. In your daze, your legs can't support your weight, and you drop to your knees in front of <<npc $sex.npcId>><</npc>>.</p>
+									<p>When you catch your breath, you see <<npc $sex.npcId>><</npc>>'s erect cock directly in front of your face!</p>
 									<<actCLA 'Suck it'>>
 										<<set $time.minutes += 5>>
 										<<set $pc.horny += 10>>
@@ -442,7 +442,7 @@
 											<<actCLA 'Look at him'>>
 												<<set $time.minutes += 1>>
 												<<image "shared/sex/cum/cocksuck3.jpg">>
-												<p><<=$npcs.get($sex.npcId,'firstname')>> still has his hand on your head. "Look at me." he grunts.</p>
+												<p><<npc $sex.npcId>><</npc>> still has his hand on your head. "Look at me." he grunts.</p>
 												You look him in the eye, your mouth half open. His load is still on your tongue, and you're unsure whether you should spit it out.
 												<p>He gives you a blissful smile. "You're an amazing cocksucker, $pc.name_nick! That was great."</p>
 												<<actCLA 'Spit' undefined `{willpower:['swallow','resist']}`>>
@@ -483,8 +483,8 @@
 											
 											
 											<<image "locations/pavlovsk/community/disco/sex/facial.jpg">>
-											<p>You remain kneeling in front of <<=$npcs.get($sex.npcId,'firstname')>> as you stare at his erection, still softly panting as you recover from your orgasm. He then begins to jerk off in front of you.</p>
-											<p>In no time at all, his cock erupts, and a thick glob of his cum lands on your nose. <<=$npcs.get($sex.npcId,'firstname')>> groans loudly as he shoots several more jets of his cum onto your face. You flinch, close your eyes, and don't dare open them again until you're sure he's finished.</p>
+											<p>You remain kneeling in front of <<npc $sex.npcId>><</npc>> as you stare at his erection, still softly panting as you recover from your orgasm. He then begins to jerk off in front of you.</p>
+											<p>In no time at all, his cock erupts, and a thick glob of his cum lands on your nose. <<npc $sex.npcId>><</npc>> groans loudly as he shoots several more jets of his cum onto your face. You flinch, close your eyes, and don't dare open them again until you're sure he's finished.</p>
 											<<actCLA 'Leave'>>
 												<<gt 'pav_commcenter'>>
 											<</actCLA>>
@@ -521,7 +521,7 @@
 					<<set $pc.horny += 5>>
 					<<set $time.minutes += 3>>
 					<<image "shared/sex/grab/cock.jpg">>
-					<p>You kiss <<=$npcs.get($sex.npcId,'firstname')>> again while you begin to stroke his cock through his pants, feeling the outline of it very clearly through the fabric.</p>
+					<p>You kiss <<npc $sex.npcId>><</npc>> again while you begin to stroke his cock through his pants, feeling the outline of it very clearly through the fabric.</p>
 					<p>"Mmmm... do you have something for me?" you ask him sweetly, and he lets out a needy groan.</p>
 					<<if $pc.fame('pav_slut') < 150>>
 						<<actCLA 'Go back to the disco' undefined `{willpower:['mast','resist']}`>>
@@ -577,7 +577,7 @@
 		<<elseif getvar("$gdk_nice_guy") == 0>>
 			<<image "shared/sex/handjob/hj.jpg">>
 			You move your hand up and down his shaft, slowly picking up the pace while you kiss him dominantly.
-			<p><<=$npcs.get($sex.npcId,'firstname')>> wants more and suddenly places his hands on your shoulder. Then, he firmly pushes downwards, forcing you to squat before him.</p>
+			<p><<npc $sex.npcId>><</npc>> wants more and suddenly places his hands on your shoulder. Then, he firmly pushes downwards, forcing you to squat before him.</p>
 			<<actCLA 'Squat down before him'>>
 				<<gt 'pav_disco_sex' 'blowjob' 'unpaid'>>
 			<</actCLA>>
@@ -621,7 +621,7 @@
 	<!-- !!{	act 'That was fun':
 	cla & *clr
 	'<<image `'locations/pavlovsk/community/dk_night.jpg'`>>'
-	'Releasing <<<<=$npcs.get($sex.npcId,'firstname')>>>>''s cock, you pull away from him.'
+	'Releasing <<<<npc $sex.npcId>><</npc>>>>''s cock, you pull away from him.'
 	'"That was fun," you grin, eyeing the cum webbing your fingers.'
 	'"Fuck..." he breathes, still coming down from your handjob.'
 	end} -->
@@ -655,13 +655,13 @@
 	<<setinit $gdk['bj'] = 1>>
 	<<video "locations/pavlovsk/community/disco/sex/bj1.mp4">>
 	<<if getvar("$gdk['fuck']") == 2>>
-		<p>You squat down before <<=$npcs.get($sex.npcId,'firstname')>> and get back to work on his cock.</p>
+		<p>You squat down before <<npc $sex.npcId>><</npc>> and get back to work on his cock.</p>
 	<</if>>
-	<p>You squat down in front of <<=$npcs.get($sex.npcId,'firstname')>> and begin working his cock with your hand and mouth. He groans under your touch, and you see him tilting his head back in pleasure above you.</p>
+	<p>You squat down in front of <<npc $sex.npcId>><</npc>> and begin working his cock with your hand and mouth. He groans under your touch, and you see him tilting his head back in pleasure above you.</p>
 	<<if rand(0,1) == 0 or getvar("$gdk['fuck']") == 2>>
 		<<setinit $gdk['cum'] = rand(1,3)>>
 		<<if getvar("$gdk['cum']") == 1>>
-			<p>After several minutes, you feel <<=$npcs.get($sex.npcId,'firstname')>> begin to stiffen up.</p>
+			<p>After several minutes, you feel <<npc $sex.npcId>><</npc>> begin to stiffen up.</p>
 			<p>"I'm-! Gonna cum-!" he grunts.</p>
 			<<actCLA 'Keep sucking'>>
 				<<gt 'pav_disco_sex' 'disco_cum_mouth'>>
@@ -674,14 +674,14 @@
 				<<gs 'cum_call' 'mouth' $sex.npcId 1>>
 				<<setinit $gdk['cum'] = 'mouth'>>
 				<<video "locations/pavlovsk/community/disco/sex/cum_mouth.mp4">>
-				<p>You continue working his cock for several minutes until <<=$npcs.get($sex.npcId,'firstname')>> grunts, and a thick salty liquid pours into your mouth without warning.</p>
+				<p>You continue working his cock for several minutes until <<npc $sex.npcId>><</npc>> grunts, and a thick salty liquid pours into your mouth without warning.</p>
 				<<actCLA 'Cough'>>
 					<<image "locations/pavlovsk/community/dk_night.jpg">>
 					You retch, coughing up the cum that suddenly appeared in your mouth and looking back at him with tears in your eyes.
 					<<gs 'pav_disco_sex' 'disco_mouth_react1'>>
 				<</actCLA>>
 				<<actCLA 'Swallow'>>
-					<p>Not knowing what else to do, you reflexively swallow, gulping down the cum spurting from <<=$npcs.get($sex.npcId,'firstname')>>'s cock. Soon enough, nothing else comes out, and you pull back, looking up at him.</p>
+					<p>Not knowing what else to do, you reflexively swallow, gulping down the cum spurting from <<npc $sex.npcId>><</npc>>'s cock. Soon enough, nothing else comes out, and you pull back, looking up at him.</p>
 					<<gs 'pav_disco_sex' 'disco_mouth_react2'>>
 				<</actCLA>>
 			<</actCLA>>
@@ -690,10 +690,10 @@
 				<<gs 'cum_call' 'face' $sex.npcId 1>>
 				<<setinit $gdk['cum'] = 'facial'>>
 				<<video "locations/pavlovsk/community/disco/sex/cum_facial.mp4">>
-				<p>You continue working his cock for several minutes until <<=$npcs.get($sex.npcId,'firstname')>> pushes you off him and begins rapidly jerking himself above your face. You close your eyes, and cum splatters across your face moments later.</p>
+				<p>You continue working his cock for several minutes until <<npc $sex.npcId>><</npc>> pushes you off him and begins rapidly jerking himself above your face. You close your eyes, and cum splatters across your face moments later.</p>
 				<<actCLA 'Smile'>>
 					<<video "locations/pavlovsk/community/disco/sex/facial_after.mp4">>
-					<p>"Well, that was fun." You smile at <<=$npcs.get($sex.npcId,'firstname')>> as he tucks his cock inside his pants.</p>
+					<p>"Well, that was fun." You smile at <<npc $sex.npcId>><</npc>> as he tucks his cock inside his pants.</p>
 					<<if getvar("$gdk['fuck']") == 1>>
 						"Yeah, you've got a great pussy."
 					<<else>>
@@ -713,7 +713,7 @@
 			<</actCLA>>
 		<</if>>
 	<<else>>
-		<p>After a few minutes, <<=$npcs.get($sex.npcId,'firstname')>> pushes your head away and pulls you to your feet, facing you towards the wall. "I want to fuck your pussy."</p>
+		<p>After a few minutes, <<npc $sex.npcId>><</npc>> pushes your head away and pulls you to your feet, facing you towards the wall. "I want to fuck your pussy."</p>
 		<<actCLA 'Refuse'>>
 			<<image "locations/pavlovsk/community/dk_night.jpg">>
 			<p>"Hey!" You quickly turn back around, putting your hands over your crotch. "What do you think you're doing?"</p>
@@ -724,13 +724,13 @@
 				<<setinit $gdk['fuck'] = 2>>
 				<<image "locations/pavlovsk/community/dk_night.jpg">>
 				<p>"I just don't want to!"</p>
-				<p>"Ugh, fine." <<=$npcs.get($sex.npcId,'firstname')>> grabs you by the shoulder and pulls you back down to your knees. "At least finish me off then."</p>
+				<p>"Ugh, fine." <<npc $sex.npcId>><</npc>> grabs you by the shoulder and pulls you back down to your knees. "At least finish me off then."</p>
 				<<actCLA 'Refuse'>>
 					<<arousalEnd>>
 					<<image "locations/pavlovsk/community/dk_night.jpg">>
 					<p>"What?? You think I'm going to just get back down there after the way you're acting?"</p>
 					<p>"But you said you didn't want to fuck!" he snarls.</p>
-					<p>"Ugh, I don't want to deal with you." You quickly back away from <<=$npcs.get($sex.npcId,'firstname')>>, leaving him with blue balls and his dick hanging out as you head back to the disco.</p>
+					<p>"Ugh, I don't want to deal with you." You quickly back away from <<npc $sex.npcId>><</npc>>, leaving him with blue balls and his dick hanging out as you head back to the disco.</p>
 					<<actCLA 'Go back to the disco'>>
 						<<gt 'pav_disco'>>
 					<</actCLA>>
@@ -749,10 +749,10 @@
 						<<gt 'pav_disco'>>
 					<</actCLA>>
 				<<else>>
-					<p>"Well..." <<=$npcs.get($sex.npcId,'firstname')>> scratches his head for a moment in confusion. "We don't have to do it in public. We could take this back to my place if you want..."</p>
+					<p>"Well..." <<npc $sex.npcId>><</npc>> scratches his head for a moment in confusion. "We don't have to do it in public. We could take this back to my place if you want..."</p>
 					<<actCLA 'Refuse'>>
 						<p>"Nuh-uh. I'm not up for that."</p>
-						<p>"Oh. Well..." <<=$npcs.get($sex.npcId,'firstname')>> looks down at his still-hard cock. "Well, could you finish me off at least?"</p>
+						<p>"Oh. Well..." <<npc $sex.npcId>><</npc>> looks down at his still-hard cock. "Well, could you finish me off at least?"</p>
 						"Sure, we can do that, at least."
 						<<actCLA 'Kneel down'>>
 							<<gt 'pav_disco_sex' 'blowjob'>>
@@ -822,7 +822,7 @@
 						<</actCLA>>
 					<</actCLA>>
 				<<else>>
-					<p>"Hang on. Use a condom?" <<=$npcs.get($sex.npcId,'firstname')>> nods and pulls one out of his pocket, tears it open and rolls it onto his cock, leaving you to breathe a sigh of relief.</p>
+					<p>"Hang on. Use a condom?" <<npc $sex.npcId>><</npc>> nods and pulls one out of his pocket, tears it open and rolls it onto his cock, leaving you to breathe a sigh of relief.</p>
 					<<actCLA 'Bend over'>>
 						<<setinit $gdk['condom'] = 1>>
 						<<video "locations/pavlovsk/community/disco/sex/insert.mp4">>
@@ -836,7 +836,7 @@
 				<<if $prezikcount + $inventory.get("condom") > 0>>
 					<<actCLA 'Get a condom from your purse'>>
 						<<image "locations/pavlovsk/community/dk_night.jpg">>
-						<p>"Hang on," you pause, reaching into your bag and pulling out a condom. You tear the package open and gently roll it onto <<=$npcs.get($sex.npcId,'firstname')>>'s cock, giving him a few gentle tugs when you're finished. "Safety first."</p>
+						<p>"Hang on," you pause, reaching into your bag and pulling out a condom. You tear the package open and gently roll it onto <<npc $sex.npcId>><</npc>>'s cock, giving him a few gentle tugs when you're finished. "Safety first."</p>
 						<<setinit $gdk['condom'] = 1>>
 						<<set $prezikcount -= 1>>
 						<<actCLA 'Bend over'>>
@@ -861,32 +861,32 @@
 <</if>>
 <<if $location_var[$here][0] == 'insert'>>
 	<<if $wardrobe.PCloSkirt > 0 and $wardrobe.pantyworntype == 'none'>>
-		<p>You smile eagerly, quickly bending over and flipping your skirt up to show <<=$npcs.get($sex.npcId,'firstname')>> your bare ass.</p>
+		<p>You smile eagerly, quickly bending over and flipping your skirt up to show <<npc $sex.npcId>><</npc>> your bare ass.</p>
 		<<if getvar("$npc_condom_conscious") == 1 and getvar("$gdk['condom']") == 0>>
-			<p>"I thought I saw you weren't wearing panties when we were dancing," <<=$npcs.get($sex.npcId,'firstname')>> snickers while rolling a condom onto his cock and lining himself up with your pussy.</p>
+			<p>"I thought I saw you weren't wearing panties when we were dancing," <<npc $sex.npcId>><</npc>> snickers while rolling a condom onto his cock and lining himself up with your pussy.</p>
 		<<else>>
-			<p>"I thought I saw you weren't wearing panties when we were dancing," <<=$npcs.get($sex.npcId,'firstname')>> snickers, lining his cock up with your pussy.</p>
+			<p>"I thought I saw you weren't wearing panties when we were dancing," <<npc $sex.npcId>><</npc>> snickers, lining his cock up with your pussy.</p>
 		<</if>>
 	<<elseif $wardrobe.PCloSkirt > 0>>
 		You smile eagerly, quickly bending over and pulling your panties from under your skirt to your knees.
 		<<if getvar("$npc_condom_conscious") == 1>>
-			<p>Behind you, <<=$npcs.get($sex.npcId,'firstname')>> rolls a condom onto his cock before lining himself up with your pussy.</p>
+			<p>Behind you, <<npc $sex.npcId>><</npc>> rolls a condom onto his cock before lining himself up with your pussy.</p>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> moves in behind you, lining his cock up with your pussy.</p>
+			<p><<npc $sex.npcId>><</npc>> moves in behind you, lining his cock up with your pussy.</p>
 		<</if>>
 	<<elseif $wardrobe.pantyworntype == 'none'>>
-		<p>You smile eagerly, quickly bending over and pulling down your pants to show <<=$npcs.get($sex.npcId,'firstname')>> your bare ass.</p>
+		<p>You smile eagerly, quickly bending over and pulling down your pants to show <<npc $sex.npcId>><</npc>> your bare ass.</p>
 		<<if getvar("$npc_condom_conscious") == 1>>
-			<p>"Looks like you came ready for this," <<=$npcs.get($sex.npcId,'firstname')>> snickers while rolling a condom onto his cock and lining himself up with your pussy.</p>
+			<p>"Looks like you came ready for this," <<npc $sex.npcId>><</npc>> snickers while rolling a condom onto his cock and lining himself up with your pussy.</p>
 		<<else>>
-			<p>"Looks like you came ready for this," <<=$npcs.get($sex.npcId,'firstname')>> snickers, lining his cock up with your pussy.</p>
+			<p>"Looks like you came ready for this," <<npc $sex.npcId>><</npc>> snickers, lining his cock up with your pussy.</p>
 		<</if>>
 	<<else>>
 		You smile eagerly, grabbing your pants and panties and pulling them down to your knees in one tug.
 		<<if getvar("$npc_condom_conscious") == 1>>
-			<p>Behind you, <<=$npcs.get($sex.npcId,'firstname')>> rolls a condom onto his cock before lining himself up with your pussy.</p>
+			<p>Behind you, <<npc $sex.npcId>><</npc>> rolls a condom onto his cock before lining himself up with your pussy.</p>
 		<<else>>
-			<p><<=$npcs.get($sex.npcId,'firstname')>> moves in behind you, lining his cock up with your pussy.</p>
+			<p><<npc $sex.npcId>><</npc>> moves in behind you, lining his cock up with your pussy.</p>
 		<</if>>
 	<</if>>
 <</if>>
@@ -894,7 +894,7 @@
 	<<setinit $gdk['virgin'] = 1>>
 	<<arouse 'vaginal' `rand(3,7)` `['no_orgasm_msg']`>>
 	<<video "locations/pavlovsk/community/disco/sex/fuck.mp4">>
-	<p><<=$npcs.get($sex.npcId,'firstname')>> thrusts into your pussy, and you gasp in pain as his cock pierces your hymen. You're not sure exactly what you expected sex to feel like, but you did hope it would feel better than this.</p>
+	<p><<npc $sex.npcId>><</npc>> thrusts into your pussy, and you gasp in pain as his cock pierces your hymen. You're not sure exactly what you expected sex to feel like, but you did hope it would feel better than this.</p>
 	<<actCLA 'This hurts!'>>
 		<<set $orgasm_or = 'no'>>
 		<<if $pc.horny > 50>>
@@ -914,7 +914,7 @@
 		<<gs 'pav_disco_sex' 'disco_cum'>>
 	<</actCLA>>
 	<<actCLA 'Start to feel good'>>
-		<p>Within a minute, the initial pain fades. And after that, you start to feel <i>really good</i>. <<=$npcs.get($sex.npcId,'firstname')>>'s cock just "fills" you in a way you've never experienced before. Soon, you're thrusting your hips back to meet his, chasing after this brand-new pleasure.</p>
+		<p>Within a minute, the initial pain fades. And after that, you start to feel <i>really good</i>. <<npc $sex.npcId>><</npc>>'s cock just "fills" you in a way you've never experienced before. Soon, you're thrusting your hips back to meet his, chasing after this brand-new pleasure.</p>
 		<p><i>Why did I wait this long to have sex?!</i> You think to yourself.</p>
 		<<gs 'pav_disco_sex' 'disco_cum'>>
 	<</actCLA>>
@@ -929,9 +929,9 @@
 	<<arouse 'vaginal' `rand(3,7)` `['no_orgasm_msg']`>>
 	<<video "locations/pavlovsk/community/disco/sex/fuck.mp4">>
 	<<if getvar("$mesec") > 0>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> slips inside you easily, your pussy already slick from your period, and quickly builds up to a steady pace, pummelling your pussy. The rhythmic fucking pounds your insides just the right way, and you soon find yourself moaning in pleasure.</p>
+		<p><<npc $sex.npcId>><</npc>> slips inside you easily, your pussy already slick from your period, and quickly builds up to a steady pace, pummelling your pussy. The rhythmic fucking pounds your insides just the right way, and you soon find yourself moaning in pleasure.</p>
 	<<else>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> quickly builds up to a steady pace, pummelling your pussy from behind, pumping his cock in and out of you. The rhythmic fucking pounds your insides just the right way, and you soon find yourself moaning in pleasure.</p>
+		<p><<npc $sex.npcId>><</npc>> quickly builds up to a steady pace, pummelling your pussy from behind, pumping his cock in and out of you. The rhythmic fucking pounds your insides just the right way, and you soon find yourself moaning in pleasure.</p>
 	<</if>>
 	<<gs 'pav_disco_sex' 'disco_cum'>>
 <</if>>
@@ -952,7 +952,7 @@
 
 		<</if>>
 	<<elseif getvar("$gdk['cum']") == 2>>
-		<p>"Hey," <<=$npcs.get($sex.npcId,'firstname')>> grunts from behind you. "Let me cum in your mouth."</p>
+		<p>"Hey," <<npc $sex.npcId>><</npc>> grunts from behind you. "Let me cum in your mouth."</p>
 		<<actCLA 'Squat down'>>
 			<<gt 'pav_disco_sex' 'disco_cum_facial'>>
 		<</actCLA>>
@@ -961,9 +961,9 @@
 		<</actCLA>>
 	<<elseif getvar("$gdk['cum']") == 3>>
 		<<if getvar("$gdk['condom']") == 1>>
-			<p>Suddenly, <<=$npcs.get($sex.npcId,'firstname')>> pulls out of you and pushes you down to your knees, tears off the condom and starts rapidly jerking himself off in front of your face.</p>
+			<p>Suddenly, <<npc $sex.npcId>><</npc>> pulls out of you and pushes you down to your knees, tears off the condom and starts rapidly jerking himself off in front of your face.</p>
 		<<else>>
-			<p>Suddenly, <<=$npcs.get($sex.npcId,'firstname')>> pulls out of you, pushes you down to your knees and starts rapidly jerking himself off in front of your face.</p>
+			<p>Suddenly, <<npc $sex.npcId>><</npc>> pulls out of you, pushes you down to your knees and starts rapidly jerking himself off in front of your face.</p>
 		<</if>>
 		<<actCLA 'Squat down'>>
 			<<gt 'pav_disco_sex' 'disco_cum_facial'>>
@@ -982,7 +982,7 @@
 			<<gs 'cum_call' '' $sex.npcId 1>>
 			<<setinit $gdk['cum'] = 'creampie'>>
 			<<if $gdk['orgasm'] < $orgasm>>
-				<p>You feel pressure building with every thrust of <<=$npcs.get($sex.npcId,'firstname')>>'s cock inside you, and soon, it explodes in a climactic orgasm. Every muscle in your body clenches, your pussy clamping down on the cock inside it so hard, it almost hurts. Then, as your breathing winds down, you feel <<=$npcs.get($sex.npcId,'firstname')>> slip out from inside you.</p>
+				<p>You feel pressure building with every thrust of <<npc $sex.npcId>><</npc>>'s cock inside you, and soon, it explodes in a climactic orgasm. Every muscle in your body clenches, your pussy clamping down on the cock inside it so hard, it almost hurts. Then, as your breathing winds down, you feel <<npc $sex.npcId>><</npc>> slip out from inside you.</p>
 				You start to smile in pleasure when you suddenly feel something oozing from your pussy, and your eyes go wide.
 				<<actCLA 'WHAT THE FUCK!'>>
 					<<gt 'pav_disco_sex' 'creampie_surprise2'>>
@@ -998,7 +998,7 @@
 			<<setinit $gdk['cum'] = 'creampie'>>
 			<<if $pc.horny >= 90>>
 				<<set $orgasm_or = 'yes'>>
-				<p>You feel pressure building with every thrust of <<=$npcs.get($sex.npcId,'firstname')>>'s cock inside you, and soon, it explodes in a climactic orgasm. Every muscle in your body clenches, your pussy clamping down on the cock inside it so hard, it almost hurts. Finally, your breathing slowly winds down, and you feel <<=$npcs.get($sex.npcId,'firstname')>> slip his cock out from inside you.</p>
+				<p>You feel pressure building with every thrust of <<npc $sex.npcId>><</npc>>'s cock inside you, and soon, it explodes in a climactic orgasm. Every muscle in your body clenches, your pussy clamping down on the cock inside it so hard, it almost hurts. Finally, your breathing slowly winds down, and you feel <<npc $sex.npcId>><</npc>> slip his cock out from inside you.</p>
 				As he does, you feel something oozing out of your pussy after it.
 				<<gs 'pav_disco_sex' 'creampie_surprise1'>>
 			<<else>>
@@ -1013,21 +1013,21 @@
 	<<video "locations/pavlovsk/community/disco/sex/cum_facial.mp4">>
 	<<if getvar("$gdk['cum']") != 2>>
 		<<if getvar("$gdk['condom']") == 1>>
-			<p>You quickly jump off his cock and squat down in front of him. <<=$npcs.get($sex.npcId,'firstname')>> takes the hint and rips off the condom, jerking himself off over your face. Within seconds, cum erupts from the tip of his cock, spattering across your forehead and running down your cheeks. Seconds after that, it seems <<=$npcs.get($sex.npcId,'firstname')>> is out of juice and pulls back to admire his handiwork.</p>
+			<p>You quickly jump off his cock and squat down in front of him. <<npc $sex.npcId>><</npc>> takes the hint and rips off the condom, jerking himself off over your face. Within seconds, cum erupts from the tip of his cock, spattering across your forehead and running down your cheeks. Seconds after that, it seems <<npc $sex.npcId>><</npc>> is out of juice and pulls back to admire his handiwork.</p>
 		<<else>>
-			<p>You quickly jump off his cock and squat down in front of him. <<=$npcs.get($sex.npcId,'firstname')>> takes the hint and begins jerking himself off over your face. Within seconds, cum erupts from the tip of his cock, spattering across your forehead and running down your cheeks. Seconds after that, it seems <<=$npcs.get($sex.npcId,'firstname')>> is out of juice and pulls back to admire his handiwork.</p>
+			<p>You quickly jump off his cock and squat down in front of him. <<npc $sex.npcId>><</npc>> takes the hint and begins jerking himself off over your face. Within seconds, cum erupts from the tip of his cock, spattering across your forehead and running down your cheeks. Seconds after that, it seems <<npc $sex.npcId>><</npc>> is out of juice and pulls back to admire his handiwork.</p>
 		<</if>>
 	<<else>>
 		<p>"Nuh-uh," You wrinkle your nose in disgust. "I don't want that. But you can still cum on my face."</p>
 		<<if getvar("$gdk['condom']") == 1>>
-			<p>With a smile, you jump off his cock and squat in front of him. <<=$npcs.get($sex.npcId,'firstname')>> rips off the condom in turn, quickly jerking himself off over your face. Within seconds, cum erupts from the tip of his cock, spattering across your forehead and running down your cheeks. Seconds after that, it seems <<=$npcs.get($sex.npcId,'firstname')>> is out of juice and pulls back to admire his handiwork.</p>
+			<p>With a smile, you jump off his cock and squat in front of him. <<npc $sex.npcId>><</npc>> rips off the condom in turn, quickly jerking himself off over your face. Within seconds, cum erupts from the tip of his cock, spattering across your forehead and running down your cheeks. Seconds after that, it seems <<npc $sex.npcId>><</npc>> is out of juice and pulls back to admire his handiwork.</p>
 		<<else>>
-			<p>With a smile, you jump off his cock and squat in front of him. <<=$npcs.get($sex.npcId,'firstname')>> takes the hint and quickly begins jerking himself off over your face. Within seconds, cum erupts from the tip of his cock, spattering across your forehead and running down your cheeks. Seconds after that, it seems <<=$npcs.get($sex.npcId,'firstname')>> is out of juice and pulls back to admire his handiwork.</p>
+			<p>With a smile, you jump off his cock and squat in front of him. <<npc $sex.npcId>><</npc>> takes the hint and quickly begins jerking himself off over your face. Within seconds, cum erupts from the tip of his cock, spattering across your forehead and running down your cheeks. Seconds after that, it seems <<npc $sex.npcId>><</npc>> is out of juice and pulls back to admire his handiwork.</p>
 		<</if>>
 	<</if>>
 	<<actCLA 'Smile'>>
 		<<video "locations/pavlovsk/community/disco/sex/facial_after.mp4">>
-		<p>"Well, that was fun." You smile at <<=$npcs.get($sex.npcId,'firstname')>> as he tucks his cock inside his pants.</p>
+		<p>"Well, that was fun." You smile at <<npc $sex.npcId>><</npc>> as he tucks his cock inside his pants.</p>
 		<<if getvar("$gdk['fuck']") == 1>>
 			"Yeah, you've got a great pussy."
 		<<else>>
@@ -1066,23 +1066,23 @@
 		<<if getvar("$swallow") < 1>>
 			<<actCLA 'Yes...'>>
 				<p>"Yes..." you admit, blushing and turning your head away. "Got a problem?</p>
-				<p>"No, but it explains a lot," <<=$npcs.get($sex.npcId,'firstname')>> grins. Your blush deepens.</p>
+				<p>"No, but it explains a lot," <<npc $sex.npcId>><</npc>> grins. Your blush deepens.</p>
 				<<gs 'pav_disco_sex' 'disco_sex_end'>>
 			<</actCLA>>
 			<<actCLA 'No... (lie)'>>
 				"No..." you say, blushing and turning your head away. "You just... don't taste how I expected."
-				<p>"Uh-huh..." <<=$npcs.get($sex.npcId,'firstname')>> eyes you knowingly, and your blush deepens, but you refuse to look him in the eye.</p>
+				<p>"Uh-huh..." <<npc $sex.npcId>><</npc>> eyes you knowingly, and your blush deepens, but you refuse to look him in the eye.</p>
 				<<gs 'pav_disco_sex' 'disco_sex_end'>>
 			<</actCLA>>
 		<<else>>
 			<<actCLA 'Yes... (lie)'>>
 				<p>"Yes..." you lie, blushing and turning your head away, hoping to claim inexperience to save him some hurt feelings. "Got a problem?</p>
-				<p>"No, but it explains a lot," <<=$npcs.get($sex.npcId,'firstname')>> grins. Your blush deepens. Maybe you should have just told him his cum is disgusting after all...</p>
+				<p>"No, but it explains a lot," <<npc $sex.npcId>><</npc>> grins. Your blush deepens. Maybe you should have just told him his cum is disgusting after all...</p>
 				<<gs 'pav_disco_sex' 'disco_sex_end'>>
 			<</actCLA>>
 			<<actCLA 'No! You just taste awful!'>>
 				<p>"No!" you spit. "You just taste awful! You need to eat more fruit or something!"</p>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> recoils, looking somewhat offended, but doesn't say anything more.</p>
+				<p><<npc $sex.npcId>><</npc>> recoils, looking somewhat offended, but doesn't say anything more.</p>
 				<<gs 'pav_disco_sex' 'disco_sex_end'>>
 			<</actCLA>>
 		<</if>>
@@ -1125,7 +1125,7 @@
 	<</if>>
 	<<actCLA 'Spit'>>
 		<<image "locations/pavlovsk/community/dk_night.jpg">>
-		<p>Opening your mouth, you stick your tongue out and let <<=$npcs.get($sex.npcId,'firstname')>>'s cum dribble out onto the pavement.</p>
+		<p>Opening your mouth, you stick your tongue out and let <<npc $sex.npcId>><</npc>>'s cum dribble out onto the pavement.</p>
 		<<gs 'pav_disco_sex' 'disco_sex_end'>>
 	<</actCLA>>
 	<<actCLA 'Swallow'>>
@@ -1138,12 +1138,12 @@
 	<<setinit $gdk['cum'] = 'condom'>>
 	<<video "locations/pavlovsk/community/disco/sex/fuck.mp4">>
 	<<if $gdk['orgasm'] < $orgasm>>
-		<p>You gasp in surprise when <<=$npcs.get($sex.npcId,'firstname')>> pulls you tight against him, shoving his entire length inside you to the base. Seconds later, you hear him groan and feel him cumming inside the condom. The sensation sends you over the edge, and your body goes taut, leaving you on tiptoes while the orgasm rolls through your body.</p>
-		<p>When the quivering finally stops, you lean forward. Letting <<=$npcs.get($sex.npcId,'firstname')>>'s cock slip from inside you and looking over your shoulder, you can see white liquid filling the rubber sleeve.</p>
+		<p>You gasp in surprise when <<npc $sex.npcId>><</npc>> pulls you tight against him, shoving his entire length inside you to the base. Seconds later, you hear him groan and feel him cumming inside the condom. The sensation sends you over the edge, and your body goes taut, leaving you on tiptoes while the orgasm rolls through your body.</p>
+		<p>When the quivering finally stops, you lean forward. Letting <<npc $sex.npcId>><</npc>>'s cock slip from inside you and looking over your shoulder, you can see white liquid filling the rubber sleeve.</p>
 		<i>"Looks like we came together"</i> you think.
 	<<else>>
-		<p>You gasp in surprise when <<=$npcs.get($sex.npcId,'firstname')>> pulls you tight against him, shoving his entire length inside you to the base. Seconds later, you hear him groan and feel him cum inside the condom.</p>
-		<p>Clenching your pussy, you milk him for all he's worth until you feel him stop pulsing inside you. Then, leaning forward, you let <<=$npcs.get($sex.npcId,'firstname')>>'s cock slip from your pussy.</p>
+		<p>You gasp in surprise when <<npc $sex.npcId>><</npc>> pulls you tight against him, shoving his entire length inside you to the base. Seconds later, you hear him groan and feel him cum inside the condom.</p>
+		<p>Clenching your pussy, you milk him for all he's worth until you feel him stop pulsing inside you. Then, leaning forward, you let <<npc $sex.npcId>><</npc>>'s cock slip from your pussy.</p>
 	<</if>>
 	<<actCLA 'Continue'>>
 		<<gt 'pav_disco_sex' 'disco_sex_end'>>
@@ -1153,11 +1153,11 @@
 	<<setinit $gdk['cum'] = 'condom'>>
 	<<video "locations/pavlovsk/community/disco/sex/fuck.mp4">>
 	<<if $gdk['orgasm'] < $orgasm>>
-		<p>You don't say a word, instead throwing your hips back onto <<=$npcs.get($sex.npcId,'firstname')>>'s cock as hard as you can. Seconds later, you hear him groan and feel him cum inside the condom. The sensation sends you over the edge, and your body goes taut, leaving you on tiptoes while the orgasm rolls through your body.</p>
-		<p>When the quivering finally stops, you lean forward, letting <<=$npcs.get($sex.npcId,'firstname')>>'s cock slip from your pussy.</p>
+		<p>You don't say a word, instead throwing your hips back onto <<npc $sex.npcId>><</npc>>'s cock as hard as you can. Seconds later, you hear him groan and feel him cum inside the condom. The sensation sends you over the edge, and your body goes taut, leaving you on tiptoes while the orgasm rolls through your body.</p>
+		<p>When the quivering finally stops, you lean forward, letting <<npc $sex.npcId>><</npc>>'s cock slip from your pussy.</p>
 	<<else>>
-		<p>You don't say a word, instead throwing your hips back onto <<=$npcs.get($sex.npcId,'firstname')>>'s cock as hard as you can. Seconds later, you hear him groan and feel him cumming inside the condom.</p>
-		<p>Clenching your pussy, you milk him for all he's worth until you feel him stop pulsing inside you. Then, leaning forward, you let <<=$npcs.get($sex.npcId,'firstname')>>'s cock slip from your pussy.</p>
+		<p>You don't say a word, instead throwing your hips back onto <<npc $sex.npcId>><</npc>>'s cock as hard as you can. Seconds later, you hear him groan and feel him cumming inside the condom.</p>
+		<p>Clenching your pussy, you milk him for all he's worth until you feel him stop pulsing inside you. Then, leaning forward, you let <<npc $sex.npcId>><</npc>>'s cock slip from your pussy.</p>
 	<</if>>
 	<<actCLA 'Continue'>>
 		<<gt 'pav_disco_sex' 'disco_sex_end'>>
@@ -1173,11 +1173,11 @@
 	<<image "locations/pavlovsk/community/disco/sex/creampie.jpg">>
 	<<if $pc.horny >= 90>>
 		<<set $orgasm_or = 'yes'>>
-		<p>You don't say a word, instead throwing your hips back onto <<=$npcs.get($sex.npcId,'firstname')>>'s cock as hard as you can. Seconds later, you hear him groan and feel his load spill out inside you. The sensation sends you over the edge, and your body goes taut, leaving you on tiptoes while the orgasm rolls through your body.</p>
-		<p>When the quivering finally stops, you lean forward, letting <<=$npcs.get($sex.npcId,'firstname')>>'s cock slip from your pussy, his cum trickling out after it.</p>
+		<p>You don't say a word, instead throwing your hips back onto <<npc $sex.npcId>><</npc>>'s cock as hard as you can. Seconds later, you hear him groan and feel his load spill out inside you. The sensation sends you over the edge, and your body goes taut, leaving you on tiptoes while the orgasm rolls through your body.</p>
+		<p>When the quivering finally stops, you lean forward, letting <<npc $sex.npcId>><</npc>>'s cock slip from your pussy, his cum trickling out after it.</p>
 	<<else>>
-		<p>You don't say a word, instead throwing your hips back onto <<=$npcs.get($sex.npcId,'firstname')>>'s cock as hard as you can. Seconds later, you hear him groan and feel his load spill out inside you.</p>
-		<p>Clenching your pussy, you milk him for all he's worth until you feel him stop pulsing inside you. Then, leaning forward, you let <<=$npcs.get($sex.npcId,'firstname')>>'s cock slip from your pussy, and his cum slowly trickles out.</p>
+		<p>You don't say a word, instead throwing your hips back onto <<npc $sex.npcId>><</npc>>'s cock as hard as you can. Seconds later, you hear him groan and feel his load spill out inside you.</p>
+		<p>Clenching your pussy, you milk him for all he's worth until you feel him stop pulsing inside you. Then, leaning forward, you let <<npc $sex.npcId>><</npc>>'s cock slip from your pussy, and his cum slowly trickles out.</p>
 	<</if>>
 	<<actCLA 'Felt too good'>>
 		<<image "locations/pavlovsk/community/disco/sex/creampie.jpg">>
@@ -1201,7 +1201,7 @@
 	<<if ($pcs_cp_safe_known + $pcs_cp_notsafe_known + $pcs_cp_risky_known) > 0>>
 		<<actCLA 'I love getting creampied'>>
 			<<image "locations/pavlovsk/community/disco/sex/creampie.jpg">>
-			<p>"I love getting creampied," you grin, closing your eyes and savouring the feeling of <<=$npcs.get($sex.npcId,'firstname')>>'s load oozing from your pussy.</p>
+			<p>"I love getting creampied," you grin, closing your eyes and savouring the feeling of <<npc $sex.npcId>><</npc>>'s load oozing from your pussy.</p>
 			<<gs 'pav_disco_sex' 'disco_sex_end'>>
 		<</actCLA>>
 	<</if>>
@@ -1219,11 +1219,11 @@
 		<<actCLA 'What the fuck!'>>
 			<<arousalEnd>>
 			<<image "locations/pavlovsk/community/dk_night.jpg">>
-			<p>"What the fuck!" you shout, causing <<=$npcs.get($sex.npcId,'firstname')>> to recoil backwards. "What made you think that was fucking okay?!"</p>
+			<p>"What the fuck!" you shout, causing <<npc $sex.npcId>><</npc>> to recoil backwards. "What made you think that was fucking okay?!"</p>
 			<<if getvar("$gdk['virgin']") == 1 or getvar("$mesec") > 0>>
-				<p>You stare at your pussy, horrified by the white liquid oozing inside. Before you can do anything else, <<=$npcs.get($sex.npcId,'firstname')>> hurries away from you, pulling up his pants and escaping back into the disco, leaving you alone in the dark with cum and blood dripping from your pussy.</p>
+				<p>You stare at your pussy, horrified by the white liquid oozing inside. Before you can do anything else, <<npc $sex.npcId>><</npc>> hurries away from you, pulling up his pants and escaping back into the disco, leaving you alone in the dark with cum and blood dripping from your pussy.</p>
 			<<else>>
-				<p>You stare at your pussy, horrified by the white liquid oozing inside. Before you can do anything else, <<=$npcs.get($sex.npcId,'firstname')>> hurries away from you, pulling up his pants and escaping back into the disco, leaving you alone in the dark with his cum still dripping from your pussy.</p>
+				<p>You stare at your pussy, horrified by the white liquid oozing inside. Before you can do anything else, <<npc $sex.npcId>><</npc>> hurries away from you, pulling up his pants and escaping back into the disco, leaving you alone in the dark with his cum still dripping from your pussy.</p>
 			<</if>>
 			<<set $gdk to null>>
 			<<actCLA 'Continue'>>
@@ -1232,7 +1232,7 @@
 		<</actCLA>>
 		<<actCLA 'Forgive the mistake'>>
 			<<image "locations/pavlovsk/community/dk_night.jpg">>
-			<p>"You look down at the white liquid dripping from your pussy. It fills you with stress, but you know it wouldn't be right to blame <<=$npcs.get($sex.npcId,'firstname')>>.</p>
+			<p>"You look down at the white liquid dripping from your pussy. It fills you with stress, but you know it wouldn't be right to blame <<npc $sex.npcId>><</npc>>.</p>
 			You bite your lip for a moment considering the situation.
 			<<actCLA 'I`ll be fine'>>
 				You decide it isn''t a big deal.
@@ -1261,14 +1261,14 @@
 		<<actCLA 'Hot'>>
 			<<set $pc.horny += 15>>
 			<<image "locations/pavlovsk/community/disco/sex/creampie.jpg">>
-			<p>A shiver of pleasure washes over your body. Knowing that <<=$npcs.get($sex.npcId,'firstname')>> blew his load inside you is enough to send heat coursing through your hips, and you can feel your nipples stiffen up again.</p>
+			<p>A shiver of pleasure washes over your body. Knowing that <<npc $sex.npcId>><</npc>> blew his load inside you is enough to send heat coursing through your hips, and you can feel your nipples stiffen up again.</p>
 			<<actCLA 'It felt so good'>>
-				<p>"That felt so good," you smile tiredly. <<=$npcs.get($sex.npcId,'firstname')>> blinks at you, a look of surprise on his face as if he expected you to be mad about it.</p>
+				<p>"That felt so good," you smile tiredly. <<npc $sex.npcId>><</npc>> blinks at you, a look of surprise on his face as if he expected you to be mad about it.</p>
 				<<gs 'pav_disco_sex' 'disco_sex_end'>>
 			<</actCLA>>
 			<<actCLA 'Premature ejaculation is hot'>>
 				"Fuck, it's so hot when guys can't hold their load," you grin.
-				<p>"What?" <<=$npcs.get($sex.npcId,'firstname')>> says, seemingly taken aback by your statement.</p>
+				<p>"What?" <<npc $sex.npcId>><</npc>> says, seemingly taken aback by your statement.</p>
 				<p>"Premature ejaculation?" you say, your smile growing wider. "It's hot."</p>
 				<<if $npcs.get($sex.npcId,'insecure') == 1>>
 					<<arousalEnd>>
@@ -1277,7 +1277,7 @@
 					<p>"I didn't prematurely ejaculate! I don't do that!"</p>
 					<p>"Well, there wasn't any warning. Seemed like you didn't mean to cum when-"</p>
 					<p>"I SAID I DON'T DO THAT!"</p>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> shouts at you one last time before storming back towards the disco, grumbling the whole time. Suddenly, you're alone in the dark with the load of a stranger inside your pussy.</p>
+					<p><<npc $sex.npcId>><</npc>> shouts at you one last time before storming back towards the disco, grumbling the whole time. Suddenly, you're alone in the dark with the load of a stranger inside your pussy.</p>
 					<<set $gdk to null>>
 					<<actCLA 'Continue'>>
 						<<gt 'pav_commcenter'>>
@@ -1292,13 +1292,13 @@
 			<<actCLA 'Already?'>>
 				<<image "locations/pavlovsk/community/disco/sex/creampie.jpg">>
 				<p>"Seriously?! Already?!" You look down at the cum seeping from your pussy with heavy disappointment. "Fuck! Why do guys like you never manage to hold it in until I get off?"</p>
-				<p>"What the fuck is your problem?" <<=$npcs.get($sex.npcId,'firstname')>> growls angrily.</p>
+				<p>"What the fuck is your problem?" <<npc $sex.npcId>><</npc>> growls angrily.</p>
 				<p>"Apparently, my problem is that you're a two-pump chump who can't wait to nut inside a girl before she's gotten off!"</p>
 				<p>"Fuck you, bitch!"</p>
 				<<if getvar("$gdk['virgin']") == 1 or getvar("$mesec") > 0>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> storms away from you, pulling up his pants as he goes. Before you know it, you're alone in the dark, a stranger's cum and blood dripping from your pussy, and feeling severely blue-balled.</p>
+					<p><<npc $sex.npcId>><</npc>> storms away from you, pulling up his pants as he goes. Before you know it, you're alone in the dark, a stranger's cum and blood dripping from your pussy, and feeling severely blue-balled.</p>
 				<<else>>
-					<p><<=$npcs.get($sex.npcId,'firstname')>> storms away from you, pulling up his pants as he goes. Before you know it, you're alone in the dark, a stranger's cum dripping from your pussy, and feeling severely blue-balled.</p>
+					<p><<npc $sex.npcId>><</npc>> storms away from you, pulling up his pants as he goes. Before you know it, you're alone in the dark, a stranger's cum dripping from your pussy, and feeling severely blue-balled.</p>
 				<</if>>
 				<<arousalEnd>>
 				<<set $gdk to null>>
@@ -1312,11 +1312,11 @@
 <<if $location_var[$here][0] == 'creampie_surprise2'>>
 	<<arousalEnd>>
 	<<image "locations/pavlovsk/community/disco/sex/creampie.jpg">>
-	<p>"WHAT THE FUCK!" you shout, causing <<=$npcs.get($sex.npcId,'firstname')>> to recoil backwards. "I fucking <i>told you</i> not to cum inside me!"</p>
+	<p>"WHAT THE FUCK!" you shout, causing <<npc $sex.npcId>><</npc>> to recoil backwards. "I fucking <i>told you</i> not to cum inside me!"</p>
 	<<if getvar("$gdk['virgin']") == 1 or getvar("$mesec") > 0>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> hurries away from you, escaping back into the disco as you stare at your pussy, horrified by the white liquid oozing from inside it. Before you know it, you're alone in the dark, a stranger's cum and blood dripping from your pussy.</p>
+		<p><<npc $sex.npcId>><</npc>> hurries away from you, escaping back into the disco as you stare at your pussy, horrified by the white liquid oozing from inside it. Before you know it, you're alone in the dark, a stranger's cum and blood dripping from your pussy.</p>
 	<<else>>
-		<p><<=$npcs.get($sex.npcId,'firstname')>> hurries away from you, escaping back into the disco as you stare at your pussy, horrified by the white liquid oozing from inside it. Before you know it, you're alone in the dark, a stranger's cum inside your pussy.</p>
+		<p><<npc $sex.npcId>><</npc>> hurries away from you, escaping back into the disco as you stare at your pussy, horrified by the white liquid oozing from inside it. Before you know it, you're alone in the dark, a stranger's cum inside your pussy.</p>
 	<</if>>
 	<<set $gdk to null>>
 	<<actCLA 'Continue'>>
@@ -1329,60 +1329,60 @@
 		<<if $wardrobe.pantyworntype != 'none' or getvar("$gdk['fuck']") != 1>>
 			<<if $gdk['cum'] == 'facial'>>
 				<<image "locations/pavlovsk/community/dk_night.jpg">>
-				<p>Zipping his pants back up, <<=$npcs.get($sex.npcId,'firstname')>> heads back inside, leaving you alone in the dark with cum on your face.</p>
+				<p>Zipping his pants back up, <<npc $sex.npcId>><</npc>> heads back inside, leaving you alone in the dark with cum on your face.</p>
 			<<elseif $gdk['cum'] == 'mouth'>>
-				<p>Zipping his pants back up, <<=$npcs.get($sex.npcId,'firstname')>> heads back inside, leaving you alone in the dark, the taste of his cum still on your lips.</p>
+				<p>Zipping his pants back up, <<npc $sex.npcId>><</npc>> heads back inside, leaving you alone in the dark, the taste of his cum still on your lips.</p>
 			<<elseif $gdk['cum'] == 'creampie' and (getvar("$mesec") > 0 or getvar("$gdk['virgin']") == 1)>>
-				<p>Zipping his pants back up, <<=$npcs.get($sex.npcId,'firstname')>> heads back inside, leaving you alone in the dark, cum and menstrual fluids running down your legs.</p>
+				<p>Zipping his pants back up, <<npc $sex.npcId>><</npc>> heads back inside, leaving you alone in the dark, cum and menstrual fluids running down your legs.</p>
 			<<elseif $gdk['cum'] == 'creampie'>>
-				<p>Zipping his pants back up, <<=$npcs.get($sex.npcId,'firstname')>> heads back inside, leaving you alone in the dark, cum running down your legs.</p>
+				<p>Zipping his pants back up, <<npc $sex.npcId>><</npc>> heads back inside, leaving you alone in the dark, cum running down your legs.</p>
 			<<elseif $gdk['cum'] == 'condom'>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> pulls off the condom and tosses it aside, zipping his pants back up to head back inside and leaving you alone in the dark, pussy juices running down your legs.</p>
+				<p><<npc $sex.npcId>><</npc>> pulls off the condom and tosses it aside, zipping his pants back up to head back inside and leaving you alone in the dark, pussy juices running down your legs.</p>
 			<</if>>
 		<<else>>
 			<<if $gdk['cum'] == 'facial'>>
 				<<image "locations/pavlovsk/community/dk_night.jpg">>
-				<p>You pull up your panties while <<=$npcs.get($sex.npcId,'firstname')>> zips up his pants before heading back inside, leaving you alone in the dark with cum on your face.</p>
+				<p>You pull up your panties while <<npc $sex.npcId>><</npc>> zips up his pants before heading back inside, leaving you alone in the dark with cum on your face.</p>
 			<<elseif $gdk['cum'] == 'mouth'>>
-				<p>You pull up your panties while <<=$npcs.get($sex.npcId,'firstname')>> zips up his pants before heading back inside, leaving you alone in the dark, the taste of his cum still on your lips.</p>
+				<p>You pull up your panties while <<npc $sex.npcId>><</npc>> zips up his pants before heading back inside, leaving you alone in the dark, the taste of his cum still on your lips.</p>
 			<<elseif $gdk['cum'] == 'creampie' and (getvar("$mesec") > 0 or getvar("$gdk['virgin']") == 1)>>
-				<p>You pull up your panties while <<=$npcs.get($sex.npcId,'firstname')>> zips up his pants before heading back inside, leaving you alone in the dark, cum and blood soaking into your underwear.</p>
+				<p>You pull up your panties while <<npc $sex.npcId>><</npc>> zips up his pants before heading back inside, leaving you alone in the dark, cum and blood soaking into your underwear.</p>
 			<<elseif $gdk['cum'] == 'creampie'>>
-				<p>You pull up your panties while <<=$npcs.get($sex.npcId,'firstname')>> zips up his pants before heading back inside, leaving you alone in the dark, cum soaking into your underwear.</p>
+				<p>You pull up your panties while <<npc $sex.npcId>><</npc>> zips up his pants before heading back inside, leaving you alone in the dark, cum soaking into your underwear.</p>
 				<!-- !!			elseif $gdk['cum'] = 'creampie_wipe':-->
-				<!-- !!				'You pull out some wipes and begin to clean up the mess leaking out of your pussy while <<<<=$npcs.get($sex.npcId,'firstname')>>>> zips up his pants and heads back inside. By the time you're done, you're alone, pulling up your panties in the dark.'-->
+				<!-- !!				'You pull out some wipes and begin to clean up the mess leaking out of your pussy while <<<<npc $sex.npcId>><</npc>>>> zips up his pants and heads back inside. By the time you're done, you're alone, pulling up your panties in the dark.'-->
 			<<elseif $gdk['cum'] == 'condom'>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> pulls off the condom and tosses it aside while you pull up your panties. Afterwards, he zips his pants back up and heads inside, leaving you alone in the dark.</p>
+				<p><<npc $sex.npcId>><</npc>> pulls off the condom and tosses it aside while you pull up your panties. Afterwards, he zips his pants back up and heads inside, leaving you alone in the dark.</p>
 			<</if>>
 		<</if>>
 	<<else>>
 		<<if getvar("$gdk['fuck']") != 1>>
 			<<if $gdk['cum'] == 'facial'>>
 				<<image "locations/pavlovsk/community/dk_night.jpg">>
-				<p>Zipping his pants back up, <<=$npcs.get($sex.npcId,'firstname')>> heads back inside, leaving you alone in the dark with cum on your face.</p>
+				<p>Zipping his pants back up, <<npc $sex.npcId>><</npc>> heads back inside, leaving you alone in the dark with cum on your face.</p>
 			<<elseif $gdk['cum'] == 'mouth'>>
-				<p>Zipping his pants back up, <<=$npcs.get($sex.npcId,'firstname')>> heads back inside, leaving you alone in the dark, the taste of his cum still on your lips.</p>
+				<p>Zipping his pants back up, <<npc $sex.npcId>><</npc>> heads back inside, leaving you alone in the dark, the taste of his cum still on your lips.</p>
 			<</if>>
 		<<else>>
 			<<if $gdk['cum'] == 'facial'>>
 				<<image "locations/pavlovsk/community/dk_night.jpg">>
-				<p>The two of you pull your pants back up, and <<=$npcs.get($sex.npcId,'firstname')>> heads back inside, leaving you alone in the dark with cum on your face.</p>
+				<p>The two of you pull your pants back up, and <<npc $sex.npcId>><</npc>> heads back inside, leaving you alone in the dark with cum on your face.</p>
 			<<elseif $gdk['cum'] == 'mouth'>>
-				<p>The two of you pull your pants back up, and <<=$npcs.get($sex.npcId,'firstname')>> heads back inside, leaving you alone in the dark, the taste of his cum still on your lips.</p>
+				<p>The two of you pull your pants back up, and <<npc $sex.npcId>><</npc>> heads back inside, leaving you alone in the dark, the taste of his cum still on your lips.</p>
 			<<elseif $gdk['cum'] == 'creampie' and (getvar("$mesec") > 0 or getvar("$gdk['virgin']") == 1)>>
 				<<if $wardrobe.pantyworntype == 'none'>>
-					<p>The two of you pull your pants back up, and <<=$npcs.get($sex.npcId,'firstname')>> heads back inside, leaving you alone in the dark, cum and blood seeping into the crotch of your pants.</p>
+					<p>The two of you pull your pants back up, and <<npc $sex.npcId>><</npc>> heads back inside, leaving you alone in the dark, cum and blood seeping into the crotch of your pants.</p>
 				<<else>>
-					<p>The two of you pull your pants back up, and <<=$npcs.get($sex.npcId,'firstname')>> heads back inside, leaving you alone in the dark, cum and blood seeping into your panties.</p>
+					<p>The two of you pull your pants back up, and <<npc $sex.npcId>><</npc>> heads back inside, leaving you alone in the dark, cum and blood seeping into your panties.</p>
 				<</if>>
 			<<elseif $gdk['cum'] == 'creampie'>>
 				<<if $wardrobe.pantyworntype == 'none'>>
-					<p>The two of you pull your pants back up, and <<=$npcs.get($sex.npcId,'firstname')>> heads back inside, leaving you alone in the dark, cum seeping into the crotch of your pants.</p>
+					<p>The two of you pull your pants back up, and <<npc $sex.npcId>><</npc>> heads back inside, leaving you alone in the dark, cum seeping into the crotch of your pants.</p>
 				<<else>>
-					<p>The two of you pull your pants back up, and <<=$npcs.get($sex.npcId,'firstname')>> heads back inside, leaving you alone in the dark, cum seeping into your panties.</p>
+					<p>The two of you pull your pants back up, and <<npc $sex.npcId>><</npc>> heads back inside, leaving you alone in the dark, cum seeping into your panties.</p>
 				<</if>>
 			<<elseif $gdk['cum'] == 'condom'>>
-				<p><<=$npcs.get($sex.npcId,'firstname')>> pulls off the condom and tosses it aside while you pull up your pants. Afterwards, he zips his pants back up and heads inside, leaving you alone in the dark.</p>
+				<p><<npc $sex.npcId>><</npc>> pulls off the condom and tosses it aside while you pull up your pants. Afterwards, he zips his pants back up and heads inside, leaving you alone in the dark.</p>
 			<</if>>
 		<</if>>
 	<</if>>

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio