Merge branch 'Edited-TW' into SC-Master

sugarcube/src/activities/actress/audition_reflections.tw

@@ -1004,7 +1004,7 @@
 		<</if>>
 	<</if>>
 <</if>>
-<<arousalEnd>>
+
 <<actCLA 'Continue'>>
 	<<gt 'auditions' 'reflection_end'>>
 <</actCLA>>
@@ -1031,7 +1031,7 @@
 <<else>>
 	You just blew some guy trying to get an acting gig. You know you should feel dirty right now, or upset, or enraged, but for some reason the only thing you can think about is how turned on you feel right now. You were used and abused. Taken advantage of. Fucked over. Literally. You didn''t even get the job. But you don't care about any of that. You put your fingers to your mouth and taste yourself, moaning at the flavor. The only thing on your mind is how much the idea excites you that the next time you come in for an audition... <i>it could happen again.</i>
 <</if>>
-<<arousalEnd>>
+
 <<actCLA 'Continue'>>
 	<<gt 'auditions' 'reflection_end'>>
 <</actCLA>>
@@ -1302,7 +1302,7 @@
 			<</if>>
 		<</if>>
 	<</actCLA>>
-	<<arousalEnd>>
+	
 	<<actCLA 'Continue'>>
 		<<gt 'auditions' 'reflection_end'>>
 	<</actCLA>>

sugarcube/src/activities/actress/audition_sex2.tw

@@ -317,14 +317,14 @@
 					<!-- !!							cumspclnt = 4-->
 					<!-- !!							gs 'cum_cleanup'-->
 					<!-- !!							cla & *clr-->
-					<!-- !!							'<<image `'locations/city/citycenter/aurora/auditions/room.jpg'`>>'-->
+					<!-- !!							'<<image 'locations/city/citycenter/aurora/auditions/room.jpg'>>'-->
 					<!-- !!							'Picking up the packet, you clean yourself off, carefully wiping your mouth and your cheeks and around your eyes and finally your hands. By the time you're done, <<$boydesc>> has already pulled up his pants and has been watching you from behind the desk.'-->
 					<!-- !!							act'Find out the results of your audition':gt'auditions','neutral_results'-->
 					<!-- !!						end-->
 					<!-- !!						act'Don't bother':-->
 					<!-- !!							cla & *clr-->
 					<!-- !!							audition['bonus'] += 5-->
-					<!-- !!							'<<image `'locations/city/citycenter/aurora/auditions/room.jpg'`>>'-->
+					<!-- !!							'<<image 'locations/city/citycenter/aurora/auditions/room.jpg'>>'-->
 					<!-- !!							'You consider the cum covering your face and coating your hands but decide you just can't be bothered to clean it up and simply stand up.'-->
 					<!-- !!							'<<$boydesc>> pulls up his pants and sits down behind the desk. Looking at you he smirks.'-->
 					<!-- !!							'"That's a good look on you. I bet you wear that often."'-->

sugarcube/src/activities/actress/audition_sex3.tw

@@ -314,14 +314,14 @@
 					<!-- !!							cumspclnt = 4-->
 					<!-- !!							gs 'cum_cleanup'-->
 					<!-- !!							cla & *clr-->
-					<!-- !!							'<<image `'locations/city/citycenter/aurora/auditions/room.jpg'`>>'-->
+					<!-- !!							'<<image 'locations/city/citycenter/aurora/auditions/room.jpg'>>'-->
 					<!-- !!							'Picking up the packet, you clean yourself off, carefully wiping your mouth and your cheeks and around your eyes and finally your hands. By the time you're done, <<$boydesc>> has already pulled up his pants and has been watching you from behind the desk.'-->
 					<!-- !!							act'Find out the results of your audition':gt'auditions','slutty_results'-->
 					<!-- !!						end-->
 					<!-- !!						act'Don't bother':-->
 					<!-- !!							cla & *clr-->
 					<!-- !!							audition['bonus'] += 5-->
-					<!-- !!							'<<image `'locations/city/citycenter/aurora/auditions/room.jpg'`>>'-->
+					<!-- !!							'<<image 'locations/city/citycenter/aurora/auditions/room.jpg'>>'-->
 					<!-- !!							'You consider the cum covering your face and coating your hands but decide you just can't be bothered to clean it up and simply stand up.'-->
 					<!-- !!							'<<$boydesc>> pulls up his pants and sits down behind the desk. Looking at you he smirks.'-->
 					<!-- !!							'"That's a good look on you. I bet you wear that often."'-->

sugarcube/src/activities/actress/auditions.tw

@@ -451,7 +451,7 @@
 		<</actCLA>>
 		<!-- !!{		act'What the fuck?!':
 		cla & *clr
-		'<<image `'locations/city/citycenter/aurora/auditions/room.jpg'`>>'
+		'<<image 'locations/city/citycenter/aurora/auditions/room.jpg'>>'
 		if audition['cast_couch'] < 6:
 		if cumloc[11] > 0:
 		'"What the fuck?!" Something suddenly snaps inside you and you're practically blind with rage. "We had a deal! I blow you and you give me the part! Well I fucking <i>blew</i> you! And then I let you <i>cum on my fucking face</i>," you say, pointing at your spunk covered visage, "and now you're just going to toss me out like some kind of gutter whore?"'
@@ -1028,7 +1028,7 @@
 <</if>>
 <!-- !! ----------------------------------- Post Casting Couch Reflection ------------------------------------------->
 <<if $location_var[$here][0] == 'reflection'>>
-	<<arousalEnd>>
+	
 	<<if $wardrobe.clothingworntype == 'nude'>>
 		<<gs 'clothing' 'wear_last_worn'>>
 		<<gs 'underwear' 'wear'>>
@@ -1048,7 +1048,7 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'reflection_end'>>
-	<<arousalEnd>>
+	
 	<<if $audition['result'] >= $audition['requirement']>>
 		<<gs 'auditions' 'role_success'>>
 	<<else>>
@@ -1058,7 +1058,7 @@
 <</if>>
 <!-- !!if $ARGS[0] = 'reflect_first_time':-->
 <!-- !!	cla & *clr-->
-<!-- !!	'<<image `'locations/city/citycenter/aurora/auditions/hallway.jpg'`>>'-->
+<!-- !!	'<<image 'locations/city/citycenter/aurora/auditions/hallway.jpg'>>'-->
 <!-- !!	'The door shuts behind you and you lean against it, thinking about what just happened.'-->
 <!-- !!	''-->
 <!-- !! if actress['cast_couch_refuse'] > 0:-->

sugarcube/src/activities/bootycall/booty_call_after.tw

@@ -1057,7 +1057,7 @@
 			<<set $isprokp = 1>>
 			<<set $time.minutes += 2>>
 			<<set $pc.mood -= 5>>
-			<<image `'pc/body/pee/period/pad/'+rand(2,3)+'.jpg'`>>
+			<<image 'pc/body/pee/period/pad/#.jpg' 2 3>>
 			You use a sanitary pad.
 			<<actCLA 'Continue'>>
 				<<gs 'booty_call_after' 'boy_bathroom'>>
@@ -1541,11 +1541,11 @@
 	Your eyelids feel so heavy right now. You should probably get up but... you just need to rest your eyes...
 	just... for... a minute...
 	<<actCLA 'Drift off into sleep'>>
-		<!-- !!		'<<image `'shared/home/bedroom/son.jpg'`>>'-->
+		<!-- !!		'<<image 'shared/home/bedroom/son.jpg'>>'-->
 		<<setinit $booty_call['sleep_accident'] = 1>>
 		<<if getvar("$cum_loc['face']") > 0>>
 			<!-- !! face-->
-			<<image `'shared/sex/cum/facial/sleep'+rand(1,3)+'.jpg'`>>
+			<<image 'shared/sex/cum/facial/sleep#.jpg' 1 3>>
 		<<elseif getvar("$cum_loc['stomach']") > 0>>
 			<!-- !! stomach-->
 			<<image "shared/sex/cum/stomach/sleep1.jpg">>

sugarcube/src/activities/bootycall/booty_call_doggy.tw

@@ -4,7 +4,7 @@
 <<if $location_var[$here][0] == 'doggy_start'>>
 	<!-- !!	if stat['think_virgin'] = 1 and booty_call['fuck_count'] = 0:-->
 	<!-- !!		cla & *clr-->
-	<!-- !!		'<<image `'shared/sex/foreplay/miss3.jpg'`>>'-->
+	<!-- !!		'<<image 'shared/sex/foreplay/miss3.jpg'>>'-->
 	<!-- !!		'<<<<npc $sex.npcId>><</npc>>>> flips you over.'-->
 	<!-- !!		act'Stop him (virgin)':gt'booty_call_virgin', 'wait'-->
 	<!-- !!		act'Let him take your virginity':gs'booty_call_virgin', 'start3'-->

sugarcube/src/activities/bootycall/booty_call_leave.tw

@@ -44,7 +44,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'ending'>>
 	<!-- !!	gs 'booty_call_stats', 'save'-->
-	<<arousalEnd>>
+	
 	<<if $wardrobe.clothingworntype == 'nude'>>
 		<<gs 'booty_call_leave' 'dress'>>
 

sugarcube/src/activities/bootycall/booty_call_morning.tw

@@ -1068,7 +1068,7 @@ end} -->
 			<<image "shared/sex/after/wakeup1.jpg">>
 			Your eyes snap open as a lance of guilt pierces your chest.
 		<</if>>
-		<!-- !!		'<<image `'shared/sex/after/wakeup1.jpg'`>>'-->
+		<!-- !!		'<<image 'shared/sex/after/wakeup1.jpg'>>'-->
 		<!-- !!		'Your eyes snap open as your thoughts settle on one thing.'-->
 		<!-- !!		'<i>My <<$booty_call[''cheat'']>>...</i> you think.'-->
 		<<actCLA 'Wallow'>>
@@ -1442,20 +1442,20 @@ end} -->
 			<<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 <<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'`>>
+			<<image 'pc/activities/cooking/nude_stove#.jpg' 1 3>>
 			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.
 		<<elseif getvar("$booty_call['kolbasa_make']") == 1>>
 			<<image "pc/activities/cooking/nude_misc2.jpg">>
 			You set out some pieces of bread and take a knife to the kolbasa, cutting some decent slices
 		<<elseif getvar("$booty_call['pancakes_make']") == 1>>
-			<<image `'pc/activities/cooking/nude_stove'+rand(1,3)+'.jpg'`>>
+			<<image 'pc/activities/cooking/nude_stove#.jpg' 1 3>>
 			You start mixing batter while the pan heats up. Once hot, you spread thin layers across its surface, flipping to the other side once browned. After a short while, you have a nice stack of perfectly thin pancakes with crispy edges, taking one last stop at the fridge to pull out some butter, raspberry jam, and of course, sour cream.
 		<</if>>
 	<<elseif getvar("$booty_call['cooking_total']") == 5>>
 		<<image "pc/activities/cooking/nude_misc1.jpg">>
 		With a lot to do, you start quickly, spending the next half hour or so preparing your bonanza of breakfast goodies.
 	<<else>>
-		<<image `'pc/activities/cooking/nude_stove'+rand(1,3)+'.jpg'`>>
+		<<image 'pc/activities/cooking/nude_stove#.jpg' 1 3>>
 		You get to work preparing all of the things you planned for breakfast and a short while later, you have a nice but simple variety of things to eat.
 	<</if>>
 	<<actCLA 'Continue'>>

sugarcube/src/activities/bootycall/booty_call_pillow_talk2.tw

@@ -1116,7 +1116,7 @@ act'Nice way to start the day':
 gs'booty_call_pillow_talk', 'talk_time_add'
 booty_call['morning_sore_pussy'] = 1
 cla & *clr
-'<<image `'shared/sex/after/pillow_talk1.jpg'`>>'
+'<<image 'shared/sex/after/pillow_talk1.jpg'>>'
 end
 end
 end

sugarcube/src/activities/bootycall/booty_call_reactions.tw

@@ -1404,7 +1404,7 @@
 			<<image "shared/sex/cum/back1.jpg">>
 		<<elseif $booty_call['position'] == 'cowgirl'>>
 			<<image "shared/sex/cum/stomach/bellycum2.jpg">>
-			<!-- !!'<<image `'shared/sex/cum/back1.jpg'`>>'-->
+			<!-- !!'<<image 'shared/sex/cum/back1.jpg'>>'-->
 		<</if>>
 	<<else>>
 		<<=$npc($sex.npcId).apt_bedroom>>

sugarcube/src/activities/bootycall/booty_call_sex.tw

@@ -45,7 +45,7 @@
 				<<gs 'booty_call_after' 'fucked_out'>>
 			<<else>>
 				<!-- !!					cla & *clr-->
-				<!-- !!					'<<image `'shared/sex/misc/smile.jpg'`>>'-->
+				<!-- !!					'<<image 'shared/sex/misc/smile.jpg'>>'-->
 				<!-- !!					'"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'>>

sugarcube/src/activities/bootycall/booty_call_start.tw

@@ -957,7 +957,7 @@
 			<<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 <<npc $sex.npcId>><</npc>>'s cock and the floor.</p>
 			<<actCLA 'Sorry'>>
-				<!-- !!'<<image `'shared/sex/cum/mouth/cum52.jpg'`>>'-->
+				<!-- !!'<<image 'shared/sex/cum/mouth/cum52.jpg'>>'-->
 				<<=$npc($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 $npc($sex.npcId).generous == 1>>
@@ -2123,7 +2123,7 @@
 <<if $location_var[$here][0] == '69_dom1'>>
 	<!-- !!{	act'69 him':
 	cla & *clr
-	'<<image `'shared/sex/69/pre1.jpg'`>>'
+	'<<image 'shared/sex/69/pre1.jpg'>>'
 	$booty_call['position'] = '69'
 	if booty_call['foreplay_change'] >= 1:
 	'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.'

sugarcube/src/activities/bootycall/booty_call_talk.tw

@@ -6,7 +6,7 @@
 	<<setinit $booty_call['accidental_creampie_convo'] = 1>>
 	<!-- !!{	if $booty_call['convo'] = 'used_all_condoms':
 	cla & *clr
-	'<<image `'shared/sex/after/pillow_talk1.jpg'`>>'
+	'<<image 'shared/sex/after/pillow_talk1.jpg'>>'
 	end} -->
 	<<if $npc($sex.npcId).childfree == 1 and getvar("$WIP_enabled") == 1>>
 		<<if getvar("$cum_loc['vagina']") > 0>>

sugarcube/src/activities/bootycall/booty_call_virgin.tw

@@ -1231,7 +1231,7 @@ end} -->
 		<</actCLA>>
 		<<actCLA 'Didn`t feel much (lie)'>>
 			<<setinit $booty_call['virgin_enjoyment_share'] = 1>>
-			<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
+			<<image 'shared/sex/after/pillow_talk#.jpg' 1 2>>
 			Not wanting to spoil the mood, you decide to lie.
 			<p>"I didn't feel very much to be honest. Maybe it's just because it's the first time?"</p>
 			"Maybe," he shrugs back.
@@ -1245,7 +1245,7 @@ end} -->
 	<<elseif getvar("$booty_call['virgin_enjoyment']") == 1>>
 		<<actCLA 'Didn`t feel much'>>
 			<<setinit $booty_call['virgin_enjoyment_share'] = 1>>
-			<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
+			<<image 'shared/sex/after/pillow_talk#.jpg' 1 2>>
 			"It was... I don't know..." you admit. "I didn''t actually feel much. It hurt when you tore through my hymen, but after that it was just sort of... there... inside me."
 			<p>"It wasn't bad!" you rush to reassure him. "But... it wasn't... what I expected I guess? I don't really know how this is supposed to feel," you mumble sheepishly.</p>
 			<<if $npc($sex.npcId).generous == 1>>
@@ -1265,7 +1265,7 @@ end} -->
 	<<else>>
 		<<actCLA 'It was nice'>>
 			<<setinit $booty_call['virgin_enjoyment_share'] = 2>>
-			<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
+			<<image 'shared/sex/after/pillow_talk#.jpg' 1 2>>
 			"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 $npc($sex.npcId).generous == 1>>
 				<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>
@@ -1282,7 +1282,7 @@ end} -->
 		<</actCLA>>
 		<<actCLA 'It was amazing'>>
 			<<setinit $booty_call['virgin_enjoyment_share'] = 3>>
-			<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
+			<<image 'shared/sex/after/pillow_talk#.jpg' 1 2>>
 			<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 $npc($sex.npcId).generous == 1>>
 				<p>Perhaps spurred by your words, <<npc $sex.npcId>><</npc>> quickly moves in to kiss you.</p>
@@ -1325,7 +1325,7 @@ end} -->
 		<<setinit $booty_call['virgin_enjoyment_share'] = 3>>
 		<<setinit $first_time_nice_lie1[$sex.npcId] = 1>>
 		<!-- !! this variable is so that if you end up dating, you can confess down the line that you lied about your first time feeling good-->
-		<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
+		<<image 'shared/sex/after/pillow_talk#.jpg' 1 2>>
 		<<if getvar("$booty_call['virgin_enjoyment']") == -1>>
 			<p>"It was... nice," you say, giving a forced smile. Actually, it hurt like hell! But you don't want to spoil the mood so you just lie instead. "Felt really good."</p>
 		<<elseif getvar("$booty_call['virgin_enjoyment']") == 1>>
@@ -1359,7 +1359,7 @@ end} -->
 		<<setinit $booty_call['virgin_enjoyment_share'] = 3>>
 		<<setinit $first_time_nice_lie1[$sex.npcId] = 1>>
 		<!-- !! this variable is so that if you end up dating, you can confess down the line that you lied about your first time feeling good-->
-		<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
+		<<image 'shared/sex/after/pillow_talk#.jpg' 1 2>>
 		<<if getvar("$booty_call['virgin_enjoyment']") == -1>>
 			<p>"It was... nice," you say, giving a forced smile, trying to ignore his hand between your legs. Actually, it hurt like hell! But you don't want to spoil the mood so you just lie instead. "Felt really good."</p>
 		<<elseif getvar("$booty_call['virgin_enjoyment']") == 1>>
@@ -1428,7 +1428,7 @@ end} -->
 		<<setinit $booty_call['virgin_enjoyment_share'] = 3>>
 		<!-- !! this variable is so that if you end up dating, you can confess down the line that you lied about your first time feeling good-->
 		<<setinit $first_time_nice_amazing[$sex.npcId] = 1>>
-		<<image `'shared/sex/after/pillow_talk'+rand(1,2)+'.jpg'`>>
+		<<image 'shared/sex/after/pillow_talk#.jpg' 1 2>>
 		<<if getvar("$booty_call['virgin_enjoyment']") == -1>>
 			<p>"It was amazing!" you say, giving a forced grin, trying to ignore the hand between your legs. Actually, it hurt like hell! But you don't want to spoil the mood 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>
 		<<elseif getvar("$booty_call['virgin_enjoyment']") == 1>>

sugarcube/src/activities/dating/dateM.tw

@@ -838,7 +838,7 @@
 								<<arouse 'foreplay' 2 >>
 								<<actCLA 'Decide to stop' undefined `{willpower:['bj','resist']}`>>
 
-										<<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><<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>
@@ -861,7 +861,7 @@
 										<<set $orgasm_or = 'custom'>>
 										<<set $orgasm_txt = 'Even though he's edging $npc($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>>
+										
 										<<cum '' $boydesc>>
 										<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'>>

sugarcube/src/activities/phone/phone.tw

@@ -443,8 +443,8 @@
 	<br>
 	<br>
 	<br>
-	<a href="exec:<<$telefonIncC["Code"]>>"><<image `'images/system/phone/call_accept.png'`>></a>
-	<a href="exec:gt $loc, $loc_arg"><<image `'images/system/phone/decline.png'`>></a><br>
+	<a href="exec:<<$telefonIncC["Code"]>>"><<image 'images/system/phone/call_accept.png'>></a>
+	<a href="exec:gt $loc, $loc_arg"><<image 'images/system/phone/decline.png'>></a><br>
 	<!-- FAILED TO CONVERT
 		<b><font color="red">Your phone is ringing</font></b><br>'
 	-----
@@ -787,7 +787,7 @@
 		<!-- FAILED TO CONVERT
 			<a href="exec:gs ''telefon'', ''Phone_menu'' "><img src="images/system/phone/decline.png"></a><br>'
 		-----
-			<<set ERROR: FAILED TO CONVERT LITERAL: """<a href""" = ERROR: FAILED TO CONVERT LITERAL: """"exec:gs ''telefon''""" , ERROR: FAILED TO CONVERT LITERAL: """''Phone_menu'' "><<image `'images""" / $system / $phone / ERROR: FAILED TO CONVERT LITERAL: """decline.png'`>><""" / ERROR: FAILED TO CONVERT LITERAL: """a><br>'""">>
+			<<set ERROR: FAILED TO CONVERT LITERAL: """<a href""" = ERROR: FAILED TO CONVERT LITERAL: """"exec:gs ''telefon''""" , ERROR: FAILED TO CONVERT LITERAL: """''Phone_menu'' "><<image 'images""" / $system / $phone / ERROR: FAILED TO CONVERT LITERAL: """decline.png'>><""" / ERROR: FAILED TO CONVERT LITERAL: """a><br>'""">>
 
 		-->
 		<<warn "CONVERSION ERROR 2e3b2851f1e236fb53477bb3b00dbc04">>
@@ -802,11 +802,11 @@
 <<if $location_var[$here][0] == 'Phone_call'>>
 	<<setinit $telefon['body'] = >>
 	<font size=6>Calling <<<<=$npc(''A29'').nickname>>>></font><br>
-	<<image `'images/system/phone/icons/icon_npc1.png'`>><br><br>
+	<<image 'images/system/phone/icons/icon_npc1.png'>><br><br>
 	<!-- FAILED TO CONVERT
 		<a href="exec:gs ''telefon'', ''Phone_contactlist'' "><img src="images/system/phone/decline.png"></a><br>'
 	-----
-		<<set ERROR: FAILED TO CONVERT LITERAL: """<a href""" = ERROR: FAILED TO CONVERT LITERAL: """"exec:gs ''telefon''""" , ERROR: FAILED TO CONVERT LITERAL: """''Phone_contactlist'' "><<image `'images""" / $system / $phone / ERROR: FAILED TO CONVERT LITERAL: """decline.png'`>><""" / ERROR: FAILED TO CONVERT LITERAL: """a><br>'""">>
+		<<set ERROR: FAILED TO CONVERT LITERAL: """<a href""" = ERROR: FAILED TO CONVERT LITERAL: """"exec:gs ''telefon''""" , ERROR: FAILED TO CONVERT LITERAL: """''Phone_contactlist'' "><<image 'images""" / $system / $phone / ERROR: FAILED TO CONVERT LITERAL: """decline.png'>><""" / ERROR: FAILED TO CONVERT LITERAL: """a><br>'""">>
 
 	-->
 	<<warn "CONVERSION ERROR f87fdbc8ca2ef0bac2fddbedb86d763f">>
@@ -825,7 +825,7 @@
 	<!-- FAILED TO CONVERT
 		<a href="exec:gs ''telefon'', ''Phone_contactlist'' "><img src="images/system/phone/decline.png"></a><br>'
 	-----
-		<<set ERROR: FAILED TO CONVERT LITERAL: """<a href""" = ERROR: FAILED TO CONVERT LITERAL: """"exec:gs ''telefon''""" , ERROR: FAILED TO CONVERT LITERAL: """''Phone_contactlist'' "><<image `'images""" / $system / $phone / ERROR: FAILED TO CONVERT LITERAL: """decline.png'`>><""" / ERROR: FAILED TO CONVERT LITERAL: """a><br>'""">>
+		<<set ERROR: FAILED TO CONVERT LITERAL: """<a href""" = ERROR: FAILED TO CONVERT LITERAL: """"exec:gs ''telefon''""" , ERROR: FAILED TO CONVERT LITERAL: """''Phone_contactlist'' "><<image 'images""" / $system / $phone / ERROR: FAILED TO CONVERT LITERAL: """decline.png'>><""" / ERROR: FAILED TO CONVERT LITERAL: """a><br>'""">>
 
 	-->
 	<<warn "CONVERSION ERROR f87fdbc8ca2ef0bac2fddbedb86d763f">>
@@ -874,7 +874,7 @@
 	<!-- FAILED TO CONVERT
 		pl'<center><a href="exec:gs ''telefon'', ''Phone_menu'' "><img src="images/system/icons/back.png"></a></center>'
 	-----
-		<<set ERROR: FAILED TO CONVERT LITERAL: """pl'<center><a href""" = ERROR: FAILED TO CONVERT LITERAL: """"exec:gs ''telefon''""" , ERROR: FAILED TO CONVERT LITERAL: """''Phone_menu'' "><<image `'images""" / $system / $icons / ERROR: FAILED TO CONVERT LITERAL: """back.png'`>><""" / ERROR: FAILED TO CONVERT LITERAL: """a><""" / ERROR: FAILED TO CONVERT LITERAL: """center>'""">>
+		<<set ERROR: FAILED TO CONVERT LITERAL: """pl'<center><a href""" = ERROR: FAILED TO CONVERT LITERAL: """"exec:gs ''telefon''""" , ERROR: FAILED TO CONVERT LITERAL: """''Phone_menu'' "><<image 'images""" / $system / $icons / ERROR: FAILED TO CONVERT LITERAL: """back.png'>><""" / ERROR: FAILED TO CONVERT LITERAL: """a><""" / ERROR: FAILED TO CONVERT LITERAL: """center>'""">>
 
 	-->
 	<<warn "CONVERSION ERROR 2755962b3be37ed6004451fa14b040a1">>
@@ -1724,7 +1724,7 @@ $ARGS[2] is for flashing when clothed if left blank then it is not flashing
 	<</if>>
 	<!-- !if spdirtyf > 0: phone_rand = RAND (m,n) - for SELF in the semen-->
 	<!-- !if photo_event_pic = x: phone_rand = RAND (x,y) - for photos during the events (by heart)-->
-	<!-- !msg '<<image `'images/system/phone/phone_selfie<<phone_rand>>.jpg'`>>'-->
+	<!-- !msg '<<image 'images/system/phone/phone_selfie<<phone_rand>>.jpg'>>'-->
 <</if>>
 <!-- !!taking selfies, this chooses a random image for the location for clothed, underwear and nude-->
 <!-- !{
@@ -1910,7 +1910,7 @@ $ARGS[2] is for flashing when clothed if left blank then it is not flashing
 		<!-- !!Setting the image owned flag to 1-->
 		<<setinit $bathroom_showerselfie['+phone_rand+'] = 1>>
 		<<if getvar("$usePopUps") == 1>>
-			<<msg '<<image `'images/pc/activities/phone/selfies/bathroom/shower/<<phone_rand>>.jpg'`>>'>>
+			<<msg '<<image 'images/pc/activities/phone/selfies/bathroom/shower/<<phone_rand>>.jpg'>>'>>
 		<<else>>
 			<!-- FAILED TO CONVERT
 				view 'images/pc/activities/phone/selfies/bathroom/shower/<<phone_rand>>.jpg'
@@ -1929,7 +1929,7 @@ $ARGS[2] is for flashing when clothed if left blank then it is not flashing
 		<<set $phone_rand = rand(1,temp_bathtot)>>
 		<<setinit $bathroom_bathselfie['+phone_rand+'] = 1>>
 		<<if getvar("$usePopUps") == 1>>
-			<<msg '<<image `'images/pc/activities/phone/selfies/bathroom/bath/<<phone_rand>>.jpg'`>>'>>
+			<<msg '<<image 'images/pc/activities/phone/selfies/bathroom/bath/<<phone_rand>>.jpg'>>'>>
 		<<else>>
 			<!-- FAILED TO CONVERT
 				view 'images/pc/activities/phone/selfies/bathroom/bath/<<phone_rand>>.jpg'
@@ -2421,9 +2421,9 @@ $ARGS[2] = Delete id of the message ($SMSSendDeleteId)
 	<b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b><br>
 	<TABLE cellspacing="0" width="80%">
 	<TR>
-	<TD><<image `'images/system/icons/icon_statusbar_left.png'`>></TD>
+	<TD><<image 'images/system/icons/icon_statusbar_left.png'>></TD>
 	<TD><<$telefon[''SMSstatus'']>></TD>
-	<TD align="right"><<image `'images/system/icons/icon_statusbar_right.png'`>></TD>
+	<TD align="right"><<image 'images/system/icons/icon_statusbar_right.png'>></TD>
 	</TR>
 	<!-- FAILED TO CONVERT
 	</TABLE><br>'
@@ -2442,7 +2442,7 @@ $ARGS[2] = Delete id of the message ($SMSSendDeleteId)
 	<!-- FAILED TO CONVERT
 	$result = '	<a href="exec:<<$telefon[''backButton'']>>"><img src="images/system/icons/back.png"></a><br><br>
 -----
-	<<set $result = ERROR: FAILED TO CONVERT LITERAL: """'	<a href="exec:$telefon['backButton']"><<image `'images""" / $system / $icons / ERROR: FAILED TO CONVERT LITERAL: """back.png'`>><""" / ERROR: FAILED TO CONVERT LITERAL: """a><br><br>""">>
+	<<set $result = ERROR: FAILED TO CONVERT LITERAL: """'	<a href="exec:$telefon['backButton']"><<image 'images""" / $system / $icons / ERROR: FAILED TO CONVERT LITERAL: """back.png'>><""" / ERROR: FAILED TO CONVERT LITERAL: """a><br><br>""">>
 
 -->
 <<warn "CONVERSION ERROR 4b68b3151eb9ebe33b90b9c376d5dfa2">>

sugarcube/src/activities/school/chats/gschool_coolkid_chats.tw

@@ -209,7 +209,7 @@
 					While you are sucking his dick, he reaches down and starts stroking his dick himself before pulling it out of your mouth. After a few more strokes, spurts of his cum start landing on your face and running down your neck. Once the last spurt lands on you, he sticks his dick back in your mouth. "Suck me clean, slut." You suck the cum off his dick and the last few drops out of him.
 					<<cum 'face' 'A1'>>
 					<<arouse 'bj' 2 `['sub']`>>
-					<<arousalEnd>>
+					
 					<<if getvar("$dimka_debt") > 0>>
 						He puts his dick away and buttons up his pants. "I want my money by next week," he demands before he walks out, leaving you to get cleaned up on your own.
 						<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
@@ -529,7 +529,7 @@
 							<p>You slowly slide the full length of your dickcm $dick_girth dildo into his ass. Once you are balls deep, you start to slowly thrust the strapon into his ass, steadily picking up speed until you're holding onto his hips and pounding his ass. It doesn't take long until he moans loudly and his whole body starts to shudder. You know he just shot his load without either of you even touching his dick.</p>
 						<</if>>
 						<<arouse 'anal_dildo_give' 5 `['dom','rough']`>>
-						<<arousalEnd>>
+						
 						<<actCLA 'Clean up'>>
 							<<image "characters/shared/headshots_main/big4.jpg">>
 							<<if getvar("$igorqw['schoolstrap']") == 1>>
@@ -801,7 +801,7 @@
 <<case 'Katjaproblems'>>
 	
 	<<setinit $katjaQW['QWstage'] = 1>>
-	<center><table><tr><td><<image `'images/characters/shared/headshots_main/big14.jpg'`>></td><td><<image `'images/characters/shared/headshots_main/big8.jpg'`>></tr></td></table></center>
+	<center><table><tr><td><<image 'images/characters/shared/headshots_main/big14.jpg'>></td><td><<image 'images/characters/shared/headshots_main/big8.jpg'>></tr></td></table></center>
 	You see Katja near the lockers, biting her lips and looking around nervously. Leaning against her is none other than Svyatoslav who, according to rumors, has a crush on her. He seems to be trying to convince Katja to go on a date with him.
 	<p>"Come on Katja, it'll be fun! I'll pay for the popcorn!"</p>
 	She isn''t convinced and plays compulsively with her notebook, obviously trying to look for a way out.
@@ -812,7 +812,7 @@
 	<p>"Okay... Uh... Look Katja, just think about it, okay? Just... give me a chance... Yeah... Ehm... Until later."</p>
 	<p>As Svyatoslav leaves, Katja releases a long-winded sigh.</p>
 	<<actCLA 'Talk with the twins'>>
-		<center><table><td><<image `'images/characters/shared/headshots_main/big14.jpg'`>></td><td><<image `'images/characters/shared/headshots_main/big15.jpg'`>></td></table></center>
+		<center><table><td><<image 'images/characters/shared/headshots_main/big14.jpg'>></td><td><<image 'images/characters/shared/headshots_main/big15.jpg'>></td></table></center>
 		<p>"Thanks Vicky. I don't know how to tell him that I'm not interested." She sighs. "I don't think that will make him relent... Oh $pc.name_nick! You heard us?!"</p>
 		<p>You don't answer, only looking around the crowded corridor and at a smiling Lizaveta, who is furiously recording into her phone. "Thankfully, Vicky came to her sister's rescue!"</p>
 		<p>"Come on Katja! It isn't that bad. You didn't do anything wrong! Relax! If you want to avoid him, beyond paying Vitek to break his legs, you only need to hang around with other people. Tell him that you have a full schedule!"</p>

sugarcube/src/activities/school/chats/gschool_nerd_chats.tw

@@ -405,7 +405,7 @@
 					She starts using her fingers on you as well and is really getting into it as you start to pant and moan. Clamping a hand over your mouth to keep yourself from crying out, it doesn't take her long to bring you to a climax.
 					<<gs 'arousal' 'cuni' -10 'lesbian' 'dom'>>
 					Your whole body shudders as the orgasm rocks your body and you grind your pussy against her face as it does. Once the sensation passes, you look down and see Natasha smiling up at you, obviously pleased with herself. You lean down and give her a long slow passionate kiss, tasting your own pussy juices on her lips. A few seconds later, the bell rings and you both merrily hurry to class.
-					<<arousalEnd>>
+					
 					<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 				<</actCLA>>
 			<</actCLA>>

sugarcube/src/activities/school/deprecated/gschool_lessons2.tw

@@ -1127,7 +1127,7 @@
 							<<image "characters/pavlovsk/school/teacher/arina/sex/dream/dream6.jpg">>
 							<p>She suddenly gets up, turns around and sits on your face. She grinds against your face as you lick her pussy and she starts moaning louder and louder. "Oh god yes, $pc.name_nick yes! Eat my pussy, I love it." She suddenly cums and her juices flow out of her pussy, covering your face and filling your mouth. You drink it down, but it seems to be never ending. Then it just suddenly stops and she climbs off of you.</p>
 							<<arouse 'cuni_give' 3 `['sub']`>>
-							<<arousalEnd>>
+							
 							<<actCLA 'Our secret'>>
 								<<image "characters/pavlovsk/school/teacher/arina/sex/dream/dream6.jpg">>
 								<p>She roughly pulls you up into a half sitting postition as she waggles her finger in your face. "This is our little secret. You can't tell anyone about this, understand?" You nod in understanding and then she gently bops your nose with her finger.</p>

sugarcube/src/activities/school/deprecated/gschool_lessons3.tw

@@ -508,7 +508,7 @@
 											<p>As you kiss you suddenly hear someone shout "Oh my god!" As you stop kissing and turn to look, whoever it was has already rushed back out. You both have a good laugh before you get cleaned up and dressed. As you do, Anushka says "Thanks, I really needed that. I was about to pop in class I was so fucking horny."</p>
 											You giggle. "It was my pleasure, any time." You both laugh as the bell rings and you both hurry back to class.
 											<<arouse 'foreplay' 3 `['lesbian']`>>
-											<<arousalEnd>>
+											
 											<<actCLA 'Leave'>><<gs 'school_schedule'>><</actCLA>>
 											<!-- !!Since this can be triggered in more than one class not sure if I need to do something special with this leave to make sure it goes to the right place in the short break code, to go to next class-->
 											<!-- !! I think this works. We can see if any bugs are reported.-->

sugarcube/src/activities/school/deprecated/gschool_lessons4.tw

@@ -258,7 +258,7 @@
 					<p>If you want to change clothes or do your make-up, you'll need to go home or wait until the bullies have left and you can come back.</p>
 					<<actCLA 'Flee the locker room'>>
 						<<set $time.minutes += 10>>
-						<<arousalEnd>>
+						
 						<<gt 'school_grounds'>>
 					<</actCLA>>
 				<</actCLA>>
@@ -276,7 +276,7 @@
 					<p>If you want to change clothes or do your make-up, you'll need to go home or wait until the bullies have left and you can come back.</p>
 					<<actCLA 'Flee in shame'>>
 						<<set $time.minutes += 10>>
-						<<arousalEnd>>
+						
 						<<gt 'school_grounds'>>
 					<</actCLA>>
 				<</actCLA>>
@@ -288,7 +288,7 @@
 				Albina scoffs in response. "I took pity on her at first and tried helping her out, but she wouldn''t even stop to listen to me. Too eager to run and suck dick like the pathetic slut that she's become. Let the fucking whore get on with it I say."
 				The rest of the girls offer their opinions as you all get dressed and leave, the sounds of the girls having their way with Sonia echoing from the showers.
 				<<actCLA 'Finish dressing'>>
-					<<arousalEnd>>
+					
 					<<gt 'gschool_lessons4' 'post_dress'>>
 				<</actCLA>>
 			<</actCLA>>
@@ -299,7 +299,7 @@
 				<<actCLA 'Stop watching'>>
 					You've seen enough and quietly slip out of the showers into the locker room. You pass by Lariska on your way, who doesn''t seem to know what to do and looks everywhere except for at the action. The girls who walked out have already gone, so you get dressed and leave as the sounds of <<npc 'A18'>><</npc>> loudly orgasming and the other girls laughing and expressing amazement echo into the room.
 					<<actCLA 'Finish dressing'>>
-						<<arousalEnd>>
+						
 						<<gt 'gschool_lessons4' 'post_dress'>>
 					<</actCLA>>
 				<</actCLA>>
@@ -311,7 +311,7 @@
 					When you finish cumming, Sonia buries herself back in your pussy and starts licking you again. The pleasure is too good to stop her and for a few seconds you weakly stand there, having had one of the best orgasms in your life. You then somewhat reluctantly step off of her and let another girl have a go with her. Once the last few girls have had their turn, you all look down on Sonia, who is covered from head to breasts in girl cum, her cheeks bright red from all the slaps she received. She ignores the crude insults being thrown down at her and instead focuses all her attention on vigorously fingering herself. The group insults her even more upon seeing this and a few even spit on her face and in her mouth, but she doesn''t seem to care and makes no effort to resist. You then all leave her sitting there and head to the lockers to get changed, where the girls all continue to laugh at and mock Sonia while showing videos to each other. You finish getting dressed and head out.
 					<<arouse 'cuni' -8 `['lesbian','dom']`>>
 					<<actCLA 'Finish dressing'>>
-						<<arousalEnd>>
+						
 						<<gt 'gschool_lessons4' 'post_dress'>>
 					<</actCLA>>
 				<</actCLA>>
@@ -472,7 +472,7 @@
 						<<image "characters/pavlovsk/school/boy/lazar/sex/school/shower/lazarno.jpg">>
 						<p>"What the fuck are you doing? This is the girls shower, get out!" you yell at him while covering up.</p>
 						He stops stroking his dick and puts his hands up with his dick still hanging out. "Okay, okay, no need to yell. I'll go." He puts his dick away and then very slowly walks out of the room, looking at your naked body the whole time. Once he's gone, you wait for a few minutes before you rush to your locker and quickly dry off and get dressed before he comes back.
-						<<arousalEnd>>
+						
 						<<actCLA 'Finish dressing'>>
 							<<gt 'gschool_lessons4' 'post_dress'>>
 						<</actCLA>>
@@ -503,7 +503,7 @@
 				<<if $will_cost <= $pc.pcs_willpwr>>
 					<<actCLA 'Tell them to get out (will_cost Willpower)'>>
 						<<gs 'willpower' 'pay' 'resist'>>
-						<<arousalEnd>>
+						
 						<<image "locations/pavlovsk/school/gym/sex/vd2.jpg">>
 						<<if $quest('school').func('isGroupMember','gopniks')>>
 							<p>"What the fuck are you doing? This is the girls shower, get out!" you yell at them.</p>
@@ -581,14 +581,14 @@
 						<p>She arches a shapely brow. "No? Then why do you check me out when I'm naked?"</p>
 						You blush slightly. You didn''t think anyone noticed you checking out the other girls.
 						<<arouse 'erotic_nudity' 2>>
-						<<arousalEnd>>
+						
 						<<actCLA 'Deny it'>>
 							<<run $npcs.dec('A23','rel',5)>>
 							<<image "characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg">>
 							"Sorry, I was just admiring what great shape you're in. I didn''t mean anything by it," you say while shaking your head.
 							She just shrugs. "Whatever," she grumbles before she starts getting dressed while ignoring you. You start getting dressed yourself and as soon as she is done, she walks out, leaving you alone in the locker room.
 							<<arouse 'erotic_nudity' 2>>
-							<<arousalEnd>>
+							
 							<<actCLA 'Finish dressing'>>
 								<<gt 'gschool_lessons4' 'post_dress'>>
 							<</actCLA>>
@@ -626,7 +626,7 @@
 								<p>You pull away from her and step back. "What are you doing?"</p>
 								She gives you a confused stare. "I thought... never mind," she says while shaking her head. She starts to get dressed while ignoring you. You start getting dressed yourself and as soon as she is done, she walks out, leaving you alone in the locker room.
 								<<arouse 'erotic_nudity' 2>>
-								<<arousalEnd>>
+								
 								<<actCLA 'Finish dressing'>>
 									<<gt 'gschool_lessons4' 'post_dress'>>
 								<</actCLA>>
@@ -639,14 +639,14 @@
 						<p>She arches a shapely brow. "No? Then why do you check me out when I'm naked?"</p>
 						You blush slightly. You didn''t think anyone noticed you checking out the other girls.
 						<<arouse 'erotic_nudity' 2>>
-						<<arousalEnd>>
+						
 						<<actCLA 'Deny it'>>
 							<<run $npcs.dec('A23','rel',5)>>
 							<<image "characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg">>
 							"Sorry, I was just admiring what great shape you're in. I didn''t mean anything by it," you say while shaking your head.
 							She just shrugs. "Whatever," she grumbles before she starts getting dressed while ignoring you. You start getting dressed yourself and as soon as she is done, she walks out, leaving you alone in the locker room.
 							<<arouse 'erotic_nudity' 2>>
-							<<arousalEnd>>
+							
 							<<actCLA 'Finish dressing'>>
 								<<gt 'gschool_lessons4' 'post_dress'>>
 							<</actCLA>>
@@ -667,7 +667,7 @@
 									<p>You pull away from her and step back. "What are you doing?"</p>
 									She gives you a confused stare. "I thought... never mind," she says, shaking her head. She starts to get dressed while ignoring you. You start getting dressed yourself and as soon as she is done, she walks out, leaving you alone in the locker room.
 									<<arouse 'erotic_nudity' 2>>
-									<<arousalEnd>>
+									
 									<<actCLA 'Finish dressing'>>
 										<<gt 'gschool_lessons4' 'post_dress'>>
 									<</actCLA>>
@@ -737,7 +737,7 @@
 	After watching for a few more seconds, you decide you've looked enough and turn back to your shower to turn the faucet off. Grabbing a towel, you start drying off as you pad your way back to your locker.
 	<<arouse 'erotic_nudity' 3>>
 	<<actCLA 'Go to the locker room'>>
-		<<arousalEnd>> <<gt 'gschool_lessons4' 'dress'>>
+		 <<gt 'gschool_lessons4' 'dress'>>
 	<</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'post_dress'>>
@@ -791,7 +791,7 @@
 			<<set $time.minutes += 1>>
 			<<run $inventory.dec('deo',1)>>
 			<<gs 'sweat' 'deo'>>
-			<<set iif(func('body_din','pregnancyVisibility') = 1, '<<image `'shared/home/bathroom/deodorant_preg.jpg'`>>', '<<image `'shared/home/bathroom/deodorant.jpg'`>>')>>
+			<<set iif(func('body_din','pregnancyVisibility') = 1, '<<image 'shared/home/bathroom/deodorant_preg.jpg'>>', '<<image 'shared/home/bathroom/deodorant.jpg'>>')>>
 			You apply deodorant to your armpits. It will keep you feeling fresh and clean for longer.
 			<<actCLA 'Continue'>>
 				<<set $menu_off = 0>> <<gt $location>>

sugarcube/src/activities/school/gschool_cheerleading.tw

@@ -547,7 +547,7 @@
 							Her legs almost buckle as she rides through her orgasm, but she soon turns around and starts licking up her pussy juice as it runs down your face before finishing with a final kiss.
 							<<arouse 'cuni_give' 10 >>
 							<<arouse 'cuni' -10 >>
-							<<arousalEnd>>
+							
 							<<actCLA 'Continue'>>
 								<<image "pc/activities/facewash.jpg">>
 								<p>"That was just what I needed, $pc.name_nick! You eat pussy like a pro!"</p>
@@ -732,7 +732,7 @@
 								<<arouse 'rimming_give' 5 >>
 								<<set $time.minutes += 5>>
 								<<cum 'mouth' $sex.npcId>>
-								<<arousalEnd>>
+								
 								<<actCLA 'Finish'>>
 									<<image "locations/pavlovsk/school/afterschool/cheerleading/events/sex/threesome4.jpg">>
 									<p>Albina then climbs off of you and fingers her ass, a look of admiration on her face. "Fuck $pc.name_nick, you really cleaned me out. Come here." She pulls you up to her and starts to make out with you, her tongue lapping away at the cum in your mouth. After a few seconds, she breaks the kiss and grimaces as she swallows the cum in her mouth before encouraging you to do the same. You gulp down the sticky fluid and Lazar grins. "You two were amazing! We need to do this again sometime, no?" he asks.</p>
@@ -752,7 +752,7 @@
 								<<arouse 'cuni_give' 5 >>
 								<<set $time.minutes += 5>>
 								<<cum 'mouth' $sex.npcId>>
-								<<arousalEnd>>
+								
 								<<actCLA 'Finish'>>
 									<<image "locations/pavlovsk/school/afterschool/cheerleading/events/sex/threesome4.jpg">>
 									<p>Albina then climbs off of you and fingers her ass. "I think I got it all out. Come here $pc.name_nick." She pulls you up to her and starts to make out with you, her tongue lapping away at the cum in your mouth. After a few seconds, she breaks the kiss and grimaces as she swallows the cum in her mouth before encouraging you to do the same. You gulp down the sticky fluid and Lazar grins. "You two were amazing! We need to do this again sometime, no?" he asks.</p>
@@ -805,7 +805,7 @@
 									<<arouse 'rimming_give' 5 >>
 									<<set $time.minutes += 5>>
 									<<cum 'mouth' $sex.npcId>>
-									<<arousalEnd>>
+									
 									<<actCLA 'Finish'>>
 										<<image "locations/pavlovsk/school/afterschool/cheerleading/events/sex/threesome4.jpg">>
 										<p>Albina then climbs off of you and fingers her ass, a look of admiration on her face. "Fuck $pc.name_nick, you really cleaned me out. Come here." She pulls you up to her and starts to make out with you, her tongue lapping away at the cum in your mouth. After a few seconds, she breaks the kiss and grimaces as she swallows the cum in her mouth before encouraging you to do the same. You gulp down the sticky fluid and Lazar grins. "Until next time girls," he says.</p>
@@ -825,7 +825,7 @@
 									<<arouse 'cuni_give' 5 >>
 									<<set $time.minutes += 5>>
 									<<cum 'mouth' $sex.npcId>>
-									<<arousalEnd>>
+									
 									<<actCLA 'Finish'>>
 										<<image "locations/pavlovsk/school/afterschool/cheerleading/events/sex/threesome4.jpg">>
 										<p>Albina climbs off of you and fingers her ass. "I think I got it all out. Come here $pc.name_nick." She pulls you up to her and starts to make out with you, her tongue lapping away at the cum in your mouth. After a few seconds, she breaks the kiss and grimaces as she swallows the cum in her mouth before encouraging you to do the same. You gulp down the sticky fluid and Lazar grins. "Until next time girls," he says.</p>
@@ -870,7 +870,7 @@
 			<<set $bellawatch = 1>>
 			<<set $pc.mood += 10>>
 			<<arouse 'voyeur_sex' 15 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Leave them to it'>>
 				<<gt 'school_grounds' 'change_room'>>
 			<</actCLA>>
@@ -898,7 +898,7 @@
 				<<set $bellawatch = 2>>
 				<<set $pc.mood += 10>>
 				<<arouse 'voyeur_sex' 15 >>
-				<<arousalEnd>>
+				
 				<<actCLA 'Leave them to it'>>
 					<<gt 'school_grounds' 'change_room'>>
 				<</actCLA>>
@@ -922,7 +922,7 @@
 				<<set $bellawatch = 2>>
 				<<set $pc.mood += 10>>
 				<<arouse 'voyeur_sex' 15 >>
-				<<arousalEnd>>
+				
 				<<actCLA 'Leave'>>
 					<<gt 'school_grounds' 'change_room'>>
 				<</actCLA>>
@@ -967,7 +967,7 @@
 						<p>"Do I even want to know why you're peeping, $pc.name_nick? Forget it. Just don't get the wrong idea, please. This is my friend Yuri, and we..." she says while looking at him with distaste. "<i>...you know</i>, on occasion. Anyway, I'd appreciate it if you didn't tell anyone. God knows what Lizaveta would make of this."</p>
 						You can't fault her for having needs, and you know how mean some girls can be with this sort of thing, especially if it's with an older guy. You agree to keep quiet and head for the door.
 						You're pretty sure they'll just get right back to what they were doing after you leave. You hurry back to the locker room to grab your belongings.
-						<<arousalEnd>>
+						
 						<<actCLA 'Leave them to it'>>
 							<<gt 'school_grounds' 'change_room'>>
 						<</actCLA>>
@@ -980,7 +980,7 @@
 						<<gs 'pain' 5 'cheeks' 'slap'>>
 						<<set $pc.mood -= 20>>
 						<<run $npcs.dec('A22','rel',5)>>
-						<<arousalEnd>>
+						
 						<<actCLA 'Leave them to it'>>
 							<<gt 'school_grounds' 'change_room'>>
 						<</actCLA>>
@@ -991,7 +991,7 @@
 						Bella giggles as his cum squirts over her breasts. When he's done, she takes his cock into her mouth and sucks him off before he pulls her to her feet and drags her off to the showers, where you're certain that round two will happen.
 						You take your chance and leave while you can, feeling very aroused at what you just witnessed as you hurry back to the locker room to grab your belongings.
 						<<set $pc.mood += 10>>
-						<<arousalEnd>>
+						
 						<<actCLA 'Leave them to it'>>
 							<<gt 'school_grounds' 'change_room'>>
 						<</actCLA>>

sugarcube/src/activities/school/gschool_detention.tw

@@ -296,7 +296,7 @@
 	<<image "locations/pavlovsk/school/detention/spreadg.jpg">>
 	<p>You are sitting at a table, bored out of your mind and waiting for detention to end. You start looking around and you notice $rand_girl sitting at a table across from you. After a few minutes she leans back in her chair and relaxes, spreading her legs slightly as she does. The movement draws your eyes and you are given an eye full. She seems to have forgotton her panties today because her pussy is now on full display for anyone to see.</p>
 	<<arouse 'erotic' 5 >>
-	<<arousalEnd>>
+	
 	<<actCLA 'Ignore it'>>
 		<h2>Detention</h2>
 		<<image "locations/pavlovsk/school/detention/spreadg.jpg">>
@@ -329,7 +329,7 @@
 	<<image "locations/pavlovsk/school/detention/upskirt.jpg">>
 	<p>You are sitting at a table, bored out of your mind waiting for detention to end. You start looking around and you notice $rand_girl climbing up the small ladder used to get to the top shelves of books. As you watch her climb, you quickly realize she is not wearing any panties and is giving everyone watching a clear view of her pussy. Before you can say anything someone whistles, which causes the teacher to start asking who did it. During the distraction, she quickly climbs back down and returns to her seat, blushing slightly but also smiling.</p>
 	<<arouse 'voyeur' 5 >>
-	<<arousalEnd>>
+	
 	<<actCLA 'Go home'>>
 		<<gt 'gschool_detention' 'end'>>
 	<</actCLA>>
@@ -347,7 +347,7 @@
 	<<video "locations/pavlovsk/school/detention/detflash1.mp4">>
 	<p>You are sitting at a table, bored out of your mind waiting for detention to end. You start looking around and notice $rand_girl sitting in a spot that blocks almost everybody's view of her. She has her phone held in front of her, obviously having a video conversation with someone. To your surprise, she lifts her shirt and flashes whoever it is on the phone. She laughs at their reaction, which grabs the teacher's attention and he clears his throat. She quickly ends the call and spends the rest of the time playing on her phone. After watching her a bit more, you realize she is not going to do anything more, so you play on your phone as well. At least there was a little excitement today.</p>
 	<<arouse 'voyeur' 5 >>
-	<<arousalEnd>>
+	
 	<<actCLA 'Go home'>>
 		<<gt 'gschool_detention' 'end'>>
 	<</actCLA>>
@@ -365,7 +365,7 @@
 	<<image "locations/pavlovsk/school/detention/tease.jpg">>
 	<p>You are sitting at a table, bored out of your mind waiting for detention to end. You start looking around and notice $rand_girl has snuck off into the book stacks with some boys. She pulls down her pants and starts to pull down her panties, but she stops just before she shows anything and grins as she pulls her clothes back up. After doing this a few times, the boys hopeful that she will show them something, she gets bored teasing them and wanders off. The show over, you start playing on your phone again. At least there was a little excitement today.</p>
 	<<arouse 'voyeur' 5 >>
-	<<arousalEnd>>
+	
 	<<actCLA 'Go home'>>
 		<<gt 'gschool_detention' 'end'>>
 	<</actCLA>>
@@ -392,7 +392,7 @@
 	<p>You are sitting at a table bored out of your mind waiting for detention to end. You start looking around and notice a girl from another grade, but you can't recall her name. She is sitting next to $rand_boy, who has his shorts pulled down, jerking him off under the desk. Both of them do a fairly good job of acting like nothing is going on, but from your seat, you have a perfect view of the action.</p>
 	Some time later, she switches hands, but he finally leans back and closes his eyes. Sensing he is close, she tilts his dick down as she keeps jerking him off and cups her other hand under the head of his dick. Moments later, he is shooting his load into her hand. Once he finishes, she lets go of him and brings her hands up to her face, where she starts to lick all his cum off them as he tucks his dick away. Not long after they sit side by side playing on their phones, pretending nothing happened and you start playing on your phone as well. At least there was a little excitement today.
 	<<arouse 'voyeur_sex' 10 >>
-	<<arousalEnd>>
+	
 	<<actCLA 'Go home'>>
 		<<gt 'gschool_detention' 'end'>>
 	<</actCLA>>
@@ -538,7 +538,7 @@
 						<<set $orgasm_txt = 'You end up clamping a hand over your own mouth to keep from crying out as you feel yourself having an earth-shattering orgasm. You lean back on the desk, shaking uncontrollably and desperately trying to swallow your screams as he keeps licking you through your orgasm.'>>
 						<<set $orgasm_or = 'custom'>>
 						<<arouse 'cuni' 10 `['dom']`>>
-						<<arousalEnd>>
+						
 						The shudders pass eventually and you feel your strength returning, your breathing returning to normal. Even though your climax couldn''t have been more obvious, you pull his head away from your pussy so you can slide off the table.
 						<p>While you grab your panties and put them back on, he stands up and starts to unbutton his pants. Ignoring him completely, you straighten out your clothes and start to walk back to the main area when you hear him behind you: "Hey, what about me?" You stop and lean against a bookshelf. "What about you? I said I wouldn't tell if you eat me, which you did. I never said anything about getting you off." You spin and leave him behind as you giggle. You are pretty sure you hear him muttering something about you being a cruel bitch, but you don't care, especially not after a mind-blowing orgasm like that.</p>
 						You return to your seat and start playing on your phone. About ten minutes later, your ''friend'' joins you as well and sits back down. He seems a bit confused, alternating between giving you annoyed looks and lustful looks, but the huge grin you have on your face stays there for the rest of detention.
@@ -622,7 +622,7 @@
 	<<image "characters/pavlovsk/school/boy/feofan/sex/school/detcum.jpg">>
 	<p>You squat down in front of him again and start jerking him off. All things considered, you are surprised and very pleased with how long he's lasted and you are just about to take Feofan's cock into your mouth again to suck him some more when he groans and shoots his load of sperm across your face. You open wide and some of the follow-up spurts end up in your mouth, but some of the jets still manage to hit your face. You take his dick inside and suck him, swallowing the last few small spurts in your mouth and cleaning him up, relishing the taste of his cum.</p>
 	<<arouse 'hj' 5 `['dom']`>>
-	<<arousalEnd>>
+	
 	<<cum 'mouth' $sex.npcId>>
 	When his erection starts to deflate, you release him and begin cleaning yourself up, as does he. He even helps you wipe the cum off your face, making sure you don't miss a spot. Once you are both dressed and presentable once more, you want to head back, but after taking one or two steps in that direction, he grabs your arm and kisses you on the lips. "Thanks for not telling and well... everything. I won''t tell anyone about this, I promise. You're a cool chick." He gives you a look of longing, lust and admiration, then nods his head and heads back out. You follow him a couple of minutes later, taking your seat opposite him again and waiting for detention to end. If detention is always like this, maybe you need to get in trouble more often.
 	<p>You spend the rest of the time playing on your phone and occasionally giving the boy a conspiratorial grin, which he returns in kind. Once detention ends and you start to head out, Feofan catches up to you. "Hey $pc.name_nick, do you think maybe sometime you might want to go out or maybe you want to come over to my place and we can study together or something?" He asks with a hopeful look on his face. You stop and actually consider it for a moment. "Let me think about it." He looks a little crestfallen but still hopeful, he nods and heads out. "Ok $pc.name_nick talk to you Monday."</p>
@@ -674,7 +674,7 @@
 			As you come up to your building, you stop and turn to him. "We're here. I live on the second floor." You smile at him. "Thank you for walking me home." He returns the smile and when he leans down to kiss you, you feel a warm tingle in your belly.
 			<p>Way too quickly, he breaks the kiss, his eyes locked with yours. "Mind if I call you some time?"</p>
 			<<arouse 'kiss' 2 >>
-			<<arousalEnd>>
+			
 			<p>"Ye- no! I mean, I would like that." you tell him, still a little dazed from the kiss, and give him your number.</p>
 			He grins, both at your reaction and the fact he got your phone number. "Okay, well, I will call you then. Talk to you later." He waits until you go inside before he leaves.
 			<<msg '!!Marcus BF content is WIP. More will added in in future!!'>>
@@ -877,7 +877,7 @@
 				<p>"Jerk me off on your face!". For a moment, you consider ignoring him and his dick hanging over you, but you are almost through this and so decide to tilt your head back and start jerking him off, keeping your eyes closed not only to protect them, but also because of your utter exhaustion. Not long after, you feel a hot spurt of sperm land on your face, quickly followed by several more until he has covered most of your face with his cum. Once finished, he moves over, grabs some tissues off the table and cleans up his dick.</p>
 				As he does, he says: "Now you know your place, whore. I will have you properly trained before long." Then he breaks into a cruel smile. "We will be seeing a lot more of each other in the future. Now get your ass back to detention, where whores like you belong."
 				<<arouse 'hj' 5 >>
-				<<arousalEnd>>
+				
 				<<cum 'mouth' $sex.npcId>>
 				<<actCLA 'Back to detention'>>
 					<h2>Detention</h2>
@@ -927,7 +927,7 @@
 		Bored out of your mind and feeling a little sexually frustrated, you remove enough of your clothes to expose your pussy. Then, sitting down with your back to a shelf and your legs spreading wide, you start to masturbate.You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes, but no one wanders by and finally you orgasm hard. It rocks your whole body, leaving you shaking in its aftermath. After a few minutes, you recover and get dressed again, peeking around the corner to make sure no one is near and heard you. Once it is clear, you decide to head back to the tables at the front and wait out the rest of detention there.
 		<<set $orgasm_or = 'yes'>>
 		<<arouse 'masturbate' 15 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Go home'>>
 			<<gt 'gschool_detention' 'end'>>
 		<</actCLA>>
@@ -951,7 +951,7 @@
 			<p>After they leave, you are unable to take it anymore - you remove enough of your clothes to expose your pussy and sit down with your back to a shelf. Your legs spread wide, you start to masturbate. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes, but no one wanders by and finally you orgasm hard. It rocks your whole body, leaving you shaking in its aftermath. After a few minutes, you recover and get dressed again. You decide to head back to the tables at the front and wait out the rest of detention there.</p>
 			<<set $orgasm_or = 'yes'>>
 			<<arouse 'masturbate' 15 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Go home'>>
 				<<gt 'gschool_detention' 'end'>>
 			<</actCLA>>
@@ -963,7 +963,7 @@
 		Unable to take it anymore, you remove enough of your clothes to expose your pussy. Then, sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You can just barely hear the two of them which only enhances your own arousal. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes, but no one wanders by and finally you orgasm hard. It rocks your whole body, leaving you shaking in its aftermath. After a few minutes, you recover and get dressed again, peeking around the corner to see that the couple are gone. You decide to head back to the tables at the front and wait out the rest of detention there.
 		<<set $orgasm_or = 'yes'>>
 		<<arouse 'masturbate' 15 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Go home'>>
 			<<gt 'gschool_detention' 'end'>>
 		<</actCLA>>
@@ -987,7 +987,7 @@
 			After they leave, you are unable to take it anymore. You remove enough of your clothes to expose your pussy and sit down with your back to a shelf. Your legs spread wide, you start to masturbate. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes, but no one wanders by and finally you orgasm hard. It rocks your whole body, leaving you shaking in its aftermath. After a few minutes, you recover and get dressed again. You decide to head back to the tables at the front and wait out the rest of detention there.
 			<<set $orgasm_or = 'yes'>>
 			<<arouse 'masturbate' 15 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Go home'>>
 				<<gt 'gschool_detention' 'end'>>
 			<</actCLA>>
@@ -999,7 +999,7 @@
 		Unable to take it anymore, you remove enough of your clothes to expose your pussy. Then, sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You can just barely hear the two of them, which only enhances your own arousal. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes, but no one wanders by and finally you orgasm hard. It rocks your whole body, leaving you shaking in its aftermath. After a few minutes, you recover and get dressed again, peeking around the corner to see that the couple is gone. You decide to head back to the tables at the front and wait out the rest of detention there.
 		<<set $orgasm_or = 'yes'>>
 		<<arouse 'masturbate' 15 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Go home'>>
 			<<gt 'gschool_detention' 'end'>>
 		<</actCLA>>
@@ -1023,7 +1023,7 @@
 			<p>After they leave, you are unable to take it anymore - you remove enough of your clothes to expose your pussy. Then, sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes, but no one wanders by and finally you orgasm hard. It rocks your whole body, leaving you shaking in its aftermath. After a few minutes, you recover and get dressed again. You decide to head back to the tables at the front and wait out the rest of detention there.</p>
 			<<set $orgasm_or = 'yes'>>
 			<<arouse 'masturbate' 15 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Go home'>>
 				<<gt 'gschool_detention' 'end'>>
 			<</actCLA>>
@@ -1035,7 +1035,7 @@
 		Unable to take it anymore, you remove enough of your clothes to expose your pussy. Then, sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You can just barely hear the two of them, which only enhances your own arousal. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes, but no one wanders by and finally you orgasm hard. It rocks your whole body, leaving you shaking in its aftermath. After a few minutes, you recover and get dressed again, peeking around the corner to see that the couple is gone. You decide to head back to the tables at the front and wait out the rest of detention there.
 		<<set $orgasm_or = 'yes'>>
 		<<arouse 'masturbate' 15 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Go home'>>
 			<<gt 'gschool_detention' 'end'>>
 		<</actCLA>>
@@ -1059,7 +1059,7 @@
 			<p>After they leave, you are unable to take it anymore - you remove enough of your clothes to expose your pussy. Then, sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes, but no one wanders by and finally you orgasm hard. It rocks your whole body, leaving you shaking in its aftermath. After a few minutes, you recover and get dressed again. You decide to head back to the tables at the front and wait out the rest of detention there.</p>
 			<<set $orgasm_or = 'yes'>>
 			<<arouse 'masturbate' 15 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Go home'>>
 				<<gt 'gschool_detention' 'end'>>
 			<</actCLA>>
@@ -1071,7 +1071,7 @@
 		Unable to take it anymore, you remove enough of your clothes to expose your pussy. Then, sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You can just barely hear the two of them, which only enhances your own arousal. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes, but no one wanders by and finally you orgasm hard. It rocks your whole body, leaving you shaking in its aftermath. After a few minutes, you recover and get dressed again, peeking around the corner to see that the couple is gone. You decide to head back to the tables at the front and wait out the rest of detention there.
 		<<set $orgasm_or = 'yes'>>
 		<<arouse 'masturbate' 15 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Go home'>>
 			<<gt 'gschool_detention' 'end'>>
 		<</actCLA>>
@@ -1095,7 +1095,7 @@
 			<p>After they leave, you are unable to take it anymore - you remove enough of your clothes to expose your pussy. Then, sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes, but no one wanders by and finally you orgasm hard. It rocks your whole body, leaving you shaking in its aftermath. After a few minutes, you recover and get dressed again. You decide to head back to the tables at the front and wait out the rest of detention there.</p>
 			<<set $orgasm_or = 'yes'>>
 			<<arouse 'masturbate' 15 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Go home'>>
 				<<gt 'gschool_detention' 'end'>>
 			<</actCLA>>
@@ -1107,7 +1107,7 @@
 		Unable to take it anymore, you remove enough of your clothes to expose your pussy. Then, sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You can just barely hear the two of them, which only enhances your own arousal. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes, but no one wanders by and finally you orgasm hard. It rocks your whole body, leaving you shaking in its aftermath. After a few minutes, you recover and get dressed again, peeking around the corner to see that the couple is gone. You decide to head back to the tables at the front and wait out the rest of detention there.
 		<<set $orgasm_or = 'yes'>>
 		<<arouse 'masturbate' 15 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Go home'>>
 			<<gt 'gschool_detention' 'end'>>
 		<</actCLA>>
@@ -1131,7 +1131,7 @@
 			<p>After they leave, you are unable to take it anymore - you remove enough of your clothes to expose your pussy. Then, sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes, but no one wanders by and finally you orgasm hard. It rocks your whole body, leaving you shaking in its aftermath. After a few minutes, you recover and get dressed again. You decide to head back to the tables at the front and wait out the rest of detention there.</p>
 			<<set $orgasm_or = 'yes'>>
 			<<arouse 'masturbate' 15 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Go home'>>
 				<<gt 'gschool_detention' 'end'>>
 			<</actCLA>>
@@ -1143,7 +1143,7 @@
 		Unable to take it anymore, you remove enough of your clothes to expose your pussy. Then, sitting down with your back to a shelf and your legs spreading wide, you start to masturbate. You can just barely hear the two of them, which only enhances your own arousal. You end up having to use your own panties as something to bite down on to keep from crying out. You are not sure how long it takes, but no one wanders by and finally you orgasm hard. It rocks your whole body, leaving you shaking in its aftermath. After a few minutes, you recover and get dressed again, peeking around the corner to see that the couple is gone. You decide to head back to the tables at the front and wait out the rest of detention there.
 		<<set $orgasm_or = 'yes'>>
 		<<arouse 'masturbate' 15 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Go home'>>
 			<<gt 'gschool_detention' 'end'>>
 		<</actCLA>>

sugarcube/src/activities/school/gschool_events.tw

@@ -233,7 +233,7 @@
 		<<image "locations/pavlovsk/school/events/irina_stumble.jpg">>
 		As you walk through the hallway and head up the stairs, you see Irina in front of you talking to Lazar and flirting with him. She misses one of the steps and suddenly stumbles forward, nearly falling, but manages to catch herself with her hands. Unfortunately for her, she drops her books which go tumbling down the stairs and even worse everyone behind and below her can see her panty clad ass under her skirt. Several boys and even a few girls whistle or make rude remarks as she quickly stands up and blushes. Lazar helps her gather up her books as you walk past the two of them.
 		<<arouse 'erotic_nudity' 2 >>
-		<<arousalEnd>>
+		
 		<<gs 'gschool_events' 'leave_break_events'>>
 	<<elseif getvar("$break_rand") <= 5 and $pc.fame('pav_slut') > 200 and !$quest('school').func('isGroupMember','gopniks')>>
 		<<image "characters/shared/headshots_main/big9.jpg">>
@@ -273,7 +273,7 @@
 					<</if>>
 					<<cum 'mouth_swallow' 'A9' 1>>
 					<<arouse 'bj' 10 >>
-					<<arousalEnd>>
+					
 					<<image "shared/sex/blowjob/toiletbj.jpg">>
 					<p>You obediently kneel before him, rubbing your hand over the bulge in Vitek's sweatpants before pulling out his dick. Clasping your $pc_desc['lips'] lips around the head, you run your tongue around the head a few times before sucking it in a bit deeper. You don't want him to get angry at you, so you put some effort into it, sometimes licking his balls and taking his cock down your throat without really straining yourself. He mistakes your obedience for enthusiasm though and, laughing, turns to his friends and says "Guys just look at this whore going at it, she's loving it!"</p>
 					<p>A few minutes later, Vitek is about to cum and tells you "Good job, cocksucker. I'm going to drop my load in your mouth now and when I do, you 're going to swallow it all and lick me clean. If you spill anything, you're licking it up from the floor. Got that?" You nod up at him and as soon as his cum hits your tongue, you diligently swallow his load, making sure not to let a single drop escape. When you're sure he's finished, you lick and suck his slowly softening dick clean, before tucking it back into his pants for him.</p>
@@ -323,7 +323,7 @@
 		<<actCLA 'Go and look inside the men`s room'>>
 			<<arouse 'voyeur_sex' 10 >>
 >>>>>>> Edited-QSP9
-			<<arousalEnd>>
+			
 			<<gs 'gschool_events' 'leave_break_events'>>
 		<<or ($pc.fame('pav_slut') > 200 && !$quest('school').func('isGroupMember','gopniks')) ? 3 : 0>>
 			<<image "characters/shared/headshots_main/big9.jpg">>
@@ -671,7 +671,7 @@
 		<<image "locations/pavlovsk/school/lunch/irinaphone.jpg">>
 		<p>You notice Irina sitting by herself with her phone out. She seems to be completely engrossed in her phone; she has one of her knees up and legs slightly spread. This position causes her skirt to ride way up and provide a perfect panty shot up her uniform. You briefly wonder if she is aware, and figure she most likely is since she knows how to work the boys. With a quick glance, you notice a lot of the guys staring at her. Yep, she is most definitely aware.</p>
 		<<arouse 'erotic' 5 >>
-		<<arousalEnd>>
+		
 	<<elseif getvar("$break_rand") == 16 and $pc.hotcat > 5>>
 		<<image "locations/pavlovsk/school/lunch/hallflirt.jpg">>
 		You stop at your locker. As you close the locker door and turn around, you nearly run into a boy leaning against the lockers next to you. When you stop, he leans in very close to you, smiling. He starts complimenting you and is quickly flirting for all he is worth.
@@ -729,7 +729,7 @@
 						<</if>>
 						<<cum 'mouth_swallow' 'A9' 1>>
 						<<arouse 'bj' 10>>
-						<<arousalEnd>>
+						
 						<<image "shared/sex/blowjob/toiletbj.jpg">>
 						<p>You obediently kneel before him, rubbing your hand over the bulge in Vitek's sweatpants before pulling out his dick. Clasping your $pc_desc['lips'] lips around the head, you run your tongue around the head a few times before sucking it in a bit deeper. You don't want him to get angry at you, so you put some effort into it, sometimes licking his balls and taking his cock down your throat without really straining yourself. He mistakes your obedience for enthusiasm though and, laughing, turns to his friends and says "Guys just look at this whore going at it, she's loving it!"</p>
 						<p>A few minutes later, Vitek is about to cum and tells you "Good job, cocksucker. I'm going to drop my load in your mouth now and when I do, you 're going to swallow it all and lick me clean. If you spill anything, you're licking it up from the floor. Got that?" You nod up at him and as soon as his cum hits your tongue, you diligently swallow his load, making sure not to let a single drop escape. When you're sure he's finished, you lick and suck his slowly softening dick clean, before tucking it back into his pants for him.</p>
@@ -779,7 +779,7 @@
 			They let you go and head for the restroom, laughing loudly. Some of them are already undoing their pants.
 			<<actCLA 'Go and look inside the men`s room'>>
 				<<arouse 'voyeur_sex' 10>>
-				<<arousalEnd>>
+				
 				<<image "characters/pavlovsk/school/girl/sonia/sex/school/toilet.jpg">>
 				You walk to the restroom and carefully look inside, making sure not to draw any attention to yourself. You see Sonia resting on her knees, a cock deep down her throat. She must''ve had a lot of practice, because it looks like she has no gag reflex whatsoever. Just around the corner are two more gopniks stroking their dicks, getting them nice and hard for when it's their turn. You watch Sonia''s head bob up and down the cock for a few minutes before you decide to leave while you still can.
 				<<gs 'gschool_events' 'leave_break_events'>>
@@ -1141,7 +1141,7 @@
 			<<image "locations/pavlovsk/school/lunch/irinaphone.jpg">>
 			<p>You notice Irina sitting by herself with her phone out. She seems to be completely engrossed in her phone; she has one of her knees up and legs slightly spread. This position causes her skirt to ride way up and provide a perfect panty shot up her uniform. You briefly wonder if she is aware, and figure she most likely is since she knows how to work the boys. With a quick glance, you notice a lot of the guys staring at her. Yep, she is most definitely aware.</p>
 			<<arouse 'erotic' 5>>
-			<<arousalEnd>>
+			
 		<<or $pc.hotcat > 5 ? 1 : 0>>
 			<<image "locations/pavlovsk/school/lunch/hallflirt.jpg">>
 			You stop at your locker. As you close the locker door and turn around, you nearly run into a boy leaning against the lockers next to you. When you stop, he leans in very close to you, smiling. He starts complimenting you and is quickly flirting for all he is worth.
@@ -1219,27 +1219,27 @@
 			<<image "locations/pavlovsk/school/events/bendover.jpg">>
 			As you walk down the hallway, you see Veronika writing something in her notebook as she walks. Not looking where she's going, she bumps into one of the other students and ends up dropping her pencil. Without thinking, she bends over and picks it up, giving everyone in the hallway a nice view of her panty clad ass, which elicits hoots, hollers and whistles from the other students, especially the boys. She quickly stands up, blushing a bit as she smooths her skirt back in place. She gives some of the more vocal boys a dirty look as she hurries on her way.
 			<<arouse 'erotic' 1>>
-			<<arousalEnd>>
+			
 		<<or>>
 			<<image "locations/pavlovsk/school/events/girldryhump.jpg">>
 			As you walk down the hallway, you see a commotion ahead. Several students are clustered together looking at something. As you get closer, you see Anushka bent over with Alyona standing behind her, pulling her hair as she pretends to fuck her from behind, much to the delight of the boys watching. Suddenly, a teacher starts loudly asking what''s going on and everyone quickly disperses.
 			<<arouse 'erotic' 5>>
-			<<arousalEnd>>
+			
 		<<or>>
 			<<image "locations/pavlovsk/school/events/girlsbj.jpg">>
 			As you walk down the hallway, you see two girls from your brother's class. One of them bends over and starts pretending to suck the other girl's imaginary dick. The first girl just stands there proudly for a moment, then grabs the second girl's head to force her to deepthroat the imaginary dick. As the boys hoot and holler, they carry on for a few moments until a teacher starts coming down the hallway, obviously attracted by all the noise the boys are making.
 			<<arouse 'erotic' 5>>
-			<<arousalEnd>>
+			
 		<<or>>
 			<<image "locations/pavlovsk/school/events/girlskiss.jpg">>
 			As you stop at your locker, you see a few of the cool kids hanging out. Andrey starts trying to get his girlfriend Stasya and Lizaveta to kiss, with several other boys and some of the girls joining in with the encouragement. Lizaveta is shaking her head while Stasya looks over at Andrey, who nods and winks to her. Stasya rolls her eyes but then grabs Lizaveta, says something to her then starts to kiss her. Lizaveta resists for a moment but as the kids all keep up the encouragement, she gives in and returns the kiss. They quickly break the kiss and Andrey hugs and kisses Stasya, while Lizaveta blushes a bit at the attention. Before long, a teacher hollers down the hallway asking what''s going on, which causes everyone to break up.
 			<<arouse 'erotic' 2>>
-			<<arousalEnd>>
+			
 		<<or>>
 			<<image "locations/pavlovsk/school/events/girlsskirtup.jpg">>
 			As you stop at your locker, a group of girls are teasing some of the boys about how they aren''t wearing panties under their skirt. The boys ask, beg, plead, demand the girls prove it. Finally, several of them lift up their skirts to show off some boy shorts, which annoys the boys to no end and makes the girls laugh at them. Well they weren''t lying, they were wearing boy shorts instead of panties.
 			<<arouse 'erotic' 1>>
-			<<arousalEnd>>
+			
 		<<or>>
 			<<image "locations/pavlovsk/school/events/handstand.jpg">>
 			<<if $quest('christina').fight == 1 or $quest('christina').blackmail == 2>>
@@ -1248,18 +1248,18 @@
 				As you stop at your locker, you overhear <<npc 'A18'>><</npc>> berating Lariska and Lina for yesterday''s practice. Something about how worthless they are and how it will make them lose their first game if they play that badly. They try to appologise and promise to do better but <<npc 'A18'>><</npc>> is having none of it. She tells the girls to do hand stands in the hallway until the next class. When Lariska points out their skirts will fall up and everyone will see, <<npc 'A18'>><</npc>> tells them they should have thought of that and played better.
 				After a few minutes, when it is obvious <<npc 'A18'>><</npc>> isn''t going to relent, both Lariska and Lina do as they are commanded and, with predictable results, their skirts fall down around their stomachs, showing off their panties. They blush as the boys and some of the girls whistle and comment about their choice in panties, but do as <<npc 'A18'>><</npc>> demands. <<npc 'A18'>><</npc>> stands there smugly, obviously enjoying bullying the other girls.
 				<<arouse 'erotic' 1>>
-				<<arousalEnd>>
+				
 			<</if>>
 		<<or>>
 			<<image "locations/pavlovsk/school/events/hellokitty.jpg">>
 			As you walk down the hallway, you overhear a girl asking one of the boys if he would like to see her kitty. He does a double take and grins while nodding to her. She smiles and pulls up her skirt to show off a pair of boyshorts with Hello Kitty on them. The boy looks disappointed while the girl laughs.
 			<<arouse 'erotic' 1>>
-			<<arousalEnd>>
+			
 		<<or>>
 			<<image "locations/pavlovsk/school/events/legsup.jpg">>
 			As you stop at your locker, a girl starts taking pictures of her two friends, who start posing at once in funny, seductive or teasing stances. They seem to be really enjoying playing around.
 			<<arouse 'erotic' 2>>
-			<<arousalEnd>>
+			
 		<<or>>
 			<<image "locations/pavlovsk/school/events/makeupgirl.jpg">>
 			As you walk down the hallway, you see Bella sitting on one of the window ledges, ignoring her classmates as she touches up her makeup with her compact. You admit she is pretty and always looks nice, but she is such a snob, acting like she is better than everyone else.
@@ -1305,45 +1305,45 @@
 			<<image "locations/pavlovsk/school/events/nopanties.jpg">>
 			As you pass the stairwell, you see a cluster of boys, including your brother, around a girl. You stop for a moment to see what they are doing. The boys quickly give the girl some money and then she lifts up her skirt, showing them her lack of panties and her pussy. She quickly pulls it back down, only giving them the briefest of looks. You wonder if you should say something when a teacher starts coming down the stairs and they all scatter.
 			<<arouse 'erotic_nudity' 5>>
-			<<arousalEnd>>
+			
 		<<or>>
 			<<image "locations/pavlovsk/school/events/shhh.jpg">>
 			You notice Lena and Lera sitting on the floor near the end of the hallway. Lera leans over to say something and Lena grabs her by the hair and forces her face down to her crotch. As you watch, Lena makes a "shhh" motion at you. You can't tell if Lera is really going down on Lena or if they are just messing around. After a moment you move on.
 			<<arouse 'voyeur' 2>>
-			<<arousalEnd>>
+			
 		<<or>>
 			<<if $NatbelQW['panty_stuff_day'] == $time.daystart>>
 				<<image "locations/pavlovsk/school/events/buttgrab_nopanties.jpg">>
 				As you pass by some of the nerds talking, Dan walks by them as well. He reaches out and grabs the back of Natasha''s skirt and pulls it up, showing off her naked ass to everyone. She fights to pull her skirt out of his hand to no avail. Feofan tells him to let go and gets shoved into a locker for his trouble, but it does make Dan let go of Natasha''s skirt. Before you can say anything, a teacher looks out from one of the classrooms and asks what''s going on. Everyone says nothing and they go about their way, but the look Dan gives Feofan promises it might not be over.
 				<<arouse 'erotic_nudity' 1>>
-				<<arousalEnd>>
+				
 			<<else>>
 				<<image "locations/pavlovsk/school/events/skirt_pulled_up.jpg">>
 				As you pass by some of the nerds talking, Dan walks by them as well. He reaches out and grabs the back of Natasha''s skirt and pulls it up, showing off her panty clad ass to everyone. She fights to pull her skirt out of his hand to no avail. Feofan tells him to let go and gets shoved into a locker for his trouble, but it does make Dan let go of Natasha''s skirt. Before you can say anything, a teacher looks out from one of the classrooms and asks what''s going on. Everyone says nothing and they go about their way, but the look Dan gives Feofan promises it might not be over.
 				<<arouse 'erotic' 1>>
-				<<arousalEnd>>
+				
 			<</if>>
 		<<or>>
 			<<image "locations/pavlovsk/school/events/skirtupback.jpg">>
 			<<if $quest('christina').blackmail >= 1>>
 				You see <<npc 'A18'>><</npc>> walk past Mr. Nikolaevich and as she does, she briefly flips up the back of her skirt to show off her panty clad ass. Mr. Nikolaevich gives her a stern look but otherwise doesn''t say anything. You roll your eyes and wonder how you were the first person that figured out she was fucking him. Or maybe you aren''t, who knows.
 				<<arouse 'erotic' 1>>
-				<<arousalEnd>>
+				
 			<<else>>
 				You see <<npc 'A18'>><</npc>> walk past Mr. Nikolaevich and as she does, she briefly flips up the back of her skirt to show off her panty clad ass. Mr. Nikolaevich gives her a stern look but otherwise doesn''t say anything. It does make you wonder what kind of relationship they have with each other.
 				<<arouse 'erotic' 1>>
-				<<arousalEnd>>
+				
 			<</if>>
 		<<or>>
 			<<image "locations/pavlovsk/school/events/teaseteacher.jpg">>
 			You notice Pauline, Lena, Lera and Ekaterina sitting by one of the windows, talking and occasinally hassling the other students. When Mr. Yenotin comes over to ask them what they are doing, Lena, Lera and Pauline occasionally open their legs wide to show off their panties while faking innocence. When Mr. Yenotin demands they stop, they act shocked like they don't know what he's talking about before turning it around on him, asking him if he's trying to look up their skirts. Flustered and not making progress, he tells them to behave and hurries away while the girls all burst out laughing.
 			<<arouse 'erotic' 1 `['unknown']`>>
-			<<arousalEnd>>
+			
 		<<or>>
 			<<image "locations/pavlovsk/school/events/tieshoe.jpg">>
 			As you walk down the hallway, you see Irina has stopped. She lifts her foot up to place it on the window ledge as she bends over to tie her shoe. Her skirt rides way up showing off her ass. It is only for a moment, but you're almost certain she wasn''t wearing panties. You briefly wonder if she was even aware of how much the others could see.
 			<<arouse 'erotic_nudity' 1>>
-			<<arousalEnd>>
+			
 		<<or>>
 			<<image "locations/pavlovsk/school/events/walkaround.jpg">>
 			As you walk down the hallway, you see Pauline, Lena and Lera practically laying in the middle of the hallway. This forces the other students to carefully walk around them and they berate those who step too close to them. You are sure they are enjoying making the other students lives harder by just being in their way.
@@ -1371,27 +1371,27 @@
 		<<image "locations/pavlovsk/school/events/bendover.jpg">>
 		As you walk down the hallway, you see Veronika writing something in her notebook as she walks. Not looking where she's going, she bumps into one of the other students and ends up dropping her pencil. Without thinking, she bends over and picks it up, giving everyone in the hallway a nice view of her panty clad ass, which elicits hoots, hollers and whistles from the other students, especially the boys. She quickly stands up, blushing a bit as she smooths her skirt back in place. She gives some of the more vocal boys a dirty look as she hurries on her way.
 		<<arouse 'erotic' 1 >>
-		<<arousalEnd>>
+		
 	<<elseif getvar("$break_rand") == 18>>
 		<<image "locations/pavlovsk/school/events/girldryhump.jpg">>
 		As you walk down the hallway, you see a commotion ahead. Several students are clustered together looking at something. As you get closer, you see Anushka bent over with Alyona standing behind her, pulling her hair as she pretends to fuck her from behind, much to the delight of the boys watching. Suddenly, a teacher starts loudly asking what''s going on and everyone quickly disperses.
 		<<arouse 'erotic' 5 >>
-		<<arousalEnd>>
+		
 	<<elseif getvar("$break_rand") == 19>>
 		<<image "locations/pavlovsk/school/events/girlsbj.jpg">>
 		As you walk down the hallway, you see two girls from your brother''s class. One of them bends over and starts pretending to suck the other girl''s imaginary dick. The first girl just stands there proudly for a moment, then grabs the second girl''s head to force her to deepthroat the imaginary dick. As the boys hoot and holler, they carry on for a few moments until a teacher starts coming down the hallway, obviously attracted by all the noise the boys are making.
 		<<arouse 'erotic' 5 >>
-		<<arousalEnd>>
+		
 	<<elseif getvar("$break_rand") == 20>>
 		<<image "locations/pavlovsk/school/events/girlskiss.jpg">>
 		As you stop at your locker, you see a few of the cool kids hanging out. Andrey starts trying to get his girlfriend Stasya and Lizaveta to kiss, with several other boys and some of the girls joining in with the encouragement. Lizaveta is shaking her head while Stasya looks over at Andrey, who nods and winks to her. Stasya rolls her eyes but then grabs Lizaveta, says something to her then starts to kiss her. Lizaveta resists for a moment but as the kids all keep up the encouragement, she gives in and returns the kiss. They quickly break the kiss and Andrey hugs and kisses Stasya, while Lizaveta blushes a bit at the attention. Before long, a teacher hollers down the hallway asking what''s going on, which causes everyone to break up.
 		<<arouse 'erotic' 2 >>
-		<<arousalEnd>>
+		
 	<<elseif getvar("$break_rand") == 21>>
 		<<image "locations/pavlovsk/school/events/girlsskirtup.jpg">>
 		As you stop at your locker, a group of girls are teasing some of the boys about how they aren''t wearing panties under their skirt. The boys ask, beg, plead, demand the girls prove it. Finally, several of them lift up their skirts to show off some boy shorts, which annoys the boys to no end and makes the girls laugh at them. Well they weren''t lying, they were wearing boy shorts instead of panties.
 		<<arouse 'erotic' 1 >>
-		<<arousalEnd>>
+		
 	<<elseif getvar("$break_rand") == 22>>
 		<<image "locations/pavlovsk/school/events/handstand.jpg">>
 		<<if $quest('christina').fight == 1 or $quest('christina').blackmail == 2>>
@@ -1400,18 +1400,18 @@
 			As you stop at your locker, you overhear Christina berating Lariska and Lina for yesterday''s practice. Something about how worthless they are and how it will make them lose their first game if they play that badly. They try to appologise and promise to do better but Christina is having none of it. She tells the girls to do hand stands in the hallway until the next class. When Lariska points out their skirts will fall up and everyone will see, Christina tells them they should have thought of that and played better.
 			After a few minutes, when it is obvious Christina isn''t going to relent, both Lariska and Lina do as they are commanded and, with predictable results, their skirts fall down around their stomachs, showing off their panties. They blush as the boys and some of the girls whistle and comment about their choice in panties, but do as Christina demands. Christina stands there smugly, obviously enjoying bullying the other girls.
 			<<arouse 'erotic' 1 >>
-			<<arousalEnd>>
+			
 		<</if>>
 	<<elseif getvar("$break_rand") == 23>>
 		<<image "locations/pavlovsk/school/events/hellokitty.jpg">>
 		As you walk down the hallway, you overhear a girl asking one of the boys if he would like to see her kitty. He does a double take and grins while nodding to her. She smiles and pulls up her skirt to show off a pair of boyshorts with Hello Kitty on them. The boy looks disappointed while the girl laughs.
 		<<arouse 'erotic' 1 >>
-		<<arousalEnd>>
+		
 	<<elseif getvar("$break_rand") == 24>>
 		<<image "locations/pavlovsk/school/events/legsup.jpg">>
 		As you stop at your locker, a girl starts taking pictures of her two friends, who start posing at once in funny, seductive or teasing stances. They seem to be really enjoying playing around.
 		<<arouse 'erotic' 2 >>
-		<<arousalEnd>>
+		
 	<<elseif getvar("$break_rand") == 25>>
 		<<image "locations/pavlovsk/school/events/makeupgirl.jpg">>
 		As you walk down the hallway, you see Bella sitting on one of the window ledges, ignoring her classmates as she touches up her makeup with her compact. You admit she is pretty and always looks nice, but she is such a snob, acting like she is better than everyone else.
@@ -1457,45 +1457,45 @@
 		<<image "locations/pavlovsk/school/events/nopanties.jpg">>
 		As you pass the stairwell, you see a cluster of boys, including your brother, around a girl. You stop for a moment to see what they are doing. The boys quickly give the girl some money and then she lifts up her skirt, showing them her lack of panties and her pussy. She quickly pulls it back down, only giving them the briefest of looks. You wonder if you should say something when a teacher starts coming down the stairs and they all scatter.
 		<<arouse 'erotic_nudity' 5 >>
-		<<arousalEnd>>
+		
 	<<elseif getvar("$break_rand") == 28>>
 		<<image "locations/pavlovsk/school/events/shhh.jpg">>
 		You notice Lena and Lera sitting on the floor near the end of the hallway. Lera leans over to say something and Lena grabs her by the hair and forces her face down to her crotch. As you watch, Lena makes a "shhh" motion at you. You can't tell if Lera is really going down on Lena or if they are just messing around. After a moment you move on.
 		<<arouse 'voyeur' 2 >>
-		<<arousalEnd>>
+		
 	<<elseif getvar("$break_rand") == 29>>
 		<<if $NatbelQW['panty_stuff_day'] == $time.daystart>>
 			<<image "locations/pavlovsk/school/events/buttgrab_nopanties.jpg">>
 			As you pass by some of the nerds talking, Dan walks by them as well. He reaches out and grabs the back of Natasha''s skirt and pulls it up, showing off her naked ass to everyone. She fights to pull her skirt out of his hand to no avail. Feofan tells him to let go and gets shoved into a locker for his trouble, but it does make Dan let go of Natasha''s skirt. Before you can say anything, a teacher looks out from one of the classrooms and asks what''s going on. Everyone says nothing and they go about their way, but the look Dan gives Feofan promises it might not be over.
 			<<arouse 'erotic_nudity' 1 >>
-			<<arousalEnd>>
+			
 		<<else>>
 			<<image "locations/pavlovsk/school/events/skirt_pulled_up.jpg">>
 			As you pass by some of the nerds talking, Dan walks by them as well. He reaches out and grabs the back of Natasha''s skirt and pulls it up, showing off her panty clad ass to everyone. She fights to pull her skirt out of his hand to no avail. Feofan tells him to let go and gets shoved into a locker for his trouble, but it does make Dan let go of Natasha''s skirt. Before you can say anything, a teacher looks out from one of the classrooms and asks what''s going on. Everyone says nothing and they go about their way, but the look Dan gives Feofan promises it might not be over.
 			<<arouse 'erotic' 1 >>
-			<<arousalEnd>>
+			
 		<</if>>
 	<<elseif getvar("$break_rand") == 30>>
 		<<image "locations/pavlovsk/school/events/skirtupback.jpg">>
 		<<if $quest('christina').blackmail >= 1>>
 			You see Christina walk past Mr. Nikolaevich and as she does, she briefly flips up the back of her skirt to show off her panty clad ass. Mr. Nikolaevich gives her a stern look but otherwise doesn''t say anything. You roll your eyes and wonder how you were the first person that figured out she was fucking him. Or maybe you aren''t, who knows.
 			<<arouse 'erotic' 1 >>
-			<<arousalEnd>>
+			
 		<<else>>
 			You see Christina walk past Mr. Nikolaevich and as she does, she briefly flips up the back of her skirt to show off her panty clad ass. Mr. Nikolaevich gives her a stern look but otherwise doesn''t say anything. It does make you wonder what kind of relationship they have with each other.
 			<<arouse 'erotic' 1 >>
-			<<arousalEnd>>
+			
 		<</if>>
 	<<elseif getvar("$break_rand") == 31>>
 		<<image "locations/pavlovsk/school/events/teaseteacher.jpg">>
 		You notice Pauline, Lena, Lera and Ekaterina sitting by one of the windows, talking and occasinally hassling the other students. When Mr. Yenotin comes over to ask them what they are doing, Lena, Lera and Pauline occasionally open their legs wide to show off their panties while faking innocence. When Mr. Yenotin demands they stop, they act shocked like they don't know what he's talking about before turning it around on him, asking him if he's trying to look up their skirts. Flustered and not making progress, he tells them to behave and hurries away while the girls all burst out laughing.
 		<<arouse 'erotic' 1 `['unknown']`>>
-		<<arousalEnd>>
+		
 	<<elseif getvar("$break_rand") == 32>>
 		<<image "locations/pavlovsk/school/events/tieshoe.jpg">>
 		As you walk down the hallway, you see Irina has stopped. She lifts her foot up to place it on the window ledge as she bends over to tie her shoe. Her skirt rides way up showing off her ass. It is only for a moment, but you're almost certain she wasn''t wearing panties. You briefly wonder if she was even aware of how much the others could see.
 		<<arouse 'erotic_nudity' 1 >>
-		<<arousalEnd>>
+		
 	<<elseif getvar("$break_rand") == 33>>
 		<<image "locations/pavlovsk/school/events/walkaround.jpg">>
 		As you walk down the hallway, you see Pauline, Lena and Lera practically laying in the middle of the hallway. This forces the other students to carefully walk around them and they berate those who step too close to them. You are sure they are enjoying making the other students lives harder by just being in their way.
@@ -1667,7 +1667,7 @@
 				<<image "locations/pavlovsk/school/events/afterschool/andsta2.jpg">>
 				As you watch, Andrey steps closer, saying something to her softly that you can't make out while putting one hand on the back of her neck. She puts her hands against his chest as if to push him away, but after a moment they start kissing passionately. His hands begin to roam over her body.
 				<<arouse 'voyeur' 5 >>
-				<<arousalEnd>>
+				
 				<<actCLA 'Ignore them and leave'>>
 					<<gt 'gschool_grounds' 'main'>>
 				<</actCLA>>
@@ -1676,7 +1676,7 @@
 					Within a few moments, Andrey has pushed Stasya''s shirt up, exposing her perky breasts for anyone to see. His right hand slides up her legs and starts rubbing her pussy through her panties. Things start to get more heated before she says something to him, then takes him by the hand and the two of them quickly duck into one of the empty classrooms, closing the door. You hear the lock slide in place. Well there goes spying on them, even if you wanted to. It is nice seeing a passionate couple for a change. You head for the exit.
 					<<arouse 'voyeur' 5 >>
 >>>>>>> Edited-QSP9
-					<<arousalEnd>>
+					
 					<<actCLA 'Ignore them and leave'>>
 						<<gt 'school_grounds'>>
 					<</actCLA>>
@@ -1684,7 +1684,7 @@
 						<<image "locations/pavlovsk/school/events/afterschool/andsta3.jpg">>
 						Within a few moments, Andrey has pushed Stasya''s shirt up, exposing her perky breasts for anyone to see. His right hand slides up her legs and starts rubbing her pussy through her panties. Things start to get more heated before she says something to him, then takes him by the hand and the two of them quickly duck into one of the empty classrooms, closing the door. You hear the lock slide in place. Well there goes spying on them, even if you wanted to. It is nice seeing a passionate couple for a change. You head for the exit.
 						<<arouse 'voyeur' 5>>
-						<<arousalEnd>>
+						
 						<<actCLA 'Leave'>>
 							<<gt 'school_grounds'>>
 						<</actCLA>>
@@ -1695,7 +1695,7 @@
 				<<image "locations/pavlovsk/school/events/afterschool/braflash.jpg">>
 				As you walk down the hallway, you see several of the gopnik boys giving Pauline a bit of a hard time. She flips them off and shoves the closer ones away. Before she walks off, she flips up her shirt to flash them her bra and laughs at their reaction before walking away, the boys calling her a tease as she does.
 				<<arouse 'erotic' 1>>
-				<<arousalEnd>>
+				
 			<<elseif getvar("$break_rand") == 4>>
 				<<image "locations/pavlovsk/school/events/afterschool/nakedgirl#.jpg" 1 2>>
 				As you walk down the hallway, you are greeted by an unusual sight. A girl from your brother''s class naked, walking the school hallway. When she sees you, she lets out a squeal and runs off before you can ask her what she is doing. Not feeling like trying to chase a naked girl around school and since it's really not your business anyways, you continue on your way.
@@ -1706,12 +1706,12 @@
 			<<image "locations/pavlovsk/school/events/afterschool/braflash.jpg">>
 			As you walk down the hallway, you see several of the gopnik boys giving Pauline a bit of a hard time. She flips them off and shoves the closer ones away. Before she walks off, she flips up her shirt to flash them her bra and laughs at their reaction before walking away, the boys calling her a tease as she does.
 			<<arouse 'erotic' 1 >>
-			<<arousalEnd>>
+			
 		<<elseif getvar("$break_rand") == 4>>
 			<<image "locations/pavlovsk/school/events/afterschool/nakedgirl#.jpg" 1 2>>
 			As you walk down the hallway, you are greeted by an unusual sight. A girl from your brother''s class naked, walking the school hallway. When she sees you, she lets out a squeal and runs off before you can ask her what she is doing. Not feeling like trying to chase a naked girl around school and since it's really not your business anyways, you continue on your way.
 			<<arouse 'erotic_nudity' 5 >>
-			<<arousalEnd>>
+			
 		<<elseif getvar("$break_rand") == 5>>
 			<<image "locations/pavlovsk/school/events/afterschool/nushflash1.jpg">>
 			As you walk down the hallway you are greeted by an unusual sight. Anushka naked. Well maybe it's not that unusual, but you don't typically see her naked in the school hallway.
@@ -1727,7 +1727,7 @@
 				You just nod. Once fully dressed, she adds "Well I need to go, see you around." She turns and heads out.
 				<<arouse 'erotic_nudity' 5 >>
 >>>>>>> Edited-QSP9
-				<<arousalEnd>>
+				
 			<<elseif getvar("$break_rand") == 5>>
 				<<image "locations/pavlovsk/school/events/afterschool/nushflash1.jpg">>
 				As you walk down the hallway you are greeted by an unusual sight. Anushka naked. Well maybe it's not that unusual, but you don't typically see her naked in the school hallway.
@@ -1743,14 +1743,14 @@
 					She smiles, obviously knowing what you mean and replies. "Oh you know, same old same old," she says as she gets dressed.
 					You just nod. Once fully dressed, she adds "Well I need to go, see you around." She turns and heads out.
 					<<arouse 'erotic_nudity' 5>>
-					<<arousalEnd>>
+					
 =======
 			<</actCLA>>
 		<<elseif getvar("$break_rand") == 6 and getvar("$NatbelQW['chrispaid']") <= 2>>
 			<<image "locations/pavlovsk/school/events/afterschool/onlypanties.jpg">>
 			As you walk down the hallway you are greeted by an unusual sight. Natasha frantically trying to open her locker while only wearing panties.
 			<<arouse 'erotic_nudity' 5 `['unknown']`>>
-			<<arousalEnd>>
+			
 			<<actCLA 'Ignore her and leave'>>
 				<<gt 'gschool_grounds' 'main'>>
 			<</actCLA>>
@@ -1772,7 +1772,7 @@
 			<<image "locations/pavlovsk/school/events/afterschool/streakers.jpg">>
 			<p>The hallways are almost completely empty as you leave school, but then you hear giggling. You look up just in time to see two naked girls run by and up the stairs to the second floor of the school. You are fairly certain it was Anushka and Alyona, because who else would it be? With the little show over, you head out.</p>
 			<<arouse 'erotic_nudity' 5 >>
-			<<arousalEnd>>
+			
 		<<elseif getvar("$break_rand") == 9>>
 			<<image "locations/pavlovsk/school/events/afterschool/strip1.jpg">>
 			You're running a bit late leaving school and the hallways are deserted. Or so you thought at first, as you hear some voices down one of the corridors. You slow down and then peek around the corner. You see several of the jock boys and Lariska, who seems unsure about something as you hear the boys encouraging her to give them a peek and show off her great body. She glances up and down the hallway, obviously afraid of being seen, but also just as obviously about to give into peer pressure.
@@ -1797,7 +1797,7 @@
 				<<image "locations/pavlovsk/school/events/afterschool/onlypanties.jpg">>
 				As you walk down the hallway you are greeted by an unusual sight. Natasha frantically trying to open her locker while only wearing panties.
 				<<arouse 'erotic_nudity' 5 `['unknown']`>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Ignore her and leave'>>
 					<<gt 'school_grounds'>>
 				<</actCLA>>
@@ -1819,7 +1819,7 @@
 				<<image "locations/pavlovsk/school/events/afterschool/streakers.jpg">>
 				<p>The hallways are almost completely empty as you leave school, but then you hear giggling. You look up just in time to see two naked girls run by and up the stairs to the second floor of the school. You are fairly certain it was Anushka and Alyona, because who else would it be? With the little show over, you head out.</p>
 				<<arouse 'erotic_nudity' 5>>
-				<<arousalEnd>>
+				
 			<<elseif getvar("$break_rand") == 9>>
 				<<image "locations/pavlovsk/school/events/afterschool/strip1.jpg">>
 				You're running a bit late leaving school and the hallways are deserted. Or so you thought at first, as you hear some voices down one of the corridors. You slow down and then peek around the corner. You see several of the jock boys and Lariska, who seems unsure about something as you hear the boys encouraging her to give them a peek and show off her great body. She glances up and down the hallway, obviously afraid of being seen, but also just as obviously about to give into peer pressure.
@@ -1878,7 +1878,7 @@
 						<p>But the boys aren't done and now they encourage her to take her panties off as well, pointing out she is already practically naked, so what's a little more going to matter? Again, you can tell she seems to be on the verge of giving in.</p>
 						<<arouse 'erotic_nudity' 5 >>
 						<<actCLA 'Ignore what`s happening and leave'>>
-							<<arousalEnd>> <<gt 'school_grounds'>>
+							 <<gt 'school_grounds'>>
 						<</actCLA>>
 						<<gs 'willpower' 'misc' 'self' 'medium'>>
 						<<if $will_cost <= $pc.pcs_willpwr>>
@@ -1903,7 +1903,7 @@
 							<p>But the boys aren't done and now they encourage her to take her panties off as well, pointing out she is already practically naked, so what's a little more going to matter? Again, you can tell she seems to be on the verge of giving in.</p>
 							<<arouse 'erotic_nudity' 5>>
 							<<actCLA 'Ignore what`s happening and leave'>>
-								<<arousalEnd>> <<gt 'school_grounds'>>
+								 <<gt 'school_grounds'>>
 							<</actCLA>>
 							<<gs 'willpower' 'misc' 'self' 'medium'>>
 							<<if $will_cost <= $pc.pcs_willpwr>>
@@ -1925,14 +1925,14 @@
 								<<image "locations/pavlovsk/school/events/afterschool/strip5.jpg">>
 								Finally, she gives in and pulls her panties down and steps out of them. She is now completely naked in front of the boys, who seem to be loving the show. She seems torn between enjoying the approval of the boys and the embarrassment of being naked. She lets the boys look at her naked body for a few more minutes before she seems to change her mind and starts to quickly get dressed. The boys try to get her to stay naked, but she gets dressed. The boys take it in their stride and comment about how great she looks and how cool she is. Once she is dressed, they all leave together, leaving you to go on your way as well.
 								<<arouse 'erotic_nudity' 5>>
-								<<arousalEnd>>
+								
 								<<actCLA 'Leave'>>
 									<<gt 'school_grounds'>>
 =======
 							<<image "locations/pavlovsk/school/events/afterschool/strip5.jpg">>
 							Finally, she gives in and pulls her panties down and steps out of them. She is now completely naked in front of the boys, who seem to be loving the show. She seems torn between enjoying the approval of the boys and the embarrassment of being naked. She lets the boys look at her naked body for a few more minutes before she seems to change her mind and starts to quickly get dressed. The boys try to get her to stay naked, but she gets dressed. The boys take it in their stride and comment about how great she looks and how cool she is. Once she is dressed, they all leave together, leaving you to go on your way as well.
 							<<arouse 'erotic_nudity' 5 >>
-							<<arousalEnd>>
+							
 							<<actCLA 'Leave'>>
 								<<gt 'gschool_grounds' 'main'>>
 							<</actCLA>>
@@ -1989,12 +1989,12 @@
 			<<image "locations/pavlovsk/school/events/afterschool/sex/lazarlina.jpg">>
 			The school is nearly empty and you must be one of the last people left in the building. As you walk past one of the hallways, you catch sight of something, so you stop and peek back around the corner. Halfway down the hallway, you see Lazar leaning against the wall with his pants around his ankles while Lina kneels in front of him, sucking his dick. She seems to be enjoying herself almost as much as he is. After watching them for a few moments, you decide to leave them in peace and go on your way.
 			<<arouse 'voyeur_sex' 10 >>
-			<<arousalEnd>>
+			
 		<<elseif getvar("$break_rand") == 12>>
 			<<image "locations/pavlovsk/school/events/afterschool/sex/lenalera.jpg">>
 			The school is nearly empty and you must be one of the last people left in the building. As you walk past one of the hallways, you catch sight of something, so you stop and peek back around the corner. Down at the end of the hallway, you see Lena leaning against the wall with her skirt pushed up while Lera kneels in front of her with her face buried in her crotch, obviously eating Lena out. After watching them for a few moments, you decide to leave the girls in peace and go on your way.
 			<<arouse 'voyeur_sex' 10 >>
-			<<arousalEnd>>
+			
 		<<elseif getvar("$break_rand") == 13 and getvar("$kotovLoveQW") <= 0 and $pc.fame('pav_slut') > 250 and $quest('school').func('isGroupMember','gopniks')>>
 			<<image "characters/shared/headshots_main/big9.jpg">>
 			<p>As you are heading out of school, you see a group of gopniks ahead of you. Just before you walk past them, Vitek steps in front of you and blocks your path. You step away from him, pulling out of his reach as you turn around. You point your finger at him. "Don't make me hurt you! You know I will."</p>
@@ -2050,7 +2050,7 @@
 					<p>Finally, you feel a jet of sperm hit the back of your throat and $boydesc moans. "That's right bitch! Swallow it all like a good little slut." $boydesc seems satisfied and tucks his cock back in his pants.</p>
 					<p>You immediately switch to another cock and receive another mouthful from him. You carefully swallow his load as well, which earns you a nod of approval and a pat on the head. "Good little whore." He moves aside as well and you finish off the last two guys. As you get up off your knees, you hear one of them laugh. "You're the best cock sucker we got $pc.name_nick!" they say as they leave you alone in the bathroom, more horny than when you started. You yell after them. "Fucking assholes!" You then clean up and leave.</p>
 					<<arouse 'bj' 20 `['group','sub']`>>
-					<<arousalEnd>>
+					
 					<<actCLA 'Leave'>>
 						<<gt 'gschool_grounds' 'main'>>
 					<</actCLA>>
@@ -2138,12 +2138,12 @@
 				<<image "locations/pavlovsk/school/events/afterschool/sex/lazarlina.jpg">>
 				The school is nearly empty and you must be one of the last people left in the building. As you walk past one of the hallways, you catch sight of something, so you stop and peek back around the corner. Halfway down the hallway, you see Lazar leaning against the wall with his pants around his ankles while Lina kneels in front of him, sucking his dick. She seems to be enjoying herself almost as much as he is. After watching them for a few moments, you decide to leave them in peace and go on your way.
 				<<arouse 'voyeur_sex' 10>>
-				<<arousalEnd>>
+				
 			<<elseif getvar("$break_rand") == 12>>
 				<<image "locations/pavlovsk/school/events/afterschool/sex/lenalera.jpg">>
 				The school is nearly empty and you must be one of the last people left in the building. As you walk past one of the hallways, you catch sight of something, so you stop and peek back around the corner. Down at the end of the hallway, you see Lena leaning against the wall with her skirt pushed up while Lera kneels in front of her with her face buried in her crotch, obviously eating Lena out. After watching them for a few moments, you decide to leave the girls in peace and go on your way.
 				<<arouse 'voyeur_sex' 10>>
-				<<arousalEnd>>
+				
 			<<elseif getvar("$break_rand") == 13 and getvar("$kotovLoveQW") <= 0 and $pc.fame('pav_slut') > 250 and $quest('school').func('isGroupMember','gopniks')>>
 				<<image "characters/shared/headshots_main/big9.jpg">>
 				<p>As you are heading out of school, you see a group of gopniks ahead of you. Just before you walk past them, Vitek steps in front of you and blocks your path. You step away from him, pulling out of his reach as you turn around. You point your finger at him. "Don't make me hurt you! You know I will."</p>
@@ -2187,7 +2187,7 @@
 						<p>Finally, you feel a jet of sperm hit the back of your throat and $boydesc moans. "That's right bitch! Swallow it all like a good little slut." $boydesc seems satisfied and tucks his cock back in his pants.</p>
 						<p>You immediately switch to another cock and receive another mouthful from him. You carefully swallow his load as well, which earns you a nod of approval and a pat on the head. "Good little whore." He moves aside as well and you finish off the last two guys. As you get up off your knees, you hear one of them laugh. "You're the best cock sucker we got $pc.name_nick!" they say as they leave you alone in the bathroom, more horny than when you started. You yell after them. "Fucking assholes!" You then clean up and leave.</p>
 						<<arouse 'bj' 20 `['group','sub']`>>
-						<<arousalEnd>>
+						
 						<<actCLA 'Leave'>>
 							<<gt 'school_grounds'>>
 						<</actCLA>>
@@ -2275,37 +2275,37 @@
 		<<image "locations/pavlovsk/school/events/afterschool/classroom/girlsnudeboy.jpg">>
 		You step over to the classroom door, look up and down the hallway and see no one around. You gently pull the door open just a crack and peek inside. You notice Lavrenti sitting at one of the desks completely naked while Pauline, Lera and Lena are sitting on a desk near him. You are not sure what is going on as you can't quite make out what they are saying, but the girls are teasing him about something. You decide you would rather not get caught spying, so you gently close the door and hurry off.
 		<<arouse 'voyeur' 5 >>
-		<<arousalEnd>>
+		
 	<<elseif getvar("$break_rand") == 2>>
 		<<image "locations/pavlovsk/school/events/afterschool/classroom/nudegirl#.jpg" 1 2>>
 		You step over to the classroom door, look up and down the hallway and see no one around. You gently pull the door open just a crack and peek inside. Inside you see a girl from your brother''s class sitting at a desk completely naked, talking softly to someone out of view. You can't tell what they are talking about, but she seems happy about it. You decide you would rather not get caught spying, so you gently close the door and hurry off.
 		<<arouse 'voyeur' 5 >>
-		<<arousalEnd>>
+		
 	<<elseif getvar("$break_rand") == 3>>
 		<<image "locations/pavlovsk/school/events/afterschool/classroom/nudegirls2.jpg">>
 		You step over to the classroom door, look up and down the hallway and see no one around. You gently pull the door open just a crack and peek inside. Within are two naked girls standing at the teachers desk facing the back of the classroom. They are giggling and laughing while looking at something outside of your view, most likely another person at the back of the classroom, who they seem to be teasing or modeling for. You decide you would rather not get caught spying, so you gently close the door and hurry off.
 		<<arouse 'voyeur' 5 >>
-		<<arousalEnd>>
+		
 	<<elseif getvar("$break_rand") == 4>>
 		<<image "locations/pavlovsk/school/events/afterschool/classroom/nudegirls1.jpg">>
 		You step over to the classroom door, look up and down the hallway and see no one around. You gently pull the door open just a crack and peek inside. Two naked girls sit at one of the desks with books in front of them. They look unhappy about what is going on and you hear a male voice tell them to start reading. It sounds like one of the teachers, but you can't tell as his voice is low and partially muffled. You decide you would rather not get caught spying, so you gently close the door and hurry off.
 		<<arouse 'voyeur' 5 >>
-		<<arousalEnd>>
+		
 	<<elseif getvar("$break_rand") == 5>>
 		<<image "locations/pavlovsk/school/events/afterschool/classroom/nudepunish.jpg">>
 		You step over to the classroom door, look up and down the hallway and see no one around. You gently pull the door open just a crack and peek inside. You see Ms. Braakman sitting at her desk with a stern look on her face and a cane resting across her lap. She is watching a naked girl standing at the blackboard writing something. From your angle, you can't tell who the girl is or what she is writing. After a few moments, Ms. Braakman smacks the girl''s bare ass with her cane, causing the girl to yelp and start writing faster. Ms. Braakman says something, but you can't make it out. You decide you would rather not get caught spying and likely end up naked writing on the blackboard yourself, so you gently close the door and hurry off.
 		<<arouse 'voyeur' 5 >>
-		<<arousalEnd>>
+		
 	<<elseif getvar("$break_rand") == 6>>
 		<<image "locations/pavlovsk/school/events/afterschool/classroom/sex/bjstudent.jpg">>
 		You step over to the classroom door, look up and down the hallway and see no one around. You gently pull the door open just a crack and peek inside. Standing near the windows with his dick sticking out of his pants is Lazar. Lizaveta is on her knees with Lazar''s cock in her mouth, sucking him off for all she is worth. She seems to be enjoying it and from the moans he definitely is. His moans get louder until he sighs. His cock begins to twitch as he cums in her mouth, but she keeps sucking him off, sucking out every last drop of his cum. You quickly close the door and hurry off before they finish and you get caught, wondering if you should spread rumors about Lizaveta, like she likes to do about everyone else.
 		<<arouse 'voyeur' 10 >>
-		<<arousalEnd>>
+		
 	<<elseif getvar("$break_rand") == 7>>
 		<<image "locations/pavlovsk/school/events/afterschool/classroom/sex/bjteacher.jpg">>
 		You step over to the classroom door, look up and down the hallway and see no one around. You gently pull the door open just a crack and peek inside. Standing near the teacher''s desk with his pants around his ankles is Mr. Kuznetsov, with Ms. Orlov on her knees before him sucking his dick. She seems to be enjoying it and from the moans he definitely is. His moans get louder until he sighs. His cock begins to twitch as he cums in her mouth, but she keeps sucking him off, sucking out every last drop of his cum. You quickly close the door and hurry off before they finish and you get caught.
 		<<arouse 'voyeur_sex' 10 >>
-		<<arousalEnd>>
+		
 	<<elseif getvar("$break_rand") == 8 and getvar("$soniaPS") == 5>>
 		<<image "locations/pavlovsk/school/lunch/school.jpg">>
 		As you walk past the Computer Science classroom, you hear a strange moaning coming from inside.
@@ -2317,37 +2317,37 @@
 			<<image "locations/pavlovsk/school/events/afterschool/classroom/girlsnudeboy.jpg">>
 			You step over to the classroom door, look up and down the hallway and see no one around. You gently pull the door open just a crack and peek inside. You notice Lavrenti sitting at one of the desks completely naked while Pauline, Lera and Lena are sitting on a desk near him. You are not sure what is going on as you can't quite make out what they are saying, but the girls are teasing him about something. You decide you would rather not get caught spying, so you gently close the door and hurry off.
 			<<arouse 'voyeur' 5>>
-			<<arousalEnd>>
+			
 		<<elseif getvar("$break_rand") == 2>>
 			<<image "locations/pavlovsk/school/events/afterschool/classroom/nudegirl#.jpg" 1 2>>
 			You step over to the classroom door, look up and down the hallway and see no one around. You gently pull the door open just a crack and peek inside. Inside you see a girl from your brother''s class sitting at a desk completely naked, talking softly to someone out of view. You can't tell what they are talking about, but she seems happy about it. You decide you would rather not get caught spying, so you gently close the door and hurry off.
 			<<arouse 'voyeur' 5>>
-			<<arousalEnd>>
+			
 		<<elseif getvar("$break_rand") == 3>>
 			<<image "locations/pavlovsk/school/events/afterschool/classroom/nudegirls2.jpg">>
 			You step over to the classroom door, look up and down the hallway and see no one around. You gently pull the door open just a crack and peek inside. Within are two naked girls standing at the teachers desk facing the back of the classroom. They are giggling and laughing while looking at something outside of your view, most likely another person at the back of the classroom, who they seem to be teasing or modeling for. You decide you would rather not get caught spying, so you gently close the door and hurry off.
 			<<arouse 'voyeur' 5>>
-			<<arousalEnd>>
+			
 		<<elseif getvar("$break_rand") == 4>>
 			<<image "locations/pavlovsk/school/events/afterschool/classroom/nudegirls1.jpg">>
 			You step over to the classroom door, look up and down the hallway and see no one around. You gently pull the door open just a crack and peek inside. Two naked girls sit at one of the desks with books in front of them. They look unhappy about what is going on and you hear a male voice tell them to start reading. It sounds like one of the teachers, but you can't tell as his voice is low and partially muffled. You decide you would rather not get caught spying, so you gently close the door and hurry off.
 			<<arouse 'voyeur' 5>>
-			<<arousalEnd>>
+			
 		<<elseif getvar("$break_rand") == 5>>
 			<<image "locations/pavlovsk/school/events/afterschool/classroom/nudepunish.jpg">>
 			You step over to the classroom door, look up and down the hallway and see no one around. You gently pull the door open just a crack and peek inside. You see Ms. Braakman sitting at her desk with a stern look on her face and a cane resting across her lap. She is watching a naked girl standing at the blackboard writing something. From your angle, you can't tell who the girl is or what she is writing. After a few moments, Ms. Braakman smacks the girl's bare ass with her cane, causing the girl to yelp and start writing faster. Ms. Braakman says something, but you can't make it out. You decide you would rather not get caught spying and likely end up naked writing on the blackboard yourself, so you gently close the door and hurry off.
 			<<arouse 'voyeur' 5>>
-			<<arousalEnd>>
+			
 		<<elseif getvar("$break_rand") == 6>>
 			<<image "locations/pavlovsk/school/events/afterschool/classroom/sex/bjstudent.jpg">>
 			You step over to the classroom door, look up and down the hallway and see no one around. You gently pull the door open just a crack and peek inside. Standing near the windows with his dick sticking out of his pants is Lazar. Lizaveta is on her knees with Lazar''s cock in her mouth, sucking him off for all she is worth. She seems to be enjoying it and from the moans he definitely is. His moans get louder until he sighs. His cock begins to twitch as he cums in her mouth, but she keeps sucking him off, sucking out every last drop of his cum. You quickly close the door and hurry off before they finish and you get caught, wondering if you should spread rumors about Lizaveta, like she likes to do about everyone else.
 			<<arouse 'voyeur' 10>>
-			<<arousalEnd>>
+			
 		<<elseif getvar("$break_rand") == 7>>
 			<<image "locations/pavlovsk/school/events/afterschool/classroom/sex/bjteacher.jpg">>
 			You step over to the classroom door, look up and down the hallway and see no one around. You gently pull the door open just a crack and peek inside. Standing near the teacher''s desk with his pants around his ankles is Mr. Kuznetsov, with Ms. Orlov on her knees before him sucking his dick. She seems to be enjoying it and from the moans he definitely is. His moans get louder until he sighs. His cock begins to twitch as he cums in her mouth, but she keeps sucking him off, sucking out every last drop of his cum. You quickly close the door and hurry off before they finish and you get caught.
 			<<arouse 'voyeur_sex' 10>>
-			<<arousalEnd>>
+			
 		<<elseif getvar("$break_rand") == 8 and $npcs.get('A25','slutStatus',0) == 5>>
 			<<image "locations/pavlovsk/school/lunch/school.jpg">>
 			As you walk past the Computer Science classroom, you hear a strange moaning coming from inside.
@@ -2356,11 +2356,11 @@
 			<</actCLA>>
 			<<actCLA 'See what`s happening'>>
 				<<set $pc.horny += 5>>
-				<<image `'characters/pavlovsk/school/girl/sonia/sex/school/sonia.teach0,'+rand(0,1)+'.jpg'`>>
+				<<image 'characters/pavlovsk/school/girl/sonia/sex/school/sonia.teach0,#.jpg' 0 1>>
 				<p>You carefully look around the corner, trying to see inside the classroom. You see Sonia and Mr. Ivanov, both half naked. Sonia did her best to look the part, even wearing glasses to complete her look as a desperate schoolgirl in need of help. Suddenly her good grades in school make perfect sense; Mr. Ivanov doesn't miss his chance to take advantage of the school slut in exchange for a decent grade. Sonia is currently giving Mr. Ivanov a very skillful blowjob, really giving it her all; you can see Mr. Ivanov's cock glistening with saliva all the way from where you're standing.</p>
 				<<actCLA 'Continue'>>
 					<<set $pc.horny += 10>>
-					<<image `'characters/pavlovsk/school/girl/sonia/sex/school/sonia.teach1,0.jpg'`>>
+					<<image 'characters/pavlovsk/school/girl/sonia/sex/school/sonia.teach1,0.jpg'>>
 					When Mr. Ivanov has had enough of her mouth, he pulls her up by her hair and turns her around, having her put her hands on his desk before he slides his slick cock into her pussy, fucking her from behind. He's quite rough about it, but Sonia doesn''t seem to mind at all and moans like a wanton whore. Realizing the loud moans might attract more attention from outside the class, you leave before anyone else finds you staring.
 					<<actCLA 'Continue'>>
 						<<gt 'school_grounds'>>

sugarcube/src/activities/school/gschool_events1.tw

@@ -244,7 +244,7 @@
 										<<image "locations/pavlovsk/school/building/sex/boysex_secretroom5.jpg">>
 										<p>Realizing you have to get to class soon, you quickly scoot over and take his cock into your mouth. As you quickly lick him clean, you taste the mixture of his and your juices; it makes you feel kind of raunchy and you wouldn't mind having another go if it wasn't for class starting any minute now. You quickly straighten your clothes, hand him his pants and quickly check your hair before you both run to class.</p>
 										<<arouse 'bj' 2 >>
-										<<arousalEnd>>
+										
 										<<actCLA 'Continue'>>
 											<<gt 'gschool_events' 'leave_break_events2'>>
 										<</actCLA>>
@@ -380,7 +380,7 @@
 									You moan as he does, but he moans even louder as he starts fucking you with great enthusiasm, but little skill or technique. His moaning quickly turns into grunting and you can tell he's about to cum already. After spending only a few seconds fucking you, he moans loudly as he blows his load. When he pulls out of you, a slow trickle of cum leaks from your pussy.
 									<<arouse 'vaginal' 2 >>
 									<<cum 'vaginal' 'A6' 1>>
-									<<arousalEnd>>
+									
 									<<actCLA 'Get dressed'>>
 										<<image "characters/shared/headshots_main/big6.jpg">>
 										He steps away and zips his pants back up as he blushes bright red. He won''t even meet your eyes. "Sorry." You don't know if he's apologizing for cumming inside you or for being a two pump chump.
@@ -467,7 +467,7 @@
 				<p>You eventually feel a jet of sperm hit your throat and Vitek moans. "That's right bitch! Swallow it all like a good little slut." Vitek seems satisfied and tucks his cock back in his pants before swapping places with Vasily at the door, who comes over and pulls his cock out, ready to get his turn.</p>
 				<p>You immediately switch to Dan's cock and receive another mouthful from him. You carefully swallow his load as well, which earns you a nod of approval and a pat on the head. "Good little whore." He moves aside as well, and soon you finish off Vasily. As you get up off your knees, you hear Dan laugh. "You're the best cock sucker we got $pc.name_nick!" They leave you alone in the bathroom, more horny than when you started as you clean up and leave.</p>
 				<<arouse 'bj' 20 `['group','sub']`>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Continue'>>
 					<<gt 'gschool_events' 'leave_break_events2'>>
 				<</actCLA>>
@@ -643,7 +643,7 @@
 							<p>You eventually feel a jet of sperm hit your throat and Vitek moans. "That's right bitch! Swallow it all like a good little slut." Vitek seems satisfied and tucks his cock back in his pants before swapping places with Vasily at the door, who comes over and pulls his cock out, ready to get his turn.</p>
 							<p>You immediately switch to Dan's cock and receive another mouthful from him. You carefully swallow his load as well, which earns you a nod of approval and a pat on the head. "Good little whore." He moves aside as well, and soon you finish off Vasily. As you get up off your knees, you hear Dan laugh. "You're the best cock sucker we got $pc.name_nick!" They leave you alone in the bathroom, more horny than when you started as you clean up and leave.</p>
 							<<arouse 'bj' 20 `['group','sub']`>>
-							<<arousalEnd>>
+							
 							<<actCLA 'Continue'>>
 								<<gt 'gschool_events' 'leave_break_events2'>>
 							<</actCLA>>
@@ -741,7 +741,7 @@
 							<p>You eventually feel a jet of sperm hit your throat and Vitek moans. "That's right bitch! Swallow it all like a good little slut." Vitek seems satisfied and tucks his cock back in his pants before swapping places with Vasily at the door, who comes over and pulls his cock out, ready to get his turn.</p>
 							<p>You immediately switch to Dan's cock and receive another mouthful from him. You carefully swallow his load as well, which earns you a nod of approval and a pat on the head. "Good little whore." He moves aside as well, and soon you finish off Vasily. As you get up off your knees, you hear Dan laugh. "You're the best cock sucker we got $pc.name_nick!" They leave you alone in the bathroom, more horny than when you started as you clean up and leave.</p>
 							<<arouse 'bj' 20 `['group','sub']`>>
-							<<arousalEnd>>
+							
 							<<actCLA 'Continue'>>
 								<<gt 'gschool_events' 'leave_break_events2'>>
 							<</actCLA>>
@@ -800,7 +800,7 @@
 				<p>You eventually feel a jet of sperm hit your throat and Arkadi moans. "That's right bitch! Swallow it all like a good little slut." Arkadi seems satisfied and tucks his cock back in his pants before swapping places with Niko at the door, who comes over and pulls his cock out, ready to get his turn.</p>
 				<p>You immediately switch to Roman's cock and receive another mouthful from him. You carefully swallow his load as well, which earns you a nod of approval and a pat on the head. "Good little whore." He moves aside as well, and soon you finish off Niko. As you get up off your knees, you hear Arkadi laugh. "You're the best cock sucker we got $pc.name_nick!" They leave you alone in the bathroom, more horny than when you started as you clean up and leave.</p>
 				<<arouse 'bj' 20 `['group','sub']`>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Continue'>>
 					<<gt 'gschool_events' 'leave_break_events2'>>
 				<</actCLA>>
@@ -976,7 +976,7 @@
 							<p>You eventually feel a jet of sperm hit your throat and Arkadi moans. "That's right bitch! Swallow it all like a good little slut." Arkadi seems satisfied and tucks his cock back in his pants before swapping places with Niko at the door, who comes over and pulls his cock out, ready to get his turn.</p>
 							<p>You immediately switch to Roman's cock and receive another mouthful from him. You carefully swallow his load as well, which earns you a nod of approval and a pat on the head. "Good little whore." He moves aside as well, and you finish off Niko last. As you get up off your knees, you hear Arkadi laugh. "You're the best cock sucker we got $pc.name_nick!" They leave you alone in the bathroom, more horny than when you started as you clean up and leave.</p>
 							<<arouse 'bj' 20 `['group','sub']`>>
-							<<arousalEnd>>
+							
 							<<actCLA 'Continue'>>
 								<<gt 'gschool_events' 'leave_break_events2'>>
 							<</actCLA>>
@@ -1074,7 +1074,7 @@
 							<p>You eventually feel a jet of sperm hit your throat and Arkadi moans. "That's right bitch! Swallow it all like a good little slut." Arkadi seems satisfied and tucks his cock back in his pants before swapping places with Niko at the door, who comes over and pulls his cock out, ready to get his turn.</p>
 							<p>You immediately switch to Roman's cock and receive another mouthful from him. You carefully swallow his load as well, which earns you a nod of approval and a pat on the head. "Good little whore." He moves aside as well, and soon you finish off Niko. As you get up off your knees, you hear Arkadi laugh. "You're the best cock sucker we got $pc.name_nick!" They leave you alone in the bathroom, more horny than when you started as you clean up and leave.</p>
 							<<arouse 'bj' 20 `['group','sub']`>>
-							<<arousalEnd>>
+							
 							<<actCLA 'Continue'>>
 								<<gt 'gschool_events' 'leave_break_events2'>>
 							<</actCLA>>
@@ -1113,7 +1113,7 @@
 		You eventually feel a jet of sperm hit your throat. "Swallow it all, whore. If you miss a drop, you're licking it up off the ground." Vitek says in a menacing voice, so you diligently swallow his sperm, doing your best to lick it all up from his dick and your lips. Vitek seems satisfied and tucks his cock back in his pants before swapping place with Vasily at the door, who comes over and pulls his cock out, ready to get his turn.
 		<p>You immediately switch to Dan's cock and receive another mouthful from him. You carefully swallow his load as well, which earns you a nod of approval and a pat on the head. "Good little whore." He moves aside and you finish off Vasily. As you get up off your knees, you hear Dan laugh. "Do you understand your place in life now? That place is right here, on your knees, whenever we say so. Got that?" You obediently nod, fully aware of the nasty taste of semen in your mouth.</p>
 		<<arouse 'bj' 20 `['group','sub']`>>
-		<<arousalEnd>>
+		
 		<<actCLA 'Continue'>>
 			<!-- !! if after school should sent Sveta outside-->
 			<<if $time.hour >= 14>>
@@ -1151,7 +1151,7 @@
 		You eventually feel a jet of sperm hit your throat and Arkadi seems satisfied as he tucks his cock back in his pants before swapping places with Niko at the door, who comes over and pulls his cock out, ready to get his turn.
 		<p>You immediately switch to Roman's cock and receive another mouthful. "Swallow it all, whore. If you miss a drop, you're licking it up off the ground!" he says menacingly, so you diligently swallow his sperm, doing your best to lick it all up from his dick and your lips. He moves aside and you finish off Niko. As you get up off your knees, you hear Roman laugh. "Do you understand your place in life now? That place is right here, on your knees, whenever we say so. Got that?" You obediently nod, fully aware of the nasty taste of semen in the your mouth.</p>
 		<<arouse 'bj' 20 `['group','sub']`>>
-		<<arousalEnd>>
+		
 		<<actCLA 'Continue'>>
 			<<gt 'gschool_events' 'leave_break_events2'>>
 		<</actCLA>>

sugarcube/src/activities/school/gschool_lessons.tw

@@ -146,7 +146,7 @@
 	<<set $menu_off = 0>>
 	<<setinit $class['grade_check_day'] = $time.daystart>>
 	<h2>School Hallway</h2>
-	<<image `'locations/pavlovsk/school/building/grade_results'+rand(1,2)+'.jpg'`>>
+	<<image 'locations/pavlovsk/school/building/grade_results#.jpg' 1 2>>
 	<<if getvar("$class['first_grade_check']") == 0>>
 		<<setinit $class['first_grade_check'] = 1>>
 		You walk to the wall where the grades are posted and check your grades. You see that your final grade from last year is still there. Grades are updated every Monday, but you note your grade down in your journal so you can always check it.

sugarcube/src/activities/school/gschool_lessonsev1.tw

@@ -22,13 +22,13 @@
 		<<image "locations/pavlovsk/school/gym/fizperand5.jpg">>
 		Ivan offers to help you with a workout on the exercise balls. Lariska is enthusiastic about the idea and asks if she can join in. You agree and after you and Lariska each fetch a ball and get ready, Ivan has you do all sorts of stretches and exercises. After a while, you realize that in every pose Ivan suggests, you are showing off either your breasts or your ass. One look at his face confirms that this was his intention all along. Ivan is having the time of his life ''coaching'' the two of you. With a lewd smile, you redouble your efforts and show off your ass as much as you can.
 		<<arouse 'foreplay' 10 `['exhibitionism']`>>
-		<<arousalEnd>>
+		
 	<<elseif getvar("$fizperand") == 5 and $weather.temperature >= 20 and !$weather.isRaining and $pc.hotcat >= 6>>
 		<<set $pc.mood += 20>>
 		<<image "locations/pavlovsk/school/gym/fizperand6.jpg">>
 		Today, you're training with some free weights. In the current exercise, you're supposed to keep your legs straight while the dumbbells are on the ground. Noting the class got awfully quiet, you look between your legs and notice the majority of the class and several more bystanders gawking at your ass. You hold the position for a few seconds longer than you need to, reveling in their praises as they compliment your figure.
 		<<arouse 'foreplay' 10 `['exhibitionism']`>>
-		<<arousalEnd>>
+		
 	<<elseif getvar("$fizperand") == 6>>
 		<<image "locations/pavlovsk/school/gym/gymfight.jpg">>
 		During gym class, you hear a commotion from one side and you look over to see Dan and Roman shoving each other. Roman shoves the Dan again and it quickly starts escalating. A few punches are thrown and soon the two of them are down on the ground fighting. The coach rushes over and quickly pulls them apart, before sending them straight to the principal.
@@ -73,7 +73,7 @@
 		<<image "locations/pavlovsk/school/gym/hanging.jpg">>
 		During class, Albina gives you a tap on the shoulder, giggling and pointing at Vitek. You look over and see the tip of his dick hanging out the leg of his shorts. You giggle as well, but you are also quite impressed and maybe just a little turned on at the sight... he is certainly very well endowed. It takes him a while to notice the girls giggling at him and even longer to figure out why. Once he does, he makes a big show of tucking his dick away by adjusting his shorts, all the while standing there with a huge smile on his face.
 		<<arouse 'erotic_nudity' 2 >>
-		<<arousalEnd>>
+		
 	<<elseif getvar("$fizperand") == 10 and $pc.hotcat >= 5 and $pc.fame('pav_slut') >= 150>>
 		<<image "locations/pavlovsk/school/gym/supply.jpg">>
 		<p>The coach asks you to help him get some equipment out of the storage room. You go along and he starts pointing out several things you need for the class. He gets uncomfortably close and touches you way more than is necessary. At one point, you are reaching for something high on a shelf and he stands so close behind you, you can feel his dick against your ass as his hands grip your waist. "Careful! We wouldn't want you to fall now, so let me steady you." he says.</p>
@@ -90,14 +90,14 @@
 				You jerk away from him and snatch your shirt out of his hand. "Mr Pavlovich, I'm not that kind of girl."
 				He laughs. "That's not what I hear."
 				You give him a dirty look and put your shirt back on before storming out.
-				<<arousalEnd>>
+				
 				<<actCLA 'End of lesson'>>
 					<<gt 'gschool_lessons4' 'postphys'>>
 				<</actCLA>>
 			<</actCLA>>
 		<</actCLA>>
 		<<actCLA 'Leave the creep'>>
-			<<arousalEnd>>
+			
 			<<image "locations/pavlovsk/school/gym/supply.jpg">>
 			Once you have the equipment, you duck out of the room as quickly as you can, not looking back at him.
 			<<actCLA 'End of lesson'>>
@@ -109,7 +109,7 @@
 				<<image "locations/pavlovsk/school/gym/fizperand6.jpg">>
 				You decide to have a little fun of your own. You ''accidentally'' drop something while he is keeping you steady. You bend over to pick it up, pushing your ass up against his crotch. You grind yourself against him and you can feel him getting hard. You pick up the dropped item and quickly stand up before heading out of the room. You glance back and flash him a sweet smile, noticing he's trying to hide the erection in his shorts. You add a bit of extra sway to your hips as you walk away.
 				<<arouse 'foreplay' 5 `['sub']`>>
-				<<arousalEnd>>
+				
 				<<actCLA 'End of lesson'>>
 					<<gt 'gschool_lessons4' 'postphys'>>
 				<</actCLA>>
@@ -190,7 +190,7 @@
 			<<image "locations/pavlovsk/school/classroom/biology/juliabra.jpg">>
 			Near the end of class, Miss Orlov tells the class to study quietly as she starts grading papers from yesterday''s assignment. Most of your fellow students don't study, but do a variety of other things instead. Julia catches your eye and as you look over, she opens her shirt to show off her bra, then blushes bright red, closes her shirt and pretends to be busy for the rest of the class.
 			<<arouse 'erotic' 5 >>
-			<<arousalEnd>>
+			
 		<<elseif getvar("$scooltiperand") == 7>>
 			<<video "locations/pavlovsk/school/classroom/crash.mp4">>
 			During class, there is a loud crash from the back of the room. You and the rest of the class all turn around to see what happened. You see that Lavrenti is still sitting at his desk, but now the desk is laying on its side on the floor. The whole class bursts out laughing at him.
@@ -206,7 +206,7 @@
 			<<image "locations/pavlovsk/school/classroom/biology/danshowdick.jpg">>
 			Near the end of class, Miss Orlov assigns your homework and then gives you the last few minutes of time to work on it. She starts grading papers from yesterday''s assignment, and most of the class turns their attention to working on their homework assignment while they can. After a few moments, you hear someone giggle. You think it was Irina but you're not sure. As you glance up and look around, you quickly spy what was the cause of it. Dan has he pants unzipped, with his dick out. He is saying something to Irina, who is mostly ignoring him, although she does take a peek now and again, as does Natasha. Apparently what ever Dan wanted isn''t going to happen and he finally puts his dick away at the end of class.
 			<<arouse 'voyeur' 5 >>
-			<<arousalEnd>>
+			
 		<<elseif getvar("$scooltiperand") == 13>>
 			<<image "locations/pavlovsk/school/classroom/biology/irinaselfie.jpg">>
 			Near the end of class, Miss Orlov tells the class to study quietly as she gets up and leaves the class. Of course, once she is gone everyone starts talking and only a few of the nerds actually study. Irina gets up and sits on the edge of Miss Orlov''s desk and starts taking selfies. She ignores the boys hoots and cat calls until the end of class when the bell rings.
@@ -214,7 +214,7 @@
 			<<image "locations/pavlovsk/school/classroom/biology/natpanties.jpg">>
 			Near the end of class, Miss Orlov assigns your homework and then gives you the last bit of time to work on it. She starts grading papers from yesterday''s assignment, and most of the class turns their attention to working on their homework assignment while they can. After a few moments, you glance around and notice Natasha is sitting with her legs slightly apart, showing off her panties to anyone that looks. You doubt she is aware of it, as she seems completely engrossed in working on her homework.
 			<<arouse 'erotic' 5 >>
-			<<arousalEnd>>
+			
 		<<elseif getvar("$scooltiperand") == 15>>
 			<<image "locations/pavlovsk/school/classroom/biology/natsit.jpg">>
 			Near the end of class, Miss Orlov tells the class to study quietly as she gets up and leaves the class. Of course, once she is gone everyone starts talking and only a few of the nerds actually study. Most of the students get up and walk around. Even Natasha puts her books away, gets up and sits on the back of her chair, giving you a smile when you look her way.
@@ -223,7 +223,7 @@
 			<<image "locations/pavlovsk/school/classroom/biology/natskirt.jpg">>
 			Near the end of class, Miss Orlov calls Natasha up to the blackboard to write out the assignment. Once done Natasha returns to her seat and sits down, unaware that the back of her skirt has caught on the seat, which shows off her panty clad ass as she sits through the rest of the class. Several other students notice as well.
 			<<arouse 'erotic' 5 >>
-			<<arousalEnd>>
+			
 		<<elseif getvar("$scooltiperand") == 17>>
 			<<image "locations/pavlovsk/school/classroom/open.jpg">>
 			The lesson pauses briefly when one of the other students asks Miss Orlov a question about her assignment. With nothing to do for the moment, you doodle lazily in the margin of your notebook.
@@ -560,13 +560,13 @@
 			<<image "locations/pavlovsk/school/classroom/science/stabraflash.jpg">>
 			As you sit in class listening to the lesson, you hear Andrey trying to get Stasya to do something. "Come on babe, just really quick." Stasya rolls her eyes, then looks around to make sure no one is watching and pulls up her shirt to flash her boyfriend her bra. Andrey grins at her and tells her how great she is and they start to get all lovey dovey together.
 			<<arouse 'voyeur' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>><<gs 'school_schedule'>><</actCLA>>
 		<<elseif getvar("$scooltiperand") == 15>>
 			<<image "locations/pavlovsk/school/classroom/science/staoverdesk.jpg">>
 			As class ends, Stasya starts to get up and knocks her book off the front of her desk. While still in her desk, she stands up and bends over to grab the book off the floor, inadvertently giving everyone behind her a look at her panty clad ass until she straightens up. A few snickers and giggles causes her to look back as she seems to understand what happened. She quickly smooths out her skirt and leaves class with Andrey.
 			<<arouse 'erotic' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Leave class'>><<gs 'school_schedule'>><</actCLA>>
 		<<else>>
 			<<image "locations/pavlovsk/school/classroom/class1.jpg">>
@@ -665,7 +665,7 @@
 				<<video "locations/pavlovsk/school/classroom/classflash.mp4">>
 				Mr. Ivanov engages the class in conversation. Sonia starts openly flirting with him and keeps dropping none too subtle sexual innuendos at Mr. Ivanov. He does his best to try and ignore them, but after a bit you notice him starting to blush and that his crotch is developing a serious bulge. Sonia notices too, so with a naughty twinkle in her eyes she pulls her shirt open, flashing her tits at him and the rest of the class. He quickly tells the class to read some chapters in their textbook while he hurries to sit down at his desk, though his eyes linger on a smiling Sonia. You wonder why she isn''t sent to the principal''s office. If anyone else had done that, they would been kicked out of class.
 				<<arouse 'voyeur' 5 >>
-				<<arousalEnd>>
+				
 				<<actCLA 'Wait for the end of the lesson'>><<gs 'school_schedule'>><</actCLA>>
 			<<else>>
 				<<gs 'gschool_lessonsev1' 'computer'>>
@@ -674,13 +674,13 @@
 			<<image "locations/pavlovsk/school/classroom/soniaflash.jpg">>
 			You hear some whispers and see some other students looking towards the back of the room every time Mr. Ivanov isn''t looking. You glance back and see Sonia flashing her breasts at Artem every time Mr. Ivanov looks away, while the other boys take pictures of her each time and keep encouraging her to show more.
 			<<arouse 'voyeur' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>><<gs 'school_schedule'>><</actCLA>>
 		<<elseif getvar("$scooltiperand") == 9>>
 			<<image "locations/pavlovsk/school/classroom/dickpic.jpg">>
 			<p>You get an alert on your phone. After quickly checking that Mr. Ivanov is busy, you sneakily pull it out of your purse and rest it in your lap. You lean back a bit, glancing down to see that someone has sent you an image. You open it up, expecting something innocent - only to be confronted by a photo of someone's dick. You hear snickering from one side and look up to investigate, but you can't tell who it was or exactly where it came from. Unsure what to do about it, you decide that you don't want to be caught looking at it, so you delete the image.</p>
 			<<arouse 'voyeur' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>><<gs 'school_schedule'>><</actCLA>>
 		<<elseif getvar("$scooltiperand") <= 13>>
 			<<image "locations/pavlovsk/school/classroom/talk.jpg">>
@@ -923,7 +923,7 @@
 			<<image "locations/pavlovsk/school/classroom/computer/albbendover.jpg">>
 			At the end of class, Mr. Ivanov gives a final assignment for the day. As your fellow students finish it, some of them get up and start checking out some of the computer books Mr. Ivanov has available in class. Albina is one such student. She takes one of the books to an empty table and bends over it, resting her elbows on it while standing on her toes. This gives you a nice view up her skirt at her thong, but you don't know if she's doing it on purpose since she angrily glares at Vasily when he makes lewd comments out loud. You notice Julia, who also has a view up Albina''s skirt, blushing and smiling slightly before she turns her attention back to what she was doing.
 			<<arouse 'voyeur' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>><<gs 'school_schedule'>><</actCLA>>
 		<<elseif getvar("$scooltiperand") == 18>>
 			<<image "locations/pavlovsk/school/classroom/computer/alyrage1.jpg">>
@@ -950,7 +950,7 @@
 			<<image "locations/pavlovsk/school/classroom/computer/soniabutt.jpg">>
 			At the end of class, Mr. Ivanov gives a final assignment for the day. It is a fairly hard assignment and you are sure it will take to the end of class to finish. Sonia walks past you up to Mr. Ivanov''s desk, tells him she doesn''t understand and asks if he can help. He turns his monitor so she can see it and starts explaining to her what he just explained to class. While he is doing this, Sonia leans forward, lifts her skirt up and pulls her panties down, showing the whole class her naked ass and pussy. Several students take out their phones and start taking pictures of her, but she doesn''t seem to mind in the slightest.
 			<<arouse 'voyeur' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>><<gs 'school_schedule'>><</actCLA>>
 		<<elseif getvar("$scooltiperand") == 22>>
 			<<image "locations/pavlovsk/school/classroom/computer/soniashirt.jpg">>
@@ -958,7 +958,7 @@
 			<p>Sonia smiles to him seductively. "I thought you liked what you saw?"</p>
 			He blushes and repeats himself. "Sit dow. <i>Now</i>." Sonia sits back in her chair smirking, and slowly buttons her shirt back up.
 			<<arouse 'voyeur' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>><<gs 'school_schedule'>><</actCLA>>
 		<<elseif getvar("$scooltiperand") == 23>>
 			<<image "locations/pavlovsk/school/classroom/computer/zinlean.jpg">>
@@ -1002,7 +1002,7 @@
 				<<video "locations/pavlovsk/school/classroom/classflash.mp4">>
 				Mr. Yenotin engages the class in conversation. Sonia starts openly flirting with him and keeps dropping none too subtle sexual innuendos at Mr. Yenotin. He does his best to try and ignore them, but after a bit you notice him starting to blush and that his crotch is developing a serious bulge. Sonia notices too, so with a naughty twinkle in her eyes she pulls her shirt open, flashing her tits at him and the rest of the class. He quickly tells the class to read some chapters in their textbook while he hurries to sit down at his desk, though his eyes linger on a smiling Sonia.
 				<<arouse 'voyeur' 5 >>
-				<<arousalEnd>>
+				
 				<<actCLA 'Wait for the end of the lesson'>><<gs 'school_schedule'>><</actCLA>>
 			<<else>>
 				<<gs 'gschool_lessonsev1' 'russian'>>
@@ -1011,13 +1011,13 @@
 			<<image "locations/pavlovsk/school/classroom/soniaflash.jpg">>
 			You hear some whispers and see some other students looking towards the back of the room every time Mr. Yenotin is not looking. You glance back and see Sonia flashing her breasts at Marcus every time Mr. Yenotin looks away, while the boys take pictures of her each time and keep encouraging her to show more.
 			<<arouse 'voyeur' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>><<gs 'school_schedule'>><</actCLA>>
 		<<elseif getvar("$scooltiperand") == 9>>
 			<<image "locations/pavlovsk/school/classroom/dickpic.jpg">>
 			<p>You get an alert on your phone. After quickly checking that Mr. Yenotin is busy, you sneakily pull it out of your purse and rest it in your lap. You lean back a bit, glancing down to see that someone has sent you an image. You open it up, expecting something innocent - only to be confronted by a photo of someone's dick. You hear snickering from one side and look up to investigate, but you can't tell who it was or exactly where it came from. Unsure what to do about it, you decide that you don't want to be caught looking at it, so you delete the image.</p>
 			<<arouse 'voyeur' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>><<gs 'school_schedule'>><</actCLA>>
 		<<elseif getvar("$scooltiperand") <= 13>>
 			<<image "locations/pavlovsk/school/classroom/talk.jpg">>
@@ -1284,7 +1284,7 @@
 						<<image "locations/pavlovsk/school/classroom/spreadb.jpg">>
 						<p>The thoughts of him checking you out so sneakily turns you on a great deal and the fact that you know you should know better makes it even hotter. Throughout the class, you keep spreading your legs whenever he looks your way and you can tell the looks of your bare pussy are causing him a great deal of arousal as well. Unable to control yourself, you occasionally give yourself a quick rub over your exposed pussy lips, preferably when he looks at you. Towards the end of the class, your pussy lips are soaked in your juices and you absent-mindedly put your finger in your mouth for a taste. </p>
 					<</if>>
-					<<arousalEnd>>
+					
 					<<actCLA 'Wait for the end of the lesson'>><<gs 'school_schedule'>><</actCLA>>
 				<</actCLA>>
 
@@ -1316,7 +1316,7 @@
 			<<image "locations/pavlovsk/school/classroom/russian/paulpanties.jpg">>
 			As class ends and everyone starts to get up, Pauline stops in front of Marcus, bends over and lifts her skirt to show him her panty clad ass and wiggles it around. "That's as close as any Russian girl will get to letting you touch them. It must be... hard... being so far from home Marcus." She teases him a bit more and gets a lot of laughs. He does his best to ignore it, but he can't help himself from looking. Soon, it is over as she drops her skirt back in place and everyone leaves class.
 			<<arouse 'voyeur' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Leave class'>><<gs 'school_schedule'>><</actCLA>>
 		<<elseif getvar("$scooltiperand") == 21>>
 			<<image "locations/pavlovsk/school/classroom/russian/stasyatongue.jpg">>

sugarcube/src/activities/school/gschool_lessonsev2.tw

@@ -13,7 +13,7 @@
 			<<video "locations/pavlovsk/school/classroom/boobg.mp4">>
 			Glancing over, you notice Vitek reaching around and grabbing the breasts of the girl in front of him. At first she tries to fend him off and tells him to stop, but after a few looks from Mrs. Sokoloff at her making noise, she just gives up and tries to ignore his groping hands.
 			<<arouse 'voyeur' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>><<gs 'school_schedule'>><</actCLA>>
 		
 		<<elseif getvar("$scooltiperand") == 7>>
@@ -326,17 +326,17 @@
 				<<image "locations/pavlovsk/school/classroom/breastg.jpg">>
 				While stretching out, you glance over to Sonia and notice Niko reaching under her arms and fondling her breasts. At first, Sonia tries to ignore it but as Niko continues caressing her breasts, she begins looking light headed as she licks her lips, getting more and more into it.
 				<<arouse 'voyeur' 5 >>
-				<<arousalEnd>>
+				
 			<<elseif getvar("$VK") == 2 and $npcs.get('A25','slutStatus',0) == 1>>
 				<<video "locations/pavlovsk/school/classroom/classflash.mp4">>
 				As <<npc 'A26'>><</npc>> has everyone work on solving math problems, Sonia raises her hand and asks for assistance. As <<npc 'A26'>><</npc>> begins tutoring Sonia, she begins openly flirting and dropping none too subtle innuendos while he does his best to dismiss her advances, but you notice a bulge forming in his pants. At this point, Sonia pulls open her shirt and flashes her breasts at <<npc 'A26'>><</npc>> and the whole class. <<npc 'A26'>><</npc>> pauses in shock for a moment before saying "That is very inappropriate behavior." He then does his best to silence the class before rushing back to his desk. You occasionally catch him staring back at Sonia when he believes that no one is looking.
 				<<arouse 'erotic_nudity' 5 >>
-				<<arousalEnd>>
+				
 			<<elseif getvar("$VK") == 3 and $npcs.get('A25','slutStatus',0) == 1>>
 				<<image "locations/pavlovsk/school/classroom/soniaflash.jpg">>
 				You hear some whispers and see some of the other students looking towards the back of the room every time <<npc 'A26'>><</npc>> is not looking. You curiously glance back to see Sonia flashing her breasts at the boys every time <<npc 'A26'>><</npc>> looks away, while the boys take pictures of her while encouraging her to show more.
 				<<arouse 'erotic_nudity' 5 >>
-				<<arousalEnd>>
+				
 			<<else>>
 				<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>
 				<<image "characters/pavlovsk/school/girl/sonia/soniasmile.jpg">>
@@ -347,7 +347,7 @@
 			<<image "locations/pavlovsk/school/classroom/dickpic.jpg">>
 			As the lesson goes on, you receive a message on your phone. You open the message to see that someone has sent you an image of someone''s penis. You can hear some snickering and you quickly look around to see who it was, but you can't tell where it came from. Unsure what to do and not wanting to be caught looking at it, you delete the image.
 			<<arouse 'erotic' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>><<gs 'school_schedule'>><</actCLA>>
 		<<elseif getvar("$scooltiperand") == 5>>
 			<<image "locations/pavlovsk/school/classroom/flick.jpg">>
@@ -438,19 +438,19 @@
 			<<image "locations/pavlovsk/school/classroom/math/chrissoniabully.jpg">>
 			Sonia and <<npc 'A18'>><</npc>> are called to the front to both work on the same problem to see who can get it done faster. <<npc 'A18'>><</npc>> stops in the middle of it, grabs the back of Sonia''s skirt and pulls it up, showing off her ass cheeks as she is wearing a thong. This gets a lot of hoots and hollars from the rest of the class. <<npc 'A26'>><</npc>> tries several times to get the class back in order and sends both girls to sit back down.
 			<<arouse 'erotic' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>><<gs 'school_schedule'>><</actCLA>>
 		<<elseif getvar("$scooltiperand") == 11>>
 			<<image "locations/pavlovsk/school/classroom/math/larskirtup.jpg">>
 			During class, Lariska leans forward in her seat to talk to <<npc 'A18'>><</npc>>, who is sitting in front of her. As she does Arkadi, who is sitting behind her, grabs her skirt and pulls it up, showing off her panty clad ass. It takes her a while to wrestle the hem of her skirt out of his hands and get it back in place, blushing as most of the class laughs.
 			<<arouse 'erotic' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>><<gs 'school_schedule'>><</actCLA>>
 		<<elseif getvar("$scooltiperand") == 12 and $npcs.get('A25','slutStatus',0) == 1>>
 			<<image "locations/pavlovsk/school/classroom/math/soniachair.jpg">>
 			As class ends, <<npc 'A26'>><</npc>> gives the class the last five minutes to do what they want. Some students talk to their fellow students next to them, a few get up and walk around. Sonia gets up and tries to step over a desk, but ends up straddling the back of a chair. Instead of stepping the rest of the way over it, she stops and bites her lower lip, then scoots back and forth along the chair. Before anyone really notices what she is doing, the bell rings and everyone leaves class.
 			<<arouse 'voyeur' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Leave class'>><<gs 'school_schedule'>><</actCLA>>
 		<<elseif getvar("$scooltiperand") == 13 and ($quest('christina').fight == 0 or $quest('christina').blackmail < 2)>>
 			<<image "locations/pavlovsk/school/classroom/math/dare1.jpg">>
@@ -483,7 +483,7 @@
 							<p>You bite your lip, look around and figure why not? A thrill of excitment runs down your spine at what you are about to do. You make sure no one else is watching, then spread your legs and pull up your skirt, exposing your pussy since you are not wearing panties and take a photo of your pussy. You quickly pull your skirt back down once you have the picture.</p>
 						<</if>>
 						<<arouse 'flash' -5 `['exhibitionism']`>>
-						<<arousalEnd>>
+						
 						<<actCLA 'Send the image'>>
 							<<image "locations/pavlovsk/school/classroom/math/dare5.jpg">>
 							You send the image through the school wifi so your number doesn''t show up. The nerds set it up long ago for the cool kids so texts could be sent anonymously. After you send it, <<npc 'A26'>><</npc>> stops what he is doing when his phone buzzes and looks at it. There is a shocked look on his face for a moment before he looks around at the class, obviously trying to figure out who sent it. A few minutes later, the bell to end class rings.
@@ -770,13 +770,13 @@
 			<<image "locations/pavlovsk/school/classroom/history/lenlerskirt.jpg">>
 			At the end of class, Mrs. Sokoloff asks the class to study quietly as she grades some papers. Most of the students do just that, but when it is obvious Mrs. Sokoloff is not paying attention at all, a few students start talking quietly. Lena gets up and sits on Lera''s desk, facing Lera with her legs spread, pulls Lera''s head down to her crotch and pulls her skirt up over Lera''s head. You have no idea if Lera is really going down on her in the middle of class or not, but Mrs. Sokoloff notices and yells at Lena to get off the desk. She calls Lena up to her desk where she gives her a stern lecture until the bell rings.
 			<<arouse 'voyeur' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Leave class'>><<gs 'school_schedule'>><</actCLA>>
 		<<elseif getvar("$scooltiperand") == 15>>
 			<<image "locations/pavlovsk/school/classroom/history/lenlerupskirt.jpg">>
 			As Mrs. Sokoloff lectures the class on some dull moment in history no one cares about anymore, you notice Petka keeps looking back past you to the back of the class. You turn your head to follow his gaze and see Lena and Lera sitting side by side with their legs slightly spread apart, just enough to show off their panties. They seem amused by all the looks they are getting.
 			<<arouse 'erotic' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>><<gs 'school_schedule'>><</actCLA>>
 		<<elseif getvar("$scooltiperand") == 16>>
 			<<image "locations/pavlovsk/school/classroom/history/leratongue.jpg">>
@@ -786,7 +786,7 @@
 			<<image "locations/pavlovsk/school/classroom/history/linaskirt.jpg">>
 			During class, Mrs. Sokoloff calls Lina up to the front of class to write an answer on the chalkboard. As she does, you and everyone else in class notice the back of her skirt is pulled up, held up by what looks like her pantyhose. You don't think she is aware of the view she is giving the class as several students whistle or laugh. Lina seems confused and when Mrs. Sokoloff tells the class to quieten down, she sees what is causing the ruckus, grabs the back of Lina''s skirt and pulls it down. Only then does Lina realize what happened and blushes a bright red and turns back to the chalkboard to write out the answer. She sits back down, where she looks sheepish for the rest of the class.
 			<<arouse 'erotic' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>><<gs 'school_schedule'>><</actCLA>>
 		<<else>>
 			<<image "locations/pavlovsk/school/classroom/class1.jpg">>
@@ -855,7 +855,7 @@
 			<<video "locations/pavlovsk/school/classroom/boobg.mp4">>
 			Glancing over, you notice Vitek reaching around and grabbing the breast of the girl in front of him. At first, she tries to fend him off and tell him to stop, but after a few looks from Mr. Kuznetsov at her making noise, she just gives up and tries to ignore his groping hands.
 			<<arouse 'voyeur' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>><<gs 'school_schedule'>><</actCLA>>
 		<<elseif getvar("$scooltiperand") <= 10>>
 			<<image "locations/pavlovsk/school/classroom/talk.jpg">>
@@ -1019,14 +1019,14 @@
 			<<image "locations/pavlovsk/school/classroom/shop/nushpussy.jpg">>
 			As you sit in class waiting for the lesson to end, you glance around bored. You notice Anushka looking back at you, but you think nothing of it. When you meet her eyes again, she grins, reaches down between her legs and spreads them apart before turning to face you. She pulls her panties aside to reveal her pussy and gives you an amused smirk as your eyes drift down to her hand movements. You hear Mr. Kuznetsov clear his throat and you look back to the front of class. When you glance back later, she is sitting normally again and either doesn''t notice your glance or is ignoring it.
 			<<arouse 'erotic_nudity' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>><<gs 'school_schedule'>><</actCLA>>
 		<<elseif getvar("$scooltiperand") == 13>>
 			<<image "locations/pavlovsk/school/classroom/shop/paulnushhump.jpg">>
 			Near the end of class, Mr. Kuznetsov tells the class to study quietly as he leaves class a few minutes early. Of course, once he is gone no one listens and everyone starts wandering around messing with the tools. Meanwhile, Anushka starts to tease Fedor, asking him if he wants to fuck her until she makes him blush. When he finally admits he is attracted to her, Pauline swoops in behind Anushka, pushes into her and pulls up the back of her skirt.
 			<p>She starts pounding her hips against Anushka's ass. "Oh Anushka you're so hot, I have always wanted to fuck you." Pauline says, obviously trying to sound like Fedor, and Anushka plays along. "Oh Fedor, you have such an almost average sized dick! It almost feels good!" This gets the rest of class laughing and Fedor blushing even more. His humiliation ends when the bell rings.</p>
 			<<arouse 'erotic' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Leave class'>><<gs 'school_schedule'>><</actCLA>>
 		<<elseif getvar("$scooltiperand") == 14>>
 			<<image "locations/pavlovsk/school/classroom/shop/paulvichair.jpg">>
@@ -1036,7 +1036,7 @@
 			<<image "locations/pavlovsk/school/classroom/shop/vicpanties.jpg">>
 			During class, Vicky is sitting across from you and you can faintly hear the music from her phone, as she is wearing ear buds, with one of them in her ear and the other dangling down. When she notices you looking in her direction, she turns towards you and makes a ''grrr'' sound and curls her fingers like claws and playfully claws at you, as if warning you not to tell on her listening to music. When she does that, she also exposes her pink panties for you to see as well. You smile in amusement and let her know her secret is safe.
 			<<arouse 'erotic' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>><<gs 'school_schedule'>><</actCLA>>
 		<<else>>
 			<<image "locations/pavlovsk/school/classroom/class1.jpg">>

sugarcube/src/activities/school/gschool_lessonsev3.tw

@@ -71,7 +71,7 @@
 			<<image "locations/pavlovsk/school/events/boysex_tualet.jpg">>
 			You're making your way to the trash bin to throw something away when you feel a rough hand grope your ass. Surprised, you jump and let out a tiny squeak. Looking back, you see Arkadi winking at you.
 			<<arouse 'foreplay' 2 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>>
 				<<gs 'school_schedule'>>
 			<</actCLA>>
@@ -94,7 +94,7 @@
 				<<actCLA 'Spread your legs'>>
 					<<set $orgasm_or = 'yes'>>
 					<<arouse 'vaginal_finger' 5 `['no_orgasm_msg']`>>
-					<<arousalEnd>>
+					
 					<<fame 'pav' 'sex' 1>>
 					<<set $pc.horny = 0>>
 					<<set $npc('A157').rel += 1>>
@@ -138,7 +138,7 @@
 				<<video "locations/pavlovsk/school/classroom/literature/events/humpday.mp4">>
 				You smile and stick your ass out more, encouraging her to keep going. Before you know it, a few other students have gathered around to watch and laugh. Eventually, Arkadi takes out his phone and starts recording, which prompts a few other girls to squeeze into the frame and start humping each other.
 				<<arouse 'foreplay' 5 >>
-				<<arousalEnd>>
+				
 				<<actCLA 'Wait for the end of the lesson'>>
 					<<gs 'school_schedule'>>
 				<</actCLA>>
@@ -167,7 +167,7 @@
 			<<image "locations/pavlovsk/school/classroom/literature/lizupskirt.jpg">>
 			Ms. Braakman announces a pop quiz and everyone groans. You finish your quiz and get up to turn it in, but as you walk back to your desk, you can't help be notice Lizaveta still working on her''s. She seems so intent on it that she doesn''t realize she has her legs slightly apart, giving an up the skirt shot of her panties.
 			<<arouse 'erotic' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>>
 				<<gs 'school_schedule'>>
 			<</actCLA>>
@@ -175,7 +175,7 @@
 			<<image "locations/pavlovsk/school/classroom/literature/nushliftskirt.jpg">>
 			As the bell rings and class ends, everyone gets up and starts to leave class when Radomir says "God damn I need a pick me up." Anushka, who is a little ways in front of him, apparently heard him and lifts her skirt up, showing off her panty clad ass. Radomir laughs. "I can always count on you to make school fun Nush." Seveal other students check out Anushka''s ass as well as everyone leaves.
 			<<arouse 'erotic' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Leave class'>>
 				<<gs 'school_schedule'>>
 			<</actCLA>>
@@ -183,7 +183,7 @@
 			<<image "locations/pavlovsk/school/classroom/literature/romliz.jpg">>
 			Ms. Braakman drones on about some obscure book that no one cares about, but she swears should be considered one of the great works of art, and you find yourself getting bored. You notice you are not the only one, almost everyone in class has a glazed over look in their eyes. Radomir takes it upon himself to liven things up though. He grabs Lizaveta''s skirt and lifts it up, showing off a nice, expensive looking lacy thong. This gets the attention of several students while Lizaveta fights with him to get her skirt pulled back down. When Ms. Braakman asks what''s going on, Radomir lets go of her skirt and leans back, trying to be all innocent looking. Lizaveta, still blushing, says nothing is wrong and Ms. Braakman continues on with her lecture.
 			<<arouse 'erotic' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>>
 				<<gs 'school_schedule'>>
 			<</actCLA>>
@@ -430,12 +430,12 @@
 			<<image "locations/pavlovsk/school/classroom/english/lenaselfie1.jpg">>
 			For the entire class, you see Lena recieving and sending texts on her phone, the whole time looking as pleased as you have seen her. Lera seems to be sulking as Lena pays attention to her phone. Near the end of class, Lena sticks the phone between her legs and looks like she is taking a picture of her panties. She pulls the phone back up and sends something to whoever she is texting.
 			<<arouse 'erotic' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Continue'>>
 				<<image "locations/pavlovsk/school/classroom/english/lenaselfie2.jpg">>
 				She gets a reply almost at once and grins, then exchanges a few texts more before she turns around in her seat so most can't see what she is doing, although you still can. She pulls open her shirt and her bra and then takes a picture of her tits. You don't know who she is texting since it isn''t Lera, but she seems to be sexting whoever it is. You wonder if her brother Vitek knows about this.
 				<<arouse 'erotic_nudity' 5 >>
-				<<arousalEnd>>
+				
 				<<actCLA 'Wait for the end of the lesson'>>
 					<<gs 'school_schedule'>>
 				<</actCLA>>
@@ -444,7 +444,7 @@
 			<<image "locations/pavlovsk/school/classroom/english/lenler.jpg">>
 			Ms. Braakman leaves near the end of class and tells everyone to study quietly. As soon as she is out the door, everyone starts talking or getting up. Lena and Lera go up to sit on the teacher''s desk, talking to Radomir. When Radomir starts flirting with Lena, she returns it in kind when Lera suddenly turns and kisses Lena on the lips in a long, slow and passionate kiss which Lena returns. Most of the other students hoot, holler or whistle encouragements to them. They keep making out for a couple of minutes until the bell that ends class rings.
 			<<arouse 'voyeur' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Leave class'>>
 				<<gs 'school_schedule'>>
 			<</actCLA>>
@@ -452,7 +452,7 @@
 			<<image "locations/pavlovsk/school/classroom/english/lenlerbras.jpg">>
 			Near the end of class Lena, Lera and Radomir are talking. As he is bragging about some girl he banged recently, Lena and Lera exchange looks and then pull their shirts open to show off their bras. This causes Radomir to stammer in mid sentence as he gets distracted by the breasts neatly on display in front of him. After he stops talking, they laugh and pull their shirts closed, which causes him to grumble.
 			<<arouse 'erotic' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>>
 				<<gs 'school_schedule'>>
 			<</actCLA>>
@@ -461,7 +461,7 @@
 			<p>You notice Lera squirming around in her seat during class and decide to see what's wrong. "What's up?" you ask.</p>
 			She glances at you and seems like she is about to have a sharp retort, but then closes her mouth and seems to really look at you and then says "Nothing you couldn''t fix for me." She sticks her tongue out between two of her fingers in the universal ''eat me'' sign. You can't help but blush a little as since Lera only ever seems to pay attention to Lena. Before you can reply, Ms. Braakman clears her throat and gets you both looking forward again. She spends the rest the class keeping an eye on both of you.
 			<<arouse 'erotic' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>>
 				<<gs 'school_schedule'>>
 			<</actCLA>>
@@ -470,7 +470,7 @@
 			<p>You notice Lera squirming around in her seat during class and decide to see what's wrong. "What's up?" you ask.</p>
 			She glances at you and seems like she is about to have a sharp retort, but then closes her mouth and seems to really look at you, but the bell rings to end class. As everyone gets up and heads out of class she says "Nothing you couldn''t fix for me, if you put that tongue to good use for a change." She pulls up her skirt and pulls her panties aside to show you her clean shaven pussy. Before you can respond, Lena comes over and steps between the two of you, blocking your view. They exchange a few whispers and then leave class together.
 			<<arouse 'erotic_nudity' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Leave class'>>
 				<<gs 'school_schedule'>>
 			<</actCLA>>
@@ -659,7 +659,7 @@
 				<<image "locations/pavlovsk/school/events/scoolrand_1.jpg">>
 				As you move into the classroom, Katja runs up to you with a slight blush on her face. Before you know it, she gives you a deep kiss and pulls up your skirt to touch your ass. You return the kiss, not caring about the hooting and hollering in the background from your fellow classmates.
 				<<arouse 'foreplay' 2 >>
-				<<arousalEnd>>
+				
 				<<actCLA 'Wait for the end of the lesson'>>
 					<<gs 'school_schedule'>>
 				<</actCLA>>
@@ -689,7 +689,7 @@
 				<</if>>
 				<p>Katja is trying to draw your attention for some reason. When she notices you're watching, she quickly makes sure no one else is paying attention and then puts one leg on her desk, revealing her bare pussy to you. You bite your lip and give her an appreciative nod as you think to yourself "Damn, I'll have to take a closer look into that after classes are over!"</p>
 				<<arouse 'erotic_nudity' 2 >>
-				<<arousalEnd>>
+				
 				<<actCLA 'Wait for the end of the lesson'>>
 					<<gs 'school_schedule'>>
 				<</actCLA>>
@@ -940,7 +940,7 @@
 			<<image "locations/pavlovsk/school/classroom/music/katjapanties.jpg">>
 			During class, you hear Katja say "Psstt." When you glance in her direction, she is turned in her seat so she is facing you, with her legs slightly spread. When she sees you looking, she pulls up her skirt to show off her panties to you with a grin, then quickly puts her skirt back in place and ignores you for the rest of class.
 			<<arouse 'erotic' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>>
 				<<gs 'school_schedule'>>
 			<</actCLA>>
@@ -948,7 +948,7 @@
 			<<image "locations/pavlovsk/school/classroom/music/larflute.jpg">>
 			As Mr. Vasilyev is helping Petka, Lina and Lariska are talking about how to give a blowjob and they seem to disagree. After a few moments of heated but quiet debate, Lariska decides to show what she means on her flute. After showing what she means, Lina comes around to her point of view. Several of the guys watching also seem to agree with Lariska.
 			<<arouse 'erotic' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>>
 				<<gs 'school_schedule'>>
 			<</actCLA>>
@@ -989,7 +989,7 @@
 				<<image "locations/pavlovsk/school/events/scoolrand_1.jpg">>
 				As you move into the classroom, Katja runs up to you with a slight blush on her face. Before you know it, she gives you a deep kiss and pulls up your skirt to touch your ass. You return the kiss, not caring about the hooting and hollering in the background from your fellow classmates.
 				<<arouse 'foreplay' 2 >>
-				<<arousalEnd>>
+				
 				<<actCLA 'Wait for the end of the lesson'>>
 					<<gs 'school_schedule'>>
 				<</actCLA>>
@@ -1038,7 +1038,7 @@
 			<<image "locations/pavlovsk/school/classroom/soniaflash.jpg">>
 			You hear some whispers and see some other students looking towards the back every time Mr. Vasilyev is not looking. You glance back and see Anushka flashing her breasts at Erast every time Mr. Vasilyev looks away, while the boys take pictures of her each time and keep encouraging her to show more.
 			<<arouse 'erotic_nudity' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>>
 				<<gs 'school_schedule'>>
 			<</actCLA>>
@@ -1277,7 +1277,7 @@
 			<<image "locations/pavlovsk/school/classroom/art/natpanties.jpg">>
 			Natasha asks Anushka if she can borrow a pencil as she seems to have lost hers. Anushka agrees and offers her one, but keeps pulling it slightly out of reach of Natasha, who keeps stretching forward to reach it. By the time Natasha grabs the pencil from Anushka, she has given everyone behind her a nice look at her panty clad ass.
 			<<arouse 'erotic' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>>
 				<<gs 'school_schedule'>>
 			<</actCLA>>
@@ -1297,7 +1297,7 @@
 				<p>She then smiles, as if she expected that response. "Yes, but doesn't some of their work show nudity? I only showed my panties, so why is their work OK and this isn't?"</p>
 				Mr. Vasilyev gives a bone weary sigh and starts trying to explain why art can show many things, but not everything is appropriate for school. It seems to be a losing discussion and you are sure Anushka is just yanking his chain for the fun of it. The rest of the class quickly loses interest in the discussion and goes back to doing their own thing.
 				<<arouse 'erotic' 5 >>
-				<<arousalEnd>>
+				
 				<<actCLA 'Wait for the end of the lesson'>>
 					<<gs 'school_schedule'>>
 				<</actCLA>>
@@ -1306,7 +1306,7 @@
 			<<image "locations/pavlovsk/school/classroom/art/vickypanties.jpg">>
 			You notice Erast paying special attention to Vicky today and it seems she has noticed as well. At one point, she turns to sit sideways in her desk and spreads her legs, causing her skirt to ride up until it gives Erast a very nice view of her panties. His eyes grow wide as she giggles, straightens her skirt back in place and turns back to the front of class.
 			<<arouse 'erotic' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>>
 				<<gs 'school_schedule'>>
 			<</actCLA>>
@@ -1314,7 +1314,7 @@
 			<<image "locations/pavlovsk/school/classroom/art/nushvic.jpg">>
 			Near the end of class, when Mr. Vasilyev lets the class have some free time to experiment with their own artwork, some of the girls get together to gossip about boys. Vicky starts talking about a date her and Vanya recently went on, even going so far as to act out a little bit of it. At one point, she bends over and talks about how she was rubbing her butt against Vanya''s crotch while dancing, but before she can say what Vanya did, Anushka steps up behind her, grabs her hips and starts dry humping her. "This is what he was wanting to do to you." She gets all the girls to crack up, most agreeing that is all any boy talks about.
 			<<arouse 'erotic' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wait for the end of the lesson'>>
 				<<gs 'school_schedule'>>
 			<</actCLA>>
@@ -1322,11 +1322,11 @@
 			<<image "locations/pavlovsk/school/classroom/art/nushpanties1.jpg">>
 			During one of Mr. Vasilyev''s lectures about art history, you get a little bored and glace around. You notice Anushka sitting in her desk with one of her knees pulled up almost to her chest, with her foot on the chair. This gives gives anyone looking a very clear view of her panties.
 			<<arouse 'erotic' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Look away'>>
 				<<image "locations/pavlovsk/school/classroom/classart.jpg">>
 				You quickly turn away from looking up Anushka''s skirt and focus on paying attention to the rest of Mr. Vasilyev''s lecture.
-				<<arousalEnd>>
+				
 				<<actCLA 'Wait for the end of the lesson'>>
 					<<gs 'school_schedule'>>
 				<</actCLA>>
@@ -1340,7 +1340,7 @@
 					When she notices you looking, she gives you a little smirk but then turns her attention away from you. She apparently doesn''t care if you look up her skirt at her panties.
 				<</if>>
 				<<arouse 'erotic' 5 >>
-				<<arousalEnd>>
+				
 				<<actCLA 'Wait for the end of the lesson'>>
 					<<gs 'school_schedule'>>
 				<</actCLA>>

sugarcube/src/activities/school/gschool_lunch.tw

@@ -376,7 +376,7 @@
 					As Katja gets closer to her orgasm, she firmly clutches your hair and roughly pulls your face even harder into her crotch, encouraging you to work harder. A short while later, you can feel her pussy convulsing against your mouth, a few drops of girl cum squirting out and landing on your mouth. You slowly keep lapping at her twitching pussy, bringing her down carefully while she recovers from her orgasm. When you look up into her eyes, you see her staring down at you lovingly for a second before pushing your face away and quickly straightening her clothes.
 					<p>"Damn, next period is about to start! I'm sorry $pc.name_nick, I owe you one!" she apologizes as she quickly gathers her things and leaves the closet. You're hornier than ever, but you need to get going too.</p>
 					<<arouse 'cuni_give' 20 `['sub','lesbian']`>>
-					<<arousalEnd>>
+					
 					<<actCLA 'Continue'>><<gs 'school_schedule'>><</actCLA>>
 				<</actCLA>>
 			<</if>>
@@ -463,7 +463,7 @@
 				<<set $npc($sex.npcId).sex += 1>>
 				<<arouse 'bj' 10 `['sub']`>>
 				<<cum 'mouth_swallow' $sex.npcId 1>>
-				<<arousalEnd>>
+				
 				<<image "shared/sex/blowjob/toiletbj.jpg">>
 				<p>You obediently kneel before him, rubbing your hand over the bulge in Vitek's sweatpants before pulling out his dick. Clasping your $pc_desc['lips'] lips around the head, you run your tongue around it a few times before starting to suck it in a bit deeper. You don't want him to get angry, so you put some effort into it, sometimes licking his balls and taking his cock down your throat without really straining yourself. He mistakes your obedience for enthusiasm, and laughing, he turns to his friends. "Guys just look at this slut going at it! She's loving it!"</p>
 				<p>A few minutes later, Vitek is about to cum and tells you "Good job, cocksucker. I'm going to drop my load in your mouth now and when I do, you 're going to swallow it all and lick me clean. If you spill anything, you're going to lick it up from the floor. Got that?" You nod up at him and as soon as his cum hits your tongue, you diligently swallow his load, making sure not to let a single drop escape. When you're sure he's finished, you lick and suck his slowly softening dick clean before tucking it back into his pants for him.</p>

sugarcube/src/activities/school/gschool_office.tw

@@ -76,7 +76,7 @@
 				<p>She then lifts you back to your feet and rubs your arm. "I hope this has taught you a lesson; I don't want to see you in my office anymore, $pc.name_last. You can return to your classes now." With that, she goes back to her desk and you head back to class.</p>
 				<<gs 'pain' 2 'asscheeks' 'spank'>>
 				<<arouse 'foreplay' 5 `['maso','rough']`>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Go to class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 			<<actCLA 'Flirt/rebel'>>
@@ -89,7 +89,7 @@
 				<p>To her credit, she doesn't relent and even manages to spank you harder. After another a minute or two of this, however, she roughly lifts you off her knees and back on your feet. She points at the door, her voice quivering with anger: "Back to class now, before I give you detention as well!" Not wanting detention, you don't say anymore and head for the door, putting a bit of extra sway into your hips as you go.</p>
 				<<gs 'pain' 4 'asscheeks' 'spank'>>
 				<<arouse 'foreplay' 5 `['maso','rough']`>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Go to class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<</if>>
@@ -110,7 +110,7 @@
 				<p>She then lifts you back to your feet and rubs your arm. "I hope this has taught you a lesson; I don't want to see you in my office anymore, $pc.name_last. You can return to your classes now." With that, she goes back to her desk and you pull your panties up before heading back to class.</p>
 				<<gs 'pain' 4 'asscheeks' 'spank'>>
 				<<arouse 'foreplay' 5 `['maso','rough']`>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Go to class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 			<<actCLA 'Flirt/rebel'>>
@@ -123,7 +123,7 @@
 				<p>To her credit, she doesn't relent and even manages to spank you harder. After another a minute or two of this, she roughly lifts you off her knees and back on your feet. She points at the door, her voice quivering with anger: "Back to class now, before I give you detention as well!" Not wanting detention, you slowly pull your panties back up, giving her an extra-long look at your cherry-red cheeks before you head for the door, putting a bit of extra sway into your hips as you go.</p>
 				<<gs 'pain' 5 'asscheeks' 'spank'>>
 				<<arouse 'foreplay' 5 `['maso','rough']`>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Go to class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<</if>>
@@ -144,7 +144,7 @@
 				<p>She then lifts you back to your feet and rubs your arm. "I hope this has taught you a lesson; I don't want to see you in my office anymore, $pc.name_last. You can return to your classes now." With that, she goes back to her desk and you pull your panties up before heading back to class.</p>
 				<<gs 'pain' 5 'asscheeks' 'spank'>>
 				<<arouse 'foreplay' 5 `['maso','rough']`>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Go to class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 			<<actCLA 'Flirt/rebel'>>
@@ -157,7 +157,7 @@
 				<p>To her credit, she doesn't relent and even manages to spank you harder. After another a minute or two of this, she roughly lifts you off her knees and back on your feet. She points at the door, her voice quivering with anger... but also uncertainty: "Back to class now, before this gets worse for you!" You head for the door, putting a bit of extra sway into your hips and very slowly pulling your panties back up as you go, giving her an extra-long look at your cherry-red cheeks.</p>
 				<<gs 'pain' 6 'asscheeks' 'spank'>>
 				<<arouse 'foreplay' 5 `['maso','rough']`>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Go to class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<</if>>
@@ -182,7 +182,7 @@
 				<p>She then lifts you back to your feet and rubs your arm. "I hope this has taught you a lesson; I don't want to see you in my office anymore, $pc.name_last. You can return to your classes now." With that, she goes back to her desk and you pull your panties up before heading back to class.</p>
 				<<gs 'pain' 6 'asscheeks' 'spank'>>
 				<<arouse 'foreplay' 5 `['maso','rough']`>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Go to class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 			<<actCLA 'Flirt/rebel'>>
@@ -195,7 +195,7 @@
 				<p>To her credit, she doesn't relent and even manages to spank you harder. After another a minute or two of this, she roughly lifts you off her knees and back on your feet. Her hands rest on your hips and as she stands up to face you, one hand slips down to your bare ass and stays there for just a moment... She then removes her hand and points at the door, her expression unreadable. "You're playing a very dangerous game, young lady. Get back to class." You head for the door, putting a bit of extra sway into your hips and very slowly pulling your panties back up as you go, giving her an extra-long look at your cherry-red cheeks. You don't dare to look back, but you are almost certain that Miss Volkov had her eyes on your ass right until the door closed behind you.</p>
 				<<gs 'pain' 7 'asscheeks' 'spank'>>
 				<<arouse 'foreplay' 5 `['maso','rough']`>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Go to class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<</if>>
@@ -232,7 +232,7 @@
 			Just before you walk out the door, she adds. "I'm also giving you detention this Saturday. Do <i>not</i> miss it."
 		<</if>>
 		<<arouse 'foreplay' 5 `['maso','rough']`>>
-		<<arousalEnd>>
+		
 		<<actCLA 'Go to class'>><<gs 'school_schedule'>><</actCLA>>
 	<</actCLA>>
 	<<actCLA '"Don`t like wearing them"'>>
@@ -256,7 +256,7 @@
 			<p>You silently take your punishment. It almost brings you to tears, but a part of you gets turned on by it as well - a circumstance you don't want her to know about. You don't have to play along much to hide it either: It <b>really</b> hurts, even if you are enjoying it too, so you wither around and whimper as she spanks you for a good solid minute or three, until your ass is bright red and feels like it's radiating heat.</p>
 			<p>She then lifts you back to your feet. "I hope this has taught you a lesson; I don't want to see you in my office anymore, $pc.name_last. You can return to your classes now." With that, she goes back to her desk and you pull your skirt down before heading back to class.</p>
 			<<arouse 'foreplay' 5 `['maso','rough']`>>
-			<<arousalEnd>>
+			
 			<<actCLA 'Go to class'>><<gs 'school_schedule'>><</actCLA>>
 		<</actCLA>>
 	<</actCLA>>
@@ -287,7 +287,7 @@
 			Just before you walk out the door, she adds. "I'm also giving you detention this Saturday. Do <i>not</i> miss it."
 		<</if>>
 		<<arouse 'foreplay' 5 `['maso','rough']`>>
-		<<arousalEnd>>
+		
 		<<actCLA 'Go to class'>><<gs 'school_schedule'>><</actCLA>>
 	<</actCLA>>
 	<<actCLA '"I like wearing it'>>
@@ -315,7 +315,7 @@
 				Just before you walk out the door, she adds. "I'm also giving you detention this Saturday. Do <i>not</i> miss it."
 			<</if>>
 			<<arouse 'foreplay' 5 `['maso','rough']`>>
-			<<arousalEnd>>
+			
 			<<actCLA 'Go to class'>><<gs 'school_schedule'>><</actCLA>>
 		<</actCLA>>
 	<</actCLA>>
@@ -345,7 +345,7 @@
 			Just before you walk out the door, she adds. "I'm also giving you detention this Saturday. Do <i>not</i> miss it."
 		<</if>>
 		<<arouse 'foreplay' 5 `['maso','rough']`>>
-		<<arousalEnd>>
+		
 		<<actCLA 'Go to class'>><<gs 'school_schedule'>><</actCLA>>
 	<</actCLA>>
 	<<actCLA '"I like the way it feels"'>>
@@ -373,7 +373,7 @@
 				Just before you walk out the door, she adds. "I'm also giving you detention this Saturday. Do <i>not</i> miss it."
 			<</if>>
 			<<arouse 'foreplay' 5 `['maso','rough']`>>
-			<<arousalEnd>>
+			
 			<<actCLA 'Go to class'>><<gs 'school_schedule'>><</actCLA>>
 		<</actCLA>>
 	<</actCLA>>
@@ -479,7 +479,7 @@
 				<p>She rises just a bit and then uses her hand to tilt the dildo down to your mouth. "That wasn't too bad, $pc.name_last. All you have to do now is suck my dick clean, and then you can go. Or maybe you'd rather...?" She leaves the exact alternative unspoken, but you have no doubt as to what she's alluding to, and while you'd rather be doing anything else than sucking a large dildo your headmaster just violated your ass with, it beats getting fucked up your sore ass with it again.</p>
 				With the choice rather easy, you obediently open your mouth and start sucking it clean, ignoring both the taste and the throbbing pain in your bowels as best you can.
 				<<arouse 'dildo_suck' 2 `['lesbian','humiliation','sub']`>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Get out'>>
 					<<image "characters/pavlovsk/school/teacher/aleksandrina/sex/school/whore11.jpg">>
 					Once she deems the dildo clean enough, she removes it from your mouth, gets off the desk and pulls you off as well. She leans against the table and points at the door. "Get your shit and remove yourself from my office right now. If you hurry, you can make it back into the hall and get dressed before the next bell." Your eyes widen slightly at the thought of being forced out into a hall full of the classmates naked, but the expression on her face and her previous cruelties leave no doubt in your mind that she's serious. You quickly gather your clothes and hurry out of the office.

sugarcube/src/activities/school/gschool_sex.tw

@@ -49,7 +49,7 @@
 					<<gs 'cum_manage'>>
 					<<set $spafinloc = 7>>
 					<<gs 'cum_manage'>>
-					<<arousalEnd>>
+					
 					<<image "shared/sex/group/toiletbjcum.jpg">>
 					<<if !$quest('school').func('isGroupMember','gopniks')>>
 						<p>You close your eyes to fully focus on what you're doing, and a few minutes later you feel the dick that's currently in your mouth spasm. Several ropes of cum hit your tongue; it tastes rather bitter. Carefully opening one eye, you see that it's Vitek's. The other two tell you to keep your eyes closed, and Dan shoots his load across your face before you can even comply. Luckily, he didn't hit the eye that was open. You obediently close them, and a few seconds later you feel Vasily's cum splattering against your eye lids and cheek.</p>
@@ -171,7 +171,7 @@
 							You look at each other and start giggling before Katja turns to look at him. "If you're a good boy." You both give him a look that promises, right or wrong, you want another go as badly as he does.
 							"I'm always good," he says with a laugh. He quickly finishes dressing and leaves, likely late for practice. Once he's gone, you and Katja look at each other and giggle, then leave as well.
 							<<cum 'breasts' 'A3' 1>>
-							<<arousalEnd>>
+							
 							<<actCLA 'Leave'>>
 								<<gt 'school_grounds'>>
 							<</actCLA>>
@@ -226,7 +226,7 @@
 						She pushes you back over onto your back and pulls your legs wide apart. She reaches over and grabs her pack, rummaging around in it before she pulls out a large purple dildo.
 						<p>She turns to look at you, brandishing the purple dildo with a huge grin on her face. Before you can say anything, she shoves the dickcm $dick_girth dildo into your soaking wet pussy. You cry out in ecstasy as you feel it completely fill you. She starts fucking you with the dildo and the louder you moan, the faster and deeper she goes.</p>
 						<<arouse 'vaginal_dildo' 10 `['lesbian']`>>
-						<<arousalEnd>>
+						
 						Just then, your smartphone buzzes, letting you know the bell signifying that lunch is over has rung. Anushka pulls the dildo out of you and puts it in her mouth, sucking on it before offering it to you. The two of you suck the dildo clean of your juices and quickly get dressed, doing your best to tidy up as you run back to school. You know you'll be at least a little late, but you really don't care.
 						<<actCLA 'Continue'>><<gs 'school_schedule'>><</actCLA>>
 					<</actCLA>>
@@ -255,7 +255,7 @@
 			<<arouse 'foreplay' 2 `['lesbian']`>>
 			<<actCLA 'Push her away' undefined `{willpower:['sex','resist']}`>>
 
-					<<arousalEnd>>
+					
 					<<relationship 'A144' 'hate'>>
 					<<relationship 'A156' 'hate'>>
 					<<relationship 'A158' 'hate'>>
@@ -290,7 +290,7 @@
 				<p>As Anushka takes a swig, Valentin adds in. "Fuck yeah you will! Soon you'll be putting them away like this bitch. Now this bitch knows how to party!" he says as he gropes Anushka's breast as she drinks and wraps another arm around her, giving her a quick hug. Afterwards, she passes the bottle back to the boys, who start to take a drink while she turns towards you and leans in close. She kisses you softly but passionately on the lips.</p>
 				<<actCLA 'Push her away' undefined `{willpower:['sex','resist']}`>>
 
-						<<arousalEnd>>
+						
 						<<relationship 'A144' 'hate'>>
 						<<relationship 'A156' 'hate'>>
 						<<relationship 'A158' 'hate'>>
@@ -320,7 +320,7 @@
 			Once she passes the bottle back to the boys, she leans in close and starts to feel you up and kiss you. You can hear one of the guys giving his encouragement to what he's seeing.
 			<<actCLA 'Push her away' undefined `{willpower:['sex','resist']}`>>
 					<<gs 'willpower' 'pay' 'resist'>>
-					<<arousalEnd>>
+					
 					<<relationship 'A144' 'hate'>>
 					<<relationship 'A156' 'hate'>>
 					<<relationship 'A158' 'hate'>>
@@ -415,7 +415,7 @@
 								Once you're cleaned up and dressed, the two of you join the boys sitting on the floor leaning against the wall. The boys light up two more cigarettes and pass one of them to each of you. They don't seem to really care if you smoke it. Valentin speaks up "Fuck that was great. We need to do this more often." Arkadi merely grunts in agreement as Anushka laughs.
 								"Well, you boys keep bringing us something to drink and maybe we will." The guys laugh in response and soon the four of you are laughing and joking about things that have happened lately. Before long, the bell rings, indicating the end of lunch, and the four of you get up and head out.
 								<<set $orgasm_txt = ''>>
-								<<arousalEnd>>
+								
 								<<actCLA 'Continue'>><<gs 'school_schedule'>><</actCLA>>
 							<</actCLA>>
 						<</actCLA>>
@@ -450,7 +450,7 @@
 						<<image "locations/pavlovsk/school/building/sex/boysex_tualet6.jpg">>
 						<<gs 'dinsex' 'vaginal_sex' 10>>
 						<<gs 'dinsex' 'sexcum'>>
-						<<arousalEnd>>
+						
 						<<gs 'underwear' 'wear'>>
 						<<actCLA 'Continue'>><<gs 'school_schedule'>><</actCLA>>
 					<</actCLA>>
@@ -464,7 +464,7 @@
 					<<image "locations/pavlovsk/school/building/sex/boysex_tualet6.jpg">>
 					<<gs 'dinsex' 'vaginal_sex' 10>>
 					<<gs 'dinsex' 'sexcum'>>
-					<<arousalEnd>>
+					
 					<<actCLA 'Continue'>><<gs 'school_schedule'>><</actCLA>>
 				<</actCLA>>
 			<</if>>
@@ -492,7 +492,7 @@
 				<<run $pc.sexStatInc('bj','aware',1)>>
 				<<cum 'mouth' $sex.npcId 1>>
 				<<cum 'breasts' $sex.npcId 1>>
-				<<arousalEnd>>
+				
 				<<image "locations/pavlovsk/school/building/sex/boysex_scool7.jpg">>
 				He pulls you up from the window sill and tells you to get down on your knees before him. "Open your mouth," he says and you happily oblige. He shoves his dick inside your mouth and you enthusiastically suck him off, wanting to feel him squirt his load. Unable to withstand your sweet torture any longer, he growls and you feel the squirts of his cum land on your tongue. It was too much for you and some of it dribbles down your chin and onto your chest, despite your best efforts to swallow it all.
 				<p>After he admires his handiwork for a second, he notices the time. "Oh crap! We're going to be late for class!"</p>
@@ -526,7 +526,7 @@
 					You both quickly get dressed and run as fast as you can to make it to class on time.
 					<<cum 'anus' $sex.npcId 1>>
 					<<arouse 'anal' 10 >>
-					<<arousalEnd>>
+					
 					<<actCLA 'Continue'>>
 						<<gt 'gschool_events' 'leave_break_events2'>>
 					<</actCLA>>
@@ -546,7 +546,7 @@
 		<<cum 'mouth'>>
 		<<image "locations/pavlovsk/school/lunch/sex/lunchbrcum.jpg">>
 		<p>He doesn't last long; within a few minutes you feel his cum squirting into your mouth. When he finishes, you let his cock pop out of your mouth before looking up at him and swallowing his cum. "Oh my god, you really know how to suck cock! Don't worry, I won't tell anyone," he says with a wink as he pulls his pants up before hurrying out of the bathroom. After he leaves, you take a moment to check yourself out in the mirror, making sure your hair and makeup is good before you leave.</p>
-		<<arousalEnd>>
+		
 		<<actCLA 'Continue'>>
 			<<gt 'gschool_events' 'leave_break_events2'>>
 		<</actCLA>>
@@ -594,7 +594,7 @@
 	<<cum 'mouth'>>
 	<<image "locations/pavlovsk/school/lunch/sex/roofcum.jpg">>
 	<p>He stands up and starts jerking his dick as you kneel in front of him and open your mouth. Within a few minutes, you feel his cum squirting into your mouth, which you quickly swallow. "Oh my god, you really know how to fuck! Don't worry I won't tell anyone," he says with a wink before he quickly gets dressed and hurries off the roof. After getting dressed, you make sure your hair and makeup is good before you leave.</p>
-	<<arousalEnd>>
+	
 	<<actCLA 'Continue'>>
 		<<gt 'gschool_events' 'leave_break_events2'>>
 	<</actCLA>>
@@ -634,7 +634,7 @@
 									<<image "characters/pavlovsk/school/teacher/victor/sex/storage9.jpg">>
 									Just as his dick pulls out of your pussy, you feel hot jets of cum splattering against your stomach. A few spurts hit your breasts as well as he loudly moans. Once the last spurt has landed, he rubs the tip of his dick against your stomach, wiping off the last bit of cum. Satisfied, he pulls up his pants and smiles at you. "Your reputation is well earned. We'll have to do this again some time. Now get cleaned up and get out of here." He walks out of the storage room, leaving you naked on your knees with his cum all over you.
 									<<arouse 'foreplay' 2 `['sub']`>>
-									<<arousalEnd>>
+									
 									<<cum 'breasts' 'A131'>>
 									<<cum 'stomach' 'A131'>>
 									<<actCLA 'Leave'>><<gs 'school_schedule'>><</actCLA>>
@@ -684,7 +684,7 @@
 							<<image "characters/pavlovsk/school/teacher/victor/sex/locker9.jpg">>
 							You soon feel hot jets of cum splattering against your cheek. A few more spurts hit your face as well as he loudly moans. Once the last spurt has landed, he rubs the tip of his dick against your lips, wiping off the last bit of cum. Satisfied, he pulls up his pants and smiles at you. "Your reputation is well earned. We'll have to do this again some time. Now get cleaned up and get out of here." He walks out of the storage room, leaving you naked on your knees with his cum running down your face.
 							<<arouse 'foreplay' 2 `['sub']`>>
-							<<arousalEnd>>
+							
 							<<cum 'face' 'A131'>>
 							<<actCLA 'Leave'>><<gs 'school_schedule'>><</actCLA>>
 							<<actCLA 'Go take a shower'>>
@@ -722,7 +722,7 @@
 		<<image "characters/pavlovsk/school/teacher/victor/sex/locker9.jpg">>
 		You soon feel hot jets of cum splattering against your cheek. A few more spurts hit your face as well as he loudly moans. Once the last spurt has landed, he rubs the tip of his dick against your lips, wiping off the last bit of cum. Satisfied, he pulls up his pants and smiles to you. "Your reputation is well earned. We will have to do this again. Now get cleaned up and get home." He walks out of the storage room, leaving you naked on your knees with his cum running down your cheek.
 		<<arouse 'foreplay' 2 `['sub']`>>
-		<<arousalEnd>>
+		
 		<<cum 'face' 'A131'>>
 		<<actCLA 'Leave'>><<gs 'school_schedule'>><</actCLA>>
 		<<actCLA 'Go take a shower'>>
@@ -807,7 +807,7 @@
 	<<arouse 'hj' 1 >>
 	<<arouse 'bj' 1 >>
 	<<cum 'face' 'A149'>>
-	<<arousalEnd>>
+	
 	<<actCLA 'Finish dressing'>>
 		<<gt 'gschool_lessons4' 'post_dress'>>
 	<</actCLA>>
@@ -858,7 +858,7 @@
 					<<arouse 'hj' 3 >>
 					<<arouse 'hj' 3 >>
 					<<set $time.minutes -= 3>>
-					<<arousalEnd>>
+					
 					<<actCLA 'Finish dressing'>>
 						<<gt 'gschool_lessons4' 'post_dress'>>
 					<</actCLA>>
@@ -1015,7 +1015,7 @@
 															<p>Once your shoe is good and clean, she lets go of him and steps away. "Now get the fuck out here before we decide to have another go with you!" she commands. Terrified, he grabs his clothes and bolts out of the locker room, still naked. Albina laughs loudly and you can't help but join in. The two of you then take your strapons off and clean them up. "Well that was fun..." Albina says as she gently rubs her soaking wet pussy, her juices trickling down her leg. "Good thing I forgot something."</p>
 															<p>"We might have to track him down and do that again sometime. Or maybe he'll be stupid enough to spy on us again?" she adds. Before you can make sense of what she said, she has already got dressed and walked out, leaving you to finish up.</p>
 															<<arouse 'voyeur_sex' 3 `['dom','group']`>>
-															<<arousalEnd>>
+															
 															<<actCLA 'Finish dressing'>>
 																<<gt 'gschool_lessons4' 'post_dress'>>
 															<</actCLA>>
@@ -1097,7 +1097,7 @@
 					<<arouse 'foreplay' 5 `['dom']`>>
 					<<cum 'face' 'A6'>>
 					<<cum 'breasts' 'A6'>>
-					<<arousalEnd>>
+					
 					<<actCLA 'Tell him to get lost'>>
 						<<gt 'gschool_sex' 'petka_home'>>
 					<</actCLA>>
@@ -1113,7 +1113,7 @@
 					You pull your dildo out of his ass and place one of your shoes on the bench. "Cum on my shoe." Petka gives you a puzzled look before placing his dick on your shoe and jerking off. He quickly starts cumming and coats your shoe in his cum. "Now lick your nasty cum off my shoe. Lick it clean."
 					He starts quickly licking his cum off your shoe and does a pretty good job of licking it completely clean. "Now stand there and wait for me while I put this away," you say, indicating your strapon. You take the harness off, clean it up and put it away.
 					<<arouse 'foreplay' 5 `['dom']`>>
-					<<arousalEnd>>
+					
 					<<actCLA 'Tell him to get lost'>>
 						<<gt 'gschool_sex' 'petka_home'>>
 					<</actCLA>>
@@ -1130,7 +1130,7 @@
 					<p>You reach down and pull his hand away from his dick and keep him from grabbing it again. "No cumming for you. You don't deserve it." He groans in frustration, which makes you laugh. You fuck him a little bit more and when you're sure he's about to cum, you stop and pull your dildo out of him. "Now get up. Don't you dare jerk off and cum!"</p>
 					He nods at you, slightly fearful and gets up as you clean your strapon and put it away.
 					<<arouse 'anal_strap_give' 5 `['dom']`>>
-					<<arousalEnd>>
+					
 					<<actCLA 'Tell him to get lost'>>
 						<<gt 'gschool_sex' 'petka_home'>>
 					<</actCLA>>
@@ -1231,7 +1231,7 @@
 	<p>You start stroking his cock faster and faster and cum is soon squirting out. The hot streams of cum splatter against your breasts, coating them. Once the last spurt hits your chest, he sighs. "Wow! You're amazing $pc.name_nick!"</p>
 	<p>You get up. "I know. Now what am I going to do with you now?" He visibly swallows, obviously having thought you were going to just let him go.</p>
 	<<arouse 'hj' 3 >>
-	<<arousalEnd>>
+	
 	<<actCLA 'Tell him to get lost'>>
 		<<gt 'gschool_sex' 'petka_home'>>
 	<</actCLA>>
@@ -1253,7 +1253,7 @@
 	<p>He pales and nods. "Okay, okay. I'll do all of your homework. Can I leave now?"</p>
 	<p>You make him squirm before nodding. "Yeah. Now get out of here, you little pervert!" He quickly gets dressed then runs out of the locker room. With that taken care of, you go back to getting dressed.</p>
 	<<arouse 'voyeur' 3 >>
-	<<arousalEnd>>
+	
 	<<actCLA 'Finish dressing'>>
 		<<gt 'gschool_lessons4' 'post_dress'>>
 	<</actCLA>>
@@ -1266,7 +1266,7 @@
 	<p>You shake your head. "Get the fuck out of here before I change my mind!"</p>
 	<p>He turns and takes off towards the door, half dressed. Just before he makes it out, you call out to him. "Consider this a lesson to not sneak into the girls locker room!" He doesn't reply and just runs out.</p>
 	<<arouse 'voyeur' 3 >>
-	<<arousalEnd>>
+	
 	<<actCLA 'Finish dressing'>>
 		<<gt 'gschool_lessons4' 'post_dress'>>
 	<</actCLA>>
@@ -1279,7 +1279,7 @@
 	You nod. "It's either that or I get the coach and tell him what you were doing, you dirty pervert."
 	<p>He just nods and takes off naked towards the door. Just before he makes it out, you call out to him. "Consider this a lesson! I better not see you in here again." He doesn't reply and just runs out naked. You throw his clothes in the trash and go back to getting dressed.</p>
 	<<arouse 'voyeur' 3 >>
-	<<arousalEnd>>
+	
 	<<actCLA 'Finish dressing'>>
 		<<gt 'gschool_lessons4' 'post_dress'>>
 	<</actCLA>>
@@ -1339,7 +1339,7 @@
 	<<arouse 'cuni_give' 5 >>
 	<<arouse 'cuni' 5 >>
 	<<set $time.minutes -= 5>>
-	<<arousalEnd>>
+	
 	<<actCLA 'Get dressed'>>
 		<<image "characters/pavlovsk/school/girl/albina/sex/school/lockerroom/getdressed.jpg">>
 		"It's nice being with another girl," she says as you both get dressed.
@@ -1361,7 +1361,7 @@
 			<<image "characters/pavlovsk/school/teacher/victor/sex/locker1.jpg">>
 			<p>You pull your hand away at his words. You might have been curious or interested in playing with it, but you don't want to go that far. "No, I shouldn't have touched it! Please, you need to leave now."</p>
 			<p>He pauses for a second before throwing his hands up in frustration. "Fine!" he exclaims as he turns and leaves.</p>
-			<<arousalEnd>>
+			
 			<<actCLA 'Finish dressing'>>
 				<<gt 'gschool_lessons4' 'post_dress'>>
 			<</actCLA>>
@@ -1376,7 +1376,7 @@
 				<<image "characters/pavlovsk/school/teacher/victor/sex/locker1.jpg">>
 				You pull your hand away at his words. You might have been curious or interested in playing with it, but you don't want to go that far. "No, I shouldn''t have touched it, let alone pulled your shorts down. Please, you need to leave now," you tell him as you stand up and take a step away from him.
 				<p>He pauses for a second before pulling his shorts up. "Fine!" he exclaims as he turns and leaves.</p>
-				<<arousalEnd>>
+				
 				<<actCLA 'Finish dressing'>>
 					<<gt 'gschool_lessons4' 'post_dress'>>
 				<</actCLA>>
@@ -1449,7 +1449,7 @@
 	He pulls up his shorts, tucking his dick away as he looks around, apparently making sure no one is coming to find out what the noise was. He then looks down at you and smiles. "Congratulations, you just passed P.E. Now you better get cleaned up." Satisfied, he turns and walks out of the locker room, leaving you on your knees with his cum all over your face.
 	<<arouse 'foreplay' 5 >>
 	<<cum 'face' 'A131'>>
-	<<arousalEnd>>
+	
 	<<actCLA 'Finish dressing'>>
 		<<gt 'gschool_lessons4' 'post_dress'>>
 	<</actCLA>>

sugarcube/src/activities/school/gschool_socialchg1.tw

@@ -106,7 +106,7 @@
 													You keep one eye on the sports field to ensure no one is coming over when you suddenly feel his cum squirting your mouth without warning. When he finishes cumming, he pulls his dick out of your mouth and tucks it away before pressing his pants as you swallow his cum. "Thanks, Sveta. I needed that, but I should get back before they notice I'm gone. Catch you later." He turns and heads back to the sports field.
 													<<arouse 'bj' 5 `['exhibitionism']`>>
 													<<cum 'mouth' 'A149'>>
-													<<arousalEnd>>
+													
 													<<actCLA 'Leave'>>
 														<<gt 'gschool_sportsfield'>>
 													<</actCLA>>
@@ -148,7 +148,7 @@
 			<p>As your moans get louder, he starts fucking you harder and faster, eventually fucking you balls-deep with each thrust. His dick slides out of you during one thrust, but he misses when he tries sliding it back in. So instead of penetrating your pussy, his massive dick slides balls deep into your ass with a single thrust.</p>
 			<<set $anal_slip += 4>>
 			<<arouse 'anal' 5 `['exhibitionism']`>>
-			<<arousalEnd>>
+			
 			<<actCLA 'Wrong hole!'>>
 				<<image "characters/pavlovsk/school/boy/lazar/sex/school/sportsfield/anal2.jpg">>
 				<p>You squeal at the pain and try to pull away, but he has a firm grip on your hips. When you try to pull away, he pulls you back as he pounds your ass without mercy. "Lazar, stop! That's my ass!"</p>
@@ -156,7 +156,7 @@
 				<p>"I said that's my asshole! You're fucking my ass!" you cry out as you keep trying in vain to get him to slow down or pull away.</p>
 				<p>He looks at you before looking down. He slows down but doesn't stop fucking you as he grins. "Sorry, I didn't notice. Seriously, it was an accident! I'm almost there anyway."</p>
 				<<arouse 'anal' 5 `['exhibitionism']`>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Cum'>>
 					<<image "characters/pavlovsk/school/boy/lazar/sex/school/sportsfield/buttcum.jpg">>
 					<p>A few minutes later, he pulls out, and you feel his warm cum splattered across your ass cheeks. When he finishes cumming, he tucks his dick away and buttons his pants up. "Thanks, $pc.name_nick. I needed that, but I should get back before they notice I'm gone. Catch you later." He turns and heads back to the sports field, leaving you bent over the tree with his cum running down your ass.</p>
@@ -190,7 +190,7 @@
 			<<image "characters/pavlovsk/school/boy/lazar/sex/school/sportsfield/anal2.jpg">>
 			He steadily works deeper into your ass until you feel his balls slap against your pussy with each thrust. Once he's sure you're into it, he tightens his grip on your hips and starts hammering your ass, grunting and moaning loudly. You can tell he is getting close.
 			<<arouse 'anal' 5 `['exhibitionism']`>>
-			<<arousalEnd>>
+			
 			<<actCLA 'Cum'>>
 				<<image "characters/pavlovsk/school/boy/lazar/sex/school/sportsfield/buttcum.jpg">>
 				<p>A few seconds later, he pulls out, and you feel his warm cum splatter your ass cheeks. When he finishes cumming, he tucks his dick away and buttons his pants up. "Thanks, $pc.name_nick. I needed that, but I should get back before they notice I'm gone. Catch you later." He turns and heads back to the sports field, leaving you bent over the tree with his cum running down your ass.</p>
@@ -223,14 +223,14 @@
 <</if>>
 <<if $location_var[$here][0] == 'tFedor'>>
 	<<set $menu_off = 1>>
-	<<image `'characters/shared/headshots_main/big3.jpg'`>> <<image `'images/characters/shared/headshots_main/big5.jpg'`>>
+	<<image 'characters/shared/headshots_main/big3.jpg'>> <<image 'images/characters/shared/headshots_main/big5.jpg'>>
 	A flustered Fedor is huffing and puffing. "You really need to take it easy. I can barely keep up with you, Ivan..."
 	"Come on, Fedor. Don't sell yourself short. You've got potential, and remember the dirtbag you wanted to get revenge on..." Ivan replies in an attempt to motivate a dejected Fedor.
 	<<actCLA 'Ask about the dirtbag'>>
 		<<set $time.minutes += 5>>
 		<<set $npc('A5').rel += 2>>
 		<<set $npc('A3').rel += 1>>
-		<<image `'characters/shared/headshots_main/big3.jpg'`>> <<image `'images/characters/shared/headshots_main/big5.jpg'`>>
+		<<image 'characters/shared/headshots_main/big3.jpg'>> <<image 'images/characters/shared/headshots_main/big5.jpg'>>
 		<p>"I don't mean to pry, but what is this about a dirtbag?" you ask.</p>
 		Fedor looks uncomfortable, but Ivan gives him a nudge. "Go on, tell her."
 		Fedor starts by telling you about a boxing fight last year where he went against an opponent that beat him badly, and ever since then, he's been seeking revenge.
@@ -342,7 +342,7 @@
 						<<arouse 'foreplay' 5 `['group','exhibitionism']`>>
 						<<cum 'breasts' 'A3'>>
 						<<cum 'breasts' 'A5'>>
-						<<arousalEnd>>
+						
 						<<actCLA 'Return to the secluded beach'>>
 							<<gt 'pav_lake_nude'>>
 						<</actCLA>>
@@ -516,11 +516,11 @@
 		<</if>>
 		<<arouse 'erotic_nudity' 10 `['exhibitionism']`>>
 		<<actCLA 'Leave the store'>>
-			<<arousalEnd>>
+			
 			<<gt 'pav_commercial'>>
 		<</actCLA>>
 		<<actCLA 'Stay and shop alone'>>
-			<<arousalEnd>>
+			
 			<<gt 'shop_coco_carmen' 'start'>>
 		<</actCLA>>
 		<<if getvar("$lariskalove") >= 7 and getvar("$LariskaQW['story']") >= 10>>
@@ -556,7 +556,7 @@
 				<p>Exhausted, you let your head fall back while you catch your breath. You hear her panting and feel her breath on your now sensitive lower lips as you come down in post-orgasmic bliss.</p>
 				Once you catch your breath, you stand up and share a long kiss while stroking her cheek with your hand. When you pull back from it, she seems to remember you're in a public place and gets nervous, her face red again.
 				<<actCLA 'Clean up and leave the store'>>
-					<<arousalEnd>>
+					
 					<<gt 'pav_commercial'>>
 				<</actCLA>>
 			<</actCLA>>

sugarcube/src/activities/school/schoolday/breaks/bathroom.tw

@@ -45,14 +45,14 @@
 			After sucking his dick for several minutes, they change positions. Mr. Kuznetsov sits on the toilet while Miss Orlov straddles his lap, facing the door. You duck back a moment to make sure you aren''t seen, until the moans get louder again, before you risk taking another peek. She's riding his dick hard, taking his cock deep into her while he reaches around and fondles her breasts. He squeezes her rock hard nipples each time her pussy wetly sinks down his cock to his balls. Her juices glisten on his dick each time she rises to the top of his cock before she slams back down again.
 			<<arouse 'voyeur_sex' 5 >>
 			<<actCLA 'Leave before you`re caught'>>
-				<<arousalEnd>>
+				
 				<<gt 'gschool_lessons' 'short_break'>>
 			<</actCLA>>
 			<<actCLA 'Continue to watch'>>
 				<<video "locations/pavlovsk/school/lunch/sex/teacher3.mp4">>
 				<p>Several minutes pass before he lifts her off and they switch positions again. She stands on one side of the toilet slightly bent over, her face and hands pressed against the side of the stall, while he stands on the opposite side of the toilet from her. He lines up his dick and slowly pushes it in, eliciting a moan from both of them. He starts gradually thrusting into her before saying; "Fuck Arina, your ass is so fucking tight." He continues to fuck her ass, slowly going faster and harder, her breasts bouncing in rhythm with each thrust. From the sounds of their moaning, you can tell they are both getting close to orgasm, so you decide it's time to leave before you get caught.</p>
 				<<arouse 'voyeur_sex' 5 >>
-				<<arousalEnd>>
+				
 				<<actCLA 'Leave before you`re caught'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<</actCLA>>
@@ -94,13 +94,13 @@
 		<p>As you enter the restroom, you see Anushka on her way out. She pauses long enough to pull up her skirt and show off her panties. "Do you think these are cute panties?"</p>
 		Not even fazed by her anymore, you just nod. "Yes, very cute." With that, she drops her skirt and leaves the restroom while you go about your business.
 		<<arouse 'erotic' 2 >>
-		<<arousalEnd>>
+		
 		<<gs 'gschool_break' 'restroom_actions'>>
 	<<elseif getvar("$girls_event_rand") == 14>>
 		<<image "locations/pavlovsk/school/bathroom/showass#.jpg" 1 2>>
 		As you enter the restroom, you see three girls, one of them taking the picture of the other two. After a couple of pictures, the two having their pictures taken turn and raise their skirts to show their panty clad asses to the third girl, who laughs and keeps taking their picture. They keep this up as you go about your business.
 		<<arouse 'erotic' 2 >>
-		<<arousalEnd>>
+		
 		<<gs 'gschool_break' 'restroom_actions'>>
 	<<elseif getvar("$girls_event_rand") == 15 and !$pc.thinksIsVirgin>>
 		<<set $menu_off = 1>>
@@ -187,7 +187,7 @@
 				<!-- !!ToDo: Finish this event after an overhaul of the fight system (nutluck)-->
 				<!-- !!				act 'Ask to join their fight club':-->
 				<!-- !!					-->
-				<!-- !!					'<<image `'locations/pavlovsk/school/bathroom/girlspose1.jpg'`>>'-->
+				<!-- !!					'<<image 'locations/pavlovsk/school/bathroom/girlspose1.jpg'>>'-->
 				<!-- !!					'You speak up. "Can I join in on this fight night? It sounds fun."'-->
 				<!-- !!					'They stop and look at you, Pauline and Ekaterina sizing you up before Ekaterina grabs you roughly by the arm, squeezes your bicep and snorts. "I don't know, we'll think about it and let you know." Not sure what more you can do, you just nod and go about your business.'-->
 				<!-- !!					*nl-->
@@ -249,7 +249,7 @@
 													<<image "locations/pavlovsk/school/bathroom/sex/girls/gbully7.jpg">>
 													The girl on the bottom finally has enough and pushes you off her dildo. Pauline keeps fucking your ass while the other one slides out from under you. The other girls soon demand a turn, although none seem to want to use your pussy anymore. They take turns wearing a strapon and fucking your ass.
 													<<arouse 'anal_strap' 10 `['humiliation','maso','gangbang','lesbian']`>>
-													<<arousalEnd>>
+													
 													<<actCLA 'Continue'>>
 														<<gs 'clothing' 'strip_all'>>
 														<<image "locations/pavlovsk/school/bathroom/sex/girls/gbully8.jpg">>
@@ -350,14 +350,14 @@
 				<<video "locations/pavlovsk/school/bathroom/sex/soniabj.mp4">>
 				Embarrassed, you decide to give Sonia the privacy she sought in the bathroom to begin with.
 				<<arouse 'voyeur_sex' 1 >>
-				<<arousalEnd>>
+				
 				<<actCLA 'Leave the restroom'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 			<<actCLA 'Peek'>>
 				<<video "locations/pavlovsk/school/bathroom/sex/soniabj.mp4">>
 				You close the door quick enough that they don't notice you were there, but leave it open a crack and continue to peek through. You watch as Sonia is really working that cock with a vigor you've never seen before. After another minute, the boy grabs her by the hair and pulls her towards him while thrusting his hips forward. After violently shaking for a few seconds, he pulls back with a gasp as long strands of cum splatter onto the floor, unable to be contained by her mouth or caught by her hands. The boy pulls her head towards him again and pokes her in the cheek with his member. "Come on, slut. Finish the job and clean me up." Sonia obediently starts licking his cock clean. Deciding you don't want to get caught spying on them after they're done, you close the door and move away.
 				<<arouse 'voyeur_sex' 5 >>
-				<<arousalEnd>>
+				
 				<<actCLA 'Leave'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 			<<if $quest('school').func('isGroupMember','cool') or $quest('school').func('isGroupMember','jocks') or $quest('school').func('isGroupMember','gopniks')>>
@@ -368,7 +368,7 @@
 					<p>Sonia does her best to ignore your barbs and keeps sucking the boy's cock. Drying your hands off, you walk over to the boy and lean on the wall next to him while gently putting your hand on the back of Sonia's head and pushing it forward until you hear her gagging on his cock. You glance to the boy and say "You would think she would be used to this after all the dicks she has sucked. You should get yourself checked out at the clinic after this - who knows how many diseases she has."</p>
 					The boy nods, only half paying attention to what you are saying as you let go of Sonia''s head and start to move out of the bathroom. "I'll let the rest of the boys know you are open for business as usual." you call back as you hear the boy groan loudly and presumably ejaculate down Sonia''s throat.
 					<<arouse 'voyeur_sex' 5 >>
-					<<arousalEnd>>
+					
 					<<actCLA 'Leave'>><<gs 'school_schedule'>><</actCLA>>
 				<</actCLA>>
 			<</if>>
@@ -380,7 +380,7 @@
 				<p>"She's really giving it her all today, isn't she?" You remark to the boy. "This is a special treat! Don't waste it!" you say as you let go of Sonia's head and start to move out of the bathroom.</p>
 				<p>"I'll see you in class later, Sonia!" you call back as you hear the boy groan loudly and presumably ejaculate down Sonia's throat.</p>
 				<<arouse 'voyeur_sex' 5 >>
-				<<arousalEnd>>
+				
 				<<actCLA 'Leave'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<<elseif getvar("$soniasexrand") == 2>>
@@ -389,38 +389,38 @@
 				<<setn $soniasextime += 1>>
 
 			<</if>>
-			<<image `'characters/pavlovsk/school/girl/sonia/sex/school/sonia.school1,'+rand(0,3)+'.jpg'`>>
+			<<image 'characters/pavlovsk/school/girl/sonia/sex/school/sonia.school1,#.jpg' 0 3>>
 			When you enter the restroom, you see Sonia bent over with her skirt hiked up and her panties around her ankles, getting fucked from behind by some guy you've never seen before. She's is moaning like a wanton whore and seems to really be enjoying the pounding the boy is giving her. Neither of them seem to have noticed you yet.
 			<<arouse 'voyeur_sex' 5 >>
 			<<actCLA 'Leave'>>
-				<<image `'characters/pavlovsk/school/girl/sonia/sex/school/sonia.school1,'+rand(0,3)+'.jpg'`>>
+				<<image 'characters/pavlovsk/school/girl/sonia/sex/school/sonia.school1,#.jpg' 0 3>>
 				Embarrassed, you decide to give Sonia the privacy she sought in the bathroom to begin with.
 				<<arouse 'voyeur_sex' 1 `['unknown']`>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Leave'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 			<<actCLA 'Peek'>>
-				<<image `'characters/pavlovsk/school/girl/sonia/sex/school/sonia.school1,'+rand(0,3)+'.jpg'`>>
+				<<image 'characters/pavlovsk/school/girl/sonia/sex/school/sonia.school1,#.jpg' 0 3>>
 				You close the door quick enough that they don't notice you were there, but leave it open just a crack and continue to peer through. You watch as the boy pounds Sonia for all he's worth. After another minute, the boy grabs her by the hair and pulls her head back towards him while thrusting his hips forward vigorously. After a few more minutes, he pulls back and violently shakes for a few seconds as his cock pulses, sending long strands of cum spattering all over her ass. The boy pulls her head towards him and pokes her in the cheek with his dick. "Come on slut. Finish the job and clean me up." Sonia obediently starts sucking his cock clean. Deciding you would rather not be caught spying on them, you close the door and move away.
 				<<arouse 'voyeur_sex' 5 `['unknown']`>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Leave'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 			<<if $quest('school').func('isGroupMember','cool') or $quest('school').func('isGroupMember','jocks') or $quest('school').func('isGroupMember','gopniks')>>
 				<<actCLA '"What a fucking slut!"'>>
 					<<run $npcs.dec('A25','rel',5)>>
-					<<image `'characters/pavlovsk/school/girl/sonia/sex/school/sonia.school1,'+rand(0,3)+'.jpg'`>>
+					<<image 'characters/pavlovsk/school/girl/sonia/sex/school/sonia.school1,#.jpg' 0 3>>
 					<p>Undaunted in the face of such shameless debauchery, you continue with your business and go straight to the sink. While you lather your hands in soap, you turn to face the two of them and say "God you are such a fucking slut! I wouldn't be surprised if he can feel anything with how loose you must be after every guy in town has had a turn with you!"</p>
 					Sonia does her best to ignore your barbs as she keeps letting the boy fuck her. Drying your hands off, you walk over to them. You stand next to her hips facing the boy, reach down to grab her ass cheeks in your hands, and spread them apart. You then glance at the boy and say "You should fuck her ass, it might be a little tighter." He looks at you for only a moment, but smiles and seems to like the idea. He pulls his dick out of her pussy and shoves it balls deep into her ass. Sonia cries out a bit in pain as he starts roughly fucking her ass.
 					<p>The boy moans loudly, obviously enjoying the new hole he is fucking. As you let go of Sonia's ass and start to move out of the bathroom, you turn back and look at the boy. "You should get yourself checked out at the clinic after this - who knows what diseases she has." You then turn the attention to Sonia. "I'll let the rest of the boys know you are open for business as usual."</p>
 					<<arouse 'voyeur_sex' 5 `['unknown']`>>
-					<<arousalEnd>>
+					
 					<<actCLA 'Continue your break'>><<gs 'school_schedule'>><</actCLA>>
 				<</actCLA>>
 			<</if>>
 			<<actCLA 'Greet them'>>
 				<<set $npc('A25').rel += 3>>
-				<<image `'characters/pavlovsk/school/girl/sonia/sex/school/sonia.school1,'+rand(0,3)+'.jpg'`>>
+				<<image 'characters/pavlovsk/school/girl/sonia/sex/school/sonia.school1,#.jpg' 0 3>>
 				<p>Undaunted in the face of such shameless debauchery, you continue with your business and go straight to the sink. While you lather your hands in soap, you turn to face them and say: "Hey Sonia! Having fun down there?"</p>
 				<p>Sonia bobs her head up and down as she rocks back into him, fucking him as much as he is fucking her. "Oh god yes, I am loving it!" Drying your hands off, you walk over to the boy and lean on the wall next to him while taking a look to see that he is fucking her pussy.</p>
 				<p>"So are you going to let him fuck your ass too? Or is he unworthy of that special treat?" you ask Sonia.</p>
@@ -428,7 +428,7 @@
 				<p>The boys eyes light up and he wastes no time pulling his dick out of her pussy and shoving it up her ass. They both moan in delight as he does. "This is a special treat! Don't waste it!" you say to the boy as he pounds her ass and you start to move out of the bathroom.</p>
 				<p>"I'll see you in class, Sonia!" you shout back as you leave.</p>
 				<<arouse 'voyeur_sex' 5 `['unknown']`>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Continue your break'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<<elseif getvar("$soniasexrand") == 3>>
@@ -437,20 +437,20 @@
 			<p>"You're ours now... Isn't that right, whore?" Sonia, apparently content to play along, nods her head and happily agrees before Vasily walks up to her and pulls out his dick. "Open your mouth slut." Sonia barely gets her mouth open before Vasily shoves his cock in her mouth and she begins sucking him at once.</p>
 			<<arouse 'voyeur_sex' 5 `['unknown']`>>
 			<<actCLA 'Leave'>>
-				<<arousalEnd>> <<gt 'gschool_lessons' 'short_break'>>
+				 <<gt 'gschool_lessons' 'short_break'>>
 			<</actCLA>>
 			<<actCLA 'Watch'>>
-				<<image `'characters/pavlovsk/school/girl/sonia/sex/school/sonia.orgy0,0.jpg'`>>
+				<<image 'characters/pavlovsk/school/girl/sonia/sex/school/sonia.orgy0,0.jpg'>>
 				Sonia begins to deepthroat Vasily. Soon, all the guys have their cocks out and she starts jerking them off in turn to make sure no one feels left out. Before long she switches which cock she is sucking, changing them fairly often. Sometimes an impatient tug on the leash tells her to switch cocks when she's been sucking on one for too long. Part of you wants to leave them to their fun and head for your next class, but another wants to keep watching and risk getting caught.
 				<<arouse 'voyeur_sex' 5 `['unknown']`>>
 				<<actCLA 'Leave the restroom'>>
-					<<arousalEnd>> <<gt 'gschool_lessons' 'short_break'>>
+					 <<gt 'gschool_lessons' 'short_break'>>
 				<</actCLA>>
 				<<actCLA 'Keep watching'>>
-					<<image `'characters/pavlovsk/school/girl/sonia/sex/school/sonia.orgy.pre0,0.jpg'`>>
+					<<image 'characters/pavlovsk/school/girl/sonia/sex/school/sonia.orgy.pre0,0.jpg'>>
 					The guys not currently getting their dick sucked or jerked off start stripping her while waiting for their turn and before long, she's been stripped completely naked. They order her to sit on her knees and open her mouth. She sits back with an open mouth, waiting for the guys to give her their cum as they take turns jerking off in her mouth. With them almost finished, you know it's time for you to leave.
 					<<arouse 'voyeur_sex' 5 >>
-					<<arousalEnd>>
+					
 					<<actCLA 'Leave'>><<gs 'school_schedule'>><</actCLA>>
 				<</actCLA>>
 			<</actCLA>>
@@ -610,7 +610,7 @@
 									<p>His cock barely leaves your gapping asshole before he moans loudly and you feel the hot splatter of cum on your ass cheeks. After several more spurts, he leans forward and kisses the back of your neck. "You're the best $pc.name_nick." He then steps away, pulls his pants up and puts his shirt back on.</p>
 									As he finishes dressing he says: "Thanks for the fuck and all, but I need to get going. Talk to you later." He then walks out of the bathroom, leaving you to clean up alone.
 									<<cum 'butt' 'A3'>>
-									<<arousalEnd>>
+									
 									<<actCLA 'Leave the restroom'>><<gs 'school_schedule'>><</actCLA>>
 								<</actCLA>>
 							<</actCLA>>
@@ -637,7 +637,7 @@
 				You peek through the partially open stall door and see Lavrenti standing to the side of the toilet while Alyona is sitting on the toilet with her legs apart and back against the other stall wall, sucking Lavrenti''s dick. Neither of them have noticed you yet.
 				<<arouse 'voyeur_sex' 1 `['unknown']`>>
 				<<actCLA 'Sneak away and leave'>>
-					<<arousalEnd>> <<gt 'gschool_lessons' 'short_break'>>
+					 <<gt 'gschool_lessons' 'short_break'>>
 				<</actCLA>>
 				<<gs 'willpower' 'misc' 'resist' 'medium'>>
 				<<if $will_cost < $pc.pcs_willpwr>>
@@ -658,14 +658,14 @@
 									A few minutes later, she stops and stands up before pushing on his shoulders. He takes the hint and gets down on his knees. With their positions now reversed, she lifts one leg up in the air and spreads her legs before he pulls her panties aside and begins lapping at her pussy. She quickly starts moaning at the attention his tongue is giving her clit.
 									<<arouse 'voyeur_sex' 3 `['unknown']`>>
 									<<actCLA 'Stop watching'>>
-										<<arousalEnd>> <<gt 'gschool_lessons' 'short_break'>>
+										 <<gt 'gschool_lessons' 'short_break'>>
 									<</actCLA>>
 									<<actCLA 'Keep watching'>>
 										<<image "locations/pavlovsk/school/bathroom/sex/boys/alylav4.jpg">>
 										<p>Once her moans start getting loud and her breath starts to quicken, he stops licking her and stands up. As he does, she hikes her skirt and turns around, slightly bending over and he quickly lines up his cock and slides it in her obviously wet pussy. They both quickly start moaning and fucking like wild animals - you doubt they're even aware that you're still here. Before long Alyona starts to cry out, sounding like she is having a orgasm.</p>
 										<<arouse 'voyeur_sex' 5 >>
 										<<actCLA 'Stop watching'>>
-											<<arousalEnd>> <<gt 'gschool_lessons' 'short_break'>>
+											 <<gt 'gschool_lessons' 'short_break'>>
 										<</actCLA>>
 										<<actCLA 'The final'>>
 											<<image "locations/pavlovsk/school/bathroom/sex/boys/alylav5.jpg">>
@@ -677,7 +677,7 @@
 											"We already did, or a pale imitation of fucking anyways" she scornfully replies as she straightens her clothes.
 											<p>He looks like he's torn between amused and pissed off. "Oh please, you totally had an orgasm." He glances at you. "You saw she totally had a orgasm, right?" He then follows her out, their banter never abating, never giving you a chance to get in a word edge wise.</p>
 											<<arouse 'voyeur_sex' 2 >>
-											<<arousalEnd>>
+											
 											<<actCLA 'Leave'>><<gs 'school_schedule'>><</actCLA>>
 										<</actCLA>>
 									<</actCLA>>
@@ -722,7 +722,7 @@
 										<<arouse 'bj' 5 `['dom']`>>
 										<<arouse 'foreplay' 5 `['dom']`>>
 										<<set $time.minutes -= 5>>
-										<<arousalEnd>>
+										
 										<<actCLA 'Leave'>><<gs 'school_schedule'>><</actCLA>>
 									<</actCLA>>
 								<<else>>
@@ -743,7 +743,7 @@
 											It takes you a few minutes to straighten out your clothes and by the time you do and step out, he is gone.
 											<<cum 'breasts' 'A155' 1>>
 											<<arouse 'foreplay' 2 >>
-											<<arousalEnd>>
+											
 											<<actCLA 'Continue'>>
 												<<gt $location>>
 											<</actCLA>>
@@ -754,14 +754,14 @@
 						<<elseif $quest('school').func('isGroupMember','gopniks') and $pc.hotcat <= 5>>
 							<p>You push the stall door open to get a better look. Lavrenti glances over at you as the door opens and seems a bit surprised to see you there. Alyona also glances up, but doesn't stop sucking Lavrenti's dick while he looks at you with a questioning look. "What the? Can't you see that we're busy here? Maybe if you took better care of yourself and didn't look like a cow, we might invite you to join us." he says with a laugh and Alyona seems to snicker with a mouth full of cock. "So if you don't mind, fuck off!" he yells before he closes the stall door. Knowing better than to try and spy again, you leave before things get worse.</p>
 							<<arouse 'voyeur_sex' 2 >>
-							<<arousalEnd>>
+							
 							<<actCLA 'Leave'>><<gs 'school_schedule'>><</actCLA>>
 						<<else>>
 							<<fame 'pav' 'sex' 1>>
 							<<run $quest('school').func('groupRelInc','gopniks',-5)>>
 							<p>You push the stall door open to get a better look. Lavrenti glances over at you as the door opens and seems a bit surprised to see you there. Alyona also glances up and flips you off, but doesn't stop sucking Lavrenti's dick. Lavrenti gives you a dirty look. "What the fuck? Get lost loser!" he shouts before he slams the stall door closed in your face. Knowing better than to try and spy again, you leave before things get worse.</p>
 							<<arouse 'voyeur_sex' 2 >>
-							<<arousalEnd>>
+							
 							<<actCLA 'Leave'>><<gs 'school_schedule'>><</actCLA>>
 						<</if>>
 					<</actCLA>>
@@ -783,7 +783,7 @@
 	He nods and smiles. "Well see you later." and with that he walks out of the bathroom, leaving you to finish cleaning up.
 	<<cum 'face' 'A147'>>
 	<<arouse 'foreplay' 2 >>
-	<<arousalEnd>>
+	
 	<<actCLA 'Leave the restroom'>><<gs 'school_schedule'>><</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'join_alylav'>>
@@ -811,7 +811,7 @@
 				As you and Alyona start to get dressed and Lavrenti pulls up his pants, Alyona responds. "It was okay, I suppose. Maybe if I get bored enough again, we'll see.". Alyona cleans up and heads for the door, with Lavrenti following her out. "Oh please, you loved it and you know it." he teases and she replies "You wish, it was okayish." They continue to banter as they walk out and leave you behind.
 				<<cum 'face' 'A155'>>
 				<<arouse 'voyeur_sex' 2 >>
-				<<arousalEnd>>
+				
 				<<actCLA 'Leave'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<</actCLA>>
@@ -821,7 +821,7 @@
 	<<set $menu_off = 1>>
 	<<set $time.minutes += 3>>
 	<<gs 'drugs' 'smoke'>>
-	<<image `'locations/pavlovsk/school/bathroom/smoke'+rand(1,3)+'.jpg'`>>
+	<<image 'locations/pavlovsk/school/bathroom/smoke#.jpg' 1 3>>
 	You pull out your pack of cigarettes and fish one out. Placing it between your lips, you light the cigarette and take a long slow drag of it. You spend a few minutes smoking the cigarette before dropping the bud into the toilet.
 	<<actCLA 'Continue your break'>>
 		<<gt $location>>
@@ -927,7 +927,7 @@
 																					<<else>>
 																						<p>Ms. Braakman pushes you down, bending you over her desk. She reaches around and shoves your panties in your mouth before she starts fucking you with the strapon again. Several minutes go by until she finally stops, obviously tired from the exertion. "Get your clothes and get out!" she demands and you quickly gather up your clothes, pull your panties out of your mouth and get dressed before leaving.</p>
 																						<<arouse 'vaginal_strap' 3 `['sub','humiliation']`>>
-																						<<arousalEnd>>
+																						
 																						<<actCLA 'Leave'>><<gs 'school_schedule'>><</actCLA>>
 																					<</if>>
 																				<</actCLA>>
@@ -942,7 +942,7 @@
 																<<image "locations/pavlovsk/school/bathroom/sex/girls/causmo6.jpg">>
 																You nod your head as best you can. "Yes Ms. Braakman, I'm sorry"
 																<p>She pulls you back up into a standing position and places the end of the meter stick just under your jaw. "Now that's better. Perhaps next time you will behave yourself. I will, of course, have to report this to Ms. Volkov. Now get out and behave!"</p>
-																<<arousalEnd>>
+																
 																<<actCLA 'Leave'>><<gs 'school_schedule'>><</actCLA>>
 															<</actCLA>>
 														<</if>>
@@ -956,7 +956,7 @@
 											<<image "locations/pavlovsk/school/bathroom/sex/girls/causmo6.jpg">>
 											You nod your head as best you can. "Yes Ms. Braakman, I'm sorry"
 											<p>She pulls you back up into a standing position and places the end of the meter stick just under your jaw. "Now that's better. Perhaps next time you will behave yourself. I will, of course, have to report this to Ms. Volkov. Now get out of here and behave!"</p>
-											<<arousalEnd>>
+											
 											<<actCLA 'Leave'>><<gs 'school_schedule'>><</actCLA>>
 										<</actCLA>>
 									<</actCLA>>
@@ -1001,7 +1001,7 @@
 				You smile at her. "Glad I could help you out." She can hear the humor in your voice and laughs a little. Once dressed, she takes the strapon from you and cleans it off in the sink before putting it back in her bag.
 				<p>As she heads out. "See you around $pc.name_nick."</p>
 				<<arouse 'vaginal_strap_give' 5 `['lesbian']`>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Continue your break'>>
 					<<gt $location>>
 				<</actCLA>>
@@ -1028,7 +1028,7 @@
 					You smile at her. "Glad I could help you out." She can hear the humor in your voice and laughs a little. Once dressed she takes the strapon from you and cleans it off in the sink before putting it back in her bag.
 					<p>As she heads out. "See you around $pc.name_nick."</p>
 					<<arouse 'vaginal_strap_give' 5 `['lesbian']`>>
-					<<arousalEnd>>
+					
 					<<actCLA 'Continue your break'>>
 						<<gt $location>>
 					<</actCLA>>
@@ -1050,7 +1050,7 @@
 		<p>Once the trembling stops, she sighs for a moment, then says, "Lick me clean, slut!"</p>
 		You obey her and start licking all her smeared juices off her. After you get her as clean as you can, she pushes you away, gets off the sink and starts to get dressed. As she finishes up, she turns to you. "I'll make sure to let the other girls know what an obedient little lesbian slut you are." she says with a laugh before walking out.
 		<<arouse 'cuni_give' 10 `['lesbian','sub']`>>
-		<<arousalEnd>>
+		
 		<<actCLA 'Continue your break'>>
 			<<gt $location>>
 		<</actCLA>>

sugarcube/src/activities/school/schoolday/breaks/gschool_chats.tw

@@ -13,12 +13,12 @@
 			<<image "locations/pavlovsk/school/events/buttgrab_nopanties.jpg">>
 			When you enter the hallway heading for the classroom the nerds hang out in, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air before you feel hands pawing at your naked ass. As you move to turn around, the hand quickly pulls away. By the time you can see who''s behind you, you find half the guys in your class standing there, all looking in different directions and trying to act inconspicuous, a few of them even having the gall to whistle innocently. You try to tell from their faces which one of them just touched you as you hear several classmates remark on your lack of panties.
 			<<arouse 'flash' 1 `['humiliation']`>>
-			<<arousalEnd>>
+			
 		<<else>>
 			<<image "locations/pavlovsk/school/events/boysex_tualet.jpg">>
 			When you enter the hallway heading for the classroom the nerds hang out in, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air before you feel hands pawing at your ass. As you move to turn around, the hand quickly pulls away. By the time you can see who''s behind you, you find half the guys in your class standing there, all looking in different directions and trying to act inconspicuous, a few of them even having the gall to whistle innocently. You try to tell from their faces which one of them just touched you.
 			<<arouse 'flashlite' 1 `['humiliation']`>>
-			<<arousalEnd>>
+			
 		<</if>>
 		<<actCLA 'Ignore it'>>
 			<<gt 'gschool_chats' 'nerds'>>
@@ -155,12 +155,12 @@
 			<<image "locations/pavlovsk/school/events/buttgrab_nopanties.jpg">>
 			When you enter the hallway heading for the stairwell, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air before you feel hands pawing at your naked ass. As you move to turn around, the hand quickly pulls away. By the time you can see who''s behind you, you find half the guys in your class standing there, all looking in different directions and trying to act inconspicuous, a few of them even having the gall to whistle innocently. You try to tell from their faces which one of them just touched you as you hear several classmates remark on your lack of panties.
 			<<arouse 'flash' 1 `['humiliation']`>>
-			<<arousalEnd>>
+			
 		<<else>>
 			<<image "locations/pavlovsk/school/events/boysex_tualet.jpg">>
 			When you enter the hallway heading for the stairwell, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air before you feel hands pawing at your ass. As you move to turn around, the hand quickly pulls away. By the time you can see who''s behind you, you find half the guys in your class standing there, all looking in different directions and trying to act inconspicuous, a few of them even having the gall to whistle innocently. You try to tell from their faces which one of them just touched you.
 			<<arouse 'flashlite' 1 `['humiliation']`>>
-			<<arousalEnd>>
+			
 		<</if>>
 		<<actCLA 'Ignore it'>>
 			<<gt 'gschool_chats' 'gopniks'>>
@@ -300,12 +300,12 @@
 			<<image "locations/pavlovsk/school/events/buttgrab_nopanties.jpg">>
 			When you enter the hallway, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air before you feel hands pawing at your naked ass. As you move to turn around, the hand quickly pulls away. By the time you can see who''s behind you, you find half the guys in your class standing there, all looking in different directions and trying to act inconspicuous, a few of them even having the gall to whistle innocently. You try to tell from their faces which one of them just touched you as you hear several classmates remark on your lack of panties.
 			<<arouse 'flash' 1 `['humiliation']`>>
-			<<arousalEnd>>
+			
 		<<else>>
 			<<image "locations/pavlovsk/school/events/boysex_tualet.jpg">>
 			When you enter the hallway, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air before you feel hands pawing at your ass. As you move to turn around, the hand quickly pulls away. By the time you can see who''s behind you, you find half the guys in your class standing there, all looking in different directions and trying to act inconspicuous, a few of them even having the gall to whistle innocently. You try to tell from their faces which one of them just touched you.
 			<<arouse 'flashlite' 1 `['humiliation']`>>
-			<<arousalEnd>>
+			
 		<</if>>
 		<<actCLA 'Ignore it'>>
 			<<gt 'gschool_chats' 'cooljocks'>>

sugarcube/src/activities/school/schoolday/lessons/english.tw

@@ -107,17 +107,17 @@
 							<<run $pc.skillExperienceGain('charisma',rand(1,2))>>
 							<center><b><h4><font color=#E400FF><<"Nikolai [$Niko] Volkov">></font></h4></b></center>
 							<<if getvar("$NikoPayback") > 0>>
-								<<image `'characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg'`>>
+								<<image 'characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg'>>
 								<p>Niko sneers at you as you approach. "What do you want?"</p>
 								"I just want to talk," you reply and he scoffs before nodding. You spend the next few minutes having a strained conversation until the end of the class.
 							<<elseif getvar("$NikoVolkovQW") >= 5>>
 								<<relationship 'A189' 'like'>>
-								<<image `'characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg'`>>
+								<<image 'characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg'>>
 								<p>As you approach Niko, he gives you a warm smile. "My princess graces with me with her presence. How can be of assistance?"</p>
 								You giggle. "I have spare time and I can't think of a better use of it than spending it with you." Niko chuckles and grabs onto your hand, lifting it toward his face and giving it a soft kiss before saying "Your wish is my command." You both spend the next few minutes chatting while exchanging loving glares until the end of the class.
 							<<else>>
 								<<relationship 'A189' 'like'>>
-								<<image `'characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg'`>>
+								<<image 'characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg'>>
 								<p>As you approach Niko, he gives you a warm smile. "Ahh a lovely princess decides to grace me with her presence. How can I be of assistance?"</p>
 								<p>You giggle. "You're so weird! I just want to chat for a bit, okay?" Niko chuckles and grabs onto your hand, lifting it toward his face and giving it a soft kiss before saying "Your wish is my command." You both begin chatting until the end of the class.</p>
 							<</if>>

sugarcube/src/activities/school/schoolday/lessons/pe.tw

@@ -88,7 +88,7 @@
 							<<image "locations/pavlovsk/school/gym/nushtopless.jpg">>
 							You turn your head and look over to see Anushka running next to you, but she has her top off and is carrying it in her hand. You can't help but notice her small breasts bouncing with every step she takes. She notices where your eyes drift and grins at you. She stays alongside you for most of the run and a few boys pass by, slowing down to take a good look. Some of the girls look as well, but most just give dirty or disgusted looks to Anushka.
 							<<arouse 'erotic_nudity' 5>>
-							<<arousalEnd>>
+							
 							<<actCLA 'Finish your run'>>
 								<<gt 'school_lesson_pe_end'>>
 							<</actCLA>>
@@ -115,7 +115,7 @@
 						"The weather isn''t great, so you'll be running as many laps of the gym as you can. Start when you're ready."
 						You start running laps around the inside of the gym and it's uneventful until you see Anushka pass behind Coach Nikolaevich and pull down the back of her shorts to show off her panty clad ass. It doesn''t take too long before many of the boys catch up to Anushka, but not pass her. They wait until she passes behind the teacher and flashes them her panty clad ass again.
 						<<arouse 'erotic_nudity' 5>>
-						<<arousalEnd>>
+						
 					<<else>>
 						<<image "locations/pavlovsk/school/gym/fizra1.jpg">>
 						"The weather isn''t great, so you'll be running as many laps of the gym as you can. Start when you're ready."
@@ -333,7 +333,7 @@
 				<<image "locations/pavlovsk/school/gym/bouncebhand.jpg">>
 				<p>Irina is doing jumping jacks and her breasts are really bouncing - she obviously isn't wearing a sports bra. The bouncing of her breasts starts to draw the attention of a lot of the boys as Stasya walks up behind her, reaches round and grabs her breasts. Irina lets out a startled squeak, followed by a blush when Stasya whispers in her ear and she sees all the boys staring.</p>
 				<<arouse 'erotic_nudity' 2>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Continue'>>
 					<<gt 'gschool_lessons4' 'jumping_jacks'>>
 				<</actCLA>>
@@ -349,7 +349,7 @@
 				<<video "locations/pavlovsk/school/gym/nipslip.mp4">>
 				Bella apparently doesn''t believe in wearing sports bras. During the pushup part of the class, the top of her breast pops out of her tank top, showing her nipple off for everyone to see. Lizaveta quickly points it out to her, making her blush a deep red as she quickly covers her nipple up and tries to ignore the laughter and all the staring boys around her.
 				<<arouse 'erotic_nudity' 2>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Continue'>>
 					<<gt 'gschool_lessons4' 'pushups'>>
 				<</actCLA>>
@@ -386,7 +386,7 @@
 				Deciding you have enough evidence, and not wanting to play your hand just yet, you quietly close the door and sneak off, extremely pleased with yourself.
 				<<arouse 'erotic_nudity' 5>>
 				<<actCLA 'Go to the showers'>>
-					<<arousalEnd>>
+					
 					<<gt 'gschool_lessons4' 'postphys2'>>
 				<</actCLA>>
 			<</actCLA>>
@@ -399,7 +399,7 @@
 		<<set $postphys_event = $time.daystart>> <<gt 'Zvereva_sub_1' 'showers'>>
 
 	<</if>>*/
-	<<image `'locations/pavlovsk/school/gym/locker/postphys'+rand(1,4)+'.jpg'`>>
+	<<image 'locations/pavlovsk/school/gym/locker/postphys#.jpg' 1 4>>
 	<p>You enter the girls locker room and find most of the other girls already inside, undressing, changing, heading for or returning from the showers, or simply chatting with each other. You ignore the girls in various states of undress around you, find your locker, and start to take off your clothes.</p>
 	<<gs 'gschool_gossip' 'gym'>>
 	<<act 'Have a shower'>>
@@ -441,11 +441,11 @@
 			<<gt 'school_lesson_pe_postdress'>>
 		<</actCLA>>
 		<<actCLA 'Take a peek'>>
-			<<image `'locations/pavlovsk/school/gym/sex/les'+rand(1,3)+'.jpg'`>>
+			<<image 'locations/pavlovsk/school/gym/sex/les#.jpg' 1 3>>
 			Curious, you sneak toward the source of the soft, feminine sounds. As you get closer, you are sure you are about to come across some girls making out and, sure enough, when you peek around the next corner, you spy Lena and Lera making out and feeling each other up. Their display of passion is so infectious that you are tempted to join them, but they seem so into each other that you would feel guilty intruding on their tender moment. That doesn''t make it any less arousing to watch, though.
 			<<arouse 'erotic_nudity' 3>>
 			<<actCLA 'Leave them in peace'>>
-				<<arousalEnd>> <<gt 'school_lesson_pe_postdress'>>
+				 <<gt 'school_lesson_pe_postdress'>>
 			<</actCLA>>
 			<<actCLA 'Masturbate'>>
 				<<video "locations/pavlovsk/school/gym/sex/mast#.mp4" 1 2>>
@@ -457,14 +457,14 @@
 				<<arouse 'clit_finger' -10 `['masturbate']`>>
 				<p>As you do, you hear their joined moans of pleasure grow to a crescendo that fills the room. Then, all goes quiet. You peek around the corner again and watch them talk softly for a moment, exchanging final kisses before they get up to get dressed. You quickly straighten out your clothes as well and head for the exit as quietly as you can - you don't want them to know you were spying on them.</p>
 				<<set $orgasm_txt = ''>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Return'>>
 					<<gt 'school_lesson_pe_postdress'>>
 				<</actCLA>>
 			<</actCLA>>
 		<</actCLA>>
 	<<or 0>>
-		<<image `'locations/pavlovsk/school/gym/locker/nudepic'+rand(1,2)+'.jpg'`>>
+		<<image 'locations/pavlovsk/school/gym/locker/nudepic#.jpg' 1 2>>
 		<p>Still naked, you hear a couple of girls giggling, so you turn to look at them, but they're not looking at you. Confused, you follow their collective gaze and see <<npc 'A18'>><</npc>> standing there with her phone out. Glancing back at them, you see them looking at you and giggling again - obviously, something happened that you missed; something that they thought was funny. You wonder what it was.</p>
 		<<actCLA 'Continue'>>
 			<<gt 'school_lesson_pe_postdress'>>
@@ -602,7 +602,7 @@
 			<</actCLA>>
 		<</if>>
 	<<or 4>>
-		<<image `'locations/pavlovsk/school/gym/locker/postphys'+rand(1,4)+'.jpg'`>>
+		<<image 'locations/pavlovsk/school/gym/locker/postphys#.jpg' 1 4>>
 		<p>You take your clothes out of your locker and start putting them on. This takes longer than expected, however, since you get distracted several times while getting dressed - sometimes by other girls engaging you in a brief conversation, sometimes by someone or something catching your eye. By the time you are finished, most of the other girls have already left the locker room.</p>
 		<<actCLA 'Continue'>>
 			<<gt 'school_lesson_pe_postdress'>>
@@ -611,7 +611,7 @@
 	
 :: school_lesson_pe_postdress[event]
 	<<run $wardrobe.wearLastWorn('school_sports',true)>>
-	<<image `'locations/pavlovsk/school/gym/locker/postphys'+rand(1,4)+'.jpg'`>>
+	<<image 'locations/pavlovsk/school/gym/locker/postphys#.jpg' 1 4>>
 	You finish getting dressed and are ready to leave the gym.
 	<<set $location.passage = 'school_lesson_pe_lockerroom'>>
 	<<act "Mirror">><<gt "mirror" "start">><</act>>
@@ -620,7 +620,7 @@
 	<</act>>
 
 :: school_lesson_pe_lockerroom[public indoors]
-<<image `'locations/pavlovsk/school/gym/locker/postphys'+rand(1,4)+'.jpg'`>>
+<<image 'locations/pavlovsk/school/gym/locker/postphys#.jpg' 1 4>>
 	<<act 'Leave'>>
 		<<gs 'school_schedule'>>
 	<</act>>

sugarcube/src/activities/school/schoolday/skips/boys_bathroom.tw

@@ -154,7 +154,7 @@
 				<<actCLA 'Slap him' undefined `{willpower:['sex','self','medium']}`>>
 						<<run $npcs.dec('A154','rel',5)>>
 
-						<<arousalEnd>>
+						
 						<p>You push him away again and this time, you gain just enough room to slap him. He stops, a bit surprised at first, before slapping you back. "What the fuck?! Don't you dare slap me, bitch!"</p>
 						<p>Your hand goes to your cheek and you work your jaw. It hurts and you can already feel the side of your face going red - you don't think he hit you nearly as hard as he could have. "You wouldn't stop! I don't want to fuck you."</p>
 						He backs up a step, his expression furious once more, and shoves you towards the door. "Fine, then get the fuck out of here. Fucking cock tease."
@@ -272,7 +272,7 @@
 			<<arouse 'anal' 6 `['sub','rough']`>>
 			<<actCLA 'Finish'>>
 				<<cum 'anus' $sex.npcId>>
-				<<arousalEnd>>
+				
 				<h2>Boy's bathroom</h2>
 				<<image "characters/pavlovsk/school/boy/radomir/sex/school/boy1cum.jpg">>
 				He thrusts deeply into your ass and you soon feel a hot jet of sperm shoot into your bowels. He jerks out of you as he's cumming, the last few spurts of cum landing on your inner thighs and pussy. He strokes his dick to get the last few drops out, his heavy breathing still echoing in the bathroom as he wipes them off on your thigh.
@@ -369,7 +369,7 @@
 				Knowing you don't have much time, you rub your pussy furiously and your climax hits you just as he pulls out of you.
 				<<set $orgasm_or = 'yes'>>
 				<<arouse 'clit_finger' 5 >>
-				<<arousalEnd>>
+				
 				<<set $noShampoo = 1>>
 				<<gs 'cleanBody'>>
 				His dick barely exits your ass before the first jet of cum lands on your inner thigh, another lands on your pubic area and a third hits your wet cunt and fingers. He looks at you and smiles, giving you a quick kiss while he helps you down from the sink. "That was amazing," he comments and you're inclined to agree.
@@ -439,7 +439,7 @@
 						<p>As you do, he starts jerking off, holding the tip directly over your tongue as spurts of cum start flying onto your tongue and into your mouth. Jet after jet shoots out, more than you've ever seen before, and you wonder if he's going to stop at all. He must have had a serious amount saved up; not only is the amount exceptional, but it seems thicker than any sperm you're familiar with. He completely coats your tongue in white liquid and more of it runs into your mouth, filling it.</p>
 						Letting out one last loud sigh, he steps back and leans against the stall wall, taking a long look at you sitting on your knees with his cum on your tongue. You're strangely proud of yourself and let him take one last look at you before you pull your tongue back into your mouth and swallow, feeling it go down your throat like glue, then open wide again to show him you gulped it all down.
 						<<arouse 'bj' 5 >>
-						<<arousalEnd>>
+						
 						<<cum 'mouth' $sex.npcId>>
 						He grins as he watches your little display and says, more to himself than you, "Fuck, I love Russian girls..." He pulls up his pants and bends over to give you a quick kiss on the forehead before he finishes getting dressed. You get up and make yourself presentable as well.
 						<<actCLA 'Finish'>>
@@ -478,7 +478,7 @@
 								<p>As you do, he starts jerking off, holding the tip directly over your tongue as spurts of cum start flying onto your tongue and into your mouth. Jet after jet shoots out, more than you've ever seen before, and you wonder if he's going to stop at all. He must have had a serious amount saved up; not only is the amount exceptional, but it seems thicker than any cum you're familiar with. He completely coats your tongue in white liquid and more of it runs into your mouth, filling it.</p>
 								Letting out one last loud sigh, he steps back and leans against the stall wall, taking a long look at you sitting on your knees with his cum on your tongue. You're strangely proud of yourself and let him take one last look at you before you pull your tongue back into your mouth and swallow, feeling it go down your throat like glue, then open wide again to show him you gulped it all down.
 								<<arouse 'bj' 5 >>
-								<<arousalEnd>>
+								
 								<<cum 'mouth' $sex.npcId>>
 								He grins as he watches your little display and says, more to himself than you, "Fuck, I love Russian girls..." He pulls up his pants and bends over to give you a quick kiss on the forehead before he finishes getting dressed. You get up and make yourself presentable as well.
 								<<actCLA 'Finish'>>
@@ -491,7 +491,7 @@
 								<<image "characters/pavlovsk/school/boy/marcus/sex/school/marc7.jpg">>
 								You glance back at him and grin. He gets the idea and redoubles his efforts to fuck you, his balls slapping against your clit with each powerful thrust. You feel your need for release grow with every thrust and everything he does only seems to make it better. Finally, you feel his dick pulsing inside you as he fills your pussy with his huge load. When he pulls out, you can feel his thick cum slowly leaking out and running down your inner leg.
 								<<arouse 'vaginal' 5 >>
-								<<arousalEnd>>
+								
 								<<cum 'vagina' $sex.npcId>>
 								<<actCLA 'Finish'>>
 									<<gt 'gschool_boys_bathroom' 'boy4_end'>>
@@ -519,7 +519,7 @@
 							<p>As you do, he starts jerking off, holding the tip directly over your tongue as spurts of cum start flying onto your tongue and into your mouth. Jet after jet shoots out, more than you've ever seen before, and you wonder if he's going to stop at all. He must have had a serious amount saved up; not only is the amount exceptional, but it seems thicker than any cum you're familiar with. He completely coats your tongue in white liquid and more of it runs into your mouth, filling it.</p>
 							Letting out one last loud sigh, he steps back and leans against the stall wall, taking a long look at you sitting on your knees with his cum on your tongue. You're strangely proud of yourself and let him take one last look at you before you pull your tongue back into your mouth and swallow, feeling it go down your throat like glue, then open wide again to show him you gulped it all down.
 							<<arouse 'bj' 5 >>
-							<<arousalEnd>>
+							
 							<<cum 'mouth' $sex.npcId>>
 							He grins as he watches your little display and says, more to himself than you, "Fuck, I love Russian girls..." He pulls up his pants and bends over to give you a quick kiss on the forehead before he finishes getting dressed. You get up and make yourself presentable as well.
 							<<actCLA 'Finish'>>
@@ -742,7 +742,7 @@
 		<<gs 'pain' 1 'vaginal' 'stretch'>>
 		<<arouse 'vaginal' 4 `['group']`>>
 		<<arouse 'bj' 4 `['group']`>>
-		<<arousalEnd>>
+		
 		<!-- Boy A9 -->
 		<<gs 'npcgeneratec' 0 'unknown guy' `(year - ((pcs_dob - (pcs_dob mod 10000)) / 10000))`>>
 
@@ -759,7 +759,7 @@
 			<p>The sudden surge of agony causes you to cry out, the threat about keeping quiet momentarily forgotten, but it gets even worse: As soon as Roman has forced himself all the way in, he starts hammering away at your ass. You do your best to make as little noise as you can while tears run down your face, but it is difficult - the pain only seems to get worse. Before long, the dick is pulled out of your ass and you sigh in relief, but too soon: Another takes its place a few seconds later, and so it continues - the guys take turns fucking your ass or holding you up.</p>
 			<<gs 'pain' 1 'asshole' 'stretch'>>
 			<<arouse 'anal' 10 `['group']`>>
-			<<arousalEnd>>
+			
 			<!-- Boy A9 -->
 			<!--<<gs 'boyStat' $boy1[1]>>-->
 			<!-- Boy A10 -->
@@ -772,7 +772,7 @@
 				You're so dazed by your suffering that you're barely even aware that they're talking, let alone that they're talking and joking about you. As they switch places, they start arguing about whose turn it is to fuck you where or who is taking too long on his turn.
 				<<arouse 'anal' 3 `['group']`>>
 				<<arouse 'bj' 3 `['group']`>>
-				<<arousalEnd>>
+				
 				<!-- Boy A9 -->
 				<<gs 'boyStat' $boy1[1]>>
 				<<gs 'boyStat' $boy1[2]>>
@@ -788,7 +788,7 @@
 					<<arouse 'vaginal' 5 `['group']`>>
 					<<arouse 'anal' 5 `['group']`>>
 					<<arouse 'hj' 5 `['group']`>>
-					<<arousalEnd>>
+					
 					<!-- Boy A9 -->
 					<<gs 'boyStat' $boy1[1]>>
 					<!-- Boy A10 -->
@@ -893,7 +893,7 @@
 		<<set $orgasm_txt = 'You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet.'>>
 		<<set $orgasm_or = 'custom'>>
 		<<arouse 'clit_finger' 20 `['masturbate']`>>
-		<<arousalEnd>>
+		
 		By the sound of it, you came in perfect unison with her and only a few seconds later, you hear him grunt as well. You then hear the water running and they talk in low voices before you hear the door open and close, and all is quiet once more.
 		<<if getvar("$school_bunk") == 0>>
 			<<actCLA 'Continue to play on phone'>>
@@ -941,7 +941,7 @@
 		<<set $orgasm_txt = 'You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seat.'>>
 		<<set $orgasm_or = 'custom'>>
 		<<arouse 'clit_finger' 10 `['masturbate']`>>
-		<<arousalEnd>>
+		
 		By the sound of it, you came in perfect unison with her and only a few seconds later, you hear him grunt as well. You then hear the water running and they talk in low voices before you hear the door open and close, and all is quiet once more.
 		<<if getvar("$school_bunk") == 0>>
 			<<actCLA 'Continue to play on phone'>>
@@ -977,7 +977,7 @@
 	<<else>>
 		<<actCLA 'Wait and resist masturbating' undefined `{willpower:['misc','self','hard']}`>>
 
-				<<arousalEnd>>
+				
 				<p>You banish these thoughts from your mind - with great effort - and decide to keep quiet and wait until they're done. She gets very loud after a while, obviously having an orgasm, and moans obscenities, encouraging him to fuck her ass harder. A few minutes later, he grunts as well. You then hear the water running and they talk in low voices before you hear the door open and close, and all is quiet once more.</p>
 				<<if getvar("$school_bunk") == 0>>
 					<<actCLA 'Continue to play on phone'>>
@@ -1004,7 +1004,7 @@
 		<<set $orgasm_txt = 'You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seat.'>>
 		<<set $orgasm_or = 'custom'>>
 		<<arouse 'vaginal_finger' 20 `['masturbate']`>>
-		<<arousalEnd>>
+		
 		By the sound of it, you came in perfect unison with her and only a few seconds later, you hear him grunt as well. You then hear the water running and they talk in low voices before you hear the door open and close, and all is quiet once more.
 		<<if getvar("$school_bunk") == 0>>
 			<<actCLA 'Continue to play on phone'>>
@@ -1017,7 +1017,7 @@
 		<</if>>
 	<</actCLA>>
 	<<actCLA 'Join them'>>
-		<<arousalEnd>> <<gt 'gschool_boys_bathroom' 'Join them'>>
+		 <<gt 'gschool_boys_bathroom' 'Join them'>>
 	<</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'Join them'>>
@@ -1044,7 +1044,7 @@
 				<<set $orgasm_or = 'no'>>
 				<<arouse 'bj' 5 `['group']`>>
 				<<arouse 'kiss' 5 >>
-				<<arousalEnd>>
+				
 				<<cum 'mouth' $sex.npcId>>
 				<h2>Boy's bathroom</h2>
 				<<image "locations/pavlovsk/school/bathroom/sex/boys/couplecum.jpg">>
@@ -1071,7 +1071,7 @@
 			<<set $orgasm_txt = 'You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse.'>>
 			<<set $orgasm_or = 'custom'>>
 			<<arouse 'vaginal_finger' 10 `['masturbate']`>>
-			<<arousalEnd>>
+			
 			Anushka starts to scream as her body is rocked by muscle spasms as she has an orgasm. Arkadi just fucks her right through her orgasm before pulling out and pushing her down. She quickly turns around and drops to her knees, opening her mouth and sticking out her tongue. He gives his cock a few jerks before his cum starts flying all over her face and into her mouth. Once he finishes, she sucks his dick, sucking out the last few drops of cum from him. Afterwards, as he gets dressed, she uses her fingers to clean her face, sucking the cum from her fingers before she gets dressed as well. As she finishes getting dressed, she looks over at you and winks. "Hope you enjoyed the show." The two of them then leave.
 			<<actCLA 'Go to class'>><<gs 'school_schedule'>><</actCLA>>
 		<</actCLA>>
@@ -1083,7 +1083,7 @@
 			<p>He lifts one of her legs off the ground and turns her sideways. Her leg is barely up in the air when his dickcm $dick_girth cock penetrates her pussy. You would be impressed with his stamina if you weren't so occupied with enjoying this.</p>
 			Anushka starts to scream as her body is rocked by muscle spasms as she has an orgasm. Arkadi just fucks her right through her orgasm before pulling out and pushing her down. She quickly turns around and drops to her knees, opening her mouth and sticking out her tongue. He gives his cock a few jerks before his cum starts flying all over her face and into her mouth. Once he finishes, she sucks his dick, sucking out the last few drops of cum from him. Afterwards, as he gets dressed, she uses her fingers to clean her face, sucking the cum from her fingers before she gets dressed as well. As she finishes getting dressed, she looks over at you and winks. "Hope you enjoyed the show." The two of them then leave.
 			<<arouse 'voyeur_sex' 10 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Go to class'>><<gs 'school_schedule'>><</actCLA>>
 		<</actCLA>>
 	<</if>>
@@ -1097,7 +1097,7 @@
 	<<actCLA 'Watch'>>
 		<<set $pc.horny += 15>>
 		<<arouse 'voyeur_sex' 10 >>
-		<<arousalEnd>>
+		
 		<h2>Boy's bathroom</h2>
 		<<video "locations/pavlovsk/school/bathroom/sex/teachers2.mp4">>
 		You decide to keep watching them. She sucks his cock for a while and neither seem to be aware of your presence as they are too engrossed in each other. He pulls her up, turns her around and bends her over the sinks, pulling her panties down as she hikes up her skirt. He moves up and starts fucking her, slow but passionate at first but as she begins to moan louder, he picks up his pace and before long, he's pounding her like crazy.
@@ -1140,7 +1140,7 @@
 	<<set $orgasm += 1>>
 	<<set $pc.horny = 0>>
 	<<arouse 'clit_finger' 10 `['masturbate']`>>
-	<<arousalEnd>>
+	
 	<h2>Boy's bathroom</h2>
 	<<video "locations/pavlovsk/school/bathroom/sex/masturbate#.mp4" 1 2>>
 	<<if $wardrobe.pantyworntype == 'true'>>
@@ -1237,7 +1237,7 @@
 				<p>He pulls his pants down just enough to release his manhood and make it easier for you. You give him an appreciative look and stroke his dick a few times until it's fully erect, then lean forward and start licking it; you lick up and down the shaft and run your tongue around the head, your eyes locked with his before you smile at him and take his dickcm $dick_girth cock into your mouth. You wrap your $pc_desc['lips'] lips tightly around his dick and start bobbing your head, stroking his cock with your lips as your tongue continues making its rounds. He rests one hand on the top of your head, but he lets you completely control the action.</p>
 				You caress and fondle his balls with one of your hands while the other strokes him in unison with your head''s movement. You increase your speed over time and take him as deep into your mouth as you can without gagging. He starts moaning and you feel his hand dig into your hair, telling you that he's getting close.
 				<<arouse 'bj' 10 `['dom']`>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Continue'>>
 					<h2>Boy's bathroom</h2>
 					<<image "characters/pavlovsk/school/teacher/makar/sex/school/caughtcum.jpg">>
@@ -1293,7 +1293,7 @@
 							<p>Without a word, he walks over to one of the sinks and washes his hands; he seems to be ignoring you, but you can see that he's giving you sideways glances. Finally, he smiles. "Feel free to cut class any time you like, $pc.name_first. I'll happily keep your secret."</p>
 							<p>You smile back. "If I get 'punished' like that every time I skip class, I will." He chuckles at that, shakes his head, then leaves the bathroom - you think you can hear him whistling outside as he walks away. That was amazing and you also have the rest of the period to yourself, even if you have his cum dripping down your face.</p>
 							<<cum 'face' 'A128' 1>>
-							<<arousalEnd>>
+							
 							<<if getvar("$school_bunk") == 0>>
 								<<actCLA 'Continue to play on phone'>>
 									<<gt 'gschool_boys_bathroom' 'bathroom2'>>
@@ -1335,7 +1335,7 @@
 											<p>Without a word, he walks over to one of the sinks and washes his hands; he seems to be ignoring you, but you can see that he's giving you sideways glances. Finally, he smiles. "Feel free to cut class any time you like, $pc.name_first. I'll happily keep your secret."</p>
 											<p>You smile back. "If I get 'punished' like that every time I skip class, I will." He chuckles at that, shakes his head, then leaves the bathroom - you think you can hear him whistling outside as he walks away. That was amazing and you also have the rest of the period to yourself, even if you have his cum dripping down your face.</p>
 											<<cum 'face' 'A128' 1>>
-											<<arousalEnd>>
+											
 											<<if getvar("$school_bunk") == 0>>
 												<<actCLA 'Continue to play on phone'>>
 													<<gt 'gschool_boys_bathroom' 'bathroom2'>>
@@ -1487,7 +1487,7 @@
 						As soon his dick is out of your mouth, he jerks it a few times while pointing it at you. It starts spurting cum all over your face, mostly around your mouth. Once he's finished, he shoves his cock back into your mouth and you dutifully lick him clean, feeling him go limp in your mouth. He pulls out of your mouth and tucks his dick back into his pants.
 						<p>Wordlessly, Mr. Ivanov walks over to one of the sinks and washes his hands; he seems to be ignoring you, but you can see that he's looking at you in the mirror. He gives you a cold smile. "Don't think this will get me to cut you any slack in my class, $pc.name_last. And don't you <i>dare</i> skip my lessons. I'll be seeing you soon." With that, he walks out of the bathroom.</p>
 						Your throat is burning and you like Mr. Ivanov even less than ever before. You watch him walk out as droplets of his cum run down your face.
-						<<arousalEnd>>
+						
 						<<cum 'face' 'A129' 1>>
 						<<if getvar("$school_bunk") == 0>>
 							<<actCLA 'Continue to play on phone'>>
@@ -1550,7 +1550,7 @@
 								<p>Wordlessly, Mr. Ivanov walks over to one of the sinks and washes his hands; he seems to be ignoring you, but you can see him giving you sideways glances. He breaks his silence with a cruel smile. "We'll be doing this again, $pc.name_last. Next time I feel like it, I'll keep you back after class and fuck that cute little ass of yours," he laughs and, without waiting for a reply from you, walks out of the bathroom.</p>
 								You go to the mirror yourself and clean yourself up and fix your hair. Your ass and throat are burning and his ''promise'' still rings in your ears.
 								<<cum 'anus' 'A129' 1>>
-								<<arousalEnd>>
+								
 								<<if getvar("$school_bunk") == 0>>
 									<<actCLA 'Continue to play on phone'>>
 										<<gt 'gschool_boys_bathroom' 'bathroom2'>>
@@ -1596,7 +1596,7 @@
 						<p>Wordlessly, Mr. Ivanov walks over to one of the sinks and washes his hands; he seems to be ignoring you, but you can see him giving you sideways glances. He breaks his silence with a cruel smile. "We'll be doing this again, $pc.name_last. Next time I feel like it, I'll keep you after class and fuck that cute little ass of yours," he laughs and, without waiting for a reply from you, walks out of the bathroom.</p>
 						You go to the mirror yourself and clean yourself up and fix your hair. Your ass and throat are burning and his ''promise'' still rings in your ears.
 						<<cum 'anus' 'A129' 1>>
-						<<arousalEnd>>
+						
 						<<if getvar("$school_bunk") == 0>>
 							<<actCLA 'Continue to play on phone'>>
 								<<gt 'gschool_boys_bathroom' 'bathroom2'>>
@@ -1634,7 +1634,7 @@
 								<p>Wordlessly, Mr. Ivanov walks over to one of the sinks and washes his hands; he seems to be ignoring you, but you can see him giving you sideways glances. He breaks his silence with a cruel smile. "We'll be doing this again, $pc.name_last. Next time I feel like it, I'll keep you back after class and fuck that cute little ass of yours." He laughs and, without waiting for a reply from you, walks out of the bathroom.</p>
 								You go to the mirror yourself and clean yourself up and fix your hair. Your ass and throat are burning and his ''promise'' still rings in your ears.
 								<<cum 'anus' 'A129' 1>>
-								<<arousalEnd>>
+								
 								<<if getvar("$school_bunk") == 0>>
 									<<actCLA 'Continue to play on phone'>>
 										<<gt 'gschool_boys_bathroom' 'bathroom2'>>
@@ -1717,7 +1717,7 @@
 								<p>He gives you a surprised look, but then does as you ask. You're not sure if he likes it or not, but it's hot to watch. The two of you spend the next few minutes getting cleaned up before he finally speaks up. "I still can't believe I let you do that. We could have been caught!"</p>
 								You shake your head slightly, knowing he loved it it as much as you did. "Oh you loved it and you know it. Next time I might even have you eat me so I can get off." Before he can reply, the bell rings and you both hurry out.
 								<<arouse 'anal_strap_give' 5 `['dom','humiliation']`>>
-								<<arousalEnd>>
+								
 								<<actCLA 'Go to class'>><<gs 'school_schedule'>><</actCLA>>
 							<</actCLA>>
 						<</actCLA>>

sugarcube/src/activities/school/schoolday/skips/girls_bathroom.tw

@@ -185,7 +185,7 @@
 					<p>The question leaves you dumbfounded - it takes you a moment or two to realize that everything you just experienced with her took place in a school toilet and that you now have to return to 'reality'. "Uh, I think he said there would be a quiz, yeah. Maybe we should have studied instead of having fun." You can't help but giggle, and Sonia joins in. You spend the rest of the hour until the bell rings talking about mundane stuff and going over some chemistry notes. Still, if this is how good it can be, maybe you should skip class more often.</p>
 					<<arouse 'cuni_give' 10 `['lesbian']`>>
 					<<arouse 'vaginal_finger_give' -5 `['lesbian']`>>
-					<<arousalEnd>>
+					
 					<<actCLA 'Go to class'>><<gs 'school_schedule'>><</actCLA>>
 				<</actCLA>>
 			<</actCLA>>
@@ -195,7 +195,7 @@
 <<if $location_var[$here][0] == 'girl3'>>
 	<<set $menu_off = 1>>
 	<h2>Girls bathroom</h2>
-	<<image `'locations/pavlovsk/school/bathroom/sex/girls/lena-lera.jpg'`>>
+	<<image 'locations/pavlovsk/school/bathroom/sex/girls/lena-lera.jpg'>>
 	<<if !$quest('school').func('isGroupMember','gopniks')>>
 		<p>After a few minutes, you hear someone else in the bathroom with you: Two girls are talking, and you recognize the voices as Lena and Lera's. Most of the other girls in school avoid them, as they like to bully them and even some of the boys. Trying to be quiet, you pull your feet up - you really don't want to draw their attention and catch you here, alone in the bathroom. Unfortunately, you've forgotten about your phone sitting in your lap: As you raise your legs so they can't see your feet under the stall, it slides off your lap and clatters onto the floor.</p>
 		The room turns eerily silent as you hold your breath, your heartbeat so loud in your ears that it drowns out the sound of them approaching. The stall door then suddenly slams open. Lena and Lera stand on each side of the open stall, cigarettes in their mouths, looking right at you. "Well well, look what we have here, Lena. A scared little bunny hiding in a stall," Lera says with a smirk.
@@ -229,7 +229,7 @@
 	
 	<<actCLA 'Protest'>>
 		<h2>Girls bathroom</h2>
-		<<image `'locations/pavlovsk/school/bathroom/sex/girls/lena-lerabully.jpg'`>>
+		<<image 'locations/pavlovsk/school/bathroom/sex/girls/lena-lerabully.jpg'>>
 		<p>"No. I mean, I'm cutting class, but I'm not scared, and I don't think I'm bad. I just needed a break and was hoping for a little fun, you know?" You smile weakly at them as you step out of the stall.</p>
 		<p>Lera leans in close and blows smoke in your face while Lena smiles. "Oh, you want to have some fun, huh? Okay, we can have some fun with you." Glancing and smirking at Lera as she speaks, both of them grab hold of you from each side and you're starting to wish you had just kept your mouth shut.</p>
 		<<actCLA 'Submit'>>
@@ -260,7 +260,7 @@
 	<</actCLA>>
 	<<actCLA 'Bad girl'>>
 		<h2>Girls bathroom</h2>
-		<<image `'locations/pavlovsk/school/bathroom/sex/girls/lena-lerabully.jpg'`>>
+		<<image 'locations/pavlovsk/school/bathroom/sex/girls/lena-lerabully.jpg'>>
 		<p>You step out of the stall and decide to put on your best tough girl act. "What's it to you if I want to cut class, huh?" All that does is get a laugh out of them. Lera leans in close and blows smoke in your face.</p>
 		<p>"Is that so, bunny? You a bad girl now? Why don't we show you what real bad girls are like?" Lena says as she steps close and grabs your arm; Lera quickly follows suit on your other side. "We're going to have some fun with you, little bunny..." Lera promises with a mean grin.</p>
 		<<actCLA 'Submit'>>
@@ -292,7 +292,7 @@
 	<<if getvar("$toy_bunny") == 1>>
 		<<actCLA 'Submit'>>
 			<h2>Girls bathroom</h2>
-			<<image `'locations/pavlovsk/school/bathroom/sex/girls/lena-lerabully.jpg'`>>
+			<<image 'locations/pavlovsk/school/bathroom/sex/girls/lena-lerabully.jpg'>>
 			You meekly step out of the stall, coughing a little as Lera blows smoke in your face. You don't protest or resist: You already know how this is going to play out and you doubt it would go any better if you tried to put up a fight. Besides... if you are completely honest with yourself, you did enjoy some of this demeaning treatment.
 			<p>"Look at our meek little bunny. Doesn't she look like she missed us and is back for more? You're looking forward to this, aren't you, bunny? Don't worry, we're going to take good care of you." Lena and Lera both step closer to you, but with your submission to them obvious, they don't even bother to grab and hold you down this time.</p>
 			<<actCLA 'Toy bunny'>>
@@ -356,14 +356,14 @@
 	<<set $menu_off = 1>>
 	<<gs 'pain' 1 'asscheeks' 'spank'>>
 	<h2>Girls bathroom</h2>
-	<<image `'locations/pavlovsk/school/bathroom/sex/girls/lena-leraown.jpg'`>>
+	<<image 'locations/pavlovsk/school/bathroom/sex/girls/lena-leraown.jpg'>>
 	<p>The first thing they do is unbutton your shirt and pull it off - you protest meekly, but they simply ignore you. Lena wraps one hand around your head and holds it steady while leaning in and licking the side of your face. Meanwhile, her other hand pulls down one side of your bra, exposing your breast, which she quickly starts to kneed and squeeze.</p>
 	<p>Lera squats down next to you and pulls your skirt and panties down to your ankles and makes you step out of them before tossing them across the room. Lena unclasps your bra, letting it fall to the floor as she starts kissing you, her tongue darting into your mouth and her hands roaming your body, making you acutely aware of the fact that you are now almost completely naked. Suddenly, Lera gives your ass a smack so hard it makes you yelp and even jump a little; that seems to be exactly the reaction they were looking for, because she and Lena giggle and proceed to spank you.</p>
 	<<arouse 'foreplay' 10 `['lesbian','group','sub']`>>
 	<<actCLA 'Continue'>>
 		<<gs 'pain' 2 'asscheeks' 'spank'>>
 		<h2>Girls bathroom</h2>
-		<<image `'locations/pavlovsk/school/bathroom/sex/girls/lena-leranipple.jpg'`>>
+		<<image 'locations/pavlovsk/school/bathroom/sex/girls/lena-leranipple.jpg'>>
 		Lena keeps making out with you while her hands fondle your breasts. Meanwhile, Lera stands up and continues to smack your ass until it's stinging so much you're sure it must be cherry red by now. She finally stops and takes off her top and bra, exposing her perky tits. "Okay, now it's my turn with her pretty mouth."
 		Lena breaks her kiss with you and forcefully turns you to face Lera, grabbing you by your arms to hold you in place as Lera grabs your head and pulls you down to her bust. "Suck my nipple, bunny. Do a good job and maybe we won''t hurt you... too much," she promises with an amused tone, causing Lena to chuckle behind you.
 		Not knowing what else to do and afraid of angering them, you go to work on her nipple, kissing, licking and sucking on it, your efforts guided by Lera''s soft moans. After a while, she shifts her body so you can give the other breast a similar treatment.
@@ -371,7 +371,7 @@
 		<<arouse 'foreplay' 10 `['lesbian','group','sub']`>>
 		<<actCLA 'Continue'>>
 			<h2>Girls bathroom</h2>
-			<<image `'locations/pavlovsk/school/bathroom/sex/girls/lena-leraeat.jpg'`>>
+			<<image 'locations/pavlovsk/school/bathroom/sex/girls/lena-leraeat.jpg'>>
 			Looking over your head, Lera meets Lena''s eyes. "Her mouth isn''t too bad, but I want to know how good she is with her tongue." By unspoken agreement, Lena lets go of your arms and puts her hands around your neck, first pulling you away from Lera, then forcing you down on your knees while Lera pulls up her skirt and spreads her legs, exposing her pussy.
 			Lena forces your face between Lera''s legs, practically rubbing your nose against Lera''s pussy as she does. Without even thinking about resisting, you open your mouth and start licking and sucking on Lera''s clit. The moans that escaped her when you played with her nipples were nothing compared to the loud ones you're hearing now, and even though you're not doing this entirely voluntarily, it's turning you on a little. Eventually, you feel bold enough to slip your tongue inside of her soaking wet pussy and start tongue fucking her.
 			<p>Lera's breathing quickens and she starts grinding her pussy against your face, her movements becoming more and more erractic. "Oh my god bunny, you're so good at this! You must have had a lot of practice. Are you a lesbian or something?!" At this point, Lena lets go of your neck while Lera runs her fingers through your hair and grabs it tightly, using you for leverage as she rubs against you.</p>
@@ -379,7 +379,7 @@
 			<<arouse 'cuni_give' 10 `['lesbian','group','sub']`>>
 			<<actCLA 'Continue'>>
 				<h2>Girls bathroom</h2>
-				<<image `'locations/pavlovsk/school/bathroom/sex/girls/lena-leratrain.jpg'`>>
+				<<image 'locations/pavlovsk/school/bathroom/sex/girls/lena-leratrain.jpg'>>
 				Lera wastes no time: She grabs you by your hair, drags you closer to Lena and forces you to lie down on your back, then straddles your face, putting her pussy right over your mouth. The order is clear, even without her command: "Finish me off."
 				<p>Without hesitation, you continue where you left off. When you glance up, you see that Lera is licking Lena's pussy from behind. She seems to really know what she's doing and turns Lena into a moaning mess in no time by alternating between licking Lena's pussy and her asshole, tongue-fucking one, then the other, exploring the girl's orifices with gusto. You can't help but smirk when you understand that Lera is Lena's bitch, but then you realize that this makes you Lera's bitch and thus the bottom bitch in this trio.</p>
 				<<arouse 'cuni_give' 10 `['lesbian','group','sub']`>>
@@ -387,12 +387,12 @@
 				<<set $orgasm_txt = 'Even though they forced you into this, you can`t help but feel turned on, not only by the erotic display in front of you but also by the fact itself that somebody took control of you. Slowly, as if it had a will of its own, your hand creeps down to your sopping pussy and your fingers work their magic, dipping into your nether hole and playing with your engorged clit. Soon enough, all three of you are moaning in pleasure, Lera`s and yours muffled by your respective mouthfuls of pussy. You`re not sure who came first, but soon all three of you are shivering in orgasmic delight.'>>
 				<<arouse 'clit_finger' 5 `['masturbate']`>>
 				<<arouse 'vaginal_finger' -5 `['masturbate']`>>
-				<<arousalEnd>>
+				
 				<<set $time.minutes -= 5>>
 				<<actCLA 'Clean up'>>
 					<<set $pc.horny += 10>>
 					<h2>Girls bathroom</h2>
-					<<image `'locations/pavlovsk/school/bathroom/sex/girls/lena-leragood.jpg'`>>
+					<<image 'locations/pavlovsk/school/bathroom/sex/girls/lena-leragood.jpg'>>
 					<<if !$quest('school').func('isGroupMember','gopniks')>>
 						With your face covered in Lera''s liquids, you pant, struggling to catch your breath. The two girls get up, but Lena forces Lera to squat down next to her again and gives you an imperious look. "Come here and lick my juices off Lera''s face." You get up and do as you're told, licking Lera''s face clean. Once you're done, Lera stands up once more, and both girls spread their legs, their pussies level with your kneeling self.
 						<p>"What are you waiting for, an invitation? Clean our pussies up, right now!" Lena orders. Once again, you follow her instruction and bathe their cunts with your tongue until they have a spit shine.</p>
@@ -444,7 +444,7 @@
 	Afraid you might get caught, you close the door and move back to sit on the toilet.
 	<<actCLA 'Wait them out'>>
 		<<set $pc.horny += 15>>
-		<<arousalEnd>>
+		
 		You decide to keep quiet and wait until they're done. She gets very loud after a while, obviously having an orgasm, and moans obscenities, encouraging him to fuck her harder. A few minutes later, he grunts as well. You then hear the water running and they talk in low voices before you hear the door open and close, and all is quiet once more.
 		<<if getvar("$school_bunk") == 0>>
 			<<actCLA 'Continue playing on phone'>>
@@ -473,7 +473,7 @@
 		<<set $orgasm_or = 'custom'>>
 		<<set $orgasm_txt = 'You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seat.'>>
 		<<arouse 'masturbate' 10 >>
-		<<arousalEnd>>
+		
 		By the sound of it, you came in perfect unison with her and only a few seconds later, you hear him grunt as well. You then hear the water running and they talk in low voices before you hear the door open and close, and all is quiet once more.
 		<<actCLA 'Go to class'>><<gs 'school_schedule'>><</actCLA>>
 	<</actCLA>>
@@ -488,7 +488,7 @@
 	Afraid you might get caught, you close the door and move back to sit on the toilet.
 	<<actCLA 'Wait them out'>>
 		<<set $pc.horny += 15>>
-		<<arousalEnd>>
+		
 		You decide to keep quiet and wait until they're done. She gets very loud after a while, obviously having an orgasm, and moans obscenities, encouraging him to fuck her ass harder. A few minutes later, he grunts as well. You then hear the water running and they talk in low voices before you hear the door open and close, and all is quiet once more.
 		<<if getvar("$school_bunk") == 0>>
 			<<actCLA 'Continue to play on phone'>>
@@ -522,7 +522,7 @@
 		<<set $orgasm_txt = 'You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seat.'>>
 		<<arouse 'vaginal_finger' -10 `['masturbate']`>>
 		<<arouse 'clit_finger' 10 `['masturbate']`>>
-		<<arousalEnd>>
+		
 		By the sound of it, you came in perfect unison with her and only a few seconds later, you hear him grunt as well. You then hear the water running and they talk in low voices before you hear the door open and close, and all is quiet once more.
 		<<actCLA 'Go to class'>><<gs 'school_schedule'>><</actCLA>>
 	<</actCLA>>
@@ -537,7 +537,7 @@
 	You see Arkadi with his pants around his ankles, Anushka squatting in front of him and sucking his dick. You watch for a few seconds and you''d like to watch even longer, but Arkadi keeps looking around, and in your direction. You duck back into the stall before you get spotted... and feel yourself getting very aroused from watching them, listening to them, even just knowing what they are doing. The sucking sounds soon stop and are quickly replaced by soft female moans of pleasure.
 	<<if $pc.horny < 70>>
 		<<actCLA 'Wait'>>
-			<<arousalEnd>>
+			
 			<p>You banish these thoughts from your mind - with great effort - and decide to keep quiet and wait until they're done fucking. She gets very loud after a while, obviously having an orgasm, and moans obscenities, encouraging him to fuck her harder. A few minutes later, he grunts as well. You then hear the water running and they talk in low voices before you hear the door open and close, and all is quiet once more.</p>
 			<<if getvar("$school_bunk") == 0>>
 				<<actCLA 'Continue to play on phone'>>
@@ -552,7 +552,7 @@
 	<<else>>
 		<<actCLA 'Wait and resist masturbating' undefined `{willpower:['misc','self','hard']}`>>
 				
-				<<arousalEnd>>
+				
 				<p>You banish these thoughts from your mind - with great effort - and decide to keep quiet and wait until they're done. She gets very loud after a while, obviously having an orgasm, and moans obscenities, encouraging him to fuck her ass harder. A few minutes later, he grunts as well. You then hear the water running and they talk in low voices before you hear the door open and close, and all is quiet once more.</p>
 				<<if getvar("$school_bunk") == 0>>
 					<<actCLA 'Continue to play on phone'>>
@@ -579,7 +579,7 @@
 		<<set $orgasm_txt = 'You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seat.'>>
 		<<set $orgasm_or = 'custom'>>
 		<<arouse 'clit_finger' 20 `['masturbate']`>>
-		<<arousalEnd>>
+		
 		By the sound of it, you came in perfect unison with her and only a few seconds later, you hear him grunt as well. You then hear the water running and they talk in low voices before you hear the door open and close, and all is quiet once more.
 		<<if getvar("$school_bunk") == 0>>
 			<<actCLA 'Continue to play on phone'>>
@@ -592,7 +592,7 @@
 		<</if>>
 	<</actCLA>>
 	<<actCLA 'Join them'>>
-		<<arousalEnd>> <<gt 'gschool_boys_bathroom' 'Join them'>>
+		 <<gt 'gschool_boys_bathroom' 'Join them'>>
 	<</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'company4'>>
@@ -622,7 +622,7 @@
 	<</actCLA>>
 	<<actCLA 'Wait them out'>>
 		<<set $pc.horny += 15>>
-		<<arousalEnd>>
+		
 		You decide to keep quiet and wait until they're done. She gets very loud after a while, obviously having an orgasm, and moans obscenities, encouraging him to fuck her harder. A few minutes later, he grunts as well. You then hear the water running and they talk in low voices before you hear the door open and close, and all is quiet once more.
 		<<if getvar("$school_bunk") == 0>>
 			<<actCLA 'Continue playing on phone'>>
@@ -650,7 +650,7 @@
 		<</if>>
 		<<set $orgasm_or = 'custom'>>
 		<<arouse 'masturbate' 10 >>
-		<<arousalEnd>>
+		
 		By the sound of it, you came in perfect unison with her and only a few seconds later, you hear him grunt as well. You then hear the water running and they talk in low voices before you hear the door open and close, and all is quiet once more.
 		<<actCLA 'Go to class'>><<gs 'school_schedule'>><</actCLA>>
 	<</actCLA>>
@@ -771,7 +771,7 @@
 						<<arouse 'foreplay' 10 `['sub','maso']`>>
 						<<actCLA 'Continue'>>
 							<<gs 'pain' 2 'asscheeks' 'spank'>>
-							<<arousalEnd>>
+							
 							<h2>Girls bathroom</h2>
 							<<image "characters/pavlovsk/school/teacher/raven/sex/school/caughtfspank.jpg">>
 							If you didn''t know better, you could have sworn she was getting off on hurting you. You try your best to hold back the tears, but by the tenth smack or so, the pain has gotten so intense that nothing can stop the tears from rolling down your cheeks, followed by soft sobs.
@@ -825,7 +825,7 @@
 						<<image "characters/pavlovsk/school/teacher/raven/sex/school/caughtfeat2.jpg">>
 						You keep up your rhythm but move with more force, pushing your lips and tongue harder against her weak spots, and slip your fingers inside her, fingerfucking her like she did you. Within moments, she shudders and cries out, quivering against her mouth, her juices running down your chin and hand.
 						<<arouse 'cuni_give' 10 `['lesbian','sub']`>>
-						<<arousalEnd>>
+						
 						<p>She basks in the afterglow, rhythmically moving against you still but without the need that drove her before. Once she's returned to her senses, she immediately lets go of your hair and moves her leg back down. She awkwardly moves past you and starts getting dressed, and even as you join her at the sinks to wash her secretions off, she avoids your curious gaze. "This never happened, you understand? You stay in this stall until I leave, and we'll both forget this ever happened." It would seem that she's regretting your encounter, now that her lust is sated and she's cleaning herself up. You nod, and a few seconds later, she hastily leaves the bathroom. Alone once more, you gather up your clothes and get dressed - looks like you still have a little bit of time to kill before the bell rings.</p>
 						<<if getvar("$school_bunk") == 0>>
 							<<actCLA 'Continue to play on phone'>>
@@ -850,7 +850,7 @@
 	<<arouse 'foreplay' 10 `['sub','maso']`>>
 	<<actCLA 'Continue'>>
 		<<gs 'pain' 2 'asscheeks' 'spank'>>
-		<<arousalEnd>>
+		
 		<<image "characters/pavlovsk/school/teacher/raven/sex/school/caughtffinger.jpg">>
 		<p>"Take off your skirt and panties!" she demands, your ass still stinging. You do as she tells you and get naked from the waist down. Once you are, she bends you over the sink, sucking on two of her fingers as she goes. With her other hand, she gives your bare ass several hard swats that make you yelp and leaves your ass red and stinging, but you almost immediately forget about that when she slides her wet fingers inside your pussy and starts finger-banging you with one hand. She doesn't ease up on the spanking, but the pain adds to the pleasure.</p>
 		<p>Moans start to escape you; her fingers seem to touch all the right spots inside you with unerring ease and you can feel the heat in your pussy build up - it looks like this woman is going to make you cum in record time!</p>
@@ -885,7 +885,7 @@
 							<<image "characters/pavlovsk/school/teacher/raven/sex/school/caughtfanal2.jpg">>
 							Her rhythm steadily increasing, Ms. Braakman pounds your ass harder and deeper, causing you to cry out louder. She's starting to pant and whatever regard she displayed for your comfort is evidently gone now as she mercilessly hammers the strapon into you. You then realize that you don't want her to be gentle anymore as the eroticism of the situation catches up with you. Your moans are loud, almost matching hers, as you feel a warmth pool in your belly.
 							<<arouse 'anal_strap' 10 `['lesbian','sub','lube']`>>
-							<<arousalEnd>>
+							
 							<p>All too soon, she cries out, nearly collapsing on your back and burying the strapon fully up your ass when her orgasm hits. You can feel her kisses on the back of your neck, a display of affection to contrast the rough anal you received. "My my," she whsipers. "I think you've earned the rest of the period off." She gently pulls the strapon out of you and takes the harness off, then moves to the sinks to clean it up. "This will be our little secret, $pc.name_first..." she promises, smiling absentmindedly as she dries the dildo.</p>
 							After checking her appearance, she walks towards the exit and gives you one last look, a hint of desire gleaming through the cracks of her mask of authority and indifference, before she silently leaves the bathroom. You rub your ass and get dressed while your mind goes over what you just experienced, and you eventually find yourself back in your stall where you have to decide what to do with the rest of the period.
 							<<if getvar("$school_bunk") == 0>>
@@ -915,7 +915,7 @@
 		<<image "characters/pavlovsk/school/teacher/raven/sex/school/caughtfanal2.jpg">>
 		Her rhythm steadily increasing, Ms. Braakman pounds your ass harder and deeper, causing you to cry out louder. She's starting to pant and whatever regard she displayed for your comfort is evidently gone now as she mercilessly hammers the strapon into you. You then realize that you don't want her to be gentle anymore as the eroticism of the situation catches up with you. Your moans are loud, almost matching hers, as you feel a warmth pool in your belly.
 		<<arouse 'anal_strap' 10 `['lesbian','sub','lube']`>>
-		<<arousalEnd>>
+		
 		<p>All too soon, she cries out, nearly collapsing on your back and burying the strapon fully up your ass when her orgasm hits. You can feel her kisses on the back of your neck, a display of affection to contrast the rough anal you received. "My my," she whsipers. "I think you've earned the rest of the period off." She gently pulls the strapon out of you and takes the harness off, then moves to the sinks to clean it up. "This will be our little secret, $pc.name_first..." she promises, smiling absentmindedly as she dries the dildo.</p>
 		After checking her appearance, she walks towards the exit and gives you one last look, a hint of desire gleaming through the cracks of her mask of authority and indifference, before she silently leaves the bathroom. You rub your ass and get dressed while your mind goes over what you just experienced, and you eventually find yourself back in your stall where you have to decide what to do with the rest of the period.
 		<<if getvar("$school_bunk") == 0>>
@@ -1004,7 +1004,7 @@
 				<p>He pulls his pants down just enough to release his manhood and make it easier for you. You give him an appreciative look and stroke his dick a few times until it's fully erect, then lean forward and start licking it; you lick up and down the shaft and run your tongue around the head, your eyes locked with his before you smile at him and take his dickcm $dick_girth cock into your mouth. You wrap your $pc_desc['lips'] lips tightly around his dick and start bobbing your head, stroking his cock with your lips as your tongue continues making its rounds. He rests one hand on the top of your head, but he lets you completely control the action.</p>
 				You caress and fondle his balls with one of your hands while the other strokes him in unison with your head''s movement. You increase your speed over time and take him as deep into your mouth as you can without gagging. He starts moaning and you feel his hand dig into your hair, telling you that he's getting close.
 				<<arouse 'bj' 10 `['dom']`>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Continue'>>
 					<h2>Girls bathroom</h2>
 					<<image "characters/pavlovsk/school/teacher/makar/sex/school/caughtcum.jpg">>
@@ -1060,7 +1060,7 @@
 							<p>Without a word, he walks over to one of the sinks and washes his hands; he seems to be ignoring you, but you can see him giving you sideways glances. Finally, he smiles. "Feel free to cut class any time you like, $pc.name_first. I'll happily keep your secret."</p>
 							<p>You smile back. "If I get 'punished' like that every time I skip class, I will." He chuckles at that, shakes his head, then leaves the bathroom - you think you can hear him whistling outside as he walks away. Still, you can't help but wonder what he was doing in the girls bathroom in the first place.</p>
 							<<cum 'face' 'A128' 1>>
-							<<arousalEnd>>
+							
 							<<if getvar("$school_bunk") == 0>>
 								<<actCLA 'Continue to play on phone'>>
 									<<gt 'gschool_girls_bathroom' 'bathroom2'>>
@@ -1102,7 +1102,7 @@
 											<p>Without a word, he walks over to one of the sinks and washes his hands; he seems to be ignoring you, but you can see him giving you sideways glances. Finally, he smiles. "Feel free to cut class any time you like, $pc.name_first. I'll happily keep your secret."</p>
 											<p>You smile back. "If I get 'punished' like that every time I skip class, I will." He chuckles at that, shakes his head, then leaves the bathroom - you think you can hear him whistling outside as he walks away. Still, you can't help but wonder what he was doing in the girls bathroom in the first place.</p>
 											<<cum 'face' 'A128' 1>>
-											<<arousalEnd>>
+											
 											<<if getvar("$school_bunk") == 0>>
 												<<actCLA 'Continue to play on phone'>>
 													<<gt 'gschool_girls_bathroom' 'bathroom2'>>
@@ -1148,7 +1148,7 @@
 						As you lick her shoes, she reaches down, grabs you by the hair and twists it painfully in her hand before painfully yanking you to your feet. She then pushes you forward, bending you over as her hand in your hair holds you in place while her other hand pulls up your skirt and pulls your panties down around your knees.
 					<</if>>
 					<<arouse 'foreplay' 10 `['sub','maso']`>>
-					<<arousalEnd>>
+					
 					<<if getvar("$detention_set") == 0>>
 						<<set $detention_set = 1>>
 						<<gs 'pain' 2 'asscheeks' 'spank'>>

sugarcube/src/activities/selfplay.tw

@@ -99,7 +99,7 @@
 		<<gt 'husbsex' 'husb_mastr_vtor'>>
 
 	<</if>>
-	<!-- !!if $loc = 'bedrPar':'<<image `'shared/sex/mast/dildo.jpg'`>>'-->
+	<!-- !!if $loc = 'bedrPar':'<<image 'shared/sex/mast/dildo.jpg'>>'-->
 	<<if $loc == 'vanrPar'>>
 		<<image "shared/sex/mast/dildovann.jpg">>
 	<<else>>*/
@@ -160,7 +160,7 @@
 					<<actCLA 'Use the dildo on your ass'>>
 						<<set $selfplaytime += 15>>
 						<<gs 'selfplay' 'sis_prov'>>
-						<!-- !!if $loc = 'bedrPar':'<<image `'shared/sex/mast/dildoanal.jpg'`>>'-->
+						<!-- !!if $loc = 'bedrPar':'<<image 'shared/sex/mast/dildoanal.jpg'>>'-->
 						<<if $loc == 'vanrPar'>>
 							<<image "shared/sex/mast/dildovann.jpg">>
 						<<else>>
@@ -307,12 +307,12 @@
 	<</actCLA>>
 	<<actCLA 'Finish masturbating'>>
 		<<set $dildo_timer = 0>>
-		<<arousalEnd>>
+		
 		<<gt $location>>
 	<</actCLA>>
 	<<actCLA 'Finish masturbating and unmount your dildo'>>
 		<<set $dildo_timer = 0>>
-		<<arousalEnd>>
+		
 		<<gs 'selfplay' 'bathtub_suction_dildo_remove'>>
 		<<gt $location>>
 	<</actCLA>>
@@ -368,14 +368,14 @@
 	<</actCLA>>
 	<<actCLA 'Finish masturbating and dry off'>>
 		<<set $dildo_timer = 0>>
-		<<arousalEnd>>
+		
 		<<set $mirror_steam = $time.hour>>
 		<<gt $location>>
 	<</actCLA>>
 	<<actCLA 'Finish masturbating, unmount your dildo, and get out and dry off'>>
 		<<set $dildo_timer = 0>>
 		<<gs 'selfplay' 'bathtub_suction_dildo_remove'>>
-		<<arousalEnd>>
+		
 		<<set $mirror_steam = $time.hour>>
 		<<gt $location>>
 	<</actCLA>>
@@ -439,14 +439,14 @@
 	<</actCLA>>
 	<<actCLA 'Finish masturbating and dry off'>>
 		<<set $dildo_timer = 0>>
-		<<arousalEnd>>
+		
 		<<set $mirror_steam = $time.hour>>
 		<<gt $location>>
 	<</actCLA>>
 	<<actCLA 'Finish masturbating, unmount your dildo, and get out and dry off'>>
 		<<set $dildo_timer = 0>>
 		<<gs 'selfplay' 'bathtub_suction_dildo_remove'>>
-		<<arousalEnd>>
+		
 		<<set $mirror_steam = $time.hour>>
 		<<gt $location>>
 	<</actCLA>>
@@ -515,14 +515,14 @@
 	<<actCLA 'Finish masturbating and dry off'>>
 		<<set $dildo_timer = 0>>
 		<<set $mirror_steam = $time.hour>>
-		<<arousalEnd>>
+		
 		<<gt $location>>
 	<</actCLA>>
 	<<actCLA 'Finish masturbating, unmount your dildo, and get out and dry off'>>
 		<<set $dildo_timer = 0>>
 		<<gs 'selfplay' 'shower_suction_dildo_remove'>>
 		<<set $mirror_steam = $time.hour>>
-		<<arousalEnd>>
+		
 		<<gt $location>>
 	<</actCLA>>
 <</if>>
@@ -562,14 +562,14 @@
 	<<actCLA 'Finish masturbating and dry off'>>
 		<<set $dildo_timer = 0>>
 		<<set $mirror_steam = $time.hour>>
-		<<arousalEnd>>
+		
 		<<gt $location>>
 	<</actCLA>>
 	<<actCLA 'Finish masturbating, unmount your dildo, and get out and dry off'>>
 		<<set $dildo_timer = 0>>
 		<<gs 'selfplay' 'shower_suction_dildo_remove'>>
 		<<set $mirror_steam = $time.hour>>
-		<<arousalEnd>>
+		
 		<<gt $location>>
 	<</actCLA>>
 <</if>>
@@ -877,7 +877,7 @@
 		<<set $selfplaytime += 5>>
 		<<gs 'selfplay' 'sis_prov'>>
 		<!-- !!if $loc = 'bedrPar':'<<video "shared/sex/mast/klit.mp4">>'-->
-		<!-- !!if $loc = 'vanrPar':'<<image `'shared/sex/mast/klitvann.jpg'`>>'-->
+		<!-- !!if $loc = 'vanrPar':'<<image 'shared/sex/mast/klitvann.jpg'>>'-->
 		<<image "shared/sex/mast/1.jpg">>
 		<<arouse 'anal_finger' 5 `['masturbate']`>>
 		<<if $pc.pcs_ass >= 5>>
@@ -1300,7 +1300,7 @@
 		<<setn $pc.pcs_vag += 1>> <<set $vaginaTemp = 0>>
 
 	<</if>>
-	<<arousalEnd>>
+	
 	<<gt $location>>
 <</if>>
 :: d_self_ass_fingering_macro[widget]

sugarcube/src/activities/sex/masturbation/bath.tw

@@ -33,7 +33,7 @@
 		<<gs 'arousal' 'clit_vibe'  - 10 'masturbate'>>
 		<<set $orgasm_or = 'yes'>>
 		<<gs 'arousal' 'clit_vibe' 10 'masturbate'>>
-		<<arousalEnd>>
+		
 		<<dryOff>>*/
 
 		<<ret 'Get out and dry off'>>

sugarcube/src/activities/sleep/sleep.tw

@@ -467,7 +467,7 @@ setup.moodlets.sleep_m3 = {
 <<if $location_var[$here][0] == 'magbstchoice'>>
 	<<set $menu_off = 1>>
 	<<set $tittmp = $pc.tits + 1>>
-	<<image `'pc/body/tits/t<<tittmp>>.jpg'`>>
+	<<image 'pc/body/tits/t<<tittmp>>.jpg'>>
 	<<set $tittmp to null>>
 	You have an odd dream where you are looking at your naked chest in a mirror and your breasts seem larger...
 	As the dream starts to drift away, you find yourself gazing at the reflection of your breasts and think:

sugarcube/src/autogenerated/Accessories/camera.tw

@@ -11,7 +11,7 @@
 <!-- ! People that should show up when the player is looking at her camera considering who to photograph. Also used by events that attempt to-->
 <!-- ! inject camera opportunities into existing locations-->
 <<if $location_var[$here][0] == 'start'>>
-	<<image `'pc/items/accessories/camera.jpg'`>>
+	<<image 'pc/items/accessories/camera.jpg'>>
 	You can't help but smile as you check your camera. You love capturing life as it happens, but it can take time to decide precisely who or what you want to take photographs of.
 	You spend a few minutes thinking about places and people that might make for interesting subjects. Perhaps...
 	<!-- ! Get the number of locations in the array-->
@@ -182,7 +182,7 @@
 	<<set $time.minutes += 15>>
 	<<run $pc.skillExperienceGain('photo',rand(3,5))>>
 	<<setinit $portfolio_locations[1] = 1>>
-	<<image `'pc/activities/photography/sveta_camera.jpg'`>>
+	<<image 'pc/activities/photography/sveta_camera.jpg'>>
 	You make your way over to the city library. It is a grand building and would make for a beautiful photograph. You move around several times until you find the perfect spot and take several photos before pausing and checking them. Finally, you're happy with the results, knowing you have something to add to your portfolio.
 	<<actCLA 'Put your camera away'>>
 		<<gt $location>>
@@ -192,7 +192,7 @@
 	<<set $time.minutes += 25>>
 	<<run $pc.skillExperienceGain('photo',rand(5,7))>>
 	<<setinit $portfolio_locations[2] = 1>>
-	<<image `'pc/activities/photography/sveta_camera.jpg'`>>
+	<<image 'pc/activities/photography/sveta_camera.jpg'>>
 	You make your way over to the university. It is a grand building and would make for a beautiful photograph. You move around several times until you find the perfect spot and take several photos before pausing and checking them. You can't help but notice all the students moving around and feel they would make for a great shot. You stop and take several more photos of the students before stopping. You're happy with the results, knowing you have something to add to your portfolio.
 	<<actCLA 'Put your camera away'>>
 		<<gt $location>>
@@ -202,7 +202,7 @@
 	<<set $time.minutes += 25>>
 	<<run $pc.skillExperienceGain('photo',rand(5,7))>>
 	<<setinit $portfolio_locations[4] = 1>>
-	<<image `'pc/activities/photography/sveta_camera.jpg'`>>
+	<<image 'pc/activities/photography/sveta_camera.jpg'>>
 	Standing in the village, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several pictures before pausing and checking them. You can't help but notice the houses and feel that they would also make for a great photo. You stop and take several pictures of different places before finally settling on your grandparents'' home. You're happy with the results, knowing you have something to add to your portfolio.
 	<<actCLA 'Put your camera away'>>
 		<<gt $location>>
@@ -212,7 +212,7 @@
 	<<set $time.minutes += 15>>
 	<<run $pc.skillExperienceGain('photo',rand(3,5))>>
 	<<setinit $portfolio_locations[6] = 1>>
-	<<image `'pc/activities/photography/sveta_camera.jpg'`>>
+	<<image 'pc/activities/photography/sveta_camera.jpg'>>
 	Standing in the forest, you are amazed by how breathtakingly beautiful it is. You take photos of the trees until you're happy and check all the shots you've taken. Finally, you feel confident that you've found something to add to your portfolio and put your camera away.
 	<<actCLA 'Put your camera away'>>
 		<<gt $location>>
@@ -222,7 +222,7 @@
 	<<set $time.minutes += 25>>
 	<<run $pc.skillExperienceGain('photo',rand(5,7))>>
 	<<setinit $portfolio_locations[12] = 1>>
-	<<image `'pc/activities/photography/sveta_camera.jpg'`>>
+	<<image 'pc/activities/photography/sveta_camera.jpg'>>
 	Standing in front of the local church, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several pictures before pausing and checking them. You then spot the cemetery and take some photos of it. Finally, you're happy with the results, knowing you have something to add to your portfolio.
 	<<actCLA 'Put your camera away'>>
 		<<gt $location>>
@@ -232,7 +232,7 @@
 	<<set $time.minutes += 15>>
 	<<run $pc.skillExperienceGain('photo',rand(3,5))>>
 	<<setinit $portfolio_locations[8] = 1>>
-	<<image `'pc/activities/photography/sveta_camera.jpg'`>>
+	<<image 'pc/activities/photography/sveta_camera.jpg'>>
 	Standing in front of the local train station, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several pictures before pausing and checking them. Finally, you're happy with the results, knowing you have something to add to your portfolio.
 	<<actCLA 'Put your camera away'>>
 		<<gt $location>>
@@ -242,7 +242,7 @@
 	<<set $time.minutes += 15>>
 	<<run $pc.skillExperienceGain('photo',rand(3,5))>>
 	<<setinit $portfolio_locations[7] = 1>>
-	<<image `'pc/activities/photography/sveta_camera.jpg'`>>
+	<<image 'pc/activities/photography/sveta_camera.jpg'>>
 	Standing in the courtyard, you realize this place would make a wonderful photo. You move around several times until you find the perfect spot and take several pictures before pausing and checking them. Finally, you're happy with the results, knowing you have something to add to your portfolio.
 	<<actCLA 'Put your camera away'>>
 		<<gt $location>>
@@ -252,7 +252,7 @@
 	<<set $time.minutes += 15>>
 	<<run $pc.skillExperienceGain('photo',rand(3,5))>>
 	<<setinit $portfolio_locations[9] = 1>>
-	<<image `'pc/activities/photography/sveta_camera.jpg'`>>
+	<<image 'pc/activities/photography/sveta_camera.jpg'>>
 	Standing in front of the school, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several pictures before pausing and checking them. Finally, you're happy with the results, knowing you have something to add to your portfolio.
 	<<actCLA 'Put your camera away'>>
 		<<gt $location>>
@@ -262,7 +262,7 @@
 	<<set $time.minutes += 15>>
 	<<run $pc.skillExperienceGain('photo',rand(3,5))>>
 	<<setinit $portfolio_locations[10] = 1>>
-	<<image `'pc/activities/photography/sveta_camera.jpg'`>>
+	<<image 'pc/activities/photography/sveta_camera.jpg'>>
 	Walking through the park, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several pictures before pausing and checking them. Finally, you're happy with the results, knowing you have something to add to your portfolio.
 	<<actCLA 'Put your camera away'>>
 		<<gt $location>>
@@ -272,7 +272,7 @@
 	<<set $time.minutes += 15>>
 	<<run $pc.skillExperienceGain('photo',rand(3,5))>>
 	<<setinit $portfolio_locations[11] = 1>>
-	<<image `'pc/activities/photography/sveta_camera.jpg'`>>
+	<<image 'pc/activities/photography/sveta_camera.jpg'>>
 	As you look out over the lake, you realize what a wonderful photo this place would make. You walk around the shore several times until you find the perfect spot and take several pictures before pausing and checking them. Finally, you're happy with the results, knowing you have something to add to your portfolio.
 	<<actCLA 'Put your camera away'>>
 		<<gt $location>>
@@ -294,12 +294,12 @@
 	<<actCLA 'Take her photograph'>>
 		<<setinit $camera_found['sonia'] = 1>>
 		<<run $pc.skillExperienceGain('photo',rand(1,2))>>
-		<<image `'characters/pavlovsk/school/girl/sonia/lake/photography/photo1.jpg'`>>
+		<<image 'characters/pavlovsk/school/girl/sonia/lake/photography/photo1.jpg'>>
 		You get a little closer and start taking her photograph, moving around and taking several shots from different angles before she suddenly sits up and looks in your direction.
 		<<arouse 'voyeur' 5 >>
 		<<actCLA 'Caught'>>
 			<<run $pc.skillExperienceGain('photo',rand(1,2))>>
-			<<image `'characters/pavlovsk/school/girl/sonia/lake/photography/photo2.jpg'`>>
+			<<image 'characters/pavlovsk/school/girl/sonia/lake/photography/photo2.jpg'>>
 			<p>She covers herself up and looks at you in surprise. "What the fuck, $pc.name_nick?! What are you doing?"</p>
 			You smile and take another photo of her. "Sorry, I was just taking your photo. You're just so beautiful, and I couldn''t help myself."
 			<p>She smiles at the compliment. "Really?"</p>
@@ -309,30 +309,30 @@
 			<<actCLA 'Take more photos'>>
 				<<set $time.minutes += 5>>
 				<<run $pc.skillExperienceGain('photo',rand(1,2))>>
-				<<image `'characters/pavlovsk/school/girl/sonia/lake/photography/photo3.jpg'`>>
+				<<image 'characters/pavlovsk/school/girl/sonia/lake/photography/photo3.jpg'>>
 				She is a little awkward at first, not knowing what to do, but as you take more photos, she starts to relax and become more natural in her poses. She even starts to get into it herself and enjoys it.
 				<<actCLA 'Take more photos'>>
 					<<run $pc.skillExperienceGain('photo',rand(1,2))>>
-					<<image `'characters/pavlovsk/school/girl/sonia/lake/photography/photo4.jpg'`>>
+					<<image 'characters/pavlovsk/school/girl/sonia/lake/photography/photo4.jpg'>>
 					As you continue photographing her, she starts teasing you by pulling on her bottoms while her hands run along her body or play with her breasts.
 					You can't help but smile and see how far she wants to go. "Come on, lose the bottoms. You know you want to..."
 					<<arouse 'voyeur' 5 >>
 					<<actCLA 'No bottoms'>>
 						<<run $pc.skillExperienceGain('photo',rand(1,2))>>
-						<<image `'characters/pavlovsk/school/girl/sonia/lake/photography/photo5.jpg'`>>
+						<<image 'characters/pavlovsk/school/girl/sonia/lake/photography/photo5.jpg'>>
 						She grins and unties her bottoms from one hip, which lets them partially fall off her, exposing her pussy. You take more photos as she pulls the other tie loose and her bottoms fall away.
 						<<arouse 'voyeur' 5 >>
 						<<actCLA 'Naked'>>
 							<<run $pc.skillExperienceGain('photo',rand(1,2))>>
 							<<setinit $portfolio_people[4] = 1>>
-							<<image `'characters/pavlovsk/school/girl/sonia/lake/photography/photo6.jpg'`>>
+							<<image 'characters/pavlovsk/school/girl/sonia/lake/photography/photo6.jpg'>>
 							You continue taking photos of her naked body and start getting closer to her. The longer it goes on, the more turned on she seems to get, eventually playing with her pussy. Finally, having taken several dozen photos, you feel you've taken enough and stop. "Thanks, Sonia. I got what I needed."
 							<p>She frowns before bobbing her head slightly and smiling. "It was my pleasure. I really liked it. M-Maybe we can do it again sometime?" You can hear her shy, sweet former self coming out.</p>
 							You feel bad for her, knowing that almost nobody talks to her anymore. "Yeah, sure, I would like that."
 							<p>She breaks into a huge smile and looks happier than you've seen her in a long time. "Okay, just let me know or maybe stop by my house sometime?"</p>
 							You nod. "I will, but I've got all I need now. I'll let you get back to sunbathing. Thanks again." She smiles and gets dressed as you put your camera away.
 							<<arouse 'voyeur' 5 >>
-							<<arousalEnd>>
+							
 							<<actCLA 'Leave'>>
 								<<gt $location>>
 							<</actCLA>>

sugarcube/src/autogenerated/Accessories/purses.tw

@@ -40,7 +40,7 @@
 	<<elseif $location_var[$here][1] == 'sell'>>
 		<h3><h2>Choose an item to sell</h2></h3>
 	<</if>>
-	<<image `'locations/city/island/dolls/shop_name.png'`>>
+	<<image 'locations/city/island/dolls/shop_name.png'>>
 	<<set $i = 1>>
 	<<warn 'JUMP MARKER ENCOUNTERED: :loopdollspurses'>>
 	<<if getvar("$dolls_purses["+$i+"]") == 1 and $dolls_pursesS[$i] == $ploc>>
@@ -52,7 +52,7 @@
 		<<warn 'JUMP COMMAND ENCOUNTERED: jump loopdollspurses'>>
 
 	<</if>>
-	<<image `'locations/pushkin/bomba/shop_name.png'`>>
+	<<image 'locations/pushkin/bomba/shop_name.png'>>
 	<<set $i = 1>>
 	<<warn 'JUMP MARKER ENCOUNTERED: :loopbomba_purses'>>
 	<<if getvar("$bomba_purses["+$i+"]") == 1 and $bomba_pursesS[$i] == $ploc>>
@@ -64,7 +64,7 @@
 		<<warn 'JUMP COMMAND ENCOUNTERED: jump loopbomba_purses'>>
 
 	<</if>>
-	<<image `'locations/city/citycenter/mall/fashionista.png'`>>
+	<<image 'locations/city/citycenter/mall/fashionista.png'>>
 	<<set $i = 1>>
 	<<warn 'JUMP MARKER ENCOUNTERED: :loopfashionistapurses'>>
 	<<if getvar("$fashionista_purses["+$i+"]") == 1 and $fashionista_pursesS[$i] == $ploc>>
@@ -76,7 +76,7 @@
 		<<warn 'JUMP COMMAND ENCOUNTERED: jump loopfashionistapurses'>>
 
 	<</if>>
-	<<image `'locations/city/citycenter/mall/gm.png'`>>
+	<<image 'locations/city/citycenter/mall/gm.png'>>
 	<<set $i = 1>>
 	<<warn 'JUMP MARKER ENCOUNTERED: :loopgmpurses'>>
 	<<if getvar("$gm_purses["+$i+"]") == 1 and $gm_pursesS[$i] == $ploc>>
@@ -88,7 +88,7 @@
 		<<warn 'JUMP COMMAND ENCOUNTERED: jump loopgmpurses'>>
 
 	<</if>>
-	<<image `'locations/city/citycenter/mall/pussycat.png'`>>
+	<<image 'locations/city/citycenter/mall/pussycat.png'>>
 	<<set $i = 1>>
 	<<warn 'JUMP MARKER ENCOUNTERED: :loop_cats_purses'>>
 	<<if getvar("$cats_purses["+$i+"]") == 1 and $cats_pursesS[$i] == $ploc>>
@@ -100,7 +100,7 @@
 		<<warn 'JUMP COMMAND ENCOUNTERED: jump loop_cats_purses'>>
 
 	<</if>>
-	<<image `'locations/pavlovsk/coco/shop_name.png'`>>
+	<<image 'locations/pavlovsk/coco/shop_name.png'>>
 	<<set $i = 1>>
 	<<warn 'JUMP MARKER ENCOUNTERED: :loop_coco_purses'>>
 	<<if getvar("$coco_purses["+$i+"]") == 1 and $coco_pursesS[$i] == $ploc>>
@@ -112,7 +112,7 @@
 		<<warn 'JUMP COMMAND ENCOUNTERED: jump loop_coco_purses'>>
 
 	<</if>>
-	<<image `'locations/city/island/flamingos/shop_name.png'`>>
+	<<image 'locations/city/island/flamingos/shop_name.png'>>
 	<<set $i = 1>>
 	<<warn 'JUMP MARKER ENCOUNTERED: :loop_flamingos_purses'>>
 	<<if getvar("$flamingos_purses["+$i+"]") == 1 and $flamingos_pursesS[$i] == $ploc>>
@@ -124,7 +124,7 @@
 		<<warn 'JUMP COMMAND ENCOUNTERED: jump loop_flamingos_purses'>>
 
 	<</if>>
-	<<image `'locations/city/island/nerdvana/shop_name.png'`>>
+	<<image 'locations/city/island/nerdvana/shop_name.png'>>
 	<<set $i = 1>>
 	<<warn 'JUMP MARKER ENCOUNTERED: :loop_nerdvana_purses'>>
 	<<if getvar("$nerdvana_purses["+$i+"]") == 1 and $nerdvana_pursesS[$i] == $ploc>>
@@ -136,7 +136,7 @@
 		<<warn 'JUMP COMMAND ENCOUNTERED: jump loop_nerdvana_purses'>>
 
 	<</if>>
-	<<image `'locations/city/citycenter/mall/sports.png'`>>
+	<<image 'locations/city/citycenter/mall/sports.png'>>
 	<<set $i = 1>>
 	<<warn 'JUMP MARKER ENCOUNTERED: :loop_danilovich_purses'>>
 	<<if getvar("$danilovich_purses["+$i+"]") == 1 and $danilovich_pursesS[$i] == $ploc>>
@@ -148,7 +148,7 @@
 		<<warn 'JUMP COMMAND ENCOUNTERED: jump loop_danilovich_purses'>>
 
 	<</if>>
-	<<image `'locations/city/citycenter/mall/moncheri.png'`>>
+	<<image 'locations/city/citycenter/mall/moncheri.png'>>
 	<<set $i = 1>>
 	<<warn 'JUMP MARKER ENCOUNTERED: :loop_moncheri_purses'>>
 	<<if getvar("$moncheri_purses["+$i+"]") == 1 and $moncheri_pursesS[$i] == $ploc>>

sugarcube/src/autogenerated/Anushka/anush_bedroom_city.tw

@@ -379,7 +379,7 @@
 						You lean back in the chair and spread your legs wider apart as you feel your climax approaching. You turn and bury your mouth into your shoulder to stop yourself from screaming as your orgasm rocks your body. It takes you a few seconds to recover once it's over before you straighten everything up and wonder what you can do next to kill some time.
 						<<set $orgasm_or = 'yes'>>
 						<<arouse 'clit_finger' 10 `['masturbate']`>>
-						<<arousalEnd>>
+						
 						<<actCLA 'Find something else to do'>>
 							<<gt 'anush_bedroom_city' 'anushroom'>>
 						<</actCLA>>
@@ -408,7 +408,7 @@
 		<<image "locations/pavlovsk/resident/apartment/anushapt/anushroom/watchporn.jpg">>
 		<p>As the two of you continue to watch the porno, you do your best to ignore that Anushka is masturbating right next to you. Long before the video is over, her breathing gets faster and she starts moaning - softly at first, then louder and louder until she arches her back in a shuddering orgasm. After giving herself a few seconds to come down from her little pleasure high, she pulls her pants back up, gets off the bed and turns the porno off. She then turns to look you in the eye. "I don't know about you, but I could use a snack. Come on, let's go raid the kitchen." She heads out of her room, waving for you to follow her. You're not sure what else to do, so you get up to follow along behind her.</p>
 		<<gs 'arousal' 10 'porn' 'lesbian'>>
-		<<arousalEnd>>
+		
 		<<actCLA 'Follow her'>>
 			<<gt 'anushapt_city' 'snack'>>
 		<</actCLA>>
@@ -422,7 +422,7 @@
 			Sometime later, you feel Anushka speed up next to you. Her soft moans suddenly get louder before she starts shuddering in orgasm. This is just enough to get you right to the edge, and you quicken your own pace as a result. Within seconds, a huge orgasm rocks your body that completely overwhelms your senses. By the time you fully recover, Anushka has already turned off the porno and is smiling at you with her pants back up. She nods towards the door. "I don't know about you, but I could use a snack. Come on, let''s go raid the kitchen." She heads out of her room, waving for you to follow and acting like everything is completely normal. You get up to follow her out.
 			<<set $orgasm_or = 'yes'>>
 			<<arouse 'clit_finger' 10 `['masturbate','lesbian']`>>
-			<<arousalEnd>>
+			
 			<<actCLA 'Follow her'>>
 				<<gt 'anushapt_city' 'snack'>>
 			<</actCLA>>

sugarcube/src/autogenerated/Anushka/anushkachat_city.tw

@@ -467,7 +467,7 @@
 							<<relationship 'A144' 'hate'>>
 							<p>You pull away before things go too far and catch your breath. You see her slightly confused look and you feel a little bad about it. "Sorry, I got carried away. Can we just go back to talking?"</p>
 							She frowns. "Yeah, whatever." You don't blame her for her reaction since you did just give her the girl equivalent of blue balls.
-							<<arousalEnd>>
+							
 							<<actCLA 'Talk about something else'>>
 								<<gt 'anushkachat_city' 'chat'>>
 							<</actCLA>>
@@ -495,7 +495,7 @@
 			<<else>>
 				<p>You look at her as you sit side by side. Maybe for too long, or maybe she just senses it, since she turns her head to look at you. Her face is not that far from yours and you can't help it; she's so damn pretty! You lean over to give her a kiss. She returns your kiss, then stops to pull away. Sensing that she isn't interested, you decide to keep talking instead.</p>
 				<<arouse 'foreplay' 3 `['lesbian']`>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Stop kissing and talk more'>>
 					<<gt 'anushkachat_city' 'chat'>>
 				<</actCLA>>
@@ -1210,7 +1210,7 @@
 										You put your camera away and she gets dressed as you ignore the boys. "Let''s get out of here," you tell her.
 										<p>She smiles at you and sticks her hand over the railing one last time to flip the boys off before you climb back in the window. "So we going back to my place?"</p>
 										<<arouse 'voyeur' 5 >>
-										<<arousalEnd>>
+										
 										<<actCLA 'Go back to her room'>>
 											<<set $time.minutes += 5>>
 											<<image "characters/shared/headshots_main/big144.jpg">>

sugarcube/src/autogenerated/BDSM Club/BDSM_training.tw

@@ -160,7 +160,7 @@
 	"Almost..."
 	Mistress puts you on your knees in front of her and forces you to lick her pussy. The session had excited not only you, but Mistress to, and she cums from a few movements of your tongue. After, having licked up every drop from Mistress, you go.
 	<<arouse 'cuni_give' 10 `['sub','lesbian','maso','bound']`>>
-	<<arousalEnd>>
+	
 	<<actCLA 'Leave'>>
 		<<gt 'BDSM_Club' 'start'>>
 	<</actCLA>>
@@ -279,7 +279,7 @@
 															<p>Mistress lies on her back, and forces you to ride her, and you are grinding on her strap-on. The satisfied moans of Mistress and the clear visual evidence tell you she has already cum several times.</p>
 															Satisfied, Mistress unties you, approvingly slaps you on the cheek and lets you go, ordering you to come tomorrow.
 															<<arouse 'vaginal_strap' 10 `['sub','lesbian','maso','bound']`>>
-															<<arousalEnd>>
+															
 															<<actCLA 'Leave'>>
 																<<gt 'BDSM_Club' 'start'>>
 															<</actCLA>>
@@ -373,7 +373,7 @@
 											The lady takes you by the hair and turns your face to hers.
 											<p>"Welcome to the Club, slave!"</p>
 											Hardly able to walk and your legs buckling you get in the shower. As you exit, you are handed a membership card, you can now enter to the Club as a full member.
-											<<arousalEnd>>
+											
 											<<actCLA 'Leave'>>
 												<<gt 'BDSM_Club' 'start'>>
 											<</actCLA>>
@@ -427,7 +427,7 @@
 					<<arouse 'vaginal_vibe_give' 10 `['dom','lesbian']`>>
 					<<arouse 'kiss' 10 `['lesbian']`>>
 					<<set $time.minutes -= 10>>
-					<<arousalEnd>>
+					
 					<<actCLA 'Leave'>>
 						<<gt 'BDSM_Club' 'start'>>
 					<</actCLA>>

sugarcube/src/autogenerated/BDSM Club/MBasement.tw

@@ -72,7 +72,7 @@
 <<if $location_var[$here][0] == 'end'>>
 	<<set $menu_off = 1>>
 	<<arouse 'voyeur' 5 >>
-	<<arousalEnd>>
+	
 	<<actCLA 'Continue'>>
 		<<gt 'MBasement' 'start'>>
 	<</actCLA>>
@@ -80,7 +80,7 @@
 <<if $location_var[$here][0] == 'end_sex'>>
 	<<set $menu_off = 1>>
 	<<arouse 'voyeur_sex' 5 >>
-	<<arousalEnd>>
+	
 	<<actCLA 'Continue'>>
 		<<gt 'MBasement' 'start'>>
 	<</actCLA>>

sugarcube/src/autogenerated/BDSM Club/MDining.tw

@@ -73,7 +73,7 @@
 	<!-- !!	pcs_horny += 10-->
 	<!-- !!	minut += 5-->
 	<!-- !!	-->
-	<!-- !!	'<<image `'locations/city/suburb/bdsm_club/diningroom.jpg'`>>'-->
+	<!-- !!	'<<image 'locations/city/suburb/bdsm_club/diningroom.jpg'>>'-->
 	<!-- !!	'A group of women and men are sitting in chairs while they order two young women to strip naked and then change into different fetish clothing and then walk back and forth in them for a bit. Then they repeat the whole process again, a bit of a fetish clothing fashion show.'-->
 	<!-- !!	act 'Return':gt 'MDining'-->
 <<elseif rand(0,100) < 3>>

sugarcube/src/autogenerated/BDSM Club/MEastbed.tw

@@ -48,7 +48,7 @@
 				The man begins to grunt getting close, when he does the woman takes the cock completely to herself no longer sharing, after another minute or so the man cums in her mouth.
 				She rises up a bit and pulls your head back, pulling your mouth open. Then she spits the man''s cum into your mouth. Then they dismiss you and as you're leaving you swallow the cum.
 				<<arouse 'bj' 5 `['sub','group']`>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Return'>>
 					<<gt 'MEastbed' 'guestB'>>
 				<</actCLA>>
@@ -85,7 +85,7 @@
 				You orgasm before he does and when he does, he does deep inside or her. Once finished they get dressed.
 				<<set $orgasm_or = 'yes'>>
 				<<arouse 'cuni' 5 `['sub','lesbian']`>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Return'>>
 					<<gt 'MEastbed' 'guestC'>>
 				<</actCLA>>
@@ -96,7 +96,7 @@
 		<<video "locations/city/suburb/bdsm_club/sex/bedrand8.mp4">>
 		A man and two women are having a threesome, you can't tell who is sub or dom, but they are so carried away in their act that you don't suppose that's important right now.
 		<<arouse 'voyeur_sex' 5 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Return'>>
 			<<gt 'MEastbed' 'guestC'>>
 		<</actCLA>>
@@ -105,7 +105,7 @@
 		<<video "locations/city/suburb/bdsm_club/sex/maid_pun1.mp4">>
 		A submissive woman has been tied and gagged with a body massager strapped to her pussy. Poor thing, hopefully someone will let her go soon.
 		<<arouse 'voyeur_sex' 5 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Return'>>
 			<<gt 'MEastbed' 'guestC'>>
 		<</actCLA>>
@@ -153,7 +153,7 @@
 					After a long time she beings to pant and sweat from her efforts in fucking you. Finally rolling off you to take a break, she looks at you. "You may go." You get up and get dressed leaving them in the room.
 					<<set $orgasm_or = 'yes'>>
 					<<arouse 'anal_strap' 5 `['sub','lesbian','rough']`>>
-					<<arousalEnd>>
+					
 					<<actCLA 'Return'>>
 						<<gt 'MEastbed' 'guestD'>>
 					<</actCLA>>
@@ -165,7 +165,7 @@
 		<<video "locations/city/suburb/bdsm_club/sex/maid_pun2.mp4">>
 		A submissive woman appears to have broken the dress code and is being punished.
 		<<arouse 'voyeur' 5 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Return'>>
 			<<gt 'MEastbed' 'guestD'>>
 		<</actCLA>>
@@ -174,7 +174,7 @@
 		<<video "locations/city/suburb/bdsm_club/sex/maid_b7.mp4">>
 		A submissive woman is having her face fucked by a dom in a suit.
 		<<arouse 'voyeur_sex' 5 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Return'>>
 			<<gt 'MEastbed' 'guestD'>>
 		<</actCLA>>

sugarcube/src/autogenerated/BDSM Club/MGames.tw

@@ -17,7 +17,7 @@ Games room
 	<<image "locations/city/suburb/bdsm_club/maid_a5.jpg">>
 	A maid is crawling along a bench seat showing everyone her pussy and anus.
 	<<arouse 'voyeur' 5 >>
-	<<arousalEnd>>
+	
 	<<actCLA 'Return'>>
 		<<gt 'MGames'>>
 	<</actCLA>>

sugarcube/src/autogenerated/BDSM Club/MHall.tw

@@ -107,7 +107,7 @@
 		<<image "locations/city/suburb/bdsm_club/sex/maid_mis2.jpg">>
 		A sexy domme in her underwear is leading a sub upstairs by her leash.
 		<<arouse 'voyeur' 5 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Return'>>
 			<<gt 'MHall' 'east'>>
 		<</actCLA>>
@@ -120,7 +120,7 @@
 			The woman rides her ponyboy over to you and looks you over, grabbing hold of your chin as if she was inspecting you. "Well arn''t you just a cute little filly. I've been thinking about putting my boy here out to stud and I think you will do nicely. Come along." She says as she attaches a lead to your collar from the saddle, the she uses the spurs to get ponyboy going and rides him up the stairs pulling you behind them.
 			<!-- !follow up scene to come-->
 		<</if>>
-		<<arousalEnd>>
+		
 		<<actCLA 'Return'>>
 			<<gt 'MHall' 'east'>>
 		<</actCLA>>
@@ -136,7 +136,7 @@
 			As they leave the man in leather pulls another leash off his belt and attaches it to your collar, while he takes hold of the other girls leash. Now with both leashes firmly in hand, he pulls on them and heads up the stairs. At the pull of the leash the other girl starts crawling on all fours behind him, you follow her lead and do the same.
 			<!-- !Bitches in training to come-->
 		<</if>>
-		<<arousalEnd>>
+		
 		<<actCLA 'Return'>>
 			<<gt 'MHall' 'east'>>
 		<</actCLA>>
@@ -157,7 +157,7 @@
 			<<video "locations/city/suburb/bdsm_club/sex/maid_b4.mp4">>
 			<p>It looks like she has learnt to overcome her gag-reflex.</p>
 			<<arouse 'voyeur_sex' 5 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Return'>>
 				<<gt 'MHall' 'east'>>
 			<</actCLA>>

sugarcube/src/autogenerated/BDSM Club/MLanding.tw

@@ -30,7 +30,7 @@
 		<<video "locations/city/suburb/bdsm_club/sex/maid_sex_b1.mp4">>
 		A maid is being helped with the vacuum cleaning by a man in casual clothing, you think about reporting him, but he's a bit busy right now.
 		<<arouse 'voyeur_sex' 5 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Return'>>
 			<<gt 'MLanding' 'west'>>
 		<</actCLA>>

sugarcube/src/autogenerated/BDSM Club/MRear.tw

@@ -23,7 +23,7 @@
 		<<video "locations/city/suburb/bdsm_club/sex/garrand.mp4">>
 		The gardener is fucking a sub, gagged and tied to a tree.
 		<<arouse 'voyeur_sex' 5 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Return'>>
 			<<gt 'MRear' 'garden'>>
 		<</actCLA>>
@@ -32,7 +32,7 @@
 		<<image "locations/city/suburb/bdsm_club/sex/uniform.jpg">>
 		A strapping young dom is checking a sub is adhering to the dress code. Looks like she forgotten her panties.
 		<<arouse 'voyeur' 5 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Return'>>
 			<<gt 'MRear' 'garden'>>
 		<</actCLA>>
@@ -41,7 +41,7 @@
 		<<image "locations/city/suburb/bdsm_club/sex/drink.jpg">>
 		A dominate woman is forcing a naked man to drink from the fountain.
 		<<arouse 'voyeur' 5 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Return'>>
 			<<gt 'MRear' 'garden'>>
 		<</actCLA>>
@@ -50,7 +50,7 @@
 		<<image "locations/city/suburb/bdsm_club/sex/race.jpg">>
 		A cluster of people are gathered around five women bent over in a row masturbating, you quickly realize everyone is betting on who will orgasm first. You briefly wonder if their is a prize for winning.
 		<<arouse 'voyeur_sex' 5 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Return'>>
 			<<gt 'MRear' 'garden'>>
 		<</actCLA>>
@@ -165,7 +165,7 @@
 	As you reveal in your successful work, you realise for the first time that there was 7 men there.
 	<p>You get up, still naked and your face covered in cum. The men have had their fun and are leaving. You find 2,000 <b>₽</b> on the table.</p>
 	<<arouse 'hj' 10 `['sub','group']`>>
-	<<arousalEnd>>
+	
 	<<actCLA 'Continue'>>
 		<<gt 'MRear' 'garden'>>
 	<</actCLA>>

sugarcube/src/autogenerated/BDSM Club/MWestbed.tw

@@ -20,7 +20,7 @@
 		<<video "locations/city/suburb/bdsm_club/sex/bedrand3.mp4">>
 		You see a submissive woman in lingerie and on a leash, she appears to have earned herself a treat from a dominant man in a suit.
 		<<arouse 'voyeur' 5 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Return'>>
 			<<gt 'MWestbed' 'master'>>
 		<</actCLA>>
@@ -29,7 +29,7 @@
 		<<video "locations/city/suburb/bdsm_club/sex/bedrand7.mp4">>
 		A dominant woman is being pleasured by her sub.
 		<<arouse 'voyeur_sex' 5 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Return'>>
 			<<gt 'MWestbed' 'master'>>
 		<</actCLA>>
@@ -38,7 +38,7 @@
 		<<video "locations/city/suburb/bdsm_club/sex/maid_pun4.mp4">>
 		Ooo, a spanking, someone''s been a bad girl.
 		<<arouse 'voyeur' 5 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Return'>>
 			<<gt 'MWestbed' 'master'>>
 		<</actCLA>>
@@ -75,7 +75,7 @@
 		<<image "locations/city/suburb/bdsm_club/sex/maid_bound_d1.jpg">>
 		A submissive woman is being tied to a bed by a dominant man.
 		<<arouse 'voyeur' 5 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Return'>>
 			<<gt 'MWestbed' 'guest'>>
 		<</actCLA>>
@@ -85,7 +85,7 @@
 		You peek in the room when you hear grunts coming from it.
 		<p>Inside you a man wearing womens clothes being fucked by his mistress wearing a strap-on.</p>
 		<<arouse 'voyeur_sex' 5 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Return'>>
 			<<gt 'MWestbed' 'guest'>>
 		<</actCLA>>

sugarcube/src/autogenerated/Bel gang/BelSex.tw

@@ -48,7 +48,7 @@
 			<p>$boydesc indicates that he's about to come, telling you to "Open wide, $pc.name_nick. You're going to swallow every little drop."</p>
 			You meekly nod and let out "Yes, Mr. Bely..." doing as he says, opening your mouth as wide as you can. He jerks himself off all over your face and you soon feel his warm jets of sperm landing on your left cheek. He adjusts his aim a bit and some of it ends up in your mouth as well. You decide to just sit there with your eyes closed and your mouth open until he tells you otherwise, doing your best to ignore the taste.
 			<<set $belsexpayment = 300>>
-			<<arousalEnd>>
+			
 			<<actCLA 'Get up'>>
 				<<gt 'BelSex' 'shower'>>
 			<</actCLA>>
@@ -96,7 +96,7 @@
 			<p>Redoubling your efforts, you reach the base of his wet cock with your $pc_desc['lips'] lips. $boydesc stares you in the face while your lips glide up and down on his hard dick. You know he must be close now.</p>
 			You don't want him to cum yet so you switch it up, using your tongue instead, sliding up and down his shaft, pulling out all of your tricks to make him feel good. You even use some techniques you learned to stall his orgasm for a moment, making it all the more intense for him when he shoots his load into your mouth.
 			<<set $belsexpayment = 300>>
-			<<arousalEnd>>
+			
 			<<actCLA 'Take a shower'>>
 				<<gt 'BelSex' 'shower'>>
 			<</actCLA>>
@@ -144,7 +144,7 @@
 			<<video "shared/sex/cum/mouth/cum<<picrand>>.mp4">>
 			<p>Instead, $boydesc starts jerking off, telling you "I'll be done soon, $pc.name_nick. I want you to swallow every little drop." He doesn't last much longer and cums all over your face.</p>
 			He squeezes the last few drops of sperm into your mouth and then sticks his dick in your mouth. You swallow his cum obediently and then suck his dick clean, licking every tasty inch of it you can reach. Once he goes soft in your mouth, he pulls out his cock.
-			<<arousalEnd>>
+			
 			<<actCLA 'Take a shower'>>
 				<<gt 'BelSex' 'shower'>>
 			<</actCLA>>
@@ -255,7 +255,7 @@
 	<<set $belact -= 1>>
 	<<set $sex_temp += 1>>
 	<<set $picrand = rand(1,5)>>
-	<<image `'shared/sex/vag/doggy/vagdog<<picrand>>.jpg'`>>
+	<<image 'shared/sex/vag/doggy/vagdog<<picrand>>.jpg'>>
 	With his cock rock hard and nicely wet he lifts your body, turns you around, and tells you to get on all fours on the floor. He gets down on his knees. Streching your butt cheeks slowly, he runs his shaft along your wet pussy, teasing you, all of a sudden he shoves his cock into your pussy and starts pounding away, not caring about your enjoyment. He just wants to fuck.
 	<p>Holding you by the hips, he pounds on without slowing the pace, only occasionally stopping to catch a breath. "Isn't he going to slow down soon?" you think to yourself. But you've underestimated him, instead he grabs your hair and pushes himself even deeper inside.</p>
 	You moan loudly as he rams his cock deeper and deeper. You hear him panting and grunting he must''ve reached his limit...
@@ -293,7 +293,7 @@
 	<<set $belact -= 1>>
 	<<set $sex_temp += 1>>
 	<<set $picrand = rand(1,6)>>
-	<<image `'shared/sex/vag/cowgirl/vagcow<<picrand>>.jpg'`>>
+	<<image 'shared/sex/vag/cowgirl/vagcow<<picrand>>.jpg'>>
 	<p>$boydesc lies on the bed. He smirks as he tells you that you'll be doing all the work today. You look at him, still a bit confused after the blowjob you've given him. Wasn't that enough? "Don't waste my time $pc.name_nick. Come here!" Not daring to do upset him even more, you crawl on top of $boydesc and guide his cock inside your vagina.</p>
 	He grabs your hips, controlling the rhythm as you to ride him. He wants it fast. Fast, deep and hard, without any regard to you, or that he actually bumps into your cervix in this position. You keep riding him at the same rhythm as he moves his hands grabbing you breasts instead.
 	<p>Unable to think of anything but the pleasure, you moan so loudly that you are almost screaming. Wanting to ride out this intense feeling, you completely forget that you're supposed to please $boydesc as you orgasm while riding him.</p>
@@ -427,7 +427,7 @@
 				<<run $wardrobe.wear(['panties',$lastwornpantytype['swim'],$lastwornpantynumber['swim']])>>
 				<<run $wardrobe.wear(['bra',$lastwornbratype['swim'],$lastwornbranumber['swim']])>>
 			<</if>>
-			<<arousalEnd>>
+			
 			<<actCLA 'Leave'>>
 				<<gt $loc>>
 			<</actCLA>>

sugarcube/src/autogenerated/Bel gang/LakeBoyDy.tw

@@ -215,7 +215,7 @@
 		<p>You have reduced your next weeks payment by: -1*belgangPayWeek <b>₽</b></p>
 	<</if>>
 	<<arouse 'bj' 15 `['sub','deepthroat']`>>
-	<<arousalEnd>>
+	
 	<<actCLA 'Move away from them'>>
 		<<gt 'pav_lake'>>
 	<</actCLA>>

sugarcube/src/autogenerated/Bel gang/belpicknick.tw

@@ -513,7 +513,7 @@
 		<<set $belsexpayment = 900>>
 		<<image "characters/pavlovsk/vadim/sex/bukkake.jpg">>
 		You close your eyes just in time before the first load hits your face. You patiently wait until all four men are finished, and by the time they are your entire face is splattered with cum. Fortunately they don't make you swallow any more than the few drops that landed in your mouth before you could close it.
-		<<arousalEnd>>
+		
 		<<actCLA 'Sit down'>>
 			<<gt 'belpicknick' 'end'>>
 		<</actCLA>>

sugarcube/src/autogenerated/Block/gopsex.tw

@@ -185,7 +185,7 @@
 	-----
 		<<if $pc.horny < 50 and $wardrobe.PCloStyle != 4>>
 		<!-- FAILED TO CONVERT
-	'<<image `'locations/pavlovsk/resident/apartment/shulginhome/bigroom/gopsex/body/b'+rand(1,17)+'.jpg'`>> <br> You want sex.'
+	'<<image 'locations/pavlovsk/resident/apartment/shulginhome/bigroom/gopsex/body/b#.jpg' 1 17>> <br> You want sex.'
 -----
 	<<set ERROR: FAILED TO CONVERT LITERAL: """'<center><img $set_imgh src""" = "images / $locations / $pavlovsk / $resident / $apartment / $shulginhome / $bigroom / $gopsex / $pc.body / b' + rand(1,17) + ERROR: FAILED TO CONVERT LITERAL: """'.jpg"><""" / ERROR: FAILED TO CONVERT LITERAL: """center> <br> You want sex.'""">>
 
@@ -201,7 +201,7 @@
 	-----
 		<<if $pc.horny >= 50 and $wardrobe.PCloStyle != 4>>
 		<!-- FAILED TO CONVERT
-	'<<image `'locations/pavlovsk/resident/apartment/shulginhome/bigroom/gopsex/body/g'+rand(1,20)+'.jpg'`>> <br> You are overexcited, and you strongly want to fuck.'
+	'<<image 'locations/pavlovsk/resident/apartment/shulginhome/bigroom/gopsex/body/g#.jpg' 1 20>> <br> You are overexcited, and you strongly want to fuck.'
 -----
 	<<set ERROR: FAILED TO CONVERT LITERAL: """'<center><img $set_imgh src""" = "images / $locations / $pavlovsk / $resident / $apartment / $shulginhome / $bigroom / $gopsex / $pc.body / g' + rand(1,20) + ERROR: FAILED TO CONVERT LITERAL: """'.jpg"><""" / ERROR: FAILED TO CONVERT LITERAL: """center> <br> You are overexcited""" , and you strongly want to fuck.'>>
 
@@ -1209,7 +1209,7 @@
 		<<set $O to null>>
 		<<image "locations/pavlovsk/resident/apartment/shulginhome/bigroom/gopsex/group/cum/cumface#.jpg" 1 17>>
 		<p>The '+func('gopsex','hide','gop_text_npcr')+' spray their cum all over your face</p>
-		<<arousalEnd>>
+		
 		<<actCLA 'Leave'>>
 			<<gt 'vasilyhome' 'livingroom'>>
 		<</actCLA>>
@@ -1228,7 +1228,7 @@
 		<<set $O to null>>
 		<<image "locations/pavlovsk/resident/apartment/shulginhome/bigroom/gopsex/group/cum/swallow#.jpg" 1 12>>
 		<p>One by one the '+func('gopsex','hide','gop_text_npcr')+' cum their semen into your mouth and you swallow it all.</p>
-		<<arousalEnd>>
+		
 		<<actCLA 'Leave'>>
 			<<gt 'vasilyhome' 'livingroom'>>
 		<</actCLA>>
@@ -1245,7 +1245,7 @@
 		<<gs 'boyStat' 'AO/144'>>
 		<<cum 'breasts' $sex.npcId 1>>
 		<<set $O to null>>
-		<<arousalEnd>>
+		
 		<<image "locations/pavlovsk/resident/apartment/shulginhome/bigroom/gopsex/group/cum/cumbody#.jpg" 1 15>>
 		<p>The '+func('gopsex','hide','gop_text_npcr')+' come, squirting their hot sticky cum all over your body.</p>
 		<<actCLA 'Leave'>>
@@ -1264,7 +1264,7 @@
 		<<gs 'boyStat' 'AO/144'>>
 		<<cum 'stomach' $sex.npcId 1>>
 		<<set $O to null>>
-		<<arousalEnd>>
+		
 		<<image "locations/pavlovsk/resident/apartment/shulginhome/bigroom/gopsex/group/cum/cumvag#.jpg" 1 4>>
 		<p>One by one the '+func('gopsex','hide','gop_text_npcr')+' take their turns and shot their hot cum onto your pussy.</p>
 		<<actCLA 'Leave'>>
@@ -1283,7 +1283,7 @@
 		<<gs 'boyStat' 'AO/144'>>
 		<<cum 'butt' $sex.npcId 1>>
 		<<set $O to null>>
-		<<arousalEnd>>
+		
 		<<image "pc/body/cum/cumass/cumass#.jpg" 1 19>>
 		<p>One by one the '+func('gopsex','hide','gop_text_npcr')+' take their turns and cover your asshole with their sperm.</p>
 		<<actCLA 'Leave'>>

sugarcube/src/autogenerated/Block/misha.tw

@@ -6,11 +6,11 @@
 <<if $location_var[$here][0] == '1'>>
 	
 	<!-- Boy A54 -->
-	<<image `'characters/pavlovsk/resident/misha/sex/misha.pre0,<<rand(0,1)>>.jpg'`>>
+	<<image 'characters/pavlovsk/resident/misha/sex/misha.pre0,<<rand(0,1)>>.jpg'>>
 	You enter Uncle Misha''s apartment. He lets you in, and you take a seat as he glances down the hallway once more to see if anyone saw you walk in. Content that the hallway is empty, he closes the door behind him. He immediately reaches for his pants and pulls out his giant cock with a lewd grin.
 	Uncle Misha approaches you, his cock bobbing up and down. Noticing your reluctance, he puts his hand below your chin and makes you look him in the eye: "Come on, girl, we both know why you're here. You want to service my hard cock. Get to it."
 	<<actCLA 'Take his dick in your mouth'>>
-		<<image `'characters/pavlovsk/resident/misha/sex/misha0,<<rand(0,7)>>.jpg'`>>
+		<<image 'characters/pavlovsk/resident/misha/sex/misha0,<<rand(0,7)>>.jpg'>>
 		<p>Even though the size of his giant cock intimidates you a little, you nod. He's right... you wouldn't have been here if this wasn't what you wanted. Right?</p>
 		You take your uncle''s penis in your hand, giving it a few short tugs. A bead of precum forms on the head of his dick. You accept that as your cue to get involved. You move your face closer to his penis and close your lips around it, licking a dollop of precum off. It actually tastes kind of nice. You can feel his dick stiffen further in your mouth, and the thought of you being responsible for this gives you an odd sense of accomplishment.
 		<<arouse 'hj' 5 `['sub']`>>
@@ -53,7 +53,7 @@
 	<</actCLA>>
 	<<actCLA 'Refuse to service him' undefined `{willpower:['bj','resist']}`>>
 			
-			<<image `'characters/pavlovsk/resident/misha/sex/misha.exit0,0.jpg'`>>
+			<<image 'characters/pavlovsk/resident/misha/sex/misha.exit0,0.jpg'>>
 			You have no intentions of ''servicing him'' and stand up. Although he has always been pleasant to you, you know from the stories your mother told that uncle Misha is used to getting his way and can get rather violent when he doesn''t. So you try to placate him: "I'm sorry, uncle, I didn''t mean to lead you on. I merely wanted to see if you were up for a chat."
 			<p>Fortunately, he's not upset with you at all. The smug grin on uncle Misha never leaves his face, his cock still hanging out of his pants. "No problem, $pc.name_nick. I recognized that look in your eyes when I pulled my dick out. You'll be back. They all come back." You ignore his laughter as you pull the door shut behind you.</p>
 			<<actCLA 'Exit to the stairwell'>>
@@ -65,7 +65,7 @@
 <<if $location_var[$here][0] == '1_2nd_part'>>
 	 	<<set $mish_rand1 = rand(0,100)>>
 	<<if getvar("$mish_rand1") <= 60>>
-		<<image `'characters/pavlovsk/resident/misha/sex/misha1,<<rand(0,7)>>.jpg'`>>
+		<<image 'characters/pavlovsk/resident/misha/sex/misha1,<<rand(0,7)>>.jpg'>>
 
 	<</if>>
 	<<if getvar("$mish_rand1") > 60>>
@@ -78,11 +78,11 @@
 	<<actCLA 'Continue'>>
 		<<cum 'mouth' $sex.npcId 1 '' '' 20>>
 		<<cum 'face' $sex.npcId 1 '' '' 20>>
-		<<image `'characters/pavlovsk/resident/misha/sex/misha.cum0,<<rand(0,1)>>.jpg'`>>
+		<<image 'characters/pavlovsk/resident/misha/sex/misha.cum0,<<rand(0,1)>>.jpg'>>
 		Panting heavily, your uncle Misha pulls his hard cock away from your pussy.
 		He motions for you to get on your knees. His breathing is ragged, and his face is flustered. Once you're in position, he furiously masturbates his dick as you sit there waiting for his load, not sure whether to close your eyes or to keep looking at him. You decide to be brave and look him in the eye, which turns him on a great deal. He rewards you by focusing on your mouth and making sure not to cum near your eyes. You do what feels right and stick out your tongue, trying to catch at least some of it.
 		<p>Uncle Misha takes a minute to catch his breath and admire his handiwork on your face before leaning down and kissing you on the forehead. He throws a couple of crumpled bills on the floor. "Very nice, $pc.name_nick. Here, take these for your efforts", he says as you scramble to pick them up. Indicating he's done with you now, and he expects you to leave.</p>
-		<<arousalEnd>>
+		
 		<<set $finances.cash = $finances.cash + 200>>
 		<<set $npc($sex.npcId).sex += 1>>
 		<<actCLA 'Leave Uncle Misha`s apartment'>>
@@ -93,7 +93,7 @@
 <!-- !!-->
 <<if $location_var[$here][0] == '2'>>
 	
-	<<image `'locations/pavlovsk/resident/apartment/garage/father/sex/father.misha.pre0,0.jpg'`>>
+	<<image 'locations/pavlovsk/resident/apartment/garage/father/sex/father.misha.pre0,0.jpg'>>
 	They both drop their pants to their ankles, revealing their stiff cocks.
 	<p>Your stepfather instructs you, "Well, $pc.name_nick, given your history, I'm sure you know what to do with these. Get started."</p>
 	<<actCLA 'Get on your knees and suck them off'>>
@@ -104,7 +104,7 @@
 		<<setinit $npc($sex.npcId[1).sex] += 1>>
 		<<setinit $npc($sex.npcId[2).sex] += 1>>
 		<<set $npc('A28').rel += 3>>
-		<<image `'locations/pavlovsk/resident/apartment/garage/father/sex/father.misha0,<<rand(0,1)>>.jpg'`>>
+		<<image 'locations/pavlovsk/resident/apartment/garage/father/sex/father.misha0,<<rand(0,1)>>.jpg'>>
 		You meekly nod and fall to your knees in front of them, reaching for their hard dicks.
 		<p>Since they have been talking about 'punishment' non-stop, you do your best to keep them happy. Maybe they'll go easy on you? You obediently put your lips around your stepfather's dick, diligently sucking him off while you massage your uncle's rod with your hand at the same time. A while later, the roles are reversed, and your uncle Misha's dick is deep down your throat as you try to keep your stepfather happy.</p>
 		<<arouse 'bj' 5 `['dick[1]','sub','deepthroat','group']`>>
@@ -114,7 +114,7 @@
 		<<arouse 'hj' 5 `['dick[1]','sub','group']`>>
 		<<set $time.minutes -= 5>>
 		<<actCLA 'Continue'>>
-			<<image `'locations/pavlovsk/resident/apartment/garage/father/sex/father.misha1,<<rand(0,5)>>.jpg'`>>
+			<<image 'locations/pavlovsk/resident/apartment/garage/father/sex/father.misha1,<<rand(0,5)>>.jpg'>>
 			If your goal was to avoid punishment, you were too eager to achieve that. Your uncle Misha notices how eager you are to comply and snorts: "Hmm, look at her... this is hardly a punishment. She looks like the happiest girl in the world, sucking our dicks like that."
 			<p>Your stepfather agrees: "You're right. $pc.name_nick should be punished properly." Then turning his attention to you, he says: "Go on, $pc.name_nick, spread those cute little legs of yours. After that, it's time for your real punishment."</p>
 			<p>You open your legs wide and lcase(mid($boydesc[2],1,1))mid($boydesc[2],2,len($boydesc[2])-1) enters your pussy, while you suck your lcase(mid($boydesc[1],1,1))mid($boydesc[1],2,len($boydesc[1])-1). Neither of them is too gentle about it. Within seconds, you find yourself gagging on cock on one end and being roughly pounded at the other. After a while, they change positions. And then again, you can tell this is definitely not the first time they used a girl together. You're surprised at the number of positions they manage to fuck you in, but at the same time, are too horny to care and just enjoy your "punishment".</p>
@@ -130,13 +130,13 @@
 				<!-- !! stepmisha = ARGS[1]-->
 				<!-- !! ARGS[1] = 0-->
 				<<if getvar("$stepmisha") == 0>>
-					<<image `'characters/pavlovsk/resident/misha/sex/misha.cum0,<<rand(0,1)>>.jpg'`>>
+					<<image 'characters/pavlovsk/resident/misha/sex/misha.cum0,<<rand(0,1)>>.jpg'>>
 					<<cum 'mouth' $sex.npcId[1] 1>>
 					<<cum 'face' $sex.npcId[2] 1>>
 					Eventually, they're close enough to reach orgasm, telling you to get on your knees and take it on your face like a good little slut. You simply get down on your knees and do everything they say, having way too much of a good time to cause any trouble. They drop their loads on your face one at a time while you try to lick off any bits of cum that drop close enough to your mouth. Then, being fully satisfied by you, they drop back into their chairs and resume their drinking, not paying any more attention to you.
-					<<arousalEnd>>
+					
 				<<elseif getvar("$stepmisha") == 1>>
-					<<image `'locations/pavlovsk/resident/apartment/garage/father/sex/father.misha1,5.jpg'`>>
+					<<image 'locations/pavlovsk/resident/apartment/garage/father/sex/father.misha1,5.jpg'>>
 					<<arouse 'anal' 10 `['dick[1]','sub','group','rough']`>>
 					<<arouse 'vaginal' 10 `['dick[2]','sub','group','rough']`>>
 					<<set $time.minutes -= 10>>
@@ -144,7 +144,7 @@
 					<<cum '' $sex.npcId[2] 1>>
 					<<cum 'anus' $sex.npcId[1] 1>>
 					Finally, uncle Misha fills up your pussy, while your stepfather comes inside your ass.
-					<<arousalEnd>>
+					
 				<<elseif getvar("$stepmisha") == 2>>
 					<<arouse 'anal' 10 `['dick[2]','sub','group','rough']`>>
 					<<arouse 'vaginal' 10 `['dick[1]','sub','group','rough']`>>
@@ -154,7 +154,7 @@
 					<<cum '' $sex.npcId[1] 1>>
 					<<cum 'anus' $sex.npcId[2] 1>>
 					Finally, your stepfather fills up your pussy, while uncle Misha comes inside your ass.
-					<<arousalEnd>>
+					
 				<<elseif (getvar("$stepmisha") == 3 or getvar("$stepmisha") == 4)>>
 					<<if $pc.pcs_vag < 15>>
 						<<warn 'JUMP COMMAND ENCOUNTERED: jump misha_tootight'>>
@@ -170,7 +170,7 @@
 					<<set $npc('A28').rel += 2>>
 					Finally, they force their cocks in your pussy simultaneously and push up inside you. The gravity helps them move you down on them to the hilt, but you still feel incredibly complete with their dicks.
 					For a few minutes, your pussy feels tight while you moan and hang on while they piston inside your tight cunt, but in the end, they both cum inside of you simultaneously.
-					<<arousalEnd>>
+					
 				<<elseif getvar("$stepmisha") == 5>>
 					<<image "locations/pavlovsk/resident/apartment/garage/father/sex/fathermisha.jpg">>
 					<!-- !!Misha in pussy, father in mouth-->
@@ -180,7 +180,7 @@
 					<<cum '' $sex.npcId[2] 1>>
 					<<cum 'mouth' $sex.npcId[1] 1>>
 					<p>Finally your lcase(mid($boydesc[2],1,1))mid($boydesc[2],2,len($boydesc[2])-1) fills up your pussy, while your lcase(mid($boydesc[1],1,1))mid($boydesc[1],2,len($boydesc[1])-1) fills up your mouth.</p>
-					<<arousalEnd>>
+					
 				<<elseif getvar("$stepmisha") == 6>>
 					<<image "locations/pavlovsk/resident/apartment/garage/father/sex/fathergar.jpg">>
 					<!-- !!father in pussy, Misha in mouth-->
@@ -190,7 +190,7 @@
 					<<cum '' $sex.npcId[1] 1>>
 					<<cum 'mouth' $sex.npcId[2] 1>>
 					<p>Finally your lcase(mid($boydesc[1],1,1))mid($boydesc[1],2,len($boydesc[1])-1) fills up your pussy, while your lcase(mid($boydesc[2],1,1))mid($boydesc[2],2,len($boydesc[2])-1) fills up your mouth.</p>
-					<<arousalEnd>>
+					
 				<<elseif getvar("$stepmisha") >= 7 and getvar("$stepmisha") <= 8>>
 					<!-- !!Misha and father in pussy-->
 					<<arouse 'vaginal' 10 `['dick[2]','sub','group','rough']`>>
@@ -206,7 +206,7 @@
 					<p>"Ohh, yeah!" Groans your lcase(mid($boydesc[1],1,1))mid($boydesc[1],2,len($boydesc[1])-1), cumming almost immediately inside your womb. "That's how you fuck a whore properly!"</p>
 					<p>"All right, get lost, $pc.name_nick!" says lcase(mid($boydesc[2],1,1))mid($boydesc[2],2,len($boydesc[2])-1), while slapping your ass. "We are done."</p>
 					<<set $cump = 3>>
-					<<arousalEnd>>
+					
 				<<elseif getvar("$stepmisha") >= 9 and getvar("$stepmisha") <= 10>>
 					<!-- !!Misha and father in ass-->
 					<<arouse 'anal' 10 `['dick[2]','sub','group','rough']`>>
@@ -221,7 +221,7 @@
 					<p>ucase(mid($boydesc[2],1,1))mid($boydesc[2],2,len($boydesc[2])-1) immediately jumps to the newly available hole, and stuff his prick inside.</p>
 					<p>"Ohh, yeah!" Groans your lcase(mid($boydesc[2],1,1))mid($boydesc[2],2,len($boydesc[2])-1), cumming almost immediately inside your colon. "That's how you fuck a whore properly!"</p>
 					<p>"All right, get lost, $pc.name_nick!" says lcase(mid($boydesc[1],1,1))mid($boydesc[1],2,len($boydesc[1])-1), while slapping your ass. "We are done."</p>
-					<<arousalEnd>>
+					
 				<<else>>
 					<<if $pc.pcs_ass < 15>>
 						<<warn 'JUMP COMMAND ENCOUNTERED: jump misha_tootight'>>
@@ -237,7 +237,7 @@
 					<<set $npc('A28').rel += 2>>
 					Finally, they both force their cocks in your ass simultaneously and push up inside of you. The gravity helps them move you down on them to the hilt, but you still feel incredibly complete with their dicks.
 					For a few minutes, your anus feels tight while you moan and hang on while they piston inside of your ass, but in the end, they both cum inside you simultaneously.
-					<<arousalEnd>>
+					
 				<</if>>
 				<<actCLA 'Regain your composure and get up'>>
 					<<gt 'GarGazel'>>

sugarcube/src/autogenerated/Block/pav_aptcourtev.tw

@@ -176,7 +176,7 @@
 		<<image "locations/pavlovsk/resident/apartment/events/evbg.jpg">>
 		You notice a boy and girl making out as he fondles her breasts. They seem completely oblivious to the rest of the world and are just enjoying each other. You don't know either of them.
 		<<arouse 'voyeur_sex' -10 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Move away'>>
 			<<gt 'pav_complex' 'start'>>
 		<</actCLA>>
@@ -200,7 +200,7 @@
 			You notice two girls passionately kissing each other, completely unaware that anyone is watching them.
 		<</if>>
 		<<arouse 'voyeur' -10 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Move away'>>
 			<<gt 'pav_complex' 'start'>>
 		<</actCLA>>
@@ -309,7 +309,7 @@
 		<</if>>
 		<<set $text_rand to null>>
 		<<arouse 'voyeur_sex' -10 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Move away'>>
 			<<gt 'pav_complex' 'start'>>
 		<</actCLA>>
@@ -329,7 +329,7 @@
 			The trio begin laughing as they put their dicks back in the pants. Dan then pulls out his phone and starts taking photos of the girl covered in their cum. As she gets to her feet, Vitek and Vasily grab her by the arms and start pulling her towards the street, never giving her a chance to clean the cum from her face. She tries to resist, but they don't seem to care and they're soon gone.
 		<</if>>
 		<<arouse 'voyeur_sex' -10 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Move away'>>
 			<<gt 'pav_complex' 'start'>>
 		<</actCLA>>
@@ -432,7 +432,7 @@
 		<<image "locations/pavlovsk/resident/apartment/events/sex/evanal.jpg">>
 		A young girl is bent over a bench near the garages, her skirt pushed up and her panties hanging off her left ankle as a man pounds her ass as quickly as he can while pulling her hair. The man appears older, about your stepdad''s age if you had to guess, though you can't really see his face as their location is fairly obscured. You think you recognize the girl as one of your brother''s classmates. Not wanting to get caught watching, you move on.
 		<<arouse 'voyeur_sex' -10 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Move away'>>
 			<<gt 'pav_complex' 'start'>>
 		<</actCLA>>
@@ -441,7 +441,7 @@
 		<<image "locations/pavlovsk/resident/apartment/events/boygirlplay.jpg">>
 		A boy and a girl are talking near one of the doors to the buildings before she turns her back to him and he pushes her forward. They start dry humping and seem to really get into it since it doesn''t take long for them to quickly head inside.
 		<<arouse 'voyeur' -10 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Move away'>>
 			<<gt 'pav_complex' 'start'>>
 		<</actCLA>>
@@ -451,7 +451,7 @@
 		<<image "locations/pavlovsk/resident/apartment/events/sex/evbgsex.jpg">>
 		<p>A young girl is bent over and propped against the brick wall near the garages. Her skirt is pulled up across her stomach and her panties are around her right ankle. Behind her, a guy is pounding her pussy for all he's worth, his hands glued to her hips. You think you recognize the girl, though you're at loss for a name. A friend of your sister, perhaps?</p>
 		<<arouse 'voyeur_sex' -10 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Move away'>>
 			<<gt 'pav_complex' 'start'>>
 		<</actCLA>>
@@ -470,7 +470,7 @@
 		<</if>>
 		<<set $text_rand to null>>
 		<<arouse 'voyeur_sex' -10 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Move away'>>
 			<<gt 'pav_complex' 'start'>>
 		<</actCLA>>
@@ -490,7 +490,7 @@
 			The trio begin laughing as they put their dicks back in the pants. Dan then pulls out his phone and starts taking photos of the girl covered in their cum. As she gets to her feet, Vitek and Vasily grab her by the arms and start pulling her towards the street, never giving her a chance to clean the cum from her face. She tries to resist, but they don't seem to care and they're soon gone.
 		<</if>>
 		<<arouse 'voyeur_sex' -10 >>
-		<<arousalEnd>>
+		
 		<<actCLA 'Move away'>>
 			<<gt 'pav_complex' 'start'>>
 		<</actCLA>>
@@ -939,7 +939,7 @@
 							<<run $quest('school').func('groupRelInc','gopniks',1)>>
 							<<fame 'pav' 'sex' 2>>
 							<<arouse 'flash' -5 >>
-							<<arousalEnd>>
+							
 							<<image "locations/pavlovsk/resident/apartment/events/nudewalkb.jpg">>
 							You strip off your clothes while the boys hoot and whistle. Once you're completely naked, Vitek points at the garages. "Come on, start over there and walk all the way around the whole complex." You nod and walk over with the boys following you, Vasily stopping to grab your purse and clothes.
 							They follow behind you, laughing and talking while enjoying the view. A car occasionally drives by, the headlights lighting up your naked body. You notice a few people see you, their reactions ranging from disgust to interest, but none of them approach or say anything.
@@ -1071,7 +1071,7 @@
 						<<fame 'pav' 'sex' 2>>
 						<<set $time.minutes += 5>>
 						<<arouse 'flash' 5 >>
-						<<arousalEnd>>
+						
 						<<image "locations/pavlovsk/resident/apartment/events/nudewalkg.jpg">>
 						You strip off your clothes while the girls hoot and whistle. Once you're completely naked, Lena points at the garages. "Come on, start over there and walk all the way around the whole complex." You nod and walk over with the girls following you, Lera stopping to grab your purse and clothes.
 						They follow behind you, laughing and enjoying the view. A car occasionally drives by, the headlights lighting up your naked body. You notice a few people see you, their reactions ranging from disgust to interest, but none of them approach or say anything.
@@ -1241,7 +1241,7 @@
 				<<actCLA 'Undress'>>
 					<<set $npc('A144').rel += 1>>
 					<<arouse 'flash' 5 >>
-					<<arousalEnd>>
+					
 					<<image "characters/pavlovsk/school/girl/anushka/sex/complex/undress.jpg">>
 					You start peeling your clothes off as she removes her clothes. Before either of you are fully naked, she grabs you by the hair and pulls your face over to her pussy.
 					<<arouse 'foreplay' 3 `['lesbian','exhibitionism']`>>
@@ -1269,7 +1269,7 @@
 									You and Anushka both stop and quickly get dressed. You're just pulling on the last of your clothes when an old woman comes round the landing looking at the two of you. She looks confused at first before she scoffs in disgust and heads back upstairs.
 									<p>You both burst out laughing before heading up yourself. Just as you reach the next landing, Anushka stops. "Look, I need to go do something. Talk later?" Without waiting for a reply, she takes the steps a couple at a time as she hurries up them, still giggling at what happened.</p>
 									Never a dull moment you suppose, but you have other things you can do too. With that, you head back out to the courtyard.
-									<<arousalEnd>>
+									
 									<<actCLA 'Leave'>>
 										<<gt 'pav_complex' 'start'>>
 									<</actCLA>>
@@ -1320,7 +1320,7 @@
 				<<actCLA 'Yummy cum'>>
 					<<image "locations/pavlovsk/resident/apartment/events/sex/suck3s5.jpg">>
 					Dan is the first one to cum, splattering your face with his sperm. Moments later, Vasily is covering the other side of your face with his cum. You then focus on just sucking Vitek off while Dan and Vasily sit back down. A few minutes later, Vitek cums in your mouth before he rejoins Dan and Vasily and grabs a beer, taking a big swig of it.
-					<<arousalEnd>>
+					
 					<<if rand(0,1) == 0>>
 						"Fuck, that's the last beer. Come on, let''s go," Vitek tells Dan and Vasily.
 						<p>"Hey, I just sucked your dicks for a beer! what the fuck?!" you tell them.</p>
@@ -1376,7 +1376,7 @@
 			"When you bring the beer maybe, which is never. You're almost as bad as Mooch," Lera tells Lena and the other girls laugh.
 			You all fall back into some banter for a while before everyone decides it's time to go.
 			<<arouse 'cuni_give' 5 `['lesbian','exhibitionism']`>>
-			<<arousalEnd>>
+			
 			<<actCLA 'Leave'>>
 				<<gt 'pav_complex' 'start'>>
 			<</actCLA>>
@@ -1403,7 +1403,7 @@
 			"Here you go, best investment I ever made," he tells his friend. "Come on, let''s go buy some more." They both walk away, leaving you on your knees with some cigarettes and a face full of cum.
 			<<arouse 'hj' 5 `['group','exhibitionism']`>>
 			<<arouse 'hj' -5 `['group','exhibitionism']`>>
-			<<arousalEnd>>
+			
 			<<actCLA 'Leave'>>
 				<<gt 'pav_complex' 'start'>>
 			<</actCLA>>
@@ -1452,7 +1452,7 @@
 	<<set $menu_off = 1>>
 	<<set $time.minutes += 2>>
 	<<arouse 'flash' 5 >>
-	<<arousalEnd>>
+	
 	<<image "locations/pavlovsk/naked/complexnaked.jpg">>
 	There are several older women sitting out front of your building, so you make your way round to the back of the complex near the garages, you stop a moment to peek around one of the buildings. Not seeing anyone, you dart from one building to the next, leaving just the small courtyard behind your building to cross. You peek around a building and see a few people there, you keep yourself hidden as you wait, finally they move off and you rush across the courtyard and into the back door of the apartment building.
 	<<actCLA 'Sneak upstairs'>>
@@ -1463,7 +1463,7 @@
 			<<gt 'pav_aptcourtev' 'misha'>>
 		<<else>>
 			<<arouse 'flash' -5 >>
-			<<arousalEnd>>
+			
 			<<set $time.minutes += 1>>
 			<<image "locations/pavlovsk/naked/aptstairsnaked.jpg">>
 			Once inside, you sigh in relief. Taking a look around, you glance up the stairs and then slowly start creeping up them, hoping no one suddenly comes out of their apartment or comes down the stairs.
@@ -1481,7 +1481,7 @@
 <<if $location_var[$here][0] == 'two_boys'>>
 	<<set $time.minutes += 3>>
 	<<arouse 'flash' 5 >>
-	<<arousalEnd>>
+	
 	<<set $nakedrand to null>>
 	<<set $pavapt_boyrand = rand(1,2)>>
 	<<if getvar("$pavapt_boyrand") == 1>>
@@ -1500,7 +1500,7 @@
 			<<fame 'pav' 'sex' 4>>
 			<<set $time.minutes += 1>>
 			<<arouse 'flash' -5 >>
-			<<arousalEnd>>
+			
 			<<set $pavapt_boyrand to null>>
 			<<image "locations/pavlovsk/naked/homedoornaked.jpg">>
 			You shake your head. "No, I'll not be your personal whore. Now get out of my way."
@@ -1555,7 +1555,7 @@
 								<<cum 'face' 'A125' 1>>
 								<<cum 'mouth' 'A126' 1>>
 							<</if>>
-							<<arousalEnd>>
+							
 							<<actCLA 'Go home'>>
 								<<set $pavapt_boyrand to null>>
 								<<set $time.minutes += 2>>
@@ -1604,7 +1604,7 @@
 											<<cum 'face' 'A125' 1>>
 											<<cum 'mouth' 'A126' 1>>
 										<</if>>
-										<<arousalEnd>>
+										
 										<<actCLA 'Go home'>>
 											<<set $time.minutes += 2>>
 											<<set $pavapt_boyrand to null>>
@@ -1628,7 +1628,7 @@
 	<<set $time.minutes += 1>>
 	<<set $nakedrand to null>>
 	<<arouse 'flash' 5 >>
-	<<arousalEnd>>
+	
 	<<set $npc('A54').rel += 3>>
 	<<image "locations/pavlovsk/naked/aptstairsnaked.jpg">>
 	<p>Once inside you sigh in relief. Taking a look around, you glance up the stairs and slowly start creeping up them, hoping no one suddenly comes out of their apartment or comes down the stairs. You almost make it to your door when you hear a door behind you open, followed by a cough. You turn around and see Uncle Misha watching you with a raised eyebrow. "Should I ask why you're sneaking around naked, $pc.name_nick?"</p>
@@ -1643,8 +1643,8 @@
 		<!-- !!		act 'Put on spare uniform and go back to school':-->
 		<!-- !!			-->
 		<!-- !!			minut += 12-->
-		<!-- !!			'<<image `'locations/pavlovsk/school/walk_home2.jpg'`>>'-->
-		<!-- !!			'<<image `'locations/pavlovsk/school/walk_homew1.jpg'`>>'-->
+		<!-- !!			'<<image 'locations/pavlovsk/school/walk_home2.jpg'>>'-->
+		<!-- !!			'<<image 'locations/pavlovsk/school/walk_homew1.jpg'>>'-->
 		<!-- !!			'You change into your other school uniform quickly and then quickly rush back to school.'-->
 		<!-- !!			!!this should take Sveta back to school missing one period-->
 		<!-- !!		end-->

sugarcube/src/autogenerated/Block/pav_complexb2.tw

@@ -146,7 +146,7 @@
 	<center>Roof</center>
 	<<if $time.isWinter>>
 		<!-- !!if hour >= 8 and hour <= 21:-->
-		<!-- !!'<<image `'locations/pavlovsk/resident/apartment/roof/roofw.jpg'`>>'-->
+		<!-- !!'<<image 'locations/pavlovsk/resident/apartment/roof/roofw.jpg'>>'-->
 		<!-- !!else-->
 		<<image "locations/pavlovsk/resident/apartment/roof/roofw.jpg">>
 		<!-- !!end-->

sugarcube/src/autogenerated/Block/pav_complexb3.tw

@@ -143,7 +143,7 @@
 	<center>Roof</center>
 	<<if $time.isWinter>>
 		<!-- !!if hour >= 8 and hour <= 21:-->
-		<!-- !!'<<image `'locations/pavlovsk/resident/apartment/roof/roofw.jpg'`>>'-->
+		<!-- !!'<<image 'locations/pavlovsk/resident/apartment/roof/roofw.jpg'>>'-->
 		<!-- !!else-->
 		<<image "locations/pavlovsk/resident/apartment/roof/roofw.jpg">>
 		<!-- !!end-->

sugarcube/src/autogenerated/Block/pod_whore.tw

@@ -1122,7 +1122,7 @@
 		<<set $pod_whore_client_day = $time.daystart>>
 		<<set $pod_whore_client_count -= 1>>
 		<<fame 'pav' 'prostitute' `rand(6,12)`>>
-		<<arousalEnd>>
+		
 		<<video "locations/pavlovsk/resident/apartment/stairs/sex/cum#.mp4" 1 7>>
 		<<gs 'pod_whore' 'hide' 'text_pod_whore_cum'>>
 		<p>The man gives you total_money <b>₽</b>, as promised.</p>
@@ -1331,7 +1331,7 @@
 					<<set $pod_whore_countQW += 1>>
 					<<set $pod_whore_client_day = $time.daystart>>
 					<<set $pod_whore_client_count -= 1>>
-					<<arousalEnd>>
+					
 					<<image "locations/pavlovsk/resident/apartment/stairs/sex/1_4_#.jpg" 1 2>>
 					'After they fucked you in several positions and both had their turns , they tell you they want to cum on your face.
 					You eagerly drop to your knees and stick out your tongue , inviting them to cum in your mouth while you look them deep in the eyes.
@@ -1408,7 +1408,7 @@
 							<<set $pod_whore_countQW += 1>>
 							<<set $pod_whore_client_day = $time.daystart>>
 							<<set $pod_whore_client_count -= 1>>
-							<<arousalEnd>>
+							
 							<<image "locations/pavlovsk/resident/apartment/stairs/sex/2_4.jpg">>
 							After a few more minutes of getting fucked, you suddenly feel the guy underneath you spasm. Seconds later you feel a warm liquid inside you, and when he pulls his cock out of you his cum slowly drips from your pussy. A few more jets of cum come out, landing on your stomach. The other guy cums inside your mouth at the same time, without any warning. You swallow his load as best you can, and only miss a few drops that end up on your chin.
 							The guys don't pay much attention to you when they put their clothes back on. They're mostly talking to one another about how much of a good fuck you were, pretending you're not there.

sugarcube/src/autogenerated/Block/praiders_garageev1.tw

@@ -3,30 +3,30 @@
 <<set $ARGS = $location_var[$here]>>
 <<if $location_var[$here][0] == 'radsex'>>
 	<<fame 'pav' 'sex' 3>>
-	<<image `'characters/pavlovsk/school/boy/radomir/sex/garage/practice1.jpg'`>>
+	<<image 'characters/pavlovsk/school/boy/radomir/sex/garage/practice1.jpg'>>
 	Once the two of you are alone, he turns the radio back on and sits on an up turned box next to the radio. "Come on, give me a little show."
 	You dance around and start slowly stripping for him as he quickly pulls out his semi erect cock. "Come over here and wrap those beautiful lips around my dick."
 	<<arouse 'foreplay' 2 >>
 	<<actCLA 'Blow him'>>
-		<<image `'characters/pavlovsk/school/boy/radomir/sex/garage/practice2.jpg'`>>
+		<<image 'characters/pavlovsk/school/boy/radomir/sex/garage/practice2.jpg'>>
 		You dance your way over to him before dropping down to your knees. You take his dick into your mouth, wrapping your lips tightly around it, and start sucking him. You feel his dick quickly get hard in your mouth as you bob your head up and down. "Oh yeah, that's it. You've got skills girl."
 		<<arouse 'bj' 3 >>
 		<<actCLA 'Keep sucking him'>>
-			<<image `'characters/pavlovsk/school/boy/radomir/sex/garage/practice3.jpg'`>>
+			<<image 'characters/pavlovsk/school/boy/radomir/sex/garage/practice3.jpg'>>
 			<p>He starts moving his hips as you suck his cock and starts fucking your mouth. "You really know how to suck a cock! You must get a lot of practice." You don't comment back as you keep sucking him. "I want to fuck that sweet little pussy of yours now."</p>
 			<<arouse 'bj' 3 >>
 			<<if $pc.sexStat('vaginal') >= 1>>
 				<<actCLA 'Let him fuck you'>>
 					<!-- Boy A154 -->
-					<<image `'characters/pavlovsk/school/boy/radomir/sex/garage/practice4.jpg'`>>
+					<<image 'characters/pavlovsk/school/boy/radomir/sex/garage/practice4.jpg'>>
 					<p>You just nod and he pulls you up and quickly strips you from the waist down. He then turns you around and pulls you into his lap. You feel his dickcm $dick_girth dick slide inside your wet pussy.</p>
 					<<arouse 'vaginal' 3 >>
 					<<actCLA 'Get fucked'>>
-						<<image `'characters/pavlovsk/school/boy/radomir/sex/garage/practice5.jpg'`>>
+						<<image 'characters/pavlovsk/school/boy/radomir/sex/garage/practice5.jpg'>>
 						<p>He reaches up to play with your tits as you bounce on his lap, thrusting yourself on and off his cock. "Damn, your pussy's so fucking tight! I can feel my cock stretching it out. Don't worry, you'll get use to it soon enough."</p>
 						<<arouse 'vaginal' 3 >>
 						<<actCLA 'Get butt fucked'>>
-							<<image `'characters/pavlovsk/school/boy/radomir/sex/garage/practice7.jpg'`>>
+							<<image 'characters/pavlovsk/school/boy/radomir/sex/garage/practice7.jpg'>>
 							<<if getvar("$lubri") > 0>>
 								<<arouse 'auto_lube' 'anal' `['custom']`>>
 								He suddenly stands up, pulling you up with him. He turns and lowers you to the ground until you're on your hands and knees. Instead of going back into your pussy, you feel the head of his dick pressing against your asshole. You reach over and quickly grab your purse, pulling out the lube and handing it back to him. "Use this lube first."
@@ -36,16 +36,16 @@
 							<</if>>
 							<<arouse 'anal' 3 >>
 							<<actCLA 'Not so rough'>>
-								<<image `'characters/pavlovsk/school/boy/radomir/sex/garage/practice8.jpg'`>>
+								<<image 'characters/pavlovsk/school/boy/radomir/sex/garage/practice8.jpg'>>
 								<p>You doubt he cares about your comfort as he hammers away at your ass. "Not.. so... rough Rad!" you grunt out at him.</p>
 								<p>He just grabs your hips and slams himself balls deep into you and goes even faster. "You bitches always fucking complain, but then you start moaning like whores and have an orgasm. Stop pretending you don't love being fucked raw!"</p>
 								<<arouse 'anal' 3 >>
 								<<actCLA 'Climax'>>
-									<<image `'characters/pavlovsk/school/boy/radomir/sex/garage/practice9.jpg'`>>
+									<<image 'characters/pavlovsk/school/boy/radomir/sex/garage/practice9.jpg'>>
 									You grit your teeth. A part of you is enjoying it, but it would be a lot more enjoyable if he wasn''t so rough. Just as you think it might be getting too much for you, he groans loudly and you feel him filling your ass up with his cum. Once he finishes, he stands up and tucks his dick away before walking over and grabbing a beer while you get dressed. He downs the whole beer before you finish getting dressed. "Come on, let''s go. I need to lock this place up." As soon as you finish getting dressed, he ushers you out of the garage and locks it. He turns and gives you a kiss on the lips. "I had a great time, catch you later."
 									<<arouse 'anal' 3 >>
 									<<cum 'anus' 'A154' 1>>
-									<<arousalEnd>>
+									
 									<<actCLA 'Leave'>>
 										<<gt 'pav_complex_garages'>>
 									<</actCLA>>
@@ -57,7 +57,7 @@
 			<<else>>
 				<<actCLA 'I`m a virgin'>>
 					<!-- Boy A154 -->
-					<<image `'characters/pavlovsk/school/boy/radomir/sex/garage/practice6.jpg'`>>
+					<<image 'characters/pavlovsk/school/boy/radomir/sex/garage/practice6.jpg'>>
 					<<if getvar("$lubri") > 0>>
 						<<arouse 'auto_lube' 'anal' `['custom']`>>
 						He suddenly stands up, pulling you up with him. He turns and lowers you to the ground until you're on your hands and knees. Instead of going back into your pussy, you feel the head of his dick pressing against your asshole. You reach over and quickly grab your purse, pulling out the lube and handing it back to him. "Use this lube first."
@@ -67,20 +67,20 @@
 					<</if>>
 					<<arouse 'anal' 3 >>
 					<<actCLA 'Get butt fucked'>>
-						<<image `'characters/pavlovsk/school/boy/radomir/sex/garage/practice7.jpg'`>>
+						<<image 'characters/pavlovsk/school/boy/radomir/sex/garage/practice7.jpg'>>
 						<p>He roughly fucks your ass hard and fast. "Fuck you have a tight little ass $pc.name_nick." Then he laughs. "Don't worry, we will have it stretched out in no time." Then he pulls nearly all the way out and slams himself back in balls deep, hammering away at you.</p>
 						<<arouse 'anal' 3 >>
 						<<actCLA 'Not so rough'>>
-							<<image `'characters/pavlovsk/school/boy/radomir/sex/garage/practice8.jpg'`>>
+							<<image 'characters/pavlovsk/school/boy/radomir/sex/garage/practice8.jpg'>>
 							<p>You doubt he cares about your comfort as he hammers away at your ass. "Not.. so... rough Rad!" you grunt out at him.</p>
 							<p>He just grabs your hips and slams himself balls deep into you and goes even faster. "You bitches always fucking complain, but then you start moaning like whores and have an orgasm. Stop pretending you don't love being fucked raw!"</p>
 							<<arouse 'anal' 3 >>
 							<<actCLA 'Climax'>>
-								<<image `'characters/pavlovsk/school/boy/radomir/sex/garage/practice9.jpg'`>>
+								<<image 'characters/pavlovsk/school/boy/radomir/sex/garage/practice9.jpg'>>
 								You grit your teeth. A part of you is enjoying it, but it would be a lot more enjoyable if he wasn''t so rough. Just as you think it might be getting too much for you, he groans loudly and you feel him filling your ass up with his cum. Once he finishes, he stands up and tucks his dick away before walking over and grabbing a beer while you get dressed. He downs the whole beer before you finish getting dressed. "Come on, let''s go. I need to lock this place up." As soon as you finish getting dressed, he ushers you out of the garage and locks it. He turns and gives you a kiss on the lips. "I had a great time, catch you later."
 								<<arouse 'anal' 3 >>
 								<<cum 'anus' 'A154' 1>>
-								<<arousalEnd>>
+								
 								<<actCLA 'Leave'>>
 									<<gt 'pav_complex_garages'>>
 								<</actCLA>>

sugarcube/src/autogenerated/Body/lact_bp.tw

@@ -597,7 +597,7 @@
 		<<if ($pc.pcs_inhib > 40 and $location_type == 'private') or $location_type == 'bathroom'>>
 			<<actCLA 'Try out how it works'>>
 				 				You pull up your top to release your breasts
-				<br><<image `'pc/body/tits/t<<tits>>.jpg'`>><br>
+				<br><<image 'pc/body/tits/t<<tits>>.jpg'>><br>
 				Your fingers glide around the suction cup of the breast pump, while your other hand holds the pump.
 				Making sure that no one is around, you lift the breast pump to your left breast. The cold cone feels uncomfortable on your nipple.
 				<<set $milkedvolume = (func('lact_lib','$get_breastmilk', 3, 1))/100>>
@@ -608,29 +608,29 @@
 						You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the suction on your nipple goes away and the nipple retracts.
 						With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rhythmically squeeze it. The pump starts to draw milk from your breast.
 						You go on for a minute and then detach the pump. You collected some milk, but it is just a small puddle in the bottle.
-						<br><<image `'pc/body/tits/pump_milkdrops.jpg'`>>
+						<br><<image 'pc/body/tits/pump_milkdrops.jpg'>>
 					<<elseif getvar("$milkedvolume") > 50 and getvar("$milkedvolume") <= 1500>>
 						You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the suction on your nipple goes away and the nipple retracts.
 						With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rhythmically squeeze it. The pump starts to draw milk from your breast.
 						You go on for a minute and then detach the pump. You collected <<milkedvolume/10>>ml of your breast milk.
-						<br><<image `'pc/body/tits/pump_half.jpg'`>>
+						<br><<image 'pc/body/tits/pump_half.jpg'>>
 					<<else>>
 						You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the suction on your nipple goes away and the nipple retracts.
 						With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rhythmically squeeze it. The pump starts to draw milk from your breast.
 						You go on for a minute and then detach the pump. You easily filed the breast pump bottle with your breast milk just with this little pumping.
-						<br><<image `'pc/body/tits/pump_full.jpg'`>>
+						<br><<image 'pc/body/tits/pump_full.jpg'>>
 					<</if>>
 					You nod at the breast pump, thinking it will come in handy.
 				<<elseif getvar("$lactation['active']") > 0 and getvar("$milkedvolume") <= 0>>
 					You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the suction on your nipple goes away and the nipple retracts.
 					With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rhythmically squeeze it.
 					You go on for a minute and then detach the pump. You collected some milk, but it is just a small puddle in the bottle.
-					<br><<image `'pc/body/tits/pump_milkdrops.jpg'`>>
+					<br><<image 'pc/body/tits/pump_milkdrops.jpg'>>
 				<<else>>
 					You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the suction on your nipple goes away and the nipple retracts.
 					With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rhythmically squeeze it.
 					You go on for a minute and then detach the pump. As expected no milk was collected in the bottle.
-					<br><<image `'pc/body/tits/breast_pump.jpg'`>>
+					<br><<image 'pc/body/tits/breast_pump.jpg'>>
 				<</if>>
 				<<if getvar("$lactation['active']") > 0 and $pc.pain('nipples') < 60 and getvar("$lactation['pc_aware']") <= 0>>
 					<<if getvar("$pcs_usedbreastpumponherself") > 0 and getvar("$pcs_massagedherbreasts") <= 0>>
@@ -695,7 +695,7 @@
 			<</actCLA>>
 		<<else>>
 			You pull up your top to release your breasts
-			<br><<image `'pc/body/tits/t<<tits>>.jpg'`>><br>
+			<br><<image 'pc/body/tits/t<<tits>>.jpg'>><br>
 			Your fingers glide around the suction cup of the breast pump, while your other hand holds the pump.
 			Making sure that no one is around, you lift the breast pump to your left breast. The cold cone feels uncomfortable on your nipple.
 			<<set $milkedvolume = (func('lact_lib','$get_breastmilk', 3, 1))/100>>
@@ -706,29 +706,29 @@
 					You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the suction on your nipple goes away and the nipple retracts.
 					With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rhythmically squeeze it. The pump starts to draw milk from your breast.
 					You go on for a minute and then detach the pump. You collected some milk, but it is just a small puddle in the bottle.
-					<br><<image `'pc/body/tits/pump_milkdrops.jpg'`>>
+					<br><<image 'pc/body/tits/pump_milkdrops.jpg'>>
 				<<elseif getvar("$milkedvolume") > 50 and getvar("$milkedvolume") <= 1500>>
 					You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the suction on your nipple goes away and the nipple retracts.
 					With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rhythmically squeeze it. The pump starts to draw milk from your breast.
 					You go on for a minute and then detach the pump. You collected <<milkedvolume/10>>ml of your breast milk.
-					<br><<image `'pc/body/tits/pump_half.jpg'`>>
+					<br><<image 'pc/body/tits/pump_half.jpg'>>
 				<<else>>
 					You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the suction on your nipple goes away and the nipple retracts.
 					With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rhythmically squeeze it. The pump starts to draw milk from your breast.
 					You go on for a minute and then detach the pump. You easily filed the breast pump bottle with your breast milk just with this little pumping.
-					<br><<image `'pc/body/tits/pump_full.jpg'`>>
+					<br><<image 'pc/body/tits/pump_full.jpg'>>
 				<</if>>
 				You nod at the breast pump, thinking it will come in handy.
 			<<elseif getvar("$lactation['active']") > 0 and getvar("$milkedvolume") <= 0>>
 				You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the suction on your nipple goes away and the nipple retracts.
 				With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rhythmically squeeze it.
 				You go on for a minute and then detach the pump. You collected some milk, but it is just a small puddle in the bottle.
-				<br><<image `'pc/body/tits/pump_milkdrops.jpg'`>>
+				<br><<image 'pc/body/tits/pump_milkdrops.jpg'>>
 			<<else>>
 				You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the suction on your nipple goes away and the nipple retracts.
 				With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rhythmically squeeze it.
 				You go on for a minute and then detach the pump. As expected no milk was collected in the bottle.
-				<br><<image `'pc/body/tits/breast_pump.jpg'`>>
+				<br><<image 'pc/body/tits/breast_pump.jpg'>>
 			<</if>>
 			<<actCLA 'continue'>>
 				 				<<if getvar("$milkedvolume") > 50 and $location_type == 'private'>>
@@ -1091,7 +1091,7 @@
 	<<elseif getvar("$lactation['active']") == 0 and $pc.pain('nipples') < 60>>
 		<<set $milkedvolume = (func('lact_lib','$get_breastmilk', 3, pumptime))/100>>
 		<<set $pcs_usedbreastpumponherself += 1>>
-		<<image `'pc/body/tits/t<<tits>>.jpg'`>>
+		<<image 'pc/body/tits/t<<tits>>.jpg'>>
 		<<if getvar("$breastcounter") < 100>>
 			You attach the pump to your nipples and start squeezing the bulb. The vacuum feels uncomfortable on your nipples.
 		<<elseif getvar("$breastcounter") >= 100 and getvar("$breastcounter") < 200>>

sugarcube/src/autogenerated/Boys/BDsex.tw

@@ -190,7 +190,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'sex2'>>
 	<<set $pose = 1>>
-	<<image `'shared/sex/vag/doggy/vagdog'+rand(1,5)+'.jpg'`>>
+	<<image 'shared/sex/vag/doggy/vagdog#.jpg' 1 5>>
 	<<arouse 'vaginal' 10 `['sub']`>>
 	<<gs 'BDsex' 'org'>>
 	<<if getvar("$harakBoy") > 0>>
@@ -221,7 +221,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'sex3'>>
 	<<set $pose = 0>>
-	<<image `'shared/sex/vag/cowgirl/vagcow'+rand(1,5)+'.jpg'`>>
+	<<image 'shared/sex/vag/cowgirl/vagcow#.jpg' 1 5>>
 	<<arouse 'vaginal' 10 `['sub']`>>
 	<<gs 'BDsex' 'org'>>
 	<<gs 'BDsex' 'cum'>>
@@ -233,7 +233,7 @@
 	<<gs 'bdsex' 'ancum'>>
 <</if>>
 <<if $location_var[$here][0] == 'anal2'>>
-	<<image `'shared/sex/anal/doggy/anal2'+rand(1,10)+'.jpg'`>>
+	<<image 'shared/sex/anal/doggy/anal2#.jpg' 1 10>>
 	<<arouse 'anal' 10 `['sub']`>>
 	<<gs 'bdsex' 'an'>>
 	<<if getvar("$harakBoy") > 0>>
@@ -274,13 +274,13 @@
 					<<set $protect = 0>>
 					<<if getvar("$sexcontra") == 4>>
 						<p>$boydesc finishes, filling the condom with his hot and sticky cum, and then a slimy feeling. You realize that the condom burst.</p>
-						<<arousalEnd>>
+						
 					<<elseif getvar("$sexcontra") == 5>>
 						<p>$boydesc finishes, filling the condom with his hot and sticky cum. As he pulls out, you feel a ghostly sensation, as if he didn't come all the way out. Looking down, you see his bare dick.</p>
-						<<arousalEnd>>
+						
 					<<else>>
 						<p>$boydesc finishes, filling the condom with his hot and sticky cum.</p>
-						<<arousalEnd>>
+						
 					<</if>>
 					<<set $sexcontra = 0>>
 				<<else>>
@@ -288,7 +288,7 @@
 					<<set $spafinloc = 13>>
 					<<set $sexpartkno = 1>>
 					<<gs 'cum_manage'>>
-					<<arousalEnd>>
+					
 				<</if>>
 				<<actCLA 'Leave'>>
 					<<gt 'BDsex' 'end'>>
@@ -371,7 +371,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'minet'>>
 	<!-- !!blowjob-->
-	<<image `'shared/sex/blowjob/bj'+rand(24,28)+'.jpg'`>>
+	<<image 'shared/sex/blowjob/bj#.jpg' 24 28>>
 	<<arouse 'bj' 10 `['sub']`>>
 	<<gs 'bdsex' 'autobj'>>
 	<<if rand(0, 100) >= 75>>
@@ -383,13 +383,13 @@
 					<p>$boydesc finishes, filling the condom with his cum.</p>
 					<<set $protect = 0>>
 					<<set $sexcontra = 0>>
-					<<arousalEnd>>
+					
 				<<else>>
 					<p>$boydesc finished all over your hands covering them in hot and sticky cum.</p>
 					<<set $spafinloc = 13>>
 					<<set $sexpartkno = 1>>
 					<<gs 'cum_manage'>>
-					<<arousalEnd>>
+					
 				<</if>>
 				<<actCLA 'Leave'>>
 					<<gt 'BDsex' 'end'>>
@@ -452,13 +452,13 @@
 					<p>$boydesc finishes, filling the condom with his cum.</p>
 					<<set $protect = 0>>
 					<<set $sexcontra = 0>>
-					<<arousalEnd>>
+					
 				<<else>>
 					<p>$boydesc finished all over your hands covering them in hot and sticky cum.</p>
 					<<set $spafinloc = 13>>
 					<<set $sexpartkno = 1>>
 					<<gs 'cum_manage'>>
-					<<arousalEnd>>
+					
 				<</if>>
 				<<actCLA 'Leave'>>
 					<<gt 'BDsex' 'end'>>
@@ -469,7 +469,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'facial'>>
 	<<set $time.minutes += 3>>
-	<<image `'shared/sex/cum/facial/facial'+rand(11,15)+'.jpg'`>>
+	<<image 'shared/sex/cum/facial/facial#.jpg' 11 15>>
 	<<if getvar("$protect") == 1>>
 		<p>$boydesc finishes, filling the condom with his cum.</p>
 		<<set $protect = 0>>
@@ -486,7 +486,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'swallow'>>
 	<<set $time.minutes += 3>>
-	<<image `'shared/sex/cum/mouth/cum'+rand(20,29)+'.jpg'`>>
+	<<image 'shared/sex/cum/mouth/cum#.jpg' 20 29>>
 	<<if getvar("$protect") == 1>>
 		<p>$boydesc finishes, and you feel the condom balloon up in your mouth.</p>
 		<<set $protect = 0>>
@@ -880,7 +880,7 @@
 			<<set $sexpartkno = 1>>
 			<<gs 'cum_manage'>>
 			<p>$boydesc groans and you feel each jet of sperm paint the walls of your womb with seed.</p>
-			<<arousalEnd>>
+			
 			<<set $pc.mood -= 15>>
 			<<gs 'cuminsidereact'>>
 		<<else>>
@@ -890,26 +890,26 @@
 				<<set $sexpartkno = 1>>
 				<<gs 'cum_manage'>>
 				<p>$boydesc shouts, pulling out to finish on your stomach.</p>
-				<<arousalEnd>>
+				
 			<<elseif getvar("$pose") == 1>>
 				<<set $spafinloc = 4>>
 				<<set $sexpartkno = 1>>
 				<<gs 'cum_manage'>>
 				<p>$boydesc shudders, pulling out just in time to paint your ass white with semen.</p>
-				<<arousalEnd>>
+				
 			<</if>>
 		<</if>>
 	<<elseif getvar("$protect") == 1>>
 		<<set $protect = 0>>
 		<<if getvar("$sexcontra") == 4>>
 			<p>$boydesc groans and you feel heat building deep inside, and then a slimy feeling. You realize that the condom burst.</p>
-			<<arousalEnd>>
+			
 		<<elseif getvar("$sexcontra") == 5>>
 			<p>$boydesc groans and you feel heat building deep inside. As he pulls out, you feel a ghostly sensation, as if he didn't come all the way out. Looking down, you see his bare dick.</p>
-			<<arousalEnd>>
+			
 		<<else>>
 			<p>$boydesc groans and you feel heat building deep inside. You realize that he has filled the condom.</p>
-			<<arousalEnd>>
+			
 		<</if>>
 		<<set $sexcontra = 0>>
 	<</if>>
@@ -994,7 +994,7 @@
 	<<set $spafinloc = 4>>
 	<<set $sexvolume = 20>>
 	<<set $sexpartkno = 1>>
-	<<arousalEnd>>
+	
 	<<gs 'cum_manage'>>
 	<<if $pc.pcs_ass < $dick>>
 		<<setn $pc.pcs_ass += 1>>

sugarcube/src/autogenerated/Cars/autotraidF.tw

@@ -163,7 +163,7 @@
 	<<set $carT = $ARGS[4]>>
 	<<set $autotraidF_benz = $ARGS[5]>>
 	<center><b><<$autotraidF_carname>></b></center>
-	<<image `'pc/items/accessories/car/car<<autotraidF_carnum>>.jpg'`>>
+	<<image 'pc/items/accessories/car/car<<autotraidF_carnum>>.jpg'>>
 	<<gs 'avt'>>
 	<p>$car['potential_current_condition'] The car salesman wants bupay <b>₽</b> for it.</p>
 	<<actCLA 'Look around some more'>>

sugarcube/src/autogenerated/Cars/carF.tw

@@ -11,7 +11,7 @@
 	<<set $time.minutes += 1>>
 	
 	<center><b><<$car>></b></center>
-	<<image `'pc/items/accessories/car/car<<car>>.jpg'`>>
+	<<image 'pc/items/accessories/car/car<<car>>.jpg'>>
 	<<actCLA 'Move away from the car'>>
 		<<enddrive>>
 	<</actCLA>>
@@ -39,7 +39,7 @@
 	<<set $loc = 'carF'>>
 	<<set $time.minutes += 1>>
 	<center><b><<$car>></b></center>
-	<<image `'pc/items/accessories/car/salon<<car>>.jpg'`>>
+	<<image 'pc/items/accessories/car/salon<<car>>.jpg'>>
 	<!-- FAILED TO CONVERT
 		'Gasoline - <<benz>> ' + iif(benz = 1, 'liter', 'liters') + ', the fuel tank has a capacity of 40 liters.'
 	-----

sugarcube/src/autogenerated/Cars/carF1.tw

@@ -75,9 +75,9 @@
 	It appears the car you selected does not actually exist.
 <<else>>
 	<<set $carF1_num = $location_var[$here][0]>>
-	<<image `'pc/items/accessories/car/car<<$carF1_num>>.jpg'`>>
+	<<image 'pc/items/accessories/car/car<<$carF1_num>>.jpg'>>
 	<<actCLA 'Sit behind the wheel'>>
-		<<image `'pc/items/accessories/car/salon<<$carF1_num>>.jpg'`>>
+		<<image 'pc/items/accessories/car/salon<<$carF1_num>>.jpg'>>
 		<<actCLA 'Leave'>>
 			<<gt 'carF1' $carF1_num>>
 		<</actCLA>>

sugarcube/src/autogenerated/Cars/zaprF.tw

@@ -84,7 +84,7 @@
 					<<set $zprpay = $zprbenz * 30>>
 					<<set $finances.cash -= $zprpay>>
 					<!-- ! WD: Uninitialised ~ 'pol'-->
-					<!-- ! if pol > 0:'<<image `'locations/shared/gas/zapr1.jpg'`>>'--><!--
+					<!-- ! if pol > 0:'<<image 'locations/shared/gas/zapr1.jpg'>>'--><!--
 					<<image "locations/shared/gas/zapr1.jpg">>
 					<p>You fill the tank and pay zprpay <b>₽</b>.</p>
 					<<actCLA 'Disengage from the pump'>>

sugarcube/src/autogenerated/Cars/zaprFWash.tw

@@ -739,7 +739,7 @@
 		<<set $pc.mood -= 20>>
 		The pounding suddenly stops as he cums deep inside your vagina. You can feel his cum inside of you as he continues to shoot his load inside you. When he pulls out, a bit of sperm leaks out of your hole.
 	<</if>>
-	<<arousalEnd>>
+	
 	<<actCLA 'Go back to the gas station'>>
 		<<gt 'zaprF' 'start'>>
 	<</actCLA>>
@@ -756,7 +756,7 @@
 	<<cum 'anus'>>
 	<<video "locations/shared/carwash/sex/cumanal#.mp4" 1 2>>
 	You let him cum deep inside your ass. A pleasant warmth fills your insides as he shoots his load deep inside you. When he pulls out, a bit of sperm leaks out of your hole before you can tighten your worn out anus.
-	<<arousalEnd>>
+	
 	<<actCLA 'Go back to gas station'>>
 		<<gt 'zaprF' 'start'>>
 	<</actCLA>>
@@ -783,7 +783,7 @@
 		<<image "shared/sex/cum/handjob/hand#.jpg" 1 2>>
 	<</if>>
 	When the man starts to ejaculate, you quickly point his cock away from your face. Your hands are covered in cum by the time he is done ejaculating. His sack was full, you can say that for sure.
-	<<arousalEnd>>
+	
 	<<actCLA 'Go back to the gas station'>>
 		<<gt 'zaprF' 'start'>>
 	<</actCLA>>
@@ -815,7 +815,7 @@
 	<<elseif $location_var[$here][1] == 'inside'>>
 		When the man starts to ejaculate, you quickly take his cock out of you and point it towards your face. Your face is covered in cum by the time he is done ejaculating. His sack was full, you can say that for sure.
 	<</if>>
-	<<arousalEnd>>
+	
 	<<actCLA 'Go back to the gas station'>>
 		<<gt 'zaprF' 'start'>>
 	<</actCLA>>
@@ -834,7 +834,7 @@
 		When the man starts to ejaculate, you quickly take his cock out of you and aim it straight at your tongue, giving him a good view of the cum as it flies inside your mouth. His sack was full, you can say that for sure.
 	<</if>>
 	Your mouth is full of sperm. You decide to...:
-	<<arousalEnd>>
+	
 	<<actCLA 'Swallow and then show him your empty mouth'>>
 		<<gt 'zaprFWashEvent' 'blowjobEndMouthSwallow'>>
 	<</actCLA>>
@@ -853,7 +853,7 @@
 	You gulp down the mouthful of sperm and then present your tongue as proof that all of his seed is now in your belly.
 	The man smiles, slaps you mildly on your face and says: "What a nice young slut you are. Next time I need a refill, I'll be sure to stop by."
 	<<run $pc.sexStatInc('swallow','aware',1)>>
-	<<arousalEnd>>
+	
 	<<actCLA 'Go back to the gas station'>>
 		<<gt 'zaprF' 'start'>>
 	<</actCLA>>
@@ -884,7 +884,7 @@
 	<<if $runSuccess <= Math.min(max(25,pcs_stren,pcs_agil),75)>>
 		<<image "locations/gadukino/village/turn_back.jpg">>
 		<p>You manage to escape his grasp! You take a quick look behind you to make sure he's not following you before heading back to the gas station.</p>
-		<<arousalEnd>>
+		
 		<<actCLA 'Escape'>>
 			<<gt 'zaprF' 'start'>>
 		<</actCLA>>
@@ -895,7 +895,7 @@
 		<<run $pc.painInc('neck',4)>>
 		<<video "locations/shared/carwash/sex/punishbeatface.mp4">>
 		<p>You aren't quick enough and he catches you. He pushes you down and starts to slap your face!</p>
-		<<arousalEnd>>
+		
 		<<actCLA 'Endure his punishment'>>
 			<<gt 'zaprFWashEvent' 'punish'>>
 		<</actCLA>>
@@ -922,7 +922,7 @@
 	<<elseif $pc.pcs_sleep >= 35>>
 		<<set $pc.pcs_sleep -= 35>>
 	<</if>>
-	<<arousalEnd>>
+	
 	<<gt 'zaprF' 'start'>>
 <</if>>
 <<if $location_var[$here][0] == 'punish'>>
@@ -945,7 +945,7 @@
 	The angry man drags you to a more secluded area, bends you over and starts to spank your ass very hard.
 	After twenty minutes of ruthless punishment, he finally stops, and you crawl away with your ass burning.
 	<<arouse 'foreplay' 15 `['sub','rough','unknown']`>>
-	<<arousalEnd>>
+	
 	<<gs 'zaprFWashEvent' 'punishEnd'>>
 <</if>>
 <<if $location_var[$here][0] == 'punishAnal'>>
@@ -960,7 +960,7 @@
 	Your anus fully exposed, he starts fucking it ruthlessly.
 	After half an hour of rough assfucking he releases his grip on you so you can finally crawl away, your aching ass sore from the brutal penetration.
 	<<arouse 'anal' 30 `['sub','rough','rape','unknown']`>>
-	<<arousalEnd>>
+	
 	<<gs 'zaprFWashEvent' 'punishEnd'>>
 <</if>>
 <<if $location_var[$here][0] == 'punishPussyQ'>>
@@ -1007,7 +1007,7 @@
 	<</if>>
 	After half an hour of destroying your cunt, he releases his grip on you so you can finally crawl away, your aching pussy sore from the brutal penetration.
 	<<arouse 'vaginal' 30 `['sub','rough','rape','unknown']`>>
-	<<arousalEnd>>
+	
 	<<gs 'zaprFWashEvent' 'punishEnd'>>
 <</if>>
 <!-- !! SM it was too hard to get abducted so remove old check against strength/agility, now only checks against slut reputation-->

sugarcube/src/autogenerated/City Center/BurgerTip.tw

@@ -138,7 +138,7 @@
 				<<warn "CONVERSION ERROR decd9531d53e7177635c69c3ac3321c5">>
 				<<set $bossexrand = rand(0, 3)>>
 				<<set $pc.horny += 10>>
-				<<image `'characters/city/anatoly/sex/boss<<bossexrand>>.jpg'`>>
+				<<image 'characters/city/anatoly/sex/boss<<bossexrand>>.jpg'>>
 				When you enter Anatoly''s office, he approaches you with a hungry look in his eye.
 				<<if getvar("$bossexrand") == 0>>
 					He passionately presses you against the wall, and covers you with kisses.
@@ -536,7 +536,7 @@
 
 										<</if>>
 										<<arouse 'vaginal' 15 `['sub']`>>
-										<<arousalEnd>>
+										
 										<<actCLA 'Leave'>>
 											<<gt 'city_residential'>>
 										<</actCLA>>
@@ -559,7 +559,7 @@
 							<<image "characters/city/anatoly/sex/bossbjcar.jpg">>
 							<p>Determined to send Anatoly home with a smile, you lean over and unzip his pants. You wrap your $pc_desc['lips'] lipss around his flaccid penis, and start working your magic. Soon your mouth is full of hard throbbing cock. You make an effort to get him home quickly, and suck like a woman possessed with the need for seed. He does finish quickly, and you slurp it all down with a smile. Anatoly gets himself back in his pants, and sends you on your way saying, "Thanks babe, you're the best."</p>
 							<<arouse 'bj' 5 `['sub']`>>
-							<<arousalEnd>>
+							
 							<<actCLA 'Leave'>>
 								<<gt 'city_center'>>
 							<</actCLA>>
@@ -735,7 +735,7 @@
 	<<warn "CONVERSION ERROR decd9531d53e7177635c69c3ac3321c5">>
 	<<set $numbjrand = rand(0, 14)>>
 	<<set $wantrand = rand(0, 3)>>
-	<<image `'characters/city/anatoly/sex/bossbj<<numbjrand>>.jpg'`>>
+	<<image 'characters/city/anatoly/sex/bossbj<<numbjrand>>.jpg'>>
 	<p>You greedily wrap your $pc_desc['lips'] lipss around the head of his cock. Smiling up at Anatoly, you give you lips a playfully little pop, before you begin to suck in earnest.</p>
 	<<arouse 'bj' 5 `['sub']`>>
 	<<if getvar("$wantrand") == 3>>
@@ -911,7 +911,7 @@
 		<<cum 'clothes' 'A74' 1>>
 		<<image "characters/city/anatoly/sex/bossbjcum2.jpg">>
 		Not wanting a mouth full of cum, you decide to jerk Anatoly to completion. Oh dear, it looks like your clever plan backfired. Anatoly managed to shoot his load all over your pretty outfit. It looks sexy, but you better head to the bathroom before it stains.
-		<<arousalEnd>>
+		
 		<<actCLA 'Go to the toilet'>>
 			<<gt 'BurgerTip' 'toilet'>>
 		<</actCLA>>
@@ -920,7 +920,7 @@
 		<<cum 'clothes' 'A74' 1>>
 		<<image "characters/city/anatoly/sex/bossbjcum3.jpg">>
 		Not wanting a mouth full of cum, you decide to jerk Anatoly to completion. You realize your error when jets of semen splatter against your face and clothes. You manage to get most of it off your face with a tissue, but you better get to the little girls room before it stains your top.
-		<<arousalEnd>>
+		
 		<<actCLA 'Go to the toilet'>>
 			<<gt 'BurgerTip' 'toilet'>>
 		<</actCLA>>
@@ -962,7 +962,7 @@
 		<<elseif getvar("$boburand") <= 2>>
 			<<cum 'clothes' 'A74' 1>>
 			Afterword, you notice you got some of his semen on your blouse.
-			<<arousalEnd>>
+			
 			<<actCLA 'Go to the toilet'>>
 				<<gt 'BurgerTip' 'toilet'>>
 			<</actCLA>>
@@ -1044,7 +1044,7 @@
 	<<if getvar("$bosswantrand") >= 3>>
 		<<cum 'butt' 'A74' 1>>
 		<p>$boydesc withdraws his cock, and shoots hot streams of semen all over your naked ass.</p>
-		<<arousalEnd>>
+		
 		<<if getvar("$BurgerQW['WorkShift']") == 1>>
 			<<actCLA 'Have your lunch'>>
 				<<gt 'burgerWork' 'work'>>
@@ -1080,7 +1080,7 @@
 	<<cum 'butt' 'A74' 1>>
 	He finishes by giving you a little smack on the ass and a "good girl".
 	<<arouse 'anal' 10 `['sub']`>>
-	<<arousalEnd>>
+	
 	<<if getvar("$BurgerQW['WorkShift']") == 1>>
 		<<actCLA 'Have your lunch'>>
 			<<gt 'burgerWork' 'work'>>
@@ -1112,7 +1112,7 @@
 	<<if getvar("$bosswantrand") >= 3>>
 		<<cum 'stomach' 'A74' 1>>
 		<p>$boydesc withdraws his cock, and shoots hot streams of semen all over your naked ass.</p>
-		<<arousalEnd>>
+		
 		<<if getvar("$BurgerQW['WorkShift']") == 1>>
 			<<actCLA 'Have your lunch'>>
 				<<gt 'burgerWork' 'work'>>
@@ -1150,7 +1150,7 @@
 	<<cum 'anus' 'A74' 1>>
 	He finishes by giving you a little smack on the ass and a "good girl".
 	<<arouse 'anal' 10 `['sub']`>>
-	<<arousalEnd>>
+	
 	<<if getvar("$BurgerQW['WorkShift']") == 1>>
 		<<actCLA 'Have your lunch'>>
 			<<gt 'burgerWork' 'work'>>
@@ -1226,7 +1226,7 @@
 				<<image "characters/city/ilyushkin/sex/ilyfacial.jpg">>
 				<p>You kneel with mouth open waiting for what comes next. Ilyushkin gets his dick out, and starts to masturbate in front of your face, coldly staring down at you. He shouts, "I knew you'd be my whore!" as sperm flies out of his cock and splatters against your face. After he is finished coating your face, he puts his dick back in his pants saying, "OK, get out of my office slut, and don't forget unless you want the boss finding out about those pictures I own your ass."</p>
 				<<arouse 'bj' 10 `['sub']`>>
-				<<arousalEnd>>
+				
 				<<if getvar("$BurgerQW['WorkShift']") == 1>>
 					<<actCLA 'Have your lunch'>>
 						<<gt 'burgerWork' 'work'>>

sugarcube/src/autogenerated/City Center/Club2.tw

@@ -33,7 +33,7 @@
 				<<image "locations/city/citycenter/nightclub/sex/glory3.jpg">>
 				You gather a mouthful of sperm, and then swallow it. Their sperm has a sticky and sharp taste which makes you grimace.
 				<p>A man's voice tells you - "That was fucking great, here, you deserve it." and then 1,000 RUB are pushed through the hole.</p>
-				<<arousalEnd>>
+				
 				<<actCLA 'Leave'>>
 					<<gt 'city_nightclub' 'inside'>>
 				<</actCLA>>
@@ -45,7 +45,7 @@
 				<<image "locations/city/citycenter/nightclub/sex/glory3.jpg">>
 				You gather a mouthful of sperm, but the sticky and sharp taste overwhelms you, and you spit it on the floor.
 				<p>A man's voice tells you - "Here, your money." and then 500 RUB are pushed through the hole.</p>
-				<<arousalEnd>>
+				
 				<<actCLA 'Leave'>>
 					<<gt 'city_nightclub' 'inside'>>
 				<</actCLA>>
@@ -57,7 +57,7 @@
 	You pee sitting on the toilet and begin to wipe with toilet paper. Apparently you pressed too hard, as you feel a thrill coming from between the legs.
 	<<arouse 'clit_finger' 3 >>
 	<<actCLA 'Leave'>>
-		<<arousalEnd>> <<gt 'city_nightclub' 'inside'>>
+		 <<gt 'city_nightclub' 'inside'>>
 	<</actCLA>>
 	<<actCLA 'Caress yourself'>>
 		<<set $TQuest = 1>>
@@ -72,7 +72,7 @@
 		The man behind the wall realises he has been caught, and giggles that you put on a great show. Suddenly the eye disappears, and 500 rubles are pushed through the hole.
 		<<set $orgasm_or = 'yes'>>
 		<<arouse 'clit_finger' 5 `['exhibitionism','masturbate']`>>
-		<<arousalEnd>>
+		
 		<<actCLA 'Leave'>>
 			<<gt 'city_nightclub' 'inside'>>
 		<</actCLA>>
@@ -125,7 +125,7 @@
 						<<gs 'npcgeneratec' 0 'Gloryhole Client' `rand(18,60)`>>
 						
 						<<cum 'mouth_swallow' $sex.npcId>>
-						<<arousalEnd>>
+						
 						<<if getvar("$pornstudio") == 0>>
 							<<actCLA 'Continue'>>
 								<<set $pornstudio = 2>>

sugarcube/src/autogenerated/City Center/bass.tw

@@ -109,7 +109,7 @@
 			You close your eyes, as Kisame grins and drags you deep into the water. His strong hands press you towards his groin and you wrap your lips around his cock and within seconds Kisame finishes in your mouth.
 			<<arouse 'bj' 2 `['sub']`>>
 			<<cum 'mouth' 'A40' 1>>
-			<<arousalEnd>>
+			
 			<<actCLA 'Get out of the water'>>
 				<<gt 'bass' 'start'>>
 			<</actCLA>>
@@ -127,9 +127,9 @@
 
 		<</if>>
 		<<if func('body_din','pregnancyVisibility') == 0>>
-			<<image `'pc/activities/swim/pool/swim_bikini_'+rand(1,8)+'.jpg'`>>
+			<<image 'pc/activities/swim/pool/swim_bikini_#.jpg' 1 8>>
 		<<else>>
-			<<image `'pc/activities/swim/pool/swim_bikini_preg_'+rand(1,4)+'.jpg'`>>
+			<<image 'pc/activities/swim/pool/swim_bikini_preg_#.jpg' 1 4>>
 		<</if>>
 		You take a swim in the pool, which invigorates you, making you feel refreshed.
 		<<if $pc.deodorant_on == 1>>

sugarcube/src/autogenerated/City Center/burger.tw

@@ -201,7 +201,7 @@
 							<<set $time.minutes += 15>>
 							<<image "locations/city/shared/car.jpg">>
 							<p>"Whew, $pc.name_nick. I'm a little tired. Let's go to a restaurant some other time." Anatoly tells you, taking you by the hand as he leads you to his car. You quickly get to your home and Anatoly says goodbye to you.</p>
-							<<arousalEnd>>
+							
 							<<actCLA 'Out of the car'>>
 								<<gt 'city_residential'>>
 							<</actCLA>>
@@ -242,13 +242,13 @@
 											Finally Anatoly Borisovich stops, puts his cleaned off dick back in his pants and starts to button them up. You sit on the floor stunned with semen dripping from your face. You feel taste the distinct flavor of semen in your mouth. Anatoly Borisovich helps you back to your feet and quickly walks out of the dressing room. You try to clean the traces of sperm from your face.
 											<<actCLA 'Exit out of the dressing'>>
 												<<set $time.minutes += 2>>
-												<!-- !!'<<image `'locations/city/citycenter/diner/sex/pr4.jpg'`>>'-->
+												<!-- !!'<<image 'locations/city/citycenter/diner/sex/pr4.jpg'>>'-->
 												You come out of the dressing room, your face red with shame. You feel like everyone is already aware of the fact that you just sucked a dick in a public place. Anatoly Borisovich tells the saleswoman that he will buy the dress for you and pays. The saleswoman wraps the dress for you and you feel her gaze on your face as she gives you the package.
 												<<actCLA 'Exit from the boutique'>>
 													<<set $time.minutes += 15>>
 													<<image "locations/city/shared/car.jpg">>
 													<p>You walk out of the boutique with Anatoly Borisovich. "Whew, $pc.name_nick. I'm a little tired. Let's go to a restaurant some other time." Anatoly tells you, taking you by the hand as he leads you to his car. You quickly get to your home and Anatoly says goodbye to you.</p>
-													<<arousalEnd>>
+													
 													<<actCLA 'Out of the car'>>
 														<<gt 'city_residential'>>
 													<</actCLA>>
@@ -358,7 +358,7 @@
 						<<image "locations/city/citycenter/diner/sex/bj4.jpg">>
 						You squat in front of the manager and swallow his sperm before licking the remnants of his semen off of the still standing, but quickly lowering penis.
 						<p>Finally Ilyushkin sinks back, completely satisfied and gives you 500 <b>₽</b> for the work you have done.</p>
-						<<arousalEnd>>
+						
 						<<actCLA 'Leave'>>
 							<<gt 'burger' 'start'>>
 						<</actCLA>>
@@ -393,7 +393,7 @@
 							<<image "locations/city/citycenter/diner/sex/bj4.jpg">>
 							You squat in front of the manager and swallow his sperm as you began to lick the remnants of his semen off of the still standing, but quickly lowering penis.
 							<p>Finally Ilyushkin sinks back, completely satisfied and gives you 500 <b>₽</b> for the work you have done.</p>
-							<<arousalEnd>>
+							
 							<<actCLA 'Leave'>>
 								<<gt 'burger' 'start'>>
 							<</actCLA>>
@@ -416,7 +416,7 @@
 				<!-- Boy A76 -->
 				<<arouse 'bj' 3 `['sub','prostitution']`>>
 				<<cum 'mouth_swallow' 'A76' 1>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Leave'>>
 					<<gt 'burger' 'start'>>
 				<</actCLA>>
@@ -435,7 +435,7 @@
 				<<arouse 'bj' 3 `['sub']`>>
 				<<cum 'mouth_swallow' 'A75' 1>>
 				<<cum 'face' 'A75' 1>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Leave'>>
 					<<gt 'burger' 'start'>>
 				<</actCLA>>
@@ -478,7 +478,7 @@
 						<<run $pc.sexStatInc('facial','aware',3)>>
 						<<image "locations/city/citycenter/diner/sex/tri2.jpg">>
 						Hot jets of sperm slap you in the face, you close your eyes and just feel the stinky seed on your skin. Soon after the sprays of semen stop and your face is all covered with a thick layer of sticky cum. The guys look satisfied and laugh at you. Afterwards they exit the warehouse leaving you by yourself.
-						<<arousalEnd>>
+						
 						<<actCLA 'Leave'>>
 							<<gt 'burger' 'start'>>
 						<</actCLA>>
@@ -505,7 +505,7 @@
 				<<image "shared/sex/cum/mouth/cum19.jpg">>
 				<p>A hot jet of sperm slaps you in the mouth, while you continue to stroke his member. You are careful not to spill a drop of the nasty smelling liquid out of your mouth. Finally the stream dries up and you swallow the sperm. He grins and tosses 300 <b>₽</b> on the floor. You pick them up and hide them in your pocket as you rise up from your knees and leave the office.</p>
 				<<cum 'mouth_swallow' 'A75' 1>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Leave'>>
 					<<gt 'burger' 'start'>>
 				<</actCLA>>
@@ -669,7 +669,7 @@
 					<!-- Boy A74 -->
 					<<arouse 'bj' 5 `['sub','prostitution']`>>
 					<<cum 'mouth_swallow' 'A74' 1>>
-					<<arousalEnd>>
+					
 					<<actCLA 'Leave'>>
 						<<gt 'burger' 'start'>>
 					<</actCLA>>
@@ -698,7 +698,7 @@
 			<!-- Boy A74 -->
 			<<arouse 'bj' 5 `['sub','prostitution']`>>
 			<<cum 'mouth_swallow' 'A74' 1>>
-			<<arousalEnd>>
+			
 			<<actCLA 'Leave'>>
 				<<gt 'burger' 'start'>>
 			<</actCLA>>

sugarcube/src/autogenerated/City Center/burgerWork.tw

@@ -79,7 +79,7 @@
 				<<image "characters/city/ilyushkin/sex/ilybj.jpg">>
 				<p>Ilyushkin takes you around the corner to a dirty alley behind the bistro. It smells like urine. He pulls his member out of his pants. "Put it in your mouth and show me what you can do." You squat in front of Ilyushkin and take his penis in your mouth. It tastes salty and unwashed. You start to suck actively trying to make Ilyushkin finish as quickly as possible. Finally Ilyushkin lets out a moan starts to cum in your mouth. You quickly swallow while looking around, hoping no one saw you. Once you swallowed his cum, Ilyushkin puts his cleaned up dick in his pants "That was average. You can do better. Now get out of here!"</p>
 				<<arouse 'bj' 5 `['sub']`>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Leave'>>
 					<<gt 'city_center'>>
 				<</actCLA>>
@@ -98,7 +98,7 @@
 				<<image "characters/city/ilyushkin/sex/ilybjcar.jpg">>
 				<p>Ilyushkin takes you to his car standing in the alley. He gets behind the wheel and you sit next to him. Ilyushkin gets his dick out of his pants and grabs you by the hair pulling your face to his groin until his cock is buried in your $pc_desc['lips'] lips. You open your mouth and allow the member to enter between your lips. You are trying to suck hard, using your $pc_desc['lips'] lips on the penis so Ilyushkin would be finished quickly. Ilyushkin's body finally jerks and he finishes in your mouth. You continue to suck his dick swallowing the sperm without spilling a drop. Ilyushkin tucks his dick back in his pants and says, "Okay cocksucker, get out."</p>
 				<<arouse 'bj' 5 `['sub']`>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Leave'>>
 					<<gt 'city_center'>>
 				<</actCLA>>
@@ -130,7 +130,7 @@
 							<<cum 'face' 'A76' 1>>
 							<<image "characters/city/ilyushkin/sex/ilybjfilm3.jpg">>
 							<p>Ilyushkin begins to finish on your $pc_desc['lips'] lips. Cum drips from your lips on your chin and chest. Ilyushkin finally turns the camera off and puts it away in a drawer. "Not bad. You did what you were required. Wash up and then get out."</p>
-							<<arousalEnd>>
+							
 							<<actCLA 'Leave'>>
 								<<set $cumspclnt = 12>> <<gs 'cum_cleanup'>> <<gt 'city_industrial'>>
 							<</actCLA>>

sugarcube/src/autogenerated/City Center/fit.tw

@@ -218,7 +218,7 @@
 			<<set $time.minutes += 1>>
 			<<run $inventory.dec('deo',1)>>
 			<<gs 'sweat' 'deo'>>
-			<<set iif(func('body_din','pregnancyVisibility') = 1, '<<image `'shared/home/bathroom/deodorant_preg.jpg'`>>', '<<image `'shared/home/bathroom/deodorant.jpg'`>>')>>
+			<<set iif(func('body_din','pregnancyVisibility') = 1, '<<image 'shared/home/bathroom/deodorant_preg.jpg'>>', '<<image 'shared/home/bathroom/deodorant.jpg'>>')>>
 			You apply deodorant to your armpits. It will keep you feeling fresh and clean for longer.
 			<<actCLA 'Continue'>>
 				<<set $menu_off = 0>> <<gt $location>>
@@ -268,7 +268,7 @@
 					<</actCLA>>
 					<<actCLA 'Wait for her reaction'>>
 						<<if $pc.pcs_apprnc < 100>>
-							<<arousalEnd>>
+							
 							The girl smiles at you, but removes your hand and leaves, blowing you a kiss.
 							<<actCLA 'Continue'>>
 								<<gt 'fit' 'dressing_room'>>
@@ -303,7 +303,7 @@
 	<<setinit $nichTanya['Known'] = 1>>
 	<<set $npc('A218').rel += 5>>
 	<<setinit $nichTanya['FuckLast'] = $time.daystart>>
-	<<arousalEnd>>
+	
 	"You can at least tell me your name, seeing as you did not even have the decency to do so before you assaulted me." The girl says, catching her breath. Despite her words she doesn''t seem to be angry with you.
 	<p>"I am $pc.name_nick, and how can I assault someone so keen?" You ask trying to find your panties.</p>
 	<p>"Looking for this?" asks the girl twirling your panties on her finger.</p>

sugarcube/src/autogenerated/City Center/office.tw

@@ -289,7 +289,7 @@
 			<<image "locations/city/citycenter/office/sex/restroom/mensroom/fuck1.jpg">>
 			You gather your courage and walk into the mens restroom. The restroom is very clean and nice looking and you think it's the nicest mens room you've ever been in, but that's not what catches your eye. You've walked in on one of your fellow secretaries naked and bent over the sink as one of the managers fucks her hard from behind. Unsure if you were spotted, you quickly duck back outside.
 			<<arouse 'voyeur_sex' 2 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Leave'>>
 				<<gt 'office' 'restrooms'>>
 			<</actCLA>>
@@ -297,7 +297,7 @@
 			<<image "locations/city/citycenter/office/sex/restroom/mensroom/fuck2.jpg">>
 			You gather your courage and walk into the mens restroom. The restroom is very clean and nice looking and you think it's the nicest mens room you've ever been in, but that's not what catches your eye. One of your fellow secretaries is naked from the waist down and bent over, holding onto one of the stall walls as one of the managers fucks her hard from behind. You quickly duck back outside before you're spotted.
 			<<arouse 'voyeur_sex' 2 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Leave'>>
 				<<gt 'office' 'restrooms'>>
 			<</actCLA>>
@@ -305,7 +305,7 @@
 			<<image "locations/city/citycenter/office/sex/restroom/mensroom/group_fuck.jpg">>
 			You gather your courage and walk into the mens restroom. The restroom is very clean and nice looking and you think it's the nicest mens room you've ever been in. but that's not what catches your eye. One of your fellow secretaries is naked from the waist down and leaning against one of the stall walls as one of the managers fucks her hard from behind while another stands next to them, presumably waiting his turn. You quickly duck back outside before you're spotted.
 			<<arouse 'voyeur_sex' 2 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Leave'>>
 				<<gt 'office' 'restrooms'>>
 			<</actCLA>>
@@ -313,7 +313,7 @@
 			<<image "locations/city/citycenter/office/sex/restroom/mensroom/older_bj.jpg">>
 			You gather your courage and walk into the mens restroom. The restroom is very clean and nice looking and you think it's the nicest mens room you've ever been in, but that's not what catches your eye. One of your fellow secretaries is squatting down in front of one of the senior managers, her tits pulled out as she sucks his dick. You quickly duck back outside before you're spotted.
 			<<arouse 'voyeur_sex' 2 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Leave'>>
 				<<gt 'office' 'restrooms'>>
 			<</actCLA>>
@@ -321,7 +321,7 @@
 			<<image "locations/city/citycenter/office/sex/restroom/mensroom/stall_bj.jpg">>
 			You gather your courage and walk into the mens restroom. The restroom is very clean and nice looking and you think it's the nicest mens room you've ever been in, but that's not what catches your eye. Under one of the stalls, you see what appears to be a woman sitting on her ankles on the floor, facing in, while male legs with pants and underwear pushed down around his ankles faces her. You can hear him moaning softly and the distinct slurping sounds of a sloppy blowjob. You quickly duck back outside before you're spotted.
 			<<arouse 'voyeur_sex' 2 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Leave'>>
 				<<gt 'office' 'restrooms'>>
 			<</actCLA>>
@@ -329,7 +329,7 @@
 			<<image "locations/city/citycenter/office/sex/restroom/mensroom/stall_fuck.jpg">>
 			You gather your courage up and walk into the mens restroom. The restroom is very clean and nice looking, you think it is the nicest mens room you have ever been in. But that's not what catches your eye. No that would be one of your fellow secretaries naked from the waist down, riding one of the male manager cowgirl style while he sits on one of the toilets. Both of them are moaning loudly and she seems to be enjoying herself as much as he is. You quickly duck back outside before you are seen by either of them.
 			<<arouse 'voyeur_sex' 2 >>
-			<<arousalEnd>>
+			
 			<<actCLA 'Leave'>>
 				<<gt 'office' 'restrooms'>>
 			<</actCLA>>
@@ -444,7 +444,7 @@
 					<<image "locations/city/citycenter/office/events/butt_grab_allow.jpg">>
 					You ignore him and let him keep squeezing your ass since you need this job. He then directs you to stack the files in a certain order, and he keeps feeling you up as you do as he asked. Once you're done, you return to work.
 					<<arouse 'foreplay' 2 >>
-					<<arousalEnd>>
+					
 					<<actCLA 'Go back to work'>>
 						<<gt 'office' 'secretary_office'>>
 					<</actCLA>>
@@ -457,7 +457,7 @@
 					You swallow at the not so veiled threat. "I don't like it. I just want to do my job."
 					He laughs again. "This is part of your job, but you're free to go. For now." He lets go of you and you finish placing the files. Before you leave, he slaps your ass pretty hard. Flustered, you quickly return to work.
 					<<arouse 'foreplay' 2 >>
-					<<arousalEnd>>
+					
 					<<actCLA 'Go back to work'>>
 						<<gt 'office' 'secretary_office'>>
 					<</actCLA>>
@@ -466,7 +466,7 @@
 				<<image "locations/city/citycenter/office/events/butt_slap.jpg">>
 				<p>You spend most of your work period getting files and taking them to different managers in different offices, or getting files from them and filing them away. In one of the offices, you are placing the files on the desk when you feel the sting of a hard slap on the ass. "That's a good girl! Now get back to work!" he says with a grin.</p>
 				<<arouse 'foreplay' 2 >>
-				<<arousalEnd>>
+				
 				<<actCLA 'Go back to work'>>
 					<<gt 'office' 'secretary_office'>>
 				<</actCLA>>
@@ -474,7 +474,7 @@
 				<<image "locations/city/citycenter/office/events/coffee_grab.jpg">>
 				You spend most of your work period fetching coffee for the various managers. A few make some inappropriate comments and you manage to ignore them, but one of them grabs you firmly by the ass and squeezes it hard. You manage to squirm free and get back to work.
 				<<arouse 'foreplay' 2 >>
-				<<arousalEnd>>
+				
 				<<actCLA 'Go back to work'>>
 					<<gt 'office' 'secretary_office'>>
 				<</actCLA>>
@@ -483,7 +483,7 @@
 				<p>You spend most of your work period in the copy room making copies of documents and organizing them into binders before filing them away. During one of your trips to the copy room, you find one of your fellow secretaries sitting on the copier photocopying her ass. A small stack of copies of her ass already sit in the bin. She turns to you and smiles. "It's for the manager. To brighten up their day!" she says with a giggle.</p>
 				You don't really know how to respond, so you just nod. "Okay, I'll come back later then..." She giggles as you leave and you wait out in the hall until she leaves before getting back to work.
 				<<arouse 'voyeur' 2 >>
-				<<arousalEnd>>
+				
 				<<actCLA 'Go back to work'>>
 					<<gt 'office' 'secretary_office'>>
 				<</actCLA>>
@@ -492,7 +492,7 @@
 				<p>You spend most of your work period in the copy room making copies of documents and organizing them into binders before filing them away. During one of your trips to the copy room, you find one of your fellow secretaries leaning across the copier with her shirt pulled open, photocopying her tits. A small stack of copies of her breasts already sit in the bin. She turns her head towards you and smiles. "It's for the manager. To brighten up their day!" she says with a giggle.</p>
 				You don't really know how to respond, so you just nod. "Okay, I'll come back later then..." She giggles as you leave and you wait out in the hall until she leaves before getting back.
 				<<arouse 'voyeur' 2 >>
-				<<arousalEnd>>
+				
 				<<actCLA 'Go back to work'>>
 					<<gt 'office' 'secretary_office'>>
 				<</actCLA>>
@@ -509,14 +509,14 @@
 				<<image "locations/city/citycenter/office/events/get_file1.jpg">>
 				You spend most of your work period getting files and taking them to different managers in different offices, or getting files from them and filing them away. While you're getting some files out of one of the filing cabinets, you feel someone walk up behind you and place their hands on your hips.
 				<<arouse 'foreplay' 2 >>
-				<<arousalEnd>>
+				
 				<<actCLA 'Ignore it'>>
 					<<set $office_slut += 1>>
 					<<image "locations/city/citycenter/office/events/get_file2.jpg">>
 					You ignore them and continue gathering the files you need. Their hands slide down to your thighs and they step even closer to you. You can feel a semi erect dick press against your ass as you finish gathering what you need and pull away from him with the files in hand. "Excuse me, but I need to deliver these."
 					He lets go and grins at you. "I have a delivery for you as well." You give him a fake smile and walk out of the room to deliver the files and return to work.
 					<<arouse 'foreplay' 2 >>
-					<<arousalEnd>>
+					
 					<<actCLA 'Go back to work'>>
 						<<gt 'office' 'secretary_office'>>
 					<</actCLA>>
@@ -529,7 +529,7 @@
 					<p>You swallow at the not so veiled threat. "I just want to do my job in peace. Is that too much to ask?"</p>
 					He laughs even more. "This is part of your job. Remember that in the future." He turns and walks out, leaving you flustered as you return to work.
 					<<arouse 'foreplay' 2 >>
-					<<arousalEnd>>
+					
 					<<actCLA 'Go back to work'>>
 						<<gt 'office' 'secretary_office'>>
 					<</actCLA>>
@@ -539,7 +539,7 @@
 				You spend most of your work period getting files and taking them to different managers in different offices, or getting files from them and filing them away. In one of the offices, the manager is away from his desk and directs you to place the files on his desk. As you set the files down, you feel someone walk up behind you and place their hands on your hips before they start roaming around your body.
 				<<gt 'office' 'secretary_office'>>
 				<<arouse 'foreplay' 2 >>
-				<<arousalEnd>>
+				
 				<<actCLA 'Ignore it'>>
 					<<set $office_slut += 1>>
 					<<image "locations/city/citycenter/office/events/harras_allow.jpg">>
@@ -552,7 +552,7 @@
 						Instead of looking shocked, he just grins. "Sorry to interrupt Ruvim, but we've got a meeting."
 						<p>The one feeling you up suddenly stops. "Fuck! Now?" The other manager nods before leaving as Ruvim turns his attention back to you and slaps your ass hard. "We'll have to finish this some other time." He then walks out of the office, leaving you to straighten out your skirt before going back to work.</p>
 						<<arouse 'foreplay' 2 >>
-						<<arousalEnd>>
+						
 						<<actCLA 'Go back to work'>>
 							<<gt 'office' 'secretary_office'>>
 						<</actCLA>>
@@ -565,7 +565,7 @@
 						<p>You swallow at the not so veiled threat. "I just want to do my job in peace. Is that too much to ask?"</p>
 						He laughs. "This is part of your job, but you can go. For now." He lets go of you, allowing you to pull away and leave. Feeling flustered, you quickly return to work.
 						<<arouse 'foreplay' 2 >>
-						<<arousalEnd>>
+						
 						<<actCLA 'Go back to work'>>
 							<<gt 'office' 'secretary_office'>>
 						<</actCLA>>
@@ -579,7 +579,7 @@
 					<p>You swallow at the not so veiled threat. "I just want to do my job in peace. Is that too much to ask?"</p>
 					He laughs. "This is part of your job, but you can go. For now." He lets go of you, allowing you to pull away and leave. Feeling flustered, you quickly return to work.
 					<<arouse 'foreplay' 2 >>
-					<<arousalEnd>>
+					
 					<<actCLA 'Go back to work'>>
 						<<gt 'office' 'secretary_office'>>
 					<</actCLA>>
@@ -636,7 +636,7 @@
 						<<image "locations/city/citycenter/office/events/officeharras.jpg">>
 						You choose to ignore it as best you can as he plays with your breasts for a few more minutes. You notice several of your fellow secretaries glancing in your direction. Some seem pissed, or maybe jealous, while others just look amused. None of them look surprised or act like this is out of place, so you do your best to work while he plays with your breasts. After a few more minutes, he finally lets go and walks away. "Have fun ladies." Several of the women giggle as you all go back to work.
 						<<arouse 'foreplay' 2 `['inhibition']`>>
-						<<arousalEnd>>
+						
 						<<actCLA 'Go back to work'>>
 							<<gt 'office' 'secretary_office'>>
 						<</actCLA>>
@@ -647,7 +647,7 @@
 						You turn your body away from him as best as you can and push his hands away from you. "Please stop that."
 						<p>He growls. "Fine! I try and do something nice and this is the thanks I get... Fucking bitch..." he mumbles before storming off. You notice all the other secretaries looking at you and get the feeling you just made a mistake. You put your head down and do your best to focus on your work.</p>
 						<<arouse 'foreplay' 2 `['inhibition']`>>
-						<<arousalEnd>>
+						
 						<<actCLA 'Go back to work'>>
 							<<gt 'office' 'secretary_office'>>
 						<</actCLA>>
@@ -659,7 +659,7 @@
 					You turn your body away from him as best as you can and push his hands away from you. "Please stop that."
 					<p>He growls. "Fine! I try and do something nice and this is the thanks I get... Fucking bitch..." he mumbles before storming off. You notice all the other secretaries looking at you and get the feeling you just made a mistake. You put your head down and do your best to focus on your work.</p>
 					<<arouse 'massage' 2 `['inhibition']`>>
-					<<arousalEnd>>
+					
 					<<actCLA 'Go back to work'>>
 						<<gt 'office' 'secretary_office'>>
 					<</actCLA>>
@@ -674,7 +674,7 @@
 					As you ignore him, his hands continue to group your ass until they slide up to your hips as he steps even closer behind you and you can feel his semi erect dick pressed against your ass. Finally having the files you need, you grab them and quickly pull away from him. "Excuse me, but I need to deliver these."
 					He lets go and grins at you. "I have a delivery for you as well." You give him a fake smile and walk out of the room to deliver the files and return to work.
 					<<arouse 'foreplay' 2 >>
-					<<arousalEnd>>
+					
 					<<actCLA 'Go back to work'>>
 						<<gt 'office' 'secretary_office'>>
 					<</actCLA>>
@@ -687,7 +687,7 @@
 					<p>You swallow at the not so veiled threat. "I just want to do my job in peace. Is that too much to ask?"</p>
 					He laughs. "This is part of your job. Remember that in the future." He turns and walks out, leaving you flustered as you return to work.
 					<<arouse 'foreplay' 2 >>
-					<<arousalEnd>>
+					
 					<<actCLA 'Go back to work'>>
 						<<gt 'office' 'secretary_office'>>
 					<</actCLA>>
@@ -696,7 +696,7 @@
 				<<image "locations/city/citycenter/office/events/selfie_bra.jpg">>
 				You spend most of your work period at your desk working on your computer doing a variety of tasks. You glance up to see one of your fellow secretaries with her blouse pulled open, exposing her bra as she takes several selfies. You watch her for a few seconds before returning to your work, occasionally glancing up at her until she finishes.
 				<<arouse 'voyeur' 2 >>
-				<<arousalEnd>>
+				
 				<<actCLA 'Go back to work'>>
 					<<gt 'office' 'secretary_office'>>
 				<</actCLA>>
@@ -716,7 +716,7 @@
 						<<image "locations/city/citycenter/office/events/shoulder_kiss.jpg">>
 						<p>To your surprise, he reaches down, grabs one of your hands and kisses the back of it. "You are most welcome." With that, he turns and walks away. You're unsure what just happened, but notice the amused smiles from some of your co-workers, with a few looking jealous. You do your best to ignore the looks and go back to work.</p>
 						<<arouse 'foreplay' 2 `['inhibition']`>>
-						<<arousalEnd>>
+						
 						<<actCLA 'Go back to work'>>
 							<<gt 'office' 'secretary_office'>>
 						<</actCLA>>
@@ -727,7 +727,7 @@
 						You turn your body away from him as best as you can and push his hands away from you. "Please stop that."
 						<p>He growls. "Fine! I try and do something nice and this is the thanks I get... Fucking bitch..." he mumbles before storming off. You notice all the other secretaries looking at you and get the feeling you just made a mistake. You put your head down and do your best to focus on your work.</p>
 						<<arouse 'foreplay' 2 `['inhibition']`>>
-						<<arousalEnd>>
+						
 						<<actCLA 'Go back to work'>>
 							<<gt 'office' 'secretary_office'>>
 						<</actCLA>>
@@ -739,7 +739,7 @@
 					You turn your body away from him as best as you can and push his hands away from you. "Please stop that."
 					<p>He growls. "Fine! I try and do something nice and this is the thanks I get... Fucking bitch..." he mumbles before storming off. You notice all the other secretaries looking at you and get the feeling you just made a mistake. You put your head down and do your best to focus on your work.</p>
 					<<arouse 'massage' 2 `['inhibition']`>>
-					<<arousalEnd>>
+					
 					<<actCLA 'Go back to work'>>
 						<<gt 'office' 'secretary_office'>>
 					<</actCLA>>
@@ -748,7 +748,7 @@
 				<<image "locations/city/citycenter/office/events/skirt_caught.jpg">>
 				You spend most of your work period at your desk working on your computer doing a variety of tasks. You hear giggling beside you and glance over to see several of the women giggling while looking past you. You turn and see one of the women with her skirt caught in the top of her panties, leaving her panty clad ass exposed for all to see. You can't help but smile yourself, but before you can decide if you want to say something, one of the other women tells her. She blushes and quickly fixes her skirt before sitting down to work.
 				<<arouse 'voyeur' 2 >>
-				<<arousalEnd>>
+				
 				<<actCLA 'Go back to work'>>
 					<<gt 'office' 'secretary_office'>>
 				<</actCLA>>

sugarcube/src/autogenerated/City Center/photography_work.tw

@@ -46,7 +46,7 @@
 <!-- !! These are the event stages to play the events, should be equal to the amount of jobs-->
 <<if $location_var[$here][0] == 'stage_1'>>
 	<<set $time.minutes += 20>>
-	<center><<image `'images/characters/shared/headshots_generic/37.jpg'`>></center>
+	<<image 'images/characters/shared/headshots_generic/37.jpg'>>
 	You head over to the industrial region where you quickly meet up with your contact at the Experience Center.
 	<p>"Hi there; you must be $pc.name_first. The group is already on their way to the site, so I'll take you up there in my car. I'm sure you know everything you need to do, but feel free to ask if you have any questions."</p>
 	You get in the car and drive for nearly half an hour until you reach the Experience Center. Once there, the representative parks the car and you get out and head inside.
@@ -54,7 +54,7 @@
 		<<set $time.minutes += rand(120,150)>>
 		<<run $pc.skillExperienceGain('photo',rand(6,10))>>
 		<<gs 'shop_photography' 'photojob_pay'>>
-		<center><<image `'images/pc/activities/photography/job/tank.jpg'`>></center>
+		<<image 'images/pc/activities/photography/job/tank.jpg'>>
 		<p>You arrive at the Experience Center and spend the next two hours taking as many pictures of the experience as you can. The group is clearly enjoying the event; They get to ride in military vehicles across rough terrain and fire weapons at the shooting range.</p>
 		<p>Once the day is over, you remove your SD card and hand it to the representative, who shows the photos to the group. Once they've sorted out whether any of the customers want additional copies, your contact takes you back to the city's industrial region. When you check your account, you see that you have been paid evt_wages[$act_idx].</p>
 		<!-- !! gs 'shop_photography', 'photojob_cleanup'-->
@@ -67,7 +67,7 @@
 	<<set $time.minutes += rand(60,90)>>
 	<<run $pc.skillExperienceGain('photo',rand(3,5))>>
 	<<gs 'shop_photography' 'photojob_pay'>>
-	<center><<image `'images/pc/activities/photography/job/model'+rand(1,3)+'.jpg'`>></center>
+	<<image 'images/pc/activities/photography/job/model#.jpg' 1 3>>
 	You go to the Petrovskaya Akvatoria Model Museum to take pictures of the various exhibits on behalf of an international newspaper.
 	After a brief introduction to a member of staff to confirm your activities, you walk around the exhibit, taking a large number of photographs so that the article has a wealth to choose from.
 	<p>Once you're finished, you return to the shop and hand the SD card to Branko, who gives you your fee of evt_wages[$act_idx]₽.</p>
@@ -78,14 +78,14 @@
 <</if>>
 <<if $location_var[$here][0] == 'stage_3'>>
 	<<set $time.minutes += rand(10,18)>>
-	<center><<image `'images/characters/shared/headshots_generic/18.jpg'`>></center>
+	<<image 'images/characters/shared/headshots_generic/18.jpg'>>
 	You head over to the residential district where you meet one of the family members of the betrothed.
 	<p>"Hello, you must be the photographer! If you follow me, I'll take you to the happy couple to take the pictures of them."</p>
 	<<actCLA 'Follow'>>
 		<<set $time.minutes += rand(90,120)>>
 		<<run $pc.skillExperienceGain('photo',rand(6,10))>>
 		<<gs 'shop_photography' 'photojob_pay'>>
-		<center><<image `'images/pc/activities/photography/job/wedding.jpg'`>></center>
+		<<image 'images/pc/activities/photography/job/wedding.jpg'>>
 		You meet the bride and groom and help direct them into a number of framed situations for you to take some beautiful photos of them together.
 		Once you have enough, you spend the rest of the day in the background taking a number of photos of the wedding. Once it's over, you meet back up with the relative who takes the SD card from you.
 		<p>Leaving them to close up the venue, you walk out back into the residential district. When you check your account, you see that you have been paid evt_wages[$act_idx].</p>
@@ -97,7 +97,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'stage_4'>>
 	<<set $time.minutes += rand(15,20)>>
-	<center><<image `'images/characters/shared/headshots_generic/11.jpg'`>></center>
+	<<image 'images/characters/shared/headshots_generic/11.jpg'>>
 	You head over to the industrial region and meet a representative of the Autodrome. You will be expected to take pictures of the event and deliver them to your contact.
 	"Why hello there, you must be the person Branko sent. I'm sure you already know everything you have to do at the track, so I'll give you this press pass and take you to the Autodrome."
 	You look at the pass they gave you before getting in their car to be taken to the track.
@@ -105,7 +105,7 @@
 		<<set $time.minutes += rand(180,240)>>
 		<<run $pc.skillExperienceGain('photo',rand(9,15))>>
 		<<gs 'shop_photography' 'photojob_pay'>>
-		<center><<image `'images/pc/activities/photography/job/motorsport.jpg'`>></center>
+		<<image 'images/pc/activities/photography/job/motorsport.jpg'>>
 		You're dropped off at the employee entrance and directed to the pit area as the teams get their vehicles prepared.
 		<p>You start off by getting shots of the teams in the build-up to the race, showcasing the tension and focus as the countdown approaches zero.</p>
 		When the race itself starts you roam the track, taking pictures of any event as it happens, getting high intensity shots of fast paced action, as well as the smooth professionalism of the leading drivers. It is a fantastic experience.
@@ -121,7 +121,7 @@
 	<<set $time.minutes += 60>>
 	<<run $pc.skillExperienceGain('photo',rand(3,5))>>
 	<<gs 'shop_photography' 'photojob_pay'>>
-	<center><<image `'images/pc/activities/photography/job/court.jpg'`>></center>
+	<<image 'images/pc/activities/photography/job/court.jpg'>>
 	"You need to go to the courthouse to take publicity photographs of the completed court session as they leave the building, then deliver them back to me to give you your commission."
 	You head into the City Center and straight to the courthouse, which has already seen a number of people turn up.
 	Once you've ingratiated yourself into the crowd, you position yourself to take some good shots of the plaintiff accompanied by their lawyers and representatives.

sugarcube/src/autogenerated/City Center/tatiana_lab.tw

@@ -659,7 +659,7 @@
 			<p>"You have no idea $pc.name_nick." Tatiana sighs. "Look, we are talking here of a <i>centuries</i> old mindset, the one that yearns for the times where cannibalizing non-magical children was fashionable to recharge your energies. Do yourself a favor, just lie down and let Reinhold take care of this."</p>
 			<<set $time.minutes += 5>>
 			<<actCLA '"Okay, Tatiana, and what do I get out of this job?"'>>
-				<center><table><tr><td><<image `'images/system/1_openings/shared/npc_tatiana.jpg'`>></td><td><<image `'images/characters/city/jugo/jugopre.jpg'`>></tr></td></table></center>
+				<center><table><tr><td><<image 'images/system/1_openings/shared/npc_tatiana.jpg'>></td><td><<image 'images/characters/city/jugo/jugopre.jpg'>></tr></td></table></center>
 				<p>Tatiana gives you a half-smile, and you understand that she isn't going to pay you for the Aphrodite job.</p>
 				<<if getvar("$AlexandriaQW") == 4>>
 					<<set $finances.cash += 5000>>
@@ -697,14 +697,14 @@
 <<if $location_var[$here][0] == 'teach'>>
 	<<set $menu_off = 1>>
 	<<if getvar("$tatiana_teach_escalation") == 0>>
-		<<image `'characters/city/tatiana/sex-machines.jpg'`>>
+		<<image 'characters/city/tatiana/sex-machines.jpg'>>
 		<p>A suddenly excited Tatiana grabs your hand and pulls you towards an adjacent, half-hidden room. Inside is some kind of workshop/storeroom with boxes, tools and odd-looking items shoved into shelves, whose order is soon turned upside down as Tatiana begins to throw all kinds of things over a bed, where some half-finished machine lies undisturbed.</p>
 		<p>"Okay $pc.name_nick, a quick recap." She then picks some of the tools and sits in the bed cross-legged, her hands extending towards the machine. "The Talisman has filled you with mana, making you something like a living battery. This mana is liberated when you orgasm, reinforcing your magical power. Is everything clear?"</p>
 		She stops to see if you are following her explanation, and when you gesture for her to continue, Tatiana restarts hammering the poor <i>whatever</i> that thing is.
 		<p>"$pc.name_nick, remember when I asked for your help in my investigations? Well, during your first... ehm... surge, you didn't absorb all the energy, and the leftovers burned the magic tripwire I left to watch over you, traveled back towards me and slapped my beautiful ass. To be blunt, I want those leftovers! And for that, we are going to use this!"</p>
 		<p>The <i>machine</i> is now complete. It looks like some sort of... saddle-like sex machine? Tatiana doesn't stop and takes some other similar... dildo-equipped power tools from a shadowy corner were some boxes with the name <i>Fucking Machine</i> scrawled on them lay open.</p>
 		<<actCLA 'WTF?'>>
-			<<image `'characters/city/tatiana/talisman.jpg'`>>
+			<<image 'characters/city/tatiana/talisman.jpg'>>
 			<p>"I guess that you want some explanation, correct? First: They are clean, I didn't have time to enjoy them; Two: If you want some, try Dildopolis in the red light district; Three: No, I didn't buy them, Gustav said that they are a <i>prize of war</i> but didn't elaborate. Four: Catch this!"</p>
 			Tatiana throws a little greenish item at you which you catch without a problem. It is a piece of pottery that sends a shiver up your hand and triggers a memory of... The Talisman of Power. It is a part of it.
 			<p>"Okay $pc.name_nick, this is what I want you to do. Pick your favorite one, use it and I will cast this modified sex ritual. The original was supposed to let a couple share their mana, but my version will substitute the partner for a sex machine, so when you orgasm and your body is flooded by the mana, the excess that is supposed to go to your partner will be absorbed by the fragment. Any questions?"</p>
@@ -755,7 +755,7 @@
 	<</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'saddle'>>
-	<<image `'characters/city/tatiana/sex/riding.jpg'`>>
+	<<image 'characters/city/tatiana/sex/riding.jpg'>>
 	<<if $pc.horny > 50>>
 		<p>As you approach the saddle-sex-machine, you can appreciate the amused smile on Tatiana's face as the blush in your cheeks and the heaving in your chest show, without doubt, the arousal that is wetting your pussy. Maybe it's an exhibitionist streak, or something else, but you're pretty sure that you aren't doing this just for another of Tatiana's lessons.</p>
 	<<else>>
@@ -763,7 +763,7 @@
 	<</if>>
 	<<set $orgasm_or = 'yes'>>
 	<<arouse 'vaginal_vibe' 30 >>
-	<<arousalEnd>>
+	
 	<p>Finally, psyched up, you smear some lube over the small dildo-like protrusions in the riding-machine, and with care, squat over them. It only takes a few seconds for the rubber ridges to slide into your vagina. A rubbery and sticky sensation extends across your outer and inner lips, caressing your clit without a total penetration.</p>
 	Sighing slightly at the sensation, you reach for the controller, and after a moment and with a soft "BRRRR" the machine comes alive, stimulating in only one move all of your pussy. You close your eyes as soft moans escape your mouth.
 	You barely manage to stay over the machine. Your sweaty hands grab the controller, and push it for more power, steadily increasing the vibration as your voice and the machine sound compete to fill the room with their chorus.
@@ -781,7 +781,7 @@
 	<</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'Escalation1'>>
-	<<image `'characters/city/tatiana/tatiana.jpg'`>>
+	<<image 'characters/city/tatiana/tatiana.jpg'>>
 	You stretch over the bed, happy in the magical afterglow and waiting for Tatiana to explain her lesson, but this time she seems distracted, walking from one side of the room to the other as she magically examines the pottery fragment. She even shakes it, as if trying to hear something.
 	<p>"Is something wrong Tatiana?"</p>
 	<p>She looks at you, her gaze lost into thinking "Yes $pc.name_nick. I am not sure why, but the ritual has failed to drain the excess mana. This complicates the situation."</p>
@@ -811,8 +811,8 @@
 	<<arouse 'auto_lube' 'anal' >>
 	<<set $orgasm_or = 'yes'>>
 	<<arouse 'anal_dildo' 30 >>
-	<<arousalEnd>>
-	<<image `'characters/city/tatiana/sex/ass.jpg'`>>
+	
+	<<image 'characters/city/tatiana/sex/ass.jpg'>>
 	<<if $pc.pcs_ass == 0>>
 		<p>Grabbing a KY Jelly bottle, you meekly observe the piston-powered sex machine that calmy seems to wait for your virgin anus and ask yourself why you are doing this. Are you so desperate for magical knowledge?</p>
 		Gathering your courage, you smear some lubricant onto your fingers and proceed to lube the dildo before with a sigh of discomfort, you push two fingers into your tight asshole, the sensation failing to relax the unspoiled aperture.
@@ -846,8 +846,8 @@
 	<<arouse 'auto_lube' 'vag' >>
 	<<set $orgasm_or = 'yes'>>
 	<<arouse 'vaginal_dildo' 30 >>
-	<<arousalEnd>>
-	<<image `'characters/city/tatiana/sex/vag.jpg'`>>
+	
+	<<image 'characters/city/tatiana/sex/vag.jpg'>>
 	<<if $pc.pcs_vag == 0>>
 		<p>Grabbing a KY Jelly bottle, you meekly observe the piston-powered sex machine that calmy seems to await your virgin pussy. You ask yourself why you are doing this. Are you so desperate for magical knowledge?</p>
 		Gathering your courage, you smear some lubricant onto your fingers and proceed to lube the dildo before, with a shiver at the sensation, begin to caress your lower lips, a pair of shy fingers spreading the lube into your unspoiled aperture.
@@ -873,7 +873,7 @@
 	<</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'Escalation2'>>
-	<<image `'characters/city/tatiana/tatiana.jpg'`>>
+	<<image 'characters/city/tatiana/tatiana.jpg'>>
 	You sigh contentedly as the mana is liberated by your core and spreads through your body, a feeling of elation filling your mind as your magical power is pushed beyond its limit.
 	<p>"Uh... That is interesting." Tatiana mumbles, taking you away from your reverie. She is cross-legged on the floor ignoring you, her attention fully focused on the talisman fragment.</p>
 	<p>"Let me guess. It didn't work?"</p>
@@ -895,7 +895,7 @@
 
 	<</if>>
 	<<arouse 'auto_lube' 'anal' >>
-	<<image `'characters/city/tatiana/sex/f1.jpg'`>>
+	<<image 'characters/city/tatiana/sex/f1.jpg'>>
 	<p>You bend over a yoga mat and wait as Tatiana puts on a pair of surgical gloves with a "SNAP!", the sound making you turn to look at her smiling face as she begins to smear KY Jelly over one of the powered-up-foot-long-faux-phalluses. Is she trying to arouse or scare you? She then stops and turns towards your ass.</p>
 	Tatiana''s experienced hands then begin to delicately, but without hesitation, push a smeared finger into your anus. You sigh, not in pleasure, but in relaxation as the massage begins, distending the closely guarded orifice.
 	<p>"Okay $pc.name_nick, let the fun begin!"</p>
@@ -914,7 +914,7 @@
 	<</if>>
 	<<actCLA 'Continue'>>
 		<<arouse 'auto_lube' 'vag' >>
-		<<image `'characters/city/tatiana/sex/f2.jpg'`>>
+		<<image 'characters/city/tatiana/sex/f2.jpg'>>
 		<p>Immobilized thanks to the big rubber gimmick firmly jammed into your asshole, you can only observe as Tatiana begins to give a slick handjob to the other power-dildo. A shiver runs down your spine as you contemplate the size of the thing that is going to go up your pussy.</p>
 		As you mull over this, something brush your pussy''s lips. Fortunately, it isn''t the rubbery monstrosity, but Tatiana''s fingers, which begin to spread lubricant all over your cunt, sending pleasant waves up your body, and eliciting some moans from your throat as she takes your head away from the coming onslaught.
 		<<if $pc.pcs_vag < 0>>
@@ -934,9 +934,9 @@
 			<<arouse 'vaginal_dildo' 30 >>
 			<<arouse 'anal_dildo' 30 >>
 			<<arouse 'dildo_suck' 30 >>
-			<<arousalEnd>>
+			
 			<<set $time.minutes -= 60>>
-			<<image `'characters/city/tatiana/sex/f3.jpg'`>>
+			<<image 'characters/city/tatiana/sex/f3.jpg'>>
 			<<if $pc.pcs_throat == 0>>
 				<p>With another loud "SNAP!", Tatiana throws away the pair of gloves and kneels by your side. One of her hands grabs the back of your head and the other guides the last power-dildo towards your mouth, pushing it beyond your lips.</p>
 				You try to take the painfully big dildo into your mouth, but as it reaches your throat, you begin coughing, and Tatiana removes the jawbreaker.
@@ -962,7 +962,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'lesson1'>>
 	<<set $tat_lesson_number += 1>>
-	<<image `'characters/city/tatiana/Tatianalesson.jpg'`>>
+	<<image 'characters/city/tatiana/Tatianalesson.jpg'>>
 	As you recover your breath, a more than a little giddy Tatiana falls beside you.
 	<p>"Okay, now comes a long-winded lesson about what spells and techniques are! Let's see... The old geezers in The Council like to say that they are the armor, tools and weapons of the wizard. Acts of will that have taken shape thanks to years of learning in musty libraries! Yeah, pretty poetic for something that a five-year-old can improvise."</p>
 	She pauses for a moment, playing with the talisman''s fragment with a dopey smile before continuing.
@@ -972,7 +972,7 @@
 	<<actCLA 'Continue'>>
 		<<gs 'spellList' 'addAvailableSpells' 'basicSpells'>>
 		<<gs 'spellList' 'addAvailableSpells' 'healSpells'>>
-		<<image `'characters/city/tatiana/Tatianalesson.jpg'`>>
+		<<image 'characters/city/tatiana/Tatianalesson.jpg'>>
 		Tatiana gets up with a jump and begins to slowly move her hands in a series of complex gestures accompanied with some weird words, and soon, rolling mist begins to fall through her fingers, quickly obscuring the vision in the room.
 		<p>"Spooky isn't it? This is Fog $pc.name_nick, one of the most venerable and simple spells. It's a favorite of the High Sidhe that used it in ancient ages for that <i>other wordly</i> scenery in their holdings. Today - thanks to The Veil - it has fallen into disuse, but it's useful for a quick and dirty combat distraction."</p>
 		Tatiana dissolves the spell and makes a gesture for you to follow her to the lab, where she turns on a bunsen burner and proceeds to extend her hand over it, letting the flame burn the skin of her hand as the smell of burned flesh drifts through the lab.
@@ -988,7 +988,7 @@
 	<<set $tat_lesson_number += 1>>
 	<<gs 'spellList' 'addAvailableSpells' 'basicSpells'>>
 	<<gs 'spellList' 'addAvailableSpells' 'healSpells'>>
-	<<image `'characters/city/tatiana/Tatianalesson.jpg'`>>
+	<<image 'characters/city/tatiana/Tatianalesson.jpg'>>
 	Juggling the talisman''s fragment between her fingers, Tatiana seems ready for your next lesson, and without missing a beat, she shows you some new magical passes that causes a second Tatiana to appear.
 	<p>"Neat trick, isn't it $pc.name_nick? Now look at this!"</p>
 	<p>The cheerful pair then do some coordinated dance moves before one of them bops your nose and disappears. Was that an illusion? You haven't sensed anything beyond a magical tingle.</p>
@@ -1003,7 +1003,7 @@
 	<<set $tat_lesson_number += 1>>
 	<<gs 'spellList' 'addAvailableSpells' 'basicSpells'>>
 	<<gs 'spellList' 'addAvailableSpells' 'healSpells'>>
-	<<image `'characters/city/tatiana/Tatianalesson.jpg'`>>
+	<<image 'characters/city/tatiana/Tatianalesson.jpg'>>
 	<p>After your <i>show</i>, a blushing Tatiana looks at you, her lips quivering as she seems to struggle to speak. It's strange, as Tatiana has never been affected by your <i>performances</i>. Maybe you have broken her resistance? That seems to be the case as she moves her hand towards your chin. She caresses you and whispers, and suddenly your muscles fight to move.</p>
 	<p>"This is your fault $pc.name_nick! All that shiny mana! All that beautiful... you! I'm not going to let Reinhold, The Council or anyone else put their hands on you! You are mine and mine alone, and I know! I know that you will eventually learn to love me as much as I love you!"</p>
 	You stand there, the strength sapped away from you as Tatiana leans in to kiss you, only to back away, her sudden <i>stalking creep mode</i> forgotten, and the sluggishness dissipating from your body.
@@ -1017,7 +1017,7 @@
 	<<set $tat_lesson_number += 1>>
 	<<gs 'spellList' 'addAvailableSpells' 'basicSpells'>>
 	<<gs 'spellList' 'addAvailableSpells' 'healSpells'>>
-	<<image `'characters/city/tatiana/Tatianalesson.jpg'`>>
+	<<image 'characters/city/tatiana/Tatianalesson.jpg'>>
 	Tatiana doesn''t waste any time and begins to cast Fog, so the workshop is filled with wispy ribbons of mist.
 	<p>"This, $pc.name_nick, is Gust of Wind. The companion to the venerable Fog, and responsible for those creepy cold winds that scare the kids that get too close to my little hideout. Beyond that, its primary use in this age is to dispel Fog in a combat situation, as it lacks the power to do much beyond blowing the leaves."</p>
 	As she is saying this, the mist disintegrates as a wave of gentle wind extends from the redheaded sorceress.
@@ -1030,7 +1030,7 @@
 	<<set $tat_lesson_number += 1>>
 	<<gs 'spellList' 'addAvailableSpells' 'basicSpells'>>
 	<<gs 'spellList' 'addAvailableSpells' 'healSpells'>>
-	<<image `'characters/city/tatiana/Tatianalesson.jpg'`>>
+	<<image 'characters/city/tatiana/Tatianalesson.jpg'>>
 	Tatiana doesn''t wait for you to recover before placing a folder into your hands. Inside it is several photocopies full of magic theory for a spell, accompanied with photos showing hand gestures and a DVD.
 	<p>"The old geezers will scream bloody murder if they see this <i>disrespect</i>, but, hey, they aren't here! Those files will help you learn the more advanced Multi Clone spell. There isn't a great mystery about it. It's a combat spell that creates four clones of you that copy your movements and will disappear if touched, taking any hits meant for you."</p>
 	You observe the files, and can't negate that something is wrong with the presentation. However, Tatiana doesn''t seem bothered and continues talking.
@@ -1043,7 +1043,7 @@
 	<<set $tat_lesson_number += 1>>
 	<<gs 'spellList' 'addAvailableSpells' 'basicSpells'>>
 	<<gs 'spellList' 'addAvailableSpells' 'healSpells'>>
-	<<image `'characters/city/tatiana/Tatianalesson.jpg'`>>
+	<<image 'characters/city/tatiana/Tatianalesson.jpg'>>
 	Without paying attention to your recovering form, Tatiana begins to rummage through the stands until she picks up a screwdriver and returns to your side. She kneels, extends her left hand over the floor and slams the screwdriver down. There is a loud crack and you feel a subtle mana explosion as the tool fails to hurt her, but with determination, Tatiana continues her assault, until two more tries later, the tool manages to impale the offending hand.
 	<p>"Okay $pc.name_nick, I was tired of explaining without demonstartions, and this way I can demonstrate two spells. The first one is Energy Shield, a combat spell, and your last line of defense if everything else fails. Unfortunately, it has two flaws - first: It is ablative, which means that will lose efficiency as it absorbs damage, and - two: It is designed for use against low-impact attacks, like punches and the occasional melee weapon, but anything more potent will shred it. So don't try to go against bullets."</p>
 	You watch as Tatiana pulls out the screwdriver, leaving an ugly wound that pours blood onto the floor, only to stop as the wound begins to slowly heal.
@@ -1056,7 +1056,7 @@
 	<<set $tat_lesson_number += 1>>
 	<<gs 'spellList' 'addAvailableSpells' 'basicSpells'>>
 	<<gs 'spellList' 'addAvailableSpells' 'healSpells'>>
-	<<image `'characters/city/tatiana/Tatianalesson.jpg'`>>
+	<<image 'characters/city/tatiana/Tatianalesson.jpg'>>
 	<p>After your last <i>peep show</i>, Tatiana gives you an old leather-bound folder that contains instructions for a new spell. What catches your attention are the series of carefully manuscripted notes that radiate a faint magical aura. There is even the soft smell of... dahlias?</p>
 	<p>"Yeah, I know $pc.name_nick... pretty. These are the sort of things that our elders do with their free time. They don't seem to realize that the printing press is a thing, but let's continue with your training."</p>
 	<p>"These notes show your new combat spell, Haste. Want to dodge bullets or run at supersonic speed? Sorry, but forget about it. That magic is possible, but it's heavily specialized, costly and will break the disbelief that The Veil enforces. This spell will indeed enhance your reaction time to the human upper limit, and if you take your time to train, beyond, but it isn't so blatant to let you catch bullets with your hands. At least without a lot of luck and some magical protection to evade them."</p>
@@ -1068,7 +1068,7 @@
 	<<set $tat_lesson_number += 1>>
 	<<gs 'spellList' 'addAvailableSpells' 'basicSpells'>>
 	<<gs 'spellList' 'addAvailableSpells' 'healSpells'>>
-	<<image `'characters/city/tatiana/Tatianalesson.jpg'`>>
+	<<image 'characters/city/tatiana/Tatianalesson.jpg'>>
 	Tatiana looks a little off, with a distant gaze, thinking about something as you recover from your last <i>ride</i>. It takes you to loudly cough to take her away from that reverie, and make her pay attention to your naked, kneeling form.
 	<p>"Hm? Sorry $pc.name_nick. I was just... you know thinking in ways to continue milking your mana, but... I remember that I have this little thing called <i>morality</i>, and a deal to respect... Damn!"</p>
 	She then sighs dramatically, smiles and turn towards you.

sugarcube/src/autogenerated/City Center/tatiana_missions.tw

@@ -402,7 +402,7 @@
 			<<actCLA 'Battle in the center of the mind'>>
 				<<set $time.minutes += 1>>
 				<<if getvar("$succubusQW") == 5>>
-					<center><table><tr><td><<image `'images/characters/city/btatiana/ST1.jpg'`>></td><td><<image `'images/pc/body/succubusself.jpg'`>></tr></td></table></center>
+					<center><table><tr><td><<image 'images/characters/city/btatiana/ST1.jpg'>></td><td><<image 'images/pc/body/succubusself.jpg'>></tr></td></table></center>
 					You find yourself lying face down, wearing only panties in what appears to be a photography set. ''Tatiana'' kneels by your side in a somewhat diaphanous robe.
 					<p>"Are you ready for your massage, $pc.name_nick?"</p>
 					<p>You call $sucself1 up from its resting place.</p>
@@ -447,7 +447,7 @@
 		<<set $time.minutes += 5>>
 		<<run $pc.painInc('head',360)>>
 		<h2>YOU!?</h2>
-		<<image `'locations/shared/'+rand(31,60)+'.jpg'`>>
+		<<image 'locations/shared/#.jpg' 31 60>>
 		Suddenly, you find yourself paralyzed as an electrical jolt courses through your nerves, realigning flesh and tissue into your new shape. Just when you think it's over, your suffering reverses course through your veins and up into your head, where the pain sits, simmering like a burning lake of lava.
 		<p>"What the fuck Tatiana?!" you groan, "What have you done to me?!"</p>
 		<p>"Sorry, $pc.name_nick! Three drops of your blood must be put in the potion!" You look at Tatiana like she's mad, and she pinches her nose tiredly. "Not a Raziel's fan are you? Damn... sorry, that was inappropriate. Look, $pc.name_nick, I can change your appearance superficially, but your magic will still try to revert any changes I make, that's the reason why it hurt. Now I need to do a more extensive transformation, and it will probably hurt a lot more-- but don't worry! It will pass, and the changes are only temporary."</p>
@@ -800,7 +800,7 @@
 <!-- !	cls-->
 <!-- !	-->
 <!-- !	'<h2>Tatiana</h2>'-->
-<!-- !	'<<image `'system/1_openings/shared/npc_tatiana.jpg'`>>'-->
+<!-- !	'<<image 'system/1_openings/shared/npc_tatiana.jpg'>>'-->
 <!-- !	'"<<$pc.name_first>>, I a special mission for you. There is some kind of magic emanating from a bakery in Old Town, the people who have eaten there and show traces of the magic have no recollection of something having happened."'-->
 <!-- !	'"We don't want to raise suspicion by going to the bakery as could be recognised, so we just want you to go there and buy one of their ''special cakes'' and bring it back here for me to test. I'm afraid you don't have a choice in this one, we have no one else to send."'-->
 <!-- !-->

sugarcube/src/autogenerated/City Center/yarik.tw

@@ -265,7 +265,7 @@ Close ALL
 							<<actCLA 'Finish'>>
 								<<arouse 'facial' 5 >>
 								<!-- !!-->
-								<<arousalEnd>>
+								
 								<<set $spafinloc = 12>>
 								<<gs 'cum_manage'>>
 								<!-- Boy A86 -->
@@ -317,7 +317,7 @@ Close ALL
 					You push Yaroslav back and getting the hint he withdraws and helps you down. Lying on his back he guides your anus back on to his cock and you set your own rhythm trying to bring yourself to orgasm.
 					<<actCLA 'Continue'>>
 						 						<<arouse 'facial' 5 >>
-						<<arousalEnd>>
+						
 						<<set $spafinloc = 12>>
 						<<gs 'cum_manage'>>
 						<!-- Boy A86 -->

sugarcube/src/autogenerated/City Center/zoomagazine.tw

@@ -83,7 +83,7 @@
 							He takes another tissue and wipes some of the cum off your face.
 							He then goes to the counter and mixes both your juices in the vial, "Here you go miss, one parrot inhibitor potion for you, on the house."
 							Taking the potion, you place it in your pocket and leave the store.
-							<<arousalEnd>>
+							
 							<<cum 'face' $npclastgenerated>>
 							<<set $guy += 1>>
 							<<setinit $ParrotQW['Level'] = 2>>
@@ -109,7 +109,7 @@
 				<<set $time.minutes += 10>>
 				<<set $krolik += 1>>
 				<<set $finances.cash -= 2000>>
-				<<image `'locations/city/citycenter/mall/pet shop/pets/rabbit.jpg'`>>
+				<<image 'locations/city/citycenter/mall/pet shop/pets/rabbit.jpg'>>
 				<center><b>You bought a rabbit.</b></center>
 				<<set $namekrol = input ("I call the rabbit ...")>>
 				<<if $namekrol == ''>>
@@ -131,7 +131,7 @@
 				<<set $time.minutes += 10>>
 				<<setinit $rex['owned'] = 1>>
 				<<set $finances.cash -= 3000>>
-				<<image `'locations/city/citycenter/mall/pet shop/pets/dog.jpg'`>>
+				<<image 'locations/city/citycenter/mall/pet shop/pets/dog.jpg'>>
 				<center><b>You bought a dog.</b></center>
 				<<setinit $rex['name'] = input ("I call the dog ...")>>
 				<<if $rex['name'] == ''>>
@@ -153,7 +153,7 @@
 				<<set $time.minutes += 10>>
 				<<setinit $ParrotQW['Owned1'] = 1>>
 				<<set $finances.cash -= 3000>>
-				<<image `'locations/city/citycenter/mall/pet shop/pets/parrot.jpg'`>>
+				<<image 'locations/city/citycenter/mall/pet shop/pets/parrot.jpg'>>
 				<center><b>You bought a parrot.</b></center>
 				<<setinit $ParrotQW['Name1'] = input ("I call the parrot ...")>>
 				<<if $ParrotQW['Name1'] == ''>>
@@ -176,7 +176,7 @@
 			<<setinit $ParrotQW['SisKeepParrot'] = 0>>
 			<<setinit $ParrotQW['BuyDate'] = $time.daystart>>
 			<<set $finances.cash -= 3000>>
-			<<image `'locations/city/citycenter/mall/pet shop/pets/parrot.jpg'`>>
+			<<image 'locations/city/citycenter/mall/pet shop/pets/parrot.jpg'>>
 			<center><b>You bought a parrot.</b></center>
 			<<setinit $ParrotQW['Name2'] = input ("I call the parrot ...")>>
 			<<if $ParrotQW['Name2'] == ''>>

sugarcube/src/autogenerated/City Industrial/LCporn.tw

@@ -15,7 +15,7 @@
 		<!-- Boy A89 -->
 		<<set $npc($sex.npcId).sex += 1>>
 		<<set $pose = 1>>
-		<<image `'locations/city/industrial/bbq/sex/<<randlcpic>>.jpg'`>>
+		<<image 'locations/city/industrial/bbq/sex/<<randlcpic>>.jpg'>>
 		You smile encouragingly at Eugene and tell her that she is even hotter than you imagined. Eugene, emboldened by your reaction, starts to help you undress. Finally, she descends upon your naked body like a hungry predator...
 		<<gs 'dinsex' 'boy_puts_his_condom'>>
 		<<gs 'dinsex' 'vaginal_sex' 40 'futa'>>
@@ -48,7 +48,7 @@
 		<<set $npc($sex.npcId).sex += 1>>
 		<<set $pose = 1>>
 		<<set $randlcpic = rand(1, 7)>>
-		<<image `'locations/city/industrial/bbq/sex/<<randlcpic>>.jpg'`>>
+		<<image 'locations/city/industrial/bbq/sex/<<randlcpic>>.jpg'>>
 		<p>Eugene grins and says: "I was hoping you'd say that. Come on, $pc.name_nick."</p>
 		She helps you to undress, and lies down on the mattress with you. She slips her cock into your pussy and starts to fuck you. She skillfully rubs your clit while she thrusts in and out of you, to keep you nice and wet.
 		<<gs 'dinsex' 'boy_puts_his_condom'>>
@@ -56,7 +56,7 @@
 		Finally, a good half hour after the hot sex session, Eugene lets out a loud girly moan.
 		<<gs 'dinsex' 'sexcum'>>
 		<p>She smiles and kisses you before she starts to get dressed. She tells you: "Thanks, $pc.name_nick! You were great... but I need to get back before someone notices my absence! Please come to see me again soon, $pc.name_nick!"</p>
-		<<arousalEnd>>
+		
 		<<actCLA 'Get dressed'>>
 			<<gt 'Lakecafe' 'main'>>
 		<</actCLA>>
@@ -66,14 +66,14 @@
 		<!-- Boy A89 -->
 		<<set $npc($sex.npcId).sex += 1>>
 		<<set $randlcpic = rand(10, 16)>>
-		<<image `'locations/city/industrial/bbq/sex/<<randlcpic>>.jpg'`>>
+		<<image 'locations/city/industrial/bbq/sex/<<randlcpic>>.jpg'>>
 		<p>You take your clothes off, give Eugene a deep kiss before drop to your knees in front of her. "Mmmm...$pc.name_nick!" she whispers and looks at you intently.</p>
 		<p>Eugene shoves her harden cock deep into your mouth as soon as you open your lips. She helds you firmly by the hair and begins to thrust her hips back and forth, making you take her whole length repeatedly. After a while, with her cock deep down your throat, you begin to wonder how it's possible that she still hasn't reached orgasm yet... guys never last this long!</p>
 		<<arouse 'bj' 20 `['futa','sub','deepthroat']`>>
 		Finally, a good half hour after you started sucking her cock, Eugene finally lets out a loud and girly moan and releases her load all over your face. Thick strands of saliva are running down your chin by now.
 		<<cum 'face' $sex.npcId 1>>
 		<p>She licks her cum on your face and kisses you. She smiles and starts to get dressed. She tells you: "Thank you, $pc.name_nick! That was great... but I should go back to work before someone realizes I am missing! We've got to do this again, $pc.name_nick!"</p>
-		<<arousalEnd>>
+		
 		<<actCLA 'Get dressed'>>
 			<<gt 'Lakecafe' 'main'>>
 		<</actCLA>>
@@ -83,7 +83,7 @@
 		<!-- Boy A89 -->
 		<<set $npc($sex.npcId).sex += 1>>
 		<<set $randlcpic = rand(1, 4)>>
-		<<image `'locations/city/industrial/bbq/sex/anal<<randlcpic>>.jpg'`>>
+		<<image 'locations/city/industrial/bbq/sex/anal<<randlcpic>>.jpg'>>
 		<<if getvar("$analplugin") == 1>>
 			Eugene carefully pulls the plug out of your butt.
 			<<set $analplugin = 0>>
@@ -97,7 +97,7 @@
 		<<cum 'anus' $sex.npcId 1>>
 		<p>She kisses you and savours the moment. She starts to get dressed and let you know: "Thanks, $pc.name_nick! That was amazing...  I have to go now but come visit me soon, okay, $pc.name_nick? I really want us to spend more time together."</p>
 		<<gs 'dinsex' 'after_anal' 'no_plug'>>
-		<<arousalEnd>>
+		
 		<<actCLA 'Get dressed again'>>
 			<<gt 'Lakecafe' 'main'>>
 		<</actCLA>>

sugarcube/src/autogenerated/City Industrial/LCwork.tw

@@ -48,7 +48,7 @@
 			<<arouse 'bj' 10 `['sub','gangbang','prostitution']`>>
 			<<arouse 'hj' 10 `['sub','gangbang','prostitution']`>>
 			<<set $time.minutes -= 10>>
-			<<arousalEnd>>
+			
 			<<actCLA 'Get out of his car'>>
 				<<set $finances.cash += $randLCpay>> <<gt 'city_residential'>>
 			<</actCLA>>
@@ -87,7 +87,7 @@
 		<p>He says kindly: "You were great! Get back in the van, I'll give you a ride back."</p>
 		<p>With a wink he adds: "As long as you don't get any cum on the seats, my wife would kill me!"</p>
 		<p>You have the man pull over when you're in the residential district, and he happily pays you randLCpay <b>₽</b> for your time.</p>
-		<<arousalEnd>>
+		
 		<<actCLA 'Get out of his van'>>
 			<<set $finances.cash += $randLCpay>> <<gt 'city_residential'>>
 		<</actCLA>>
@@ -129,7 +129,7 @@
 		<p>Finally in a small mercy they both pull out of you and put you on your knees where they jerk off, covering your face and tits with their sperm. As soon as they finish, before you even have a chance to do anything, one of them grabs you roughly by the hair and drags you out of the apartment naked, while the other throws your clothes out into the hallway. With that done, they toss randLCpay <b>₽</b> out and slam the door. Leaving you standing naked, with your clothes and money scattered around the hall floor and your ass and pussy aching from the rough fucking.</p>
 		Wincing you gather up the money and put on your clothes, then you head down the stairs out of the apartment.
 		<<arouse 'bj' 20 `['sub','group','prostitution','rough']`>>
-		<<arousalEnd>>
+		
 		<<actCLA 'Leave the apartment building'>>
 			<<set $finances.cash += $randLCpay>> <<gt 'city_industrial'>>
 		<</actCLA>>
@@ -177,7 +177,7 @@
 			<p>As you get up, the guy is very happy. He grins and says: "Thanks, you were great! She's still a bit shy, but at this rate it won't be long before I can properly introduce her to my buddies, if you know what I mean."</p>
 			<p>He walks you out of the bedroom, after you get dressed, leaving her behind. "Maybe we can do it again next week and you can help me talk her into trying anal." He gives you a dirty wink and gives you randLCpay <b>₽</b> as he walks you out.</p>
 			<<arouse 'anal' 20 `['sub','prostitution']`>>
-			<<arousalEnd>>
+			
 			<<actCLA 'Leave their apartment building'>>
 				<<set $finances.cash += $randLCpay>> <<gt 'city_residential'>>
 			<</actCLA>>
@@ -211,7 +211,7 @@
 				Some time later the guy shoots his load deep in your ass, pulling his dick out, she catches a few drops of sperm from his dick with her tongue.
 				<p>After you get dressed and he walks you to the door, he grins and says: "Thanks, you were great! She's still a bit shy, but at this rate it won't be long before I can properly introduce her to my buddies, if you know what I mean. Maybe we can do it again next week and you can help her get use to anal." He gives you a dirty wink and gives you randLCpay <b>₽</b> as he walks you out.</p>
 				<<arouse 'anal' 20 `['sub','prostitution']`>>
-				<<arousalEnd>>
+				
 				<<cum 'anus' $sex.npcId>>
 				<<actCLA 'Leave their apartment building'>>
 					<<set $finances.cash += $randLCpay>> <<gt 'city_residential'>>
@@ -246,7 +246,7 @@
 	<</if>>
 	When you're finished and get dressed again, the girl reverts to being her old, shy self. Nevertheless, she gives you a peck on the cheek and thanks you for the lovely lesson. She does seem a bit more confident now.
 	<p>She walks you out, giving you randLCpay <b>₽</b>.</p>
-	<<arousalEnd>>
+	
 	<<actCLA 'Leave her apartment'>>
 		<<set $finances.cash += $randLCpay>> <<gt 'city_residential'>>
 	<</actCLA>>
@@ -286,7 +286,7 @@
 			<<gs 'sweat' 'remove_deo'>> 
 
 		<</if>>
-		<<arousalEnd>>
+		
 		<<actCLA 'Leave his apartment'>>
 			<<set $finances.cash += $randLCpay>> <<gt 'city_residential'>>
 		<</actCLA>>
@@ -301,7 +301,7 @@
 	<<gs 'dinsex' 'vaginal_sex' 6 'unknown'>>
 	Not a surprise, he barely lasts any time at all, with in a few minutes he grunts and pulls out of your pussy and shoots his load all over your ass and without a further word he goes back into the cafe.
 	<<cum 'butt' $sex.npcId 1>>
-	<<arousalEnd>>
+	
 	<<actCLA 'Return to the restroom'>>
 		<<gt 'laketoilet' 'main'>>
 	<</actCLA>>

sugarcube/src/autogenerated/City Industrial/Terminal.tw

@@ -136,7 +136,7 @@ A large shipping center with many on and off load truck ports.
 
 					<<arouse 'anal' 5 `['gangbang']`>>
 					<<cum 'butt' $sex.npcId>>
-					<<arousalEnd>>
+					
 					<<image "characters/city/mikhail/sex/trfatherqw_12.jpg">>
 					You are barely aware of what they are doing, they quickly strip you naked. Soon you feel a dick being pushed inside or your pussy and ass at the same time.
 					The only time a hand is not covering your mouth is when there is a dick in it. Each of them seems to take multiple turns on all of your holes, with them switching so much, you completely lose track of how many men are even using you. By the time the start to finish, all you know is all three of your holes are acheing from being roughly used by the large gang of men around you.

sugarcube/src/autogenerated/City Industrial/alex.tw

@@ -10,7 +10,7 @@ After a while of talking and drinking you feel a bit drunk, and Alexey asks you
 <<actCLA 'Get on your knees and take it in your mouth'>>
 	<<set $npc($sex.npcId).sex += 1>>
 	<<set $alexeySex += 1>>
-	<<image `'shared/sex/blowjob/bj'+rand(29,41)+'.jpg'`>>
+	<<image 'shared/sex/blowjob/bj#.jpg' 29 41>>
 	Kneeling before him, you unbutton his pants and take a firm grasp of his erect cock.
 	<p>Leaning in closer, you give it a quick kiss with your $pc_desc['lips'] lips before guiding it to your mouth.</p>
 	As you suck on his hard dick, Alexey relaxes in his chair, letting you take care of his needs.
@@ -42,7 +42,7 @@ After a while of talking and drinking you feel a bit drunk, and Alexey asks you
 			<<image "characters/city/alexey/sex/anal.jpg">>
 			<<gs 'dinsex' 'analsex'>>
 			<<gs 'BDsex' 'ancum'>>
-			<<arousalEnd>>
+			
 			After finishing, Alexey slips out of bed goes to the bathroom.
 			<<gs 'dinsex' 'after_anal' 'no_plug'>>
 			<<actCLA 'Leave'>>

sugarcube/src/autogenerated/City Industrial/alexgang.tw

@@ -18,7 +18,7 @@ After arriving at Alexei''s apartment, he offers you various alcoholic beverages
 <</if>>
 <<actCLA 'Get on your knees and give head'>>
 	<<set $alexgangbang += 1>>
-	<<image `'shared/sex/blowjob/bj'+rand(29,41)+'.jpg'`>>
+	<<image 'shared/sex/blowjob/bj#.jpg' 29 41>>
 	Kneeling before him, you pull Alexei''s pants all the way down then take a firm grasp of his erect cock.
 	<p>Leaning in closer, you give it a quick kiss with your $pc_desc['lips'] lips before guiding it into your mouth.</p>
 	As you suck on his hard dick, he relaxes in his chair and lets you take care of his needs.
@@ -35,7 +35,7 @@ After arriving at Alexei''s apartment, he offers you various alcoholic beverages
 		<!-- Boy A88 -->
 		<<set $pose = 1>>
 		<<cum 'mouth_swallow' 'A88' 1>>
-		<<image `'shared/sex/group/gang'+rand(16,25)+'.jpg'`>>
+		<<image 'shared/sex/group/gang#.jpg' 16 25>>
 		Kneeling on all fours, you start sucking Sasha''s limp cock. As you lick, suck, and roll your tongue around his dick while stroking the shaft with your hands, you can feel it slowly stiffen in your mouth.
 		<<gs 'dinSex' 'wear_condom'>>
 		The position you're in doesn''t make it easy for you to move your head up and down. However with some determination, you manage to keep Sasha''s cock in your mouth with the help of your hands.
@@ -43,7 +43,7 @@ After arriving at Alexei''s apartment, he offers you various alcoholic beverages
 		After a while, you feel Sasha''s hard cock begin to throb. With a low grunt, he thrusts his hips forward, and you feel his sperm coat the insides of your mouth.
 		He doesn''t cum a whole lot, so you easily manage to swallow all of it. It still doesn''t diminish the inherent thrill of the threesome you just participated in.
 		<<arouse 'bj' 10 `['sub','group']`>>
-		<<arousalEnd>>
+		
 		<<actCLA 'Leave'>>
 			<<gt 'city_industrial'>>
 		<</actCLA>>

sugarcube/src/autogenerated/City Industrial/casino.tw

@@ -8,7 +8,7 @@
 	<<set $menu_arg = 'outside'>>
 	<<set $menu_off = 0>>
 	<<set $location_type = 'public_outdoors'>>
-	<right><<image `'images/locations/city/industrial/casino/zdcasino.jpg'`>></right>
+	<right><<image 'images/locations/city/industrial/casino/zdcasino.jpg'>></right>
 	You stand in front of the door of the huge building casinos.
 	<<actCLA 'Return to the city industrial area'>>
 		<<set $time.minutes += 10>> <<gt 'city_industrial'>>
@@ -25,7 +25,7 @@
 	<<set $location_type = 'public_indoors'>>
 	<<set $time.minutes += 1>>
 	<<set $picrand = rand(1, 3)>>
-	<right><<image `'images/locations/city/industrial/casino/hcasino<<picrand>>.jpg'`>></right>
+	<right><<image 'images/locations/city/industrial/casino/hcasino<<picrand>>.jpg'>></right>
 	You enter the foyer of the casino, there are lots of games .
 	In the hall are various <<link "slot machines">><<gt 'casino' 'slots'>><</link>>.
 	In the games room there is <<link "Roulette">><<gt 'casino' 'roulette'>><</link>> and <<link "card games">><<gt 'casino' 'cards'>><</link>>.
@@ -50,7 +50,7 @@
 	<<set $menu_arg = $location_var[$here][0]>>
 	<<set $menu_off = 0>>
 	<<set $time.minutes += 1>>
-	<right><<image `'images/locations/city/industrial/casino/ruletka.jpg'`>></right>
+	<right><<image 'images/locations/city/industrial/casino/ruletka.jpg'>></right>
 	You came to the table with American roulette.
 	<<actCLA 'Go back to the foyer'>>
 		<<gt 'casino' 'foyer'>>
@@ -61,7 +61,7 @@
 	<<actCLA 'Approach the croupier'>>
 		<<set $menu_off = 1>>
 		<<set $time.minutes += 1>>
-		<right><<image `'images/locations/city/industrial/casino/crup.jpg'`>></right>
+		<right><<image 'images/locations/city/industrial/casino/crup.jpg'>></right>
 		<p>"Can I help you?" He asks.</p>
 		<<actCLA 'Shake your head and move away'>>
 			<<gt 'casino' 'roulette'>>
@@ -135,7 +135,7 @@
 	<<set $du = 0>>
 	<<set $series = 0>>
 	<<set $chi = 100>>
-	<right><<image `'images/locations/city/industrial/casino/stavkaru.jpg'`>></right>
+	<right><<image 'images/locations/city/industrial/casino/stavkaru.jpg'>></right>
 	<p>Where do you put your chips?</p>
 	<<actCLA 'Don`t bet'>>
 		<<set $finances.cash += $st_1>>
@@ -230,7 +230,7 @@
 			<<set $color = 'black'>>
 		<</if>>
 	<</if>>
-	<right><<image `'images/locations/city/industrial/casino/resul.jpg'`>></right>
+	<right><<image 'images/locations/city/industrial/casino/resul.jpg'>></right>
 	<p>The ball stops at x_rul $color</p>
 	<<if getvar("$kh") != 0>>
 		<<if getvar("$kh") == 1>>
@@ -405,7 +405,7 @@
 	<<set $menu_arg = $location_var[$here][0]>>
 	<<set $menu_off = 0>>
 	<<set $time.minutes += 1>>
-	<right><<image `'images/locations/city/industrial/casino/zaligravt.jpg'`>></right>
+	<right><<image 'images/locations/city/industrial/casino/zaligravt.jpg'>></right>
 	You enter the hall and are momentarily dazzled by the multitude of ringing sounds and blinking lights coming from endless rows of slot machines. In front of them you see people of various ages, sexes and backgrounds, trying their luck or perhaps just killing time.
 	Every once in a while you hear the satisfying sound of coins streaming into the tray of the next lucky winner.
 	According to the huge animated digital display on the back wall, there is a hefty jackpot up for grabs.
@@ -465,7 +465,7 @@
 	<<set $menu_arg = $location_var[$here][0]>>
 	<<set $menu_off = 0>>
 	<<set $time.minutes += 1>>
-	<right><<image `'images/locations/city/industrial/casino/zalcart.jpg'`>></right>
+	<right><<image 'images/locations/city/industrial/casino/zalcart.jpg'>></right>
 	In the hall a lot of free games tables in Blackjack and Casino Wars.
 	<<actCLA 'Go back to the foyer'>>
 		<<gt 'casino' 'foyer'>>
@@ -527,7 +527,7 @@
 	<<set $menu_arg = $location_var[$here][0]>>
 	<<set $menu_off = 0>>
 	<<set $time.minutes += 1>>
-	<right><<image `'images/locations/city/industrial/casino/stolcw.jpg'`>></right>
+	<right><<image 'images/locations/city/industrial/casino/stolcw.jpg'>></right>
 	You approach the gambling table at the casino.
 	<<actCLA 'Move away from the table'>>
 		<<gt 'casino' 'cards'>>
@@ -538,7 +538,7 @@
 	<<actCLA 'Approach the croupier'>>
 		<<set $menu_off = 1>>
 		<<set $time.minutes += 1>>
-		<right><<image `'images/locations/city/industrial/casino/crupcw.jpg'`>></right>
+		<right><<image 'images/locations/city/industrial/casino/crupcw.jpg'>></right>
 		<p>"How can I help you?"</p>
 		<<actCLA 'Move away from the dealer'>>
 			<<gt 'casino' 'cards_cw'>>
@@ -583,7 +583,7 @@
 	<<set $menu_off = 1>>
 	<<set $time.minutes += 1>>
 	<<if getvar("$turn1") == 0>>
-		<right><<image `'images/locations/city/industrial/casino/stavkacw.jpg'`>></right>
+		<right><<image 'images/locations/city/industrial/casino/stavkacw.jpg'>></right>
 		Place your bets, ladies and gentlemen.
 		<<actCLA 'Leave the table'>>
 			<<gt 'casino' 'cards_cw'>>
@@ -611,7 +611,7 @@
 	<</if>>
 	<<if getvar("$turn1") == 1>>
 		<<set $bet_draw = 0>>
-		<right><<image `'images/locations/city/industrial/casino/stavkacw.jpg'`>></right>
+		<right><<image 'images/locations/city/industrial/casino/stavkacw.jpg'>></right>
 		<p>Continue with regular bet (payout 2 to 1), or bet on a draw (payout 11 to 1)?</p>
 		<<if $finances.cash < $bet_amount>>
 			<<set $turn1 = 2>>
@@ -630,7 +630,7 @@
 		<</if>>
 	<</if>>
 	<<if getvar("$turn1") == 2>>
-		<right><<image `'images/locations/city/industrial/casino/cartcw.jpg'`>></right>
+		<right><<image 'images/locations/city/industrial/casino/cartcw.jpg'>></right>
 		 The dealer deals the cards:
 		...
 		<<set $suit = rand(1, 4)>>
@@ -676,7 +676,7 @@
 		<</if>>
 	<</if>>
 	<<if getvar("$turn1") == 3>>
-		<right><<image `'images/locations/city/industrial/casino/cartcw.jpg'`>></right>
+		<right><<image 'images/locations/city/industrial/casino/cartcw.jpg'>></right>
 		Draw
 		<<if $finances.cash >= $bet_amount>>
 			<<actCLA 'Continue (bet another bet_amount <b>₽</b>)'>>

sugarcube/src/autogenerated/City Industrial/eugeneev1.tw

@@ -33,7 +33,7 @@
 					"Okay, we better get back." She leads you back into the main area and returns to work.
 					<<arouse 'bj' 5 `['deepthroat']`>>
 					<<cum 'mouth_swallow' 'A89' 1>>
-					<<arousalEnd>>
+					
 					<<actCLA 'Finish'>>
 						<<gt 'Lakecafe' 'main'>>
 					<</actCLA>>
@@ -69,7 +69,7 @@
 							<</if>>
 							<<arouse 'vaginal' 5 >>
 							<<cum 'stomach' 'A89' 1>>
-							<<arousalEnd>>
+							
 							<<set $cumspclnt = 14>>
 							<<gs 'cum_cleanup'>>
 							<<actCLA 'Finish'>>
@@ -90,7 +90,7 @@
 							<p>You giggle at her comment as you get up, and she pulls you into a kiss. Once the kiss is finished, the two of you start getting dressed. "That was amazing! We need to do this again, but we need to get back now." With that, she leads you back to the front of the cafe and returns to work.</p>
 							<<arouse 'anal' 5 `['lube']`>>
 							<<cum 'anus' 'A89' 1>>
-							<<arousalEnd>>
+							
 							<<actCLA 'Finish'>>
 								<<gt 'Lakecafe' 'main'>>
 							<</actCLA>>
@@ -111,7 +111,7 @@
 						<p>You giggle at her comment as you get up, and she pulls you into a kiss. Once the kiss is finished, the two of you start getting dressed. "That was amazing! We need to do this again, but we need to get back now." With that, she leads you back to the front of the cafe and returns to work.</p>
 						<<arouse 'anal' 5 `['lube']`>>
 						<<cum 'anus' 'A89' 1>>
-						<<arousalEnd>>
+						
 						<<actCLA 'Finish'>>
 							<<gt 'Lakecafe' 'main'>>
 						<</actCLA>>
@@ -126,7 +126,7 @@
 			You shake your head a little. "I... this wasn''t what I expected. I just... I don't know."
 			She nods, drops her skirt back into place, and then squats down to pull her panties back up. "I understand. If you change your mind, let me know."
 			All you can do is nod as she walks over and gives you a hug. "We should get back." With that, she leads you out of the pantry, returning to work while you choose to leave, unsure of what to do.
-			<<arousalEnd>>
+			
 			<<actCLA 'Continue'>>
 				<<gt 'city_industrial'>>
 			<</actCLA>>
@@ -137,7 +137,7 @@
 				
 				<<image "pc/reactions/disgust.jpg">>
 				You shake your head and turn away from her before hurrying out of the pantry. You dash out the door and don't stop until you're well away from the diner.
-				<<arousalEnd>>
+				
 				<<actCLA 'Continue'>>
 					<<gt 'city_industrial'>>
 				<</actCLA>>
@@ -161,7 +161,7 @@
 			<p>You swallow her cum, opening your mouth to show her, and she lets go of your hair. You get up, and she pulls you into a kiss. Once the kiss is finished, the two of you start getting dressed. "That was amazing! We need to do this again, but we need to get back now." With that, she leads you back to the front of the cafe and returns to work.</p>
 			<<arouse 'bj' 5 >>
 			<<cum 'mouth_swallow' 'A89' 1>>
-			<<arousalEnd>>
+			
 			<<actCLA 'Finish'>>
 				<<gt 'Lakecafe' 'main'>>
 			<</actCLA>>
@@ -200,7 +200,7 @@
 						<</if>>
 						<<arouse 'vaginal' 5 >>
 						<<cum 'tits' 'A89' 1>>
-						<<arousalEnd>>
+						
 						<<actCLA 'Finish'>>
 							<<gt 'Lakecafe' 'main'>>
 						<</actCLA>>
@@ -215,7 +215,7 @@
 					<p>You giggle at her comment as you get up, and she pulls you into a kiss. Once the kiss is finished, the two of you start getting dressed. "That was amazing! We need to do this again, but we need to get back now." With that, she leads you back to the front of the cafe and returns to work.</p>
 					<<arouse 'anal' 10 `['lube']`>>
 					<<cum 'anus' 'A89' 1>>
-					<<arousalEnd>>
+					
 					<<actCLA 'Finish'>>
 						<<gt 'Lakecafe' 'main'>>
 					<</actCLA>>
@@ -232,7 +232,7 @@
 			<p>You giggle at her comment as you get up, and she pulls you into a kiss. Once the kiss is finished, the two of you start getting dressed. "That was amazing! We need to do this again, but we need to get back now." With that, she leads you back to the front of the cafe and returns to work.</p>
 			<<arouse 'anal' 15 `['lube']`>>
 			<<cum 'anus' 'A89' 1>>
-			<<arousalEnd>>
+			
 			<<actCLA 'Finish'>>
 				<<gt 'Lakecafe' 'main'>>
 			<</actCLA>>
@@ -255,7 +255,7 @@
 			You swallow her cum, then open your mouth to show her. With that done, the two of you smooth your clothes out and put your panties back on. Once you are standing, she pulls you into a kiss. After the kiss is finished, the two of you start getting dressed. Afterwards, you are both finished dressing, she says. "We need to do that again, but for now, we best get back." With that, she leads you back to the front of the cafe, where she returns to work.
 			<<arouse 'bj' 5 >>
 			<<cum 'mouth_swallow' 'A89' 1>>
-			<<arousalEnd>>
+			
 			<<actCLA 'Finish'>>
 				<<gt 'Lakecafe' 'main'>>
 			<</actCLA>>
@@ -280,14 +280,14 @@
 							<p>She grabs you and flips you over onto your back again. At first, you don't think she heard you. Then, she relents as she takes off the rest of her clothes. "Fine, but next time, I get to fuck that tight little ass of yours!"</p>
 							She strips you as well, and once you're both naked, she spreads your legs wide and plunges her dick back into your pussy before proceeding to fuck you hard and fast.
 							<<arouse 'vaginal' 5 `['rough']`>>
-							<<arousalEnd>>
+							
 							<<actCLA 'Cumming'>>
 								<<image "characters/city/eugene/sex/work9.jpg">>
 								<p>Several minutes go by before she grunts, encouraging her to go faster before she suddenly pulls out of you and starts jerking off. Within seconds, she starts shooting out streams of cum that splatter across your labia. She keeps jerking her cock until she squeezes the last few drops out, then wipes the tip of her dick on your thigh. "Sorry I was so rough this time, but I needed that. I was so horny I thought my balls were going to explode!" she laughs.</p>
 								You grin at her. "Glad I could help. I really needed this too." She tosses you a towel to wipe yourself off with before you both get dressed. Once you finish, she pulls you into a kiss before leading you back to the front of the cafe, where she returns to work.
 								<<arouse 'vaginal' 5 >>
 								<<cum 'labia' 'A89' 1>>
-								<<arousalEnd>>
+								
 								<<set $cumspclnt = 15>>
 								<<gs 'cum_cleanup'>>
 								<<actCLA 'Finish'>>
@@ -306,7 +306,7 @@
 								You giggle a bit at that comment as you get up. Then, she pulls you into a kiss. Once the kiss is finished, the two of you start getting dressed. Once you are both finished dressing, she says. "We need to do that again, but for now, we best get back." With that, she leads you back to the front of the cafe, where she returns to work.
 								<<arouse 'anal' 5 `['lube']`>>
 								<<cum 'anus' 'A89' 1>>
-								<<arousalEnd>>
+								
 								<<actCLA 'Finish'>>
 									<<gt 'Lakecafe' 'main'>>
 								<</actCLA>>
@@ -328,7 +328,7 @@
 				<p>You giggle at her comment as you get up, and she pulls you into a kiss. Once the kiss is finished, the two of you start getting dressed. "That was amazing! We need to do this again, but we need to get back now." With that, she leads you back to the front of the cafe and returns to work.</p>
 				<<arouse 'anal' 5 `['lube']`>>
 				<<cum 'anus' 'A89' 1>>
-				<<arousalEnd>>
+				
 				<<actCLA 'Get dressed'>>
 					<<gt 'Lakecafe' 'main'>>
 				<</actCLA>>
@@ -412,7 +412,7 @@
 											She grabs a bottle of lube from the bedside table, squirting it on her dick as it slides in and out of your ass. Then, with your ass slick, she starts hammering your backdoor hard, her hips smacking against your ass cheeks hard enough to force you forward until you're flat on your stomach.
 											<<arouse 'anal' 5 `['lube']`>>
 											<<cum 'anus' 'A89' 1>>
-											<<arousalEnd>>
+											
 											<<actCLA 'Roll over'>>
 												<<image "characters/city/eugene/sex/photo9.jpg">>
 												After a few minutes, she pulls out of you again. "Roll over again."
@@ -424,7 +424,7 @@
 													<p>"Fuck, I need to get back to work! This was fun and all, but I'm already late." With that, she starts getting dressed into her work clothes and your clothes at you. Grabbing some tissues, you clean her cum off you before quickly getting dressed.</p>
 													Once you're both dressed, she leads you out and locks the door before giving you a quick kiss. "I had a wonderful time. Come and see me again." Then, she jogs off back to work, leaving you outside her building.
 													<<cum 'legs' 'A89' 1>>
-													<<arousalEnd>>
+													
 													<<set $cumspclnt = 17>>
 													<<gs 'cum_cleanup'>>
 													<<actCLA 'Leave'>>

sugarcube/src/autogenerated/City Industrial/ilyroom.tw

@@ -22,10 +22,10 @@ Ilyushkin''s apartment door is made of steel and held in place with strong locks
 			<<image "locations/city/industrial/apartment/gun.jpg">>
 			As Gustav approaches the door, you notice the tattoos on his face move. Seemingly having a life of their own, they grow and twist, covering his face in black designs. As the designs settle on his face, you notice his fists have increased in size and appear as if they are made of stone. With a  growl, he launches a rock hard fist at the door, bending the steel inwards. Grabbing one of the exposed edges of the now damaged door, Gustav tears it from its frame and off its hinges. You run into the apartment after Gustav and see Ilyushkin standing in the room holding a gun. Ilyushkin fires a shot and Gustav twitches, then Ilyushkin fires again and again. Gustav falls to the floor. The gun empty, Ilyushkin begins frantically reloading.
 			<<actCLA 'Attack Ilyushkin'>>
-				<!-- !!'<<image `'locations/city/industrial/apartment/gun.jpg'`>>'-->
+				<!-- !!'<<image 'locations/city/industrial/apartment/gun.jpg'>>'-->
 				<p>You run at Ilyushkin, attempting to kick him while he reloads the gun. Ilyushkin suddenly jumps back into a bedroom and slams the door in your face. Your inertia carries you into the solid interior door, and you rebound off of it just as another shot explodes through it, splintering the wood and narrowly missing hitting you. As you push yourself up from the floor, you see Gustav. The black designs swirling all over his exposed skin, he growls low and dangerous in his chest, and you see the bullet wounds expelling the bullets from his body and closing right before your eyes. His body almost totally black now with the magical tattoos, you see horns sprout from his forehead. Gustav shouts furiously, "NOW YOU DIE!" and charges at the wooden door that Ilyushkin is hiding behind. Lowering his head and shoulders for the impact, he doesn't even slow as he crashes through the solid wood, sending splinters and shards flying inward into the room. You follow close behind, entering the room and skidding to a halt. Ilyushkin has been thrown backwards and to the ground. He's bleeding badly from several areas with many wooden spikes impaling his body in various parts. No sign of his gun, he must have dropped it when the door exploded on him. Gustav, still in a rage, falls upon the prone body and, with an inhuman roar, begins to pummel the unconscious man. Small lightning bolts arc through Ilyushkin as Gustav continues to pound his body, quickly reducing him to little more then pulp.</p>
 				<<actCLA 'Run'>>
-					<!-- !!'<<image `'locations/city/industrial/apartment/gun.jpg'`>>'-->
+					<!-- !!'<<image 'locations/city/industrial/apartment/gun.jpg'>>'-->
 					At the sight of the carnage, you turn and run out of the apartment. Just as you near the entrance, you hear and feel a powerful explosion shake the house. Hit from behind by the force, you're flung out the front door.  With ears ringing and aches and pains all over, you look around and realize that Ilyushkin''s apartment has collapsed. Bits of wood and concrete litter the area around where you were thrown.
 					<<actCLA 'Run away from the entrance'>>
 						<<gt 'city_industrial'>>
@@ -36,7 +36,7 @@ Ilyushkin''s apartment door is made of steel and held in place with strong locks
 				<<image "locations/city/industrial/apartment/gun.jpg">>
 				<p>You freeze in horror as you take in the scene. Gustav is lying in a pool of his own blood, numerous bullet wounds covering his chest and one hole in his forehead. Ilyushkin has reloaded and is now pointing the gun at you. Gustav suddenly rolls over on the floor, and you watch as his wounds expel the bullets and close before your eyes. The black designs on his face now cover most of his body, swirling and thickening as he heals. In a panic, Ilyushkin begins to fire more rounds at Gustav, but as if his body has hardened to stone, the rounds now bounce off his body, ricocheting off and swirling back towards Ilyushkin. Gustav's transformation complete, a black skinned horned monster stands in front of Ilyushkin now. "NOW YOU DIE!" he roars.  Ilyushkin tries to back away from the creature, reloading his weapon again. Gustav, quick as lightning, jumps on him and hits Ilyushkin so hard it throws him across the room like a rag doll, knocking the gun from his limp hand. You cross the room to Ilyushkin's broken bleeding body and kick the gun out of reach. Gustav, with a triumphant cry, rushes to Ilyushkin and begins pummeling his head. Small arcs of lightning pass into his body as Gustav's fists turn his head to pulp. You lay your hand carefully on Gustav's powerful shoulder, calming him and stopping the carnage.</p>
 				<<actCLA 'Run'>>
-					<!-- !!'<<image `'locations/city/industrial/apartment/gun.jpg'`>>'-->
+					<!-- !!'<<image 'locations/city/industrial/apartment/gun.jpg'>>'-->
 					You turn and run out of the apartment. Just as you near the entrance, you hear and feel a powerful explosion shake the house. Hit from behind by the force, you're flung out the front door.  With ears ringing and aches and pains all over, you look around and realize that Ilyushkin''s apartment has collapsed. Bits of wood and concrete litter the area around where you were thrown.
 					<<actCLA 'Run away from the entrance'>>
 						<<gt 'city_industrial'>>
@@ -132,7 +132,7 @@ Ilyushkin''s apartment door is made of steel and held in place with strong locks
 															<<set $cumface = 0>>
 															<<image "system/1_openings/shared/npc_tatiana.jpg">>
 															<p>You secretly prepare a camera, filming through a hole in your purse. Tatiana meanwhile hands Ilyushkin a glass of water. Thirsty, he drinks the water as Tatiana asks him, "Tell me how you stole from your boss." Ilyushkin grins, "Elementary, I lost big time at the casino, and I urgently needed the money. I knew this old asshole kept his bribe money in the safe and he really liked this dumb slut dishwasher, so I came up with a brilliant plan. I convinced her to distract the manager. He would have done anything she asked he was so hot for her. I convinced her to get the keys for me and stood where the cameras could not see me and took what I wanted. Then I had the cleaning woman take the money out and return it to me outside of work for a small cut." "And where is the money now?" Ilyushkin says sadly, "It's all gone. I paid off my casino debt and some other bills." Tatiana grins, "It's done Ilyushkin, you go to sleep." Ilyushkin is immediately snoring on the couch. Tatiana turns to you. "That was close. We almost screwed up because of his cold. Good lesson for you. Everything can not go according to plan. Thought I would have to paralyze him, but I have tried that once. Paralyzed object can choke if you're not careful. Okay, let's get out of here. We got what we need." You quickly wash up in the bathroom with Tatiana, washing the leftover sperm from each other's faces and chests. She smiles at you while looking you over and gets the last of the sperm off your chin. Together, you return to the street.</p>
-															<<arousalEnd>>
+															
 															<<actCLA 'Leave'>>
 																<<gt 'city_industrial'>>
 															<</actCLA>>
@@ -238,7 +238,7 @@ Ilyushkin''s apartment door is made of steel and held in place with strong locks
 															<<set $cumface = 0>>
 															<<image "system/1_openings/shared/npc_tatiana.jpg">>
 															<p>You secretly prepare a camera filming through a hole in your purse. Tanya meanwhile hands him a glass of water after putting something into it. Thirsty, Ilyushkin drinks the water as Tanya asks him, "Tell me how you stole from your boss." Ilyushkin grins, "Elementary, I lost big time at the casino, and I urgently needed the money. I knew this old asshole kept his bribe money in the safe and he really liked the dumb slut dishwasher, so I came up with a brilliant plan. I convinced her to distract the manager. He would have done anything she asked he was so hot for her. I convinced her to get the keys for me and stood where the cameras could not see me and took what I wanted. Then I had the cleaning woman take the money out and return it to me outside of work for a small cut." "And where is the money now?" Ilyushkin says sadly, "It's all gone. I paid off my casino debt and some other bills." Tanya grins, "It's done Ilyushkin, go to sleep." Ilyushkin is immediately snoring on the couch. Tanya turns to you. "That was close. We almost screwed up because of his cold. Good lesson for you. Everything can not go according to plan. Thought I would have to paralyze him, but I have tried that once. Paralyzed object can choke if you're not careful. Okay, let's get out of here. We got what we need." You quickly wash up in the bathroom with Tanya, washing the leftover sperm from each other's faces and chests. She smiles at you while looking you over and gets the last of the sperm off your chin. Together, you return to the street.</p>
-															<<arousalEnd>>
+															
 															<<actCLA 'Leave'>>
 																<<gt 'city_industrial'>>
 															<</actCLA>>

sugarcube/src/autogenerated/City Industrial/qwBarBilliard.tw

@@ -253,7 +253,7 @@
 										They seem just as surprised as you to see each other, but they just give Martin a friendly "hello" before the two of you leave. As Martin strides towards the source of the noise you heard, you stay back long enough to hear the guys at the pool table break into wild speculations.
 										That was definitely an experience...
 										<<set $orgasm_txt = ''>>
-										<<arousalEnd>>
+										
 										<<actCLA 'Return to the bar'>>
 											<<gt 'qwBarPolet'>>
 										<</actCLA>>
@@ -279,7 +279,7 @@
 						"Pleasure doing business with you sweetheart, maybe we can do it again sometime. And I hope you enjoy your... consolation price."
 						With a fat grin on his face, he walks off, whistling and very pleased with himself, leaving you covered in cum.
 						Maybe billiards just isn''t for you.
-						<<arousalEnd>>
+						
 						<<set $spafinloc = 11>>
 						<<gs 'cum_manage'>>
 						<<set $spafinloc = 12>>

sugarcube/src/autogenerated/City Industrial/qwBarEncounters.tw

@@ -245,7 +245,7 @@
 						 						<<image "locations/city/industrial/bar/sex/bar/bargrinds2.jpg">>
 						You are not quite sure for how long you are squatting there while he fucks your mouth, but at some point, he picks up the pace and starts to groan, then suddenly pulls his cock out of your mouth and the first hot jet of sperm hits your face, then another shoots into your mouth. Several more follow and cover your lips, chin and tongue with cum.
 						Once the last spurt is out, he wipes the tip of dick against your lips to get the last drops off cum off. Then he tucks his cock back in his pants, orders another drink for each of you and, before you're even fully back on your feet, takes his drink and walks off.
-						<<arousalEnd>>
+						
 						<<cum 'face' $sex.npcId 0 '' '' 20>>
 						<<cum 'mouth' $sex.npcId 0 '' '' 20>>
 						<<fame 'city' 'sex' 1>>
@@ -268,7 +268,7 @@
 						<<actCLA 'Got to leave'>>
 							You put your hands on his and stop him from undoing his pants further. You lean in to kiss his cheek, then whisper. "Thank you for this... but I gotta go. Have a nice evening."
 							<p>Then, before he has even had time to process what you just said, you pull away and walk off. You can hear him calling you a "bitch" among other things, but you don't care - you got yours, and that puts a spring in your step as you leave the bar.</p>
-							<<arousalEnd>>
+							
 							<<actCLA 'Leave'>>
 								<<gt 'city_industrial'>>
 							<</actCLA>>
@@ -287,7 +287,7 @@
 								
 								You are not quite sure for how long you are squatting there while he fucks your mouth, but at some point, he picks up the pace and starts to groan, then suddenly pulls his cock out of your mouth and the first hot jet of sperm hits your face, then another shoots into your mouth. Several more follow and cover your lips, chin and tongue with cum.
 								Once the last spurt is out, he wipes the tip of dick against your lips to get the last drops off cum off. Then he tucks his cock back in his pants, orders another drink for each of you and, before you're even fully back on your feet, takes his drink and walks off.
-								<<arousalEnd>>
+								
 								<<set $spafinloc = 11>>
 								<<gs 'cum_manage'>>
 								<<set $spafinloc = 12>>

sugarcube/src/autogenerated/City Industrial/qwBarPolet.tw

@@ -403,7 +403,7 @@
 		Either you missed most of it or he's not one to last very long, but before you know it, the bobs of her head and work of her tongue cause him to tense up and shiver, suppressed groans reaching your ear as he blasts hot cum into her waiting mouth, causing the hand on her cunt to go crazy. She releases him and gulps visibly... and cheer breaks out among the people around them. The two of them smile at their audience without even a hint of embarrassment.
 		The woman''s smile is quickly replaced by lust and determination, though, and as soon as she's buttoned her blouse up and is back on her feet, she grabs her man''s hand and drags him out of the bar, probably off to get hers.
 		<<arouse 'voyeur_sex' 5 `['exhibitionism']`>>
-		<<arousalEnd>>
+		
 		<<actCLA 'Finish your drink'>>
 			<<gt 'qwBarPolet' 'bar'>>
 		<</actCLA>>
@@ -412,7 +412,7 @@
 			<<set $pc.horny += rand(1,3)>>
 
 		<</if>>
-		<<image `'locations/city/industrial/bar/bartalk<<pic_rand>>.jpg'`>>
+		<<image 'locations/city/industrial/bar/bartalk<<pic_rand>>.jpg'>>
 		"Coming right up." Only seconds later, Martin puts down a full glass in front of you before directing his attention elsewhere.
 		As you forlornly muster the liquid, one of the many conversations in the bar piques your interest.
 		<p>"-and then the guy just straight-up fingered that women, right there in the metro," one man narrates.</p>
@@ -538,7 +538,7 @@
 			<<gt 'qwBarPolet' 'bar'>>
 		<</actCLA>>
 	<<elseif getvar("$DrinkingRand") == 12>>
-		<<image `'locations/city/industrial/bar/bartalk<<pic_rand>>.jpg'`>>
+		<<image 'locations/city/industrial/bar/bartalk<<pic_rand>>.jpg'>>
 		"Alright." Martin nods and prepares your beverage, then places it in front of you.
 		<p>"Thank you," you smile at him and earn a half-smile in return before he leaves you to yourself.</p>
 		"Well, I guess this place is okay, but I don't get why you insisted on bringing me here," you hear a male voice from nearby table.
@@ -555,7 +555,7 @@
 			<<gt 'qwBarPolet' 'bar'>>
 		<</actCLA>>
 	<<elseif getvar("$DrinkingRand") == 13>>
-		<<image `'locations/city/industrial/bar/bartalk<<pic_rand>>.jpg'`>>
+		<<image 'locations/city/industrial/bar/bartalk<<pic_rand>>.jpg'>>
 		"Coming right up." Only seconds later, Martin puts down a full glass in front of you before directing his attention elsewhere.
 		As you muster the liquid that can only do so much to cure your boredom, you start listening in on a nearby conversation.
 		<p>"...and the guy yelled at me for ten minutes! 'What do you mean, I can't buy a second car?! I demand to see your manager!' It's good my boss showed up when he did, because I was about to punch him."</p>
@@ -567,7 +567,7 @@
 			<<gt 'qwBarPolet' 'bar'>>
 		<</actCLA>>
 	<<elseif getvar("$DrinkingRand") == 14>>
-		<<image `'locations/city/industrial/bar/bartalk<<pic_rand>>.jpg'`>>
+		<<image 'locations/city/industrial/bar/bartalk<<pic_rand>>.jpg'>>
 		"Of course." With practiced ease, Martin prepares your beverage and puts down a full glass in front of you before another patron draws his attention.
 		While you enjoy your drink in solitude, you pick up a nearby conversation.
 		"... Speaking of which, I heard somebody got hurt at your plant last week."
@@ -589,7 +589,7 @@
 		<!-- !Template for infos	the NPCs give on events, stories and other points of interest in the game-->
 		<!-- !	!!DrinkingRand ALWAYS HAS TO BE ADJUSTED AT THE TOP OF THE ARGUMENT-->
 		<!-- !	elseif DrinkingRand = 15:-->
-		<!-- !		'<<image `'locations/city/industrial/bar/bartalk<<pic_rand>>.jpg'`>>'-->
+		<!-- !		'<<image 'locations/city/industrial/bar/bartalk<<pic_rand>>.jpg'>>'-->
 		<!-- !		'"Coming right up." Only seconds later, Martin puts down a full glass in front of you before directing his attention elsewhere.'-->
 		<!-- !		'As you forlornly muster the liquid, one of the many conversations in the bar piques your interest.'-->
 		<!-- !		*nl-->

sugarcube/src/autogenerated/City Industrial/trFatherMisha.tw

@@ -486,7 +486,7 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'end'>>
-	<<arousalEnd>>
+	
 	<<actCLA 'Say goodbye'>>
 		<<set $time.minutes += 5>>
 		<<image "characters/city/mikhail/terminal/trfatherqw_15.jpg">>

sugarcube/src/autogenerated/City Industrial/youry.tw

@@ -124,7 +124,7 @@
 													<<set $pc.pcs_makeup = 1>>
 													<<video "shared/home/bathroom/dush.mp4">>
 													Yuri quickly finishes and leaves you alone so you can shower and clean up. As you step into the hall, Yuri is nervously awaiting you and makes it immediately clear that he wants you to leave...
-													<<arousalEnd>>
+													
 													<<actCLA 'Leave'>>
 														<<gt 'city_industrial'>>
 													<</actCLA>>

sugarcube/src/autogenerated/City Red Light/bordelv.tw

@@ -29,7 +29,7 @@ She looks at you through the glass and with one hand massages her pussy through
 <</actCLA>>
 <<if $location_var[$here][0] == 'sex'>>
 	 	<<set $dviksex += 1>>
-	<<image `'locations/city/residential/sauna/sex/bvika'+rand(3,7)+'.jpg'`>>
+	<<image 'locations/city/residential/sauna/sex/bvika#.jpg' 3 7>>
 	You continue to watch on as the men start to fuck Vika. They keep changing positions, alternately entering her pussy then switching to her anus, and letting her taste it all. Vika moans loudly and struggles to please them. She tries her hardest to keep looking towards you behind the mirror.
 	Even though you know that she can not see you, if feels like she's looking you right in the eyes, searching for your approval.
 	<<arouse 'voyeur_sex' 10 >>
@@ -120,14 +120,14 @@ She looks at you through the glass and with one hand massages her pussy through
 	<<actCLA 'Leave'>>
 		<<set $npc('A220').rel = 0>>
 		<<set $vikaend = 1>>
-		<<arousalEnd>>
+		
 		<<gt 'city_redlight' 'start'>>
 	<</actCLA>>
 	<<actCLA 'Comfort her' undefined `{willpower:['misc','self','hard']}`>>
 			<<set $npc('A220').rel += 15>>
 			
 			
-			<<arousalEnd>>
+			
 			Seeing her upset, you begin to comfort her by saying that you did not want to hurt her and that you're sorry. Vika walks up to you, and you hug each other. Shortly thereafter, she stops crying and says that she should get back to work, as she walks you to the exit.
 			<<actCLA 'Leave'>>
 				<<gt 'city_redlight' 'start'>>