Merge remote-tracking branch 'hornguy6/master'

locations/salon.qsrc

@@ -1321,7 +1321,7 @@ if $ARGS[0] = 'massage':
 		end
 		
 		if money >= 1500:
-			act'Double hardcore massage 1,500 <b>₽</b>':gt'salon','hardcore_massage'
+			act'Double hardcore massage 1,500 <b>₽</b>':gt'salon','double_hardcore_massage'
 		else
 			act'Double hardcore massage (<font color="red">1,500 <b>₽</b> </font>)':
 				msg'You don''t have enough money for this!'
@@ -1483,7 +1483,7 @@ if $ARGS[0] = 'throat_massage':
 		'"Mmrph mrr mrrrph," you choke around the masseur''s cock. Surprisingly, he understands you perfectly and without hesitation pulls out of your mouth and climbs onto the edge of the table before spraying semen all over youe. The hot sticky liquid coats your face and hair and the masseur continues to smear it everywhere with his cock for as much coverage as possible. It''s strangely comforting after being throatfucked for half an hour Once your face is fully covered, he steps down off the table, cleans his cock with a towel, and thanks you for your patronage before leaving you to get dressed.'
 		act'Wipe the cum off your face':
 			cumspclnt = 12
-			gs 'cum_cleanup', 'cleanloc'
+			gs 'cum_cleanup'
 			'Taking a nearby towel, you wipe your face and hair clean, tossing it into a bin and redressing before prreparing to leave.'
 			act 'Leave':
 				gs 'clothing', 'wear_last_worn'
@@ -1582,7 +1582,7 @@ if $ARGS[0] = 'hardcore_massage':
 			act'Get dressed and leave':gt'salon','massage_end'
 			act'Wipe your face off first':
 				cumspclnt = 12
-				gs 'cum_cleanup','cleanloc'
+				gs 'cum_cleanup'
 				gt 'salon','massage_end'
 			end
 		end
@@ -1633,7 +1633,7 @@ if $ARGS[0] = 'double_hardcore_massage':
 		orgasm += 1
 		gs'stat'
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial28.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial28.jpg"></center>'
 		'"Mmm mmm mm mmmmph," you mumble around the cock in your mouth. Interestingly enough, they seem to understand perfectly and immediately withdraw from your holes, gathering around your face. You stick out your tongue in anticipation and are rewarded with hot streams of cum spattering across your face. It''s thick, it''s sticky, and makes you feel so fucking hot. You massage your clit furiously while they spray load after load that coats your face and hair and it finally sends you over the edge into orgasm.'
 		act'Continue':
 			cla & *clr
@@ -1644,7 +1644,7 @@ if $ARGS[0] = 'double_hardcore_massage':
 			act'Get dressed and leave':gt'salon','massage_end'
 			act'Wipe your face off first':
 				cumspclnt = 12
-				gs 'cum_cleanup','cleanloc'
+				gs 'cum_cleanup'
 				gt 'salon','massage_end'
 			end
 		end
@@ -1708,7 +1708,7 @@ if $ARGS[0] = 'gentle_massage':
 			act'Get dressed and leave':gt'salon','massage_end'
 			act'Wipe your face off first':
 				cumspclnt = 12
-				gs 'cum_cleanup','cleanloc'
+				gs 'cum_cleanup'
 				gt 'salon','massage_end'
 			end
 		end

locations/sexshop.qsrc

@@ -316,8 +316,7 @@ if $ARGS[0] = 'start':
 			else
 				'You buy the dildo and calmly hide it.'
 			end
-			act 'Leave':gt 'pav_train_market', 'start'
-			act 'Buy something else':gt 'pav_train_market', 4
+			act 'Move away from the counter':gt'sexshop','start'
 		end
 	elseif suction_dildo > 0 and money >= 1000:
 		act 'Buy another 15cm suction dildo 1000 <b>₽</b> (cash':
@@ -332,8 +331,7 @@ if $ARGS[0] = 'start':
 			else
 				'You buy the dildo and calmly hide it.'
 			end
-			act 'Leave':gt 'pav_train_market', 'start'
-			act 'Buy something else':gt 'pav_train_market', 4
+			act 'Move away from the counter':gt'sexshop','start'
 		end
 	end
 
@@ -350,8 +348,7 @@ if $ARGS[0] = 'start':
 			else
 				'You buy the dildo and calmly hide it.'
 			end
-			act 'Leave':gt 'pav_train_market', 'start'
-			act 'Buy something else':gt 'pav_train_market', 4
+			act 'Move away from the counter':gt'sexshop','start'
 		end
 	elseif (karta + bankDebtLimit >= 950):
 		act 'Buy 15cm suction dildo 1000 <b>₽</b> (card0':
@@ -366,8 +363,7 @@ if $ARGS[0] = 'start':
 			else
 				'You buy the dildo and calmly hide it.'
 			end
-			act 'Leave':gt 'pav_train_market', 'start'
-			act 'Buy something else':gt 'pav_train_market', 4
+			act 'Move away from the counter':gt 'sexshop','start'
 		end	
 	end