[fixed] couple of forgotten edits

locations/stripclub.qsrc

@@ -232,11 +232,9 @@ if $ARGS[0] = 'bar':
 	gs 'stat'
 	if week < 5:
 		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/lev.jpg"></center>'
-		!! iff statement needs properly added
 		'You head over to the bar, where ' + iif(strip_club['stripbarwork'] = 1 or strip_club['stripbarwork1'] = 1, 'Lev', 'the bartender') + ' is taking orders. You decide what you want to drink as you wait your turn.'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/nadia.jpg"></center>'
-		!! iff statement needs properly added
 		'You head over to the bar, where ' + iif(strip_club['stripbarwork'] = 1 or strip_club['stripbarwork1'] = 1, 'Nadia', 'a girl wearing a skimpy outfit') + ' is taking orders. You decide what you want to drink as you wait your turn.'
 	end
 	act 'Leave': gt 'stripclub', 'main_floor'

locations/stwork.qsrc

@@ -30,13 +30,13 @@ if $ARGS[0] = 'start':
 	'A wooden door leads to the <a href="exec:gt ''stwork'', ''toilet''">staff bathroom</a>.'
 
 	!! Tattoos increase your desireability as a stripper
-	if tatlech > 0: stripKoef1 = rand(1,3)
-	if tatback > 0: stripKoef2 = rand(1,3)
-	if tatblly > 0: stripKoef3 = rand(1,3)
-	if tatupb > 0: stripKoef4 = rand(3,6)
-	if tatleg > 0: stripKoef5 = rand(1,3)
-	if tatarm > 0: stripKoef6 = rand(1,3)
-	if tatside > 0: stripKoef7 = rand(1,3)
+	if pcs_tattoos['shoulder'] > 0: stripKoef1 = rand(1,3)
+	if pcs_tattoos['back'] > 0: stripKoef2 = rand(1,3)
+	if pcs_tattoos['belly'] > 0: stripKoef3 = rand(1,3)
+	if pcs_tattoos['tramp'] > 0: stripKoef4 = rand(3,6)
+	if pcs_tattoos['leg'] > 0: stripKoef5 = rand(1,3)
+	if pcs_tattoos['arm'] > 0: stripKoef6 = rand(1,3)
+	if pcs_tattoos['side'] > 0: stripKoef7 = rand(1,3)
 	stripKoef = stripKoef1 + stripKoef2 + stripKoef3 + stripKoef4 + stripKoef5 + stripKoef6 + stripKoef7
 	if countmoney = 1:
 		countmoney = 0

locations/stwork3.qsrc

@@ -556,8 +556,12 @@ if $ARGS[0] = 'manager_bonus':
 end
 
 if $ARGS[0] = 'shift_end':
-	!! set time to 03:00
-	if hour < 3: hour = 3 and minut = 0
+	if hour < 3 or hour > 20:
+		temp_time_change = (3 - hour) * 60 - minut
+		if temp_time_change < 0: temp_time_change += 1440
+		minut += temp_time_change
+		killvar 'temp_time_change'
+	end
 	gs 'stat'
 	'As the night crawls into the early hours of the morning, the patrons slowly trickle out until the place is empty and the bar finally closes. Now is a good time to count your tips.'
 	act 'Count your tips': gt 'stwork3', 'tips'
@@ -663,10 +667,14 @@ if $ARGS[0] = 'manager_speak':
 
 					act 'Cum':
 						cla
-						!! magic/cum stuff
-						gs 'stat'
 						'You suddenly feel your orgasm building as you continue riding Ivanna. "That''s it, <<$pcs_nickname>>, cum for me. Let''s cum together!"'
+
 						$orgasmtext = 'You suddenly feel a wave of pleasure overwhelm you and cry out in orgasm as Ivanna keeps thrusting. Your pussy tightens around her cock and you soon feel it twitching and throbbing inside you as spurt upon spurt of thick, warm cum is unloaded deep inside you. Ivanna moans loudly in pleasure as she pumps what feels like an endless stream of cum into your pussy.'
+						$orgasm_or = 'yes'
+						gs 'arousal', 'vaginal', 5
+						gs 'arousal', 'end'
+						gs 'stat'
+
 						'When she finally finishes, she pulls out and flops back on the sofa, your pussy suddenly feeling very empty as a steady stream of thick cum pours out of you. "Now that was a fuck that satisfies us both," she pants. The sheer amount of cum inside you should be enough to keep you going for a while.'
 						'When you catch your breath, you both get dressed before heading back out to the bar, where Ivanna slaps you on the ass. "You were a good fuck <<$pcs_nickname>>, but this is the one and only time. Fucking the same person more than once is boring."'
 						'You just nod and head out as she finishes closing the bar down for the night.'