locations/Cheatmenu_din.qsrc

@@ -1100,7 +1100,7 @@ $cheatmenu['tatoo'] = {
 	if tatlip >= 1:'<a href="exec:tattCount-=1 & tatlip = 0 & dynamic $cheatmenu[''tatoo'']">Remove your lip tattoo</a>'
 	if tatneck = 0:'You do not have a tattoo on your neck</a>'
 	if tatneck >= 1:'<a href="exec:tattCount-=1 & tatneck = 0 & dynamic $cheatmenu[''tatoo'']">Remove your neck tattoo</a>'
-	if tatvag = 0:'You do not have a public tattoo</a>'
+	if tatvag = 0:'You do not have a pubic tattoo</a>'
 	if tatvag >= 1:'<a href="exec:tattCount-=1 & tatvag = 0 & dynamic $cheatmenu[''tatoo'']">Remove your pubic tattoo</a>'
 	if tatlech = 0:'You do not have a tattoo on your shoulder</a>'
 	if tatlech >= 1:'<a href="exec:tattCount-=1 & tatlech = 0 & dynamic $cheatmenu[''tatoo'']">Remove your shoulder tattoo</a>'

locations/Zvereva_house_events.qsrc

@@ -214,7 +214,7 @@ if $ARGS[0] = 'bed_chat':
 			'Giving you an appraising look, she says "Silvestr is the youngest of my older brothers and the only one of them I actually like. He taught me how to fight, and where I learned to push my body to achieve the perfection you see today."'
 			'"When will I meet him?"'
 			'"Why haven''t you already? It''s why I brought you home. What, did you think I wanted to fuck you? Get out there and say hello. He will take it from there. Remember, do what he says or else."'
-			if stat['think_virgin'] = 0:
+			if stat['think_virgin'] = 1:
 				'"But I''m a virgin. My mother makes me do regular check ups at the gynaecologist!"'
 				'Christina starts laughing. "Yeah right!"'
 				'"Really, Mistress. I don''t have a choice. If she finds out I''ve lost my virginity to your brother there will be a lot of trouble." You let the unspoken threat hang in the air.'

locations/begin.qsrc

@@ -141,10 +141,10 @@ if $ARGS[0] = 'real_character':
 	'<center><b><font color = maroon>CHARACTER SELECTION</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/character_creation_1.jpg"></center>'
 	*nl
-	'This game has two ways to display your character''s face, either dynamically depending on your hair style or a fixed image of your choice.'
+	'This game has two ways to display your character''s face, either dynamically depending on your hair style and colour or a fixed image of your choice.'
 	'To use a fixed image, replace the image "avatar" in the "images" folder of the game with a file of the same name and format (.jpg) and select "Use a fixed image".'
-	'Please note, this choice can only be changed in the cheat menu at any time and only one custom image can be used at anytime across all saves.'
-	'Your selected image is your own personal choice, and is based on your personal preferences. By default, the game uses an avatar image from the site wikimedia.org.'
+	'Please note, this choice can be changed in the cheat menu at any time. Only one fixed image can be used at a time and will be the same across all saves.'
+	'Your fixed image is your own personal choice, and is based on your personal preferences. By default, the game uses an avatar image from the site wikimedia.org.'
 
 	*nl
 	'If you are playing with Quest player for Android, click '

locations/city_redlight.qsrc

@@ -26,7 +26,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/redlight.jpg"></center>'
 	
 	'This small area inside the Industrial District has lots of strip clubs and sex shops. The Porn studio also operates out of this district.'
-	if hour >= 18 or hour < 2:
+	if hour >= 18 or hour < 3:
 		'The <a href="exec:gt ''stripclub'', ''start''">Strip Clubs</a> red lights, attracting men from all over the city.'
 	else
 		'The <a href="exec:msg ''The Strip Club is closed for the day and will reopen at 18:00''">Strip Clubs</a> red lights, attracting men from all over the city.'

locations/dimaHome.qsrc

@@ -403,6 +403,7 @@ if $ARGS[0] = 'kitchen1':
 	*clr & cla
 	menu_off = 1
 	minut += 1
+	met_DimkaMother = 1
 	gs 'stat'
 	'<center><b><font color = maroon>Kitchen</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/olya.jpg"></center>'

locations/fame.qsrc

@@ -755,7 +755,7 @@ if $ARGS[0] = 'calculateSlut':
     elseif fame['pav_slut'] < 125:
         $gnikname = 'vixen'
     elseif fame['pav_slut'] < 150:
-        $gnikname = 'tempress'
+        $gnikname = 'temptress'
     elseif fame['pav_slut'] < 175:
         $gnikname = 'cocklover'
     elseif fame['pav_slut'] < 200:

locations/gschool_grounds.qsrc

@@ -899,6 +899,7 @@ if $ARGS[0] = 'Family extension':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/sveta_mum_restaurant.jpg"></center>'
 						if npc_QW['A29'] > 0:
+							if npc_QW['A29'] = 1: npc_QW['A29'] = 2
 							'At the station cafe, your mother selects a corner spot away from the main area so you can keep your chat private.'
 							'You both initially have some general small talk during which she again congratulates you on your win and explains that she wants the best for you and will help in any way she can, but you need to meet her half way.'
 							'You''re initially unsure how to respond, but after a while in a very low shaky voice, you reply. "I''d love that, but why do you give me such a hard time just because I had sex?"'

locations/gschool_jock_chats.qsrc

@@ -841,7 +841,7 @@ if $ARGS[0] = 'lina':
 		end
 	elseif grupTipe = 4:
 		if npc_rel['A19'] >= 60:
-			if tatarm = 0 or tatass = 0 or tatback = 0 or tatblly = 0 or tatbrst = 0 or tatchst = 0 or tatfce = 0 or tatankle = 0 or tathand = 0 or tatleg = 0 or tatlip = 0 or tatneck = 0 or tatvag = 0 or tatlech = 0 or tatside = 0 or tatupb = 0 or tatunder = 0 or tatwrist = 0:
+			if tattCount = 0:
 				'"Why don''t you have any tattoos, <<$pcs_nickname>>?"'
 				'"I don''t know," you say with a shrug.'
 				'"I''m surprised the other gopniks let you hang around without at least one. Like an initiation or something."'

locations/home_activity.qsrc

@@ -6,13 +6,13 @@
 
 if $ARGS[0] = 'vomiting_check':
 	!! if not one of these locations, event will not fire
-	if at_home = 1 or at_home = 2 or at_home = 3 or at_home = 4 or $home['current'] = 5 or at_home = 6 or at_home = 13 or at_home = 15 or $loc = 'mey_home':
+	if at_home = 1 or at_home = 2 or at_home = 3 or at_home = 4 or $loc = 'bedrPar' or at_home = 6 or at_home = 13 or at_home = 15 or $loc = 'mey_home':
 		gs 'home_activity', 'vomiting_images'
 		gt 'home_activity', 'morning_vomit'
-!!	else
-!!		vomit['morning_sick'] = 0
-!!		vomit['hangover'] = 0
-!!		vomit['unlucky'] = 0
+    else
+		vomit['morning_sick'] = 0
+		vomit['hangover'] = 0
+		vomit['unlucky'] = 0
 	end
 end
 
@@ -115,7 +115,7 @@ if $ARGS[0] = 'vomiting_images':
 end
 
 if $ARGS[0] = 'morning_vomit':
-	cla & *clr
+    cla & *clr
 	$home_activity['vomit_bedroom']
 	'Before you even open your eyes, your stomach churns. Nausea courses through you, acid burns at the back of your throat, and you know without a doubt:'
 	*nl
@@ -163,7 +163,7 @@ if $ARGS[0] = 'morning_vomit':
 				if $loc = 'mey_home':
 					act'Continue':gt 'mey_home', 'mey_morning_vomit'
 				else
-					act'Continue':gt'home_activity','vomiting_exit'
+					act'Continue':gt'sleep','end'
 				end
 			end
 		end
@@ -231,7 +231,7 @@ if $ARGS[0] = 'think_preg_react':
 		'You don''t like the frequency with which this is happening. More and more, the evidence is pointing towards you being pregnant.'
 		*nl
 		'<i>What am I going to do?</i> you think to yourself.'
-		act'Continue':gt'home_activity','vomiting_exit'
+		act'Continue':gt'sleep','end'
 	end
 	
 	act'I better not be pregnant':
@@ -240,7 +240,7 @@ if $ARGS[0] = 'think_preg_react':
 		'Disgust and irritation fill you as you reach out to flush the toilet.'
 		*nl
 		'<i>Oh God,</i> you groan internally. <i>I swear, this better be a stomach bug and not pregnancy. I am not ready for motherhood.</i>'
-		act'Continue':gt'home_activity','vomiting_exit'
+		act'Continue':gt'sleep','end'
 	end
 	
 	act'I can''t wait for this baby':
@@ -249,7 +249,7 @@ if $ARGS[0] = 'think_preg_react':
 		'Even through the pain and the horrid taste on your lips, you can''t help but smile.'
 		*nl
 		'<i>I''m so ready for this baby!</i> you think excitedly.'
-		act'Continue':gt'home_activity','vomiting_exit'
+		act'Continue':gt'sleep','end'
 	end
 	
 	act'Baby good, morning sickness bad':
@@ -258,7 +258,7 @@ if $ARGS[0] = 'think_preg_react':
 		'You clutch your head, wincing at the sharp pain that lances through it.'
 		*nl
 		'<i>This baby can not come sooner,</i> you think to yourself. <i>Really looking forward to watching it grow, but <b>really</b> hate this pregnancy stuff.</i>'
-		act'Continue':gt'home_activity','vomiting_exit'
+		act'Continue':gt'sleep','end'
 	end
 end
 
@@ -267,14 +267,14 @@ if $ARGS[0] = 'preg_scare_react':
 		cla & *clr
 		$home_activity['vomit_bathroom']
 		'<i>I need to take a pregnancy test right now!</i> you think urgently. <i>I need to figure out what is going on!</i>'
-		act'Continue':gt'home_activity','vomiting_exit'
+		act'Continue':gt'sleep','end'
 	end
 	
 	act'This is really bad':
 		cla & *clr
 		$home_activity['vomit_bathroom']
 		'<i>This is really really bad!</i> you think, the blood draining from your face. <i>I don''t want to be a mom! Not now!</i>'
-		act'Continue':gt'home_activity','vomiting_exit'
+		act'Continue':gt'sleep','end'
 	end
 	
 	act'This is wonderful!':
@@ -285,7 +285,7 @@ if $ARGS[0] = 'preg_scare_react':
 		else
 			'<i>I''m going to have another baby!</i> you think, smiling to yourself. <i>This is wonderful!</i>'
 		end
-		act'Continue':gt'home_activity','vomiting_exit'
+		act'Continue':gt'sleep','end'
 	end
 	
 	if stat['think_virgin'] = 1:
@@ -293,22 +293,23 @@ if $ARGS[0] = 'preg_scare_react':
 			cla & *clr
 			$home_activity['vomit_bathroom']
 			'<i>This doesn''t make any sense,</i> you think to yourself, putting your hand on your head, feeling woozy again.'
-			act'Continue':gt'home_activity','vomiting_exit'
+			act'Continue':gt'sleep', 'end'
 		end
 	end
 end
 
 
 if $ARGS[0] = 'vomiting_exit':
-	vomit['morning_sick'] = 0
+    vomit['morning_sick'] = 0
 	vomit['hangover'] = 0
 	vomit['unlucky'] = 0
-	if at_home = 1:
+
+    if at_home = 1:
 		!! location = 'City residential apartment'
 		gt 'vanr'
-	elseif at_home = 2:
+	elseif $loc = 'bedrPar':
 		!! location = 'Parent''s home in Pavlovsk'
-		gt 'vanrPar'
+        gt 'vanrPar'
 	elseif at_home = 3:
 		!! location = 'My cottage in the cooperative farm'
 		gt 'dachain', 'dachabath'
@@ -343,4 +344,4 @@ if $ARGS[0] = 'vomiting_exit':
 end
 
 !! --------------- end vomiting ----------------------------
---- home_activity ---------------------------------
+--- home_activity ---------------------------------

locations/music_actions.qsrc

@@ -2,6 +2,7 @@
 
 if $ARGS[0] = 'music_icon':
     !! Everywhere
+    ml_time_left = ml_performance['max_perform_minutes']-ml_performance['performed_minutes']
     if alko > 5:
         'You are too drunk to stream or record music without messing up or throwing up into your guitar.'
     !! $location_type = ''public_outdoors'' means parks, streets. Some event types can be placed in these locations : playing music, recording music - e.g in front of
@@ -11,18 +12,24 @@ if $ARGS[0] = 'music_icon':
             'It''s too early to do anything noisy like playing the guitar or singing.'
         elseif hour > 22:
             'It''s too late to do anything noisy like playing the guitar or singing.'
-        elseif ml_guitar['hasguitar'] = 1 and (ml_guitar['carried'] = 1 or $ml_guitar['location'] = $loc):
-            pl '<center><a href="exec: gs ''music_actions'', ''start''"><img title="Click to to see available music activities." height = 120 src="images/system/icons/icon_transp_guitaraction01.png"></a></center>'
         else
-            pl '<center><a href="exec: gs ''music_actions'', ''start''"><img title="Click to to see available music activities." height = 120 src="images/system/icons/icon_transp_singeraction01.png"></a></center>'
+            if ml_settings['its_me'] = 1: 
+                if ml_guitar['hasguitar'] = 1 and (ml_guitar['carried'] = 1 or $ml_guitar['location'] = $loc):
+                    pl '<center><a href="exec: gs ''music_actions'', ''start''"><img title="Click to to see available music activities." height = 120 src="images/system/icons/icon_transp_guitaraction01.png"></a></center>'
+                else
+                    pl '<center><a href="exec: gs ''music_actions'', ''start''"><img title="Click to to see available music activities." height = 120 src="images/system/icons/icon_transp_singeraction01.png"></a></center>'
+                end
+            else
+                act 'Available musical activities': gs 'music_actions', 'start'
+            end
         end
         if ml_guitar['hasguitar'] = 1 and $location_type = 'private': gs 'music_actions', 'put_down_pick_up'
     end
 end
 
+
 if $ARGS[0] = 'start': 
     cla
-
     ml_time_left =  ml_performance['max_perform_minutes']-ml_performance['performed_minutes']
     if $location_type = 'public_outdoors': 
         !! In public, Sveta is never alone

locations/music_guitarlesson.qsrc

@@ -53,6 +53,7 @@ if $ARGS[0] = 'setlessonday':
 	'<a href="exec: ml_guitarlesson[''lessonday''] = 4 & $ml_guitarlesson[''lessonday''] = ''Thursday''  & gt ''music_guitarlesson'', ''goodbye''">Thursday</a>'
 	'<a href="exec: ml_guitarlesson[''lessonday''] = 5 & $ml_guitarlesson[''lessonday''] = ''Friday''  & gt ''music_guitarlesson'', ''goodbye''">Friday</a>'
 	'<a href="exec: ml_guitarlesson[''lessonday''] = 6 & $ml_guitarlesson[''lessonday''] = ''Saturday''  & gt ''music_guitarlesson'', ''goodbye''">Saturday</a>'
+	act 'Don''t arrange a lesson day': gt 'pav_commclubs'
 end
 
 

locations/pav_clinic.qsrc

@@ -156,16 +156,16 @@ if $ARGS[0] = '':
 				else
 					if pcs_missing_teeth = 1:
 						zubpay = 30000
-						'The dentist examines you and says, it will cost you <<3000>> <b>₽</b> to replace your tooth'
+						'The dentist examines you and says, it will cost you <<zubpay>> <b>₽</b> to replace your tooth'
 					elseif pcs_missing_teeth > 1:
 						zubpay = pcs_missing_teeth * 30000
-						'The dentist examines you and says, it will cost you <<pcs_missing_teeth * 30000>> <b>₽</b> to fill the gaps'
+						'The dentist examines you and says, it will cost you <<zubpay>> <b>₽</b> to fill the gaps'
 					elseif pcs_teeth = 0:
 						zubpay = 3000
-						'The dentist examines you and says, it will cost you <<3000>> <b>₽</b> to brighten and polish your teeth.'
+						'The dentist examines you and says, it will cost you <<zubpay>> <b>₽</b> to brighten and polish your teeth.'
 					elseif pcs_teeth > 0:
 						zubpay = 4500
-						'The dentist examinees you and says, it will cost you <<4500>><b>₽</b> to straighten your teeth and you will have to wear a brace for three months and he can''t promise they will be completely straight after one treatment.'
+						'The dentist examinees you and says, it will cost you <<zubpay>><b>₽</b> to straighten your teeth and you will have to wear a brace for three months and he can''t promise they will be completely straight after one treatment.'
 					end
 
 					if money < zubpay and karta < zubpay:
@@ -183,7 +183,7 @@ if $ARGS[0] = '':
 								elseif pcs_teeth > 0:
 									dentistday = daystart + 180
 									pcs_brace = 1
-									'You pay the dentist to straighten your teeth. After and hour of work he have attached a brace to teeth and tells you to comeback it six months to have it taken of.'
+									'You pay the dentist to straighten your teeth. After and hour of work he have attached a brace to teeth and tells you to come back it six months to have it taken of.'
 								else
 									dentistday = daystart + 90
 									pcs_teeth = -1

locations/pav_disco_coolkids.qsrc

@@ -4,7 +4,7 @@
 if $ARGS[0] = 'dimka':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A1', 'like'
+	gs 'npc_relationship', 'modify', 'A1', 'like', 1, 'pav_disco'
 	gs 'stat'
 	gs 'dinnpc'
 	if rand(1,4) = 1:
@@ -281,8 +281,8 @@ end
 
 if $ARGS[0] = 'marcus':
 	*clr & cla
-	minut += 5
-	gs 'npc_relationship', 'modify', 'A146', 'like'
+	minut += 5	
+	gs 'npc_relationship', 'modify', 'A146', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big146.jpg"></center>'
 	if rand(1,3) = 1:
@@ -454,8 +454,8 @@ if $ARGS[0] = 'andrey' or $ARGS[0] = 'stasya': gt 'pav_disco_coolkids', 'andrey_
 if $ARGS[0] = 'andrey_stasya':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A147', 'like'
-	gs 'npc_relationship', 'modify', 'A139', 'like'
+	gs 'npc_relationship', 'modify', 'A147', 'like', 1, 'pav_disco'
+	gs 'npc_relationship', 'modify', 'A139', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,5) <= 2:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/andrey_stasya_dance1.jpg"></center>'
@@ -485,7 +485,7 @@ if $ARGS[0] = 'andrey_stasya':
 						gs 'stat'
 						act 'No':
 							*clr & cla
-							gs 'npc_relationship', 'modify', 'A139', 'like'
+							gs 'npc_relationship', 'modify', 'A139', 'like', 1, 'pav_disco2'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/andrey_stasya_dance2.jpg"></center>'
 							'You shake your head. "No thanks, I''m having fun here. Maybe some other time?"'
@@ -497,8 +497,8 @@ if $ARGS[0] = 'andrey_stasya':
 						end
 						act 'Yes':
 							*clr & cla
-							gs 'npc_relationship', 'modify', 'A147', 'like'
-							gs 'npc_relationship', 'modify', 'A139', 'dislike'
+							gs 'npc_relationship', 'modify', 'A147', 'like', 1, 'pav_disco2'
+							gs 'npc_relationship', 'modify', 'A139', 'dislike', 1, 'pav_disco2'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/andrey_stasya_dance2.jpg"></center>'
 							'You nod your head. "Sure, that sounds like fun. What did you have in mind?"'
@@ -548,7 +548,7 @@ if $ARGS[0] = 'andrey_stasya':
 					'Whatever it is, it seems Stasya isn''t into it but after a bit of back and forth she either relents or changes her mind, because you see Andrey grin before kissing her. After his kiss with Stasya he turns to you. "How about we get out of here and go back to my place? I can get Marcus to come over."'
 					act 'No':
 						*clr & cla
-						gs 'npc_relationship', 'modify', 'A139', 'like'
+						gs 'npc_relationship', 'modify', 'A139', 'like', 1, 'pav_disco2'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/andrey_stasya.jpg"></center>'
 						'You shake your head. "No thanks, I''m having fun here. Maybe some other time?"'
@@ -560,8 +560,8 @@ if $ARGS[0] = 'andrey_stasya':
 					end
 					act 'Yes':
 						*clr & cla
-						gs 'npc_relationship', 'modify', 'A147', 'like'
-						gs 'npc_relationship', 'modify', 'A139', 'dislike'
+						gs 'npc_relationship', 'modify', 'A147', 'like', 1, 'pav_disco2'
+						gs 'npc_relationship', 'modify', 'A139', 'dislike', 1, 'pav_disco2'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/andrey_stasya.jpg"></center>'
 						'You nod your head. "Sure, that sounds like fun. What did you have in mind?"'
@@ -604,7 +604,7 @@ end
 if $ARGS[0] = 'mefodiy':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A148', 'like'
+	gs 'npc_relationship', 'modify', 'A148', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big148.jpg"></center>'
 	if rand(1,4) = 1:
@@ -733,7 +733,7 @@ end
 if $ARGS[0] = 'igor':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A4', 'like'
+	gs 'npc_relationship', 'modify', 'A14', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
 	if rand(1,4) = 1:
@@ -925,7 +925,7 @@ end
 if $ARGS[0] = 'bella':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A22', 'like'
+	gs 'npc_relationship', 'modify', 'A22', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big22.jpg"></center>'
 	'You see Bella hanging out with the other cool kids.'
@@ -970,7 +970,7 @@ end
 if $ARGS[0] = 'vicky':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A15', 'like'
+	gs 'npc_relationship', 'modify', 'A15', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big15.jpg"></center>'
 	'You see Vicky hanging out with the other cool kids.'
@@ -1012,7 +1012,7 @@ end
 if $ARGS[0] = 'inna':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A17', 'like'
+	gs 'npc_relationship', 'modify', 'A17', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big17.jpg"></center>'
 	'You see Irina hanging out with the other cool kids.'
@@ -1050,7 +1050,7 @@ end
 if $ARGS[0] = 'katja':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A14', 'like'
+	gs 'npc_relationship', 'modify', 'A14', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,4) <= 3:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_dance1_1.jpg"></center>'
@@ -1389,7 +1389,7 @@ end
 if $ARGS[0] = 'lizaveta':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A140', 'like'
+	gs 'npc_relationship', 'modify', 'A140', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big140.jpg"></center>'
 	'You see Lizaveta hanging out with the other cool kids.'
@@ -1428,7 +1428,7 @@ end
 if $ARGS[0] = 'sonia':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A25', 'like'
+	gs 'npc_relationship', 'modify', 'A25', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,4) <= 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/sonia_dance.jpg"></center>'
@@ -1480,7 +1480,7 @@ if $ARGS[0] = 'sonia':
 				end
 				act 'Yes':
 					*clr & cla
-					gs 'npc_relationship', 'modify', 'A25', 'like'
+					gs 'npc_relationship', 'modify', 'A25', 'like', 1, 'pav_disco2'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
 					'You smile at her. "Okay, let''s go."'
@@ -1525,7 +1525,7 @@ end
 if $ARGS[0] = 'sonia_outcast':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A25', 'like'
+	gs 'npc_relationship', 'modify', 'A125', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,5) <= 4:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/sonia_outcast_dance1.jpg"></center>'
@@ -1577,7 +1577,7 @@ if $ARGS[0] = 'sonia_outcast':
 				end
 				act 'Yes':
 					*clr & cla
-					gs 'npc_relationship', 'modify', 'A25', 'like'
+					gs 'npc_relationship', 'modify', 'A25', 'like', 1, 'pav_disco2'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
 					'You smile at her. "Okay, let''s go."'
@@ -1604,7 +1604,7 @@ if $ARGS[0] = 'sonia_outcast':
 				end
 				act 'Yes':
 					*clr & cla
-					gs 'npc_relationship', 'modify', 'A25', 'like'
+					gs 'npc_relationship', 'modify', 'A25', 'like', 1, 'pav_disco2'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
 					'You smile at her. "Okay, let''s go."'
@@ -1619,7 +1619,7 @@ if $ARGS[0] = 'sonia_outcast':
 				act 'Do something else': gt 'pav_disco_classmates', 'classmates'
 				act 'Ask her to dance':
 					*clr & cla
-					gs 'npc_relationship', 'modify', 'A25', 'like'
+					gs 'npc_relationship', 'modify', 'A25', 'like', 1, 'pav_disco2'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
 					'You smile at her reaction. "Would you like to dance then?"'
@@ -1689,7 +1689,7 @@ if $ARGS[0] = 'sonia_outcast_dance':
 						if will_cost <= pcs_willpwr:
 							act 'No (<<will_cost>> Willpower)':
 								*clr & cla
-								gs 'npc_relationship', 'modify', 'A25', 'hate'
+								gs 'npc_relationship', 'modify', 'A25', 'hate', 1, 'pav_disco2'
 								gs 'willpower', 'pay', 'resist'
 								discoenable['A25'] = 0
 								minut += 5
@@ -1723,7 +1723,7 @@ end
 if $ARGS[0] = 'natasha':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A16', 'like'
+	gs 'npc_relationship', 'modify', 'A16', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,4) >= 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/natasha_dance.jpg"></center>'

locations/pav_disco_gopniks.qsrc

@@ -7,9 +7,9 @@ if $ARGS[0] = 'vitek' or $ARGS[0] = 'dan' or $ARGS[0] = 'shulga': gt 'pav_disco_
 if $ARGS[0] = 'vitek_dan_vasily':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A9', 'like'
-	gs 'npc_relationship', 'modify', 'A10', 'like'
-	gs 'npc_relationship', 'modify', 'A11', 'like'
+	gs 'npc_relationship', 'modify', 'A9', 'like', 1, 'pav_disco'
+	gs 'npc_relationship', 'modify', 'A10', 'like', 1, 'pav_disco'
+	gs 'npc_relationship', 'modify', 'A11', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/vitek_dan_vasily.jpg"></center>'
 	'Vitek, Dan and Vasily are hanging out in the dark corner of the hall with the other gopniks. It''s dimly lit and hard to make out details, but it looks like they''re sharing some beers they''ve smuggled in.'
@@ -54,9 +54,9 @@ if $ARGS[0] = 'vitek_dan_vasily':
 					*clr & cla
 					gs 'willpower', 'pay', 'resist'
 					grupvalue[4] -= 1
-					gs 'npc_relationship', 'modify', 'A9', 'dislike'
-					gs 'npc_relationship', 'modify', 'A10', 'dislike'
-					gs 'npc_relationship', 'modify', 'A11', 'dislike'
+					gs 'npc_relationship', 'modify', 'A9', 'dislike', 1, 'pav_disco2'
+					gs 'npc_relationship', 'modify', 'A10', 'dislike', 1, 'pav_disco2'
+					gs 'npc_relationship', 'modify', 'A11', 'dislike', 1, 'pav_disco2'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/vitek_dan_vasily.jpg"></center>'
 					'You shake your head. "No thanks. Maybe later."'
@@ -82,9 +82,9 @@ if $ARGS[0] = 'vitek_dan_vasily':
 						*clr & cla
 						gs 'willpower', 'pay', 'resist'
 						grupvalue[4] -= 1
-						gs 'npc_relationship', 'modify', 'A9', 'dislike'
-						gs 'npc_relationship', 'modify', 'A10', 'dislike'
-						gs 'npc_relationship', 'modify', 'A11', 'dislike'
+						gs 'npc_relationship', 'modify', 'A9', 'dislike', 1, 'pav_disco2'
+						gs 'npc_relationship', 'modify', 'A10', 'dislike', 1, 'pav_disco2'
+						gs 'npc_relationship', 'modify', 'A11', 'dislike', 1, 'pav_disco2'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/vitek_dan_vasily.jpg"></center>'
 						'You shake your head. "No thanks. Maybe later."'
@@ -140,9 +140,9 @@ if $ARGS[0] = 'vitek_dan_vasily':
 					*clr & cla
 					gs 'willpower', 'pay', 'resist'
 					grupvalue[4] -= 1
-					gs 'npc_relationship', 'modify', 'A9', 'dislike'
-					gs 'npc_relationship', 'modify', 'A10', 'dislike'
-					gs 'npc_relationship', 'modify', 'A11', 'dislike'
+					gs 'npc_relationship', 'modify', 'A9', 'dislike', 1, 'pav_disco2'
+					gs 'npc_relationship', 'modify', 'A10', 'dislike', 1, 'pav_disco2'
+					gs 'npc_relationship', 'modify', 'A11', 'dislike', 1, 'pav_disco2'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/vitek_dan_vasily.jpg"></center>'
 					'You shake your head. "No thanks. Maybe later."'
@@ -168,9 +168,9 @@ if $ARGS[0] = 'vitek_dan_vasily':
 						*clr & cla
 						gs 'willpower', 'pay', 'resist'
 						grupvalue[4] -= 1
-						gs 'npc_relationship', 'modify', 'A9', 'dislike'
-						gs 'npc_relationship', 'modify', 'A10', 'dislike'
-						gs 'npc_relationship', 'modify', 'A11', 'dislike'
+						gs 'npc_relationship', 'modify', 'A9', 'dislike', 1, 'pav_disco2'
+						gs 'npc_relationship', 'modify', 'A10', 'dislike', 1, 'pav_disco2'
+						gs 'npc_relationship', 'modify', 'A11', 'dislike', 1, 'pav_disco2'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/vitek_dan_vasily.jpg"></center>'
 						'You shake your head. "No thanks. Maybe later."'
@@ -371,7 +371,7 @@ end
 if $ARGS[0] = 'radomir':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A154', 'like'
+	gs 'npc_relationship', 'modify', 'A154', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,3) = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/radomir_dance1.jpg"></center>'
@@ -392,7 +392,7 @@ if $ARGS[0] = 'radomir':
 							*clr & cla
 							gs 'willpower', 'pay', 'resist'
 							minut += 5
-							gs 'npc_relationship', 'modify', 'A154', 'loathe'
+							gs 'npc_relationship', 'modify', 'A154', 'loathe', 1, 'pav_disco2'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
 							'You try to twist your arm out of his grasp, but he has a very firm grip on you and unless you want to start a fight in the middle of the disco, you''re unable to get away. "Ow, let go! You''re hurting me!"'
@@ -429,7 +429,7 @@ if $ARGS[0] = 'radomir':
 							*clr & cla
 							gs 'willpower', 'pay', 'resist'
 							minut += 5
-							gs 'npc_relationship', 'modify', 'A154', 'loathe'
+							gs 'npc_relationship', 'modify', 'A154', 'loathe', 1, 'pav_disco2'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
 							'You try to twist your arm out of his grasp, but he has a very firm grip on you and unless you want to start a fight in the middle of the disco, you''re unable to get away. "Ow, let go! You''re hurting me!"'
@@ -467,7 +467,7 @@ if $ARGS[0] = 'radomir':
 					'"You''re too beautiful to stay here in the shadows. Why don''t we go and dance so I can show you off?"'
 					act 'No':
 						*clr & cla
-						gs 'npc_relationship', 'modify', 'A154', 'dislike'
+						gs 'npc_relationship', 'modify', 'A154', 'dislike', 1, 'pav_disco2'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
 						'You shake your head. "No thanks, I don''t feel like dancing right now."'
@@ -512,7 +512,7 @@ if $ARGS[0] = 'radomir':
 							*clr & cla
 							gs 'willpower', 'pay', 'resist'
 							minut += 5
-							gs 'npc_relationship', 'modify', 'A154', 'loathe'
+							gs 'npc_relationship', 'modify', 'A154', 'loathe', 1, 'pav_disco2'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
 							'You try to twist your arm out of his grasp, but he has a very firm grip on you and unless you want to start a fight in the middle of the disco, you''re unable to get away. "Ow, let go! You''re hurting me!"'
@@ -536,7 +536,7 @@ if $ARGS[0] = 'radomir':
 					'"You''re too beautiful to stay here in the shadows. Why don''t we go and dance so I can show you off?"'
 					act 'No':
 						*clr & cla
-						gs 'npc_relationship', 'modify', 'A154', 'dislike'
+						gs 'npc_relationship', 'modify', 'A154', 'dislike', 1, 'pav_disco2'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
 						'You shake your head. "No thanks, I don''t feel like dancing right now."'
@@ -626,7 +626,7 @@ end
 if $ARGS[0] = 'roman':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A157', 'like'
+	gs 'npc_relationship', 'modify', 'A157', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big157.jpg"></center>'
 	'Roman is hanging out in the dark corner of the hall with the other gopniks. It''s dim and hard to make out details, but he seems to be talking to several of the other gopniks and sharing some beers they''ve smuggled in.'
@@ -660,7 +660,7 @@ if $ARGS[0] = 'roman':
 					*clr & cla
 					gs 'willpower', 'pay', 'resist'
 					grupvalue[4] -= 1
-					gs 'npc_relationship', 'modify', 'A157', 'loathe'
+					gs 'npc_relationship', 'modify', 'A157', 'loathe', 1, 'pav_disco2'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big156.jpg"></center>'
 					'You shake your head. "No thanks. Maybe later."'
@@ -717,7 +717,7 @@ end
 if $ARGS[0] = 'valentin':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A158', 'like'
+	gs 'npc_relationship', 'modify', 'A158', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big158.jpg"></center>'
 	'Valentin is hanging out in the dark corner of the hall with the other gopniks. It''s dim and hard to make out details, but he seems to be talking to several of the other gopniks while sharing some beers they''ve smuggled in.'
@@ -830,7 +830,7 @@ end
 if $ARGS[0] = 'arkadi':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A156', 'like'
+	gs 'npc_relationship', 'modify', 'A156', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big156.jpg"></center>'
 	'Arkadi is hanging out in the dark corner of the hall with the other gopniks. It''s dim and hard to make out details, but he seems to be talking to several of the other gopniks while sharing some beers they''ve smuggled in.'
@@ -914,7 +914,7 @@ end
 if $ARGS[0] = 'niko':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A189', 'like'
+	gs 'npc_relationship', 'modify', 'A189', 'like', 1, 'pav_disco'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big189.jpg"></center>'
 	act 'Do something else': gt 'pav_disco_classmates', 'classmates'
 !!	if dance = 1
@@ -924,7 +924,7 @@ end
 if $ARGS[0] = 'lavrenti':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A155', 'like'
+	gs 'npc_relationship', 'modify', 'A155', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,4) = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/lavrenti_dance1.jpg"></center>'
@@ -1077,7 +1077,7 @@ end
 if $ARGS[0] = 'pauline':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A24', 'like'
+	gs 'npc_relationship', 'modify', 'A24', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big24.jpg"></center>'
 	'Pauline is hanging out in the dark corner of the hall with the other gopniks. It''s dim and hard to make out details, but she seems to be talking to several of the other gopniks while sharing some beers they''ve smuggled in.'
@@ -1180,8 +1180,8 @@ if $ARGS[0] = 'lena' or $ARGS[0] = 'lera': gt  'pav_disco_gopniks', 'lena_lera'
 if $ARGS[0] = 'lena_lera':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A20', 'like'
-	gs 'npc_relationship', 'modify', 'A21', 'like'
+	gs 'npc_relationship', 'modify', 'A20', 'like', 1, 'pav_disco'
+	gs 'npc_relationship', 'modify', 'A21', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,3) = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/lena_lera_dance1.jpg"></center>'
@@ -1363,7 +1363,7 @@ end
 if $ARGS[0] = 'nush':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A144', 'like'
+	gs 'npc_relationship', 'modify', 'A144', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,2) = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance1.jpg"></center>'
@@ -1666,7 +1666,7 @@ end
 if $ARGS[0] = 'alyona':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A143', 'like'
+	gs 'npc_relationship', 'modify', 'A143', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,4) = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/alyona_dance1.jpg"></center>'

locations/pav_disco_jocks.qsrc

@@ -4,7 +4,7 @@
 if $ARGS[0] = 'lazar':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A149', 'like'
+	gs 'npc_relationship', 'modify', 'A149', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big149.jpg"></center>'
 	if rand(1,4) = 1:
@@ -134,7 +134,7 @@ end
 if $ARGS[0] = 'ivan':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A3', 'like'
+	gs 'npc_relationship', 'modify', 'A3', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big3.jpg"></center>'
 	'To your surprise, you see Ivan hanging out with the other jocks, talking to a few of them and smiling. You almost never see him here.'
@@ -192,7 +192,7 @@ end
 if $ARGS[0] = 'fedor':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A5', 'like'
+	gs 'npc_relationship', 'modify', 'A5', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big5.jpg"></center>'
 	if FedorLove < 0:
@@ -205,7 +205,7 @@ end
 if $ARGS[0] = 'svyatoslav':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A8', 'like'
+	gs 'npc_relationship', 'modify', 'A8', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big8.jpg"></center>'
 	if rand(1,4) = 1:
@@ -315,7 +315,7 @@ end
 if $ARGS[0] = 'vanya':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A165', 'like'
+	gs 'npc_relationship', 'modify', 'A165', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big165.jpg"></center>'
 	'You see Vanya hanging out with the cool kids and jocks.'
@@ -366,7 +366,7 @@ end
 if $ARGS[0] = 'erast':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A150', 'like'
+	gs 'npc_relationship', 'modify', 'A150', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big150.jpg"></center>'
 	'You''re a little surprised to see Erast hanging out with the cool kids and jocks, standing near one of the tables with his arms crossed. You rarely see him here and you don''t think he''s enjoying himself, but he gives polite smiles to people that talk to him.'
@@ -425,7 +425,7 @@ end
 if $ARGS[0] = 'albina':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A23', 'like'
+	gs 'npc_relationship', 'modify', 'A23', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
 	if rand(1,4) <= 3:
@@ -749,7 +749,7 @@ end
 if $ARGS[0] = 'lariska':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A13', 'like'
+	gs 'npc_relationship', 'modify', 'A13', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big13.jpg"></center>'
 	if rand(1,4) <= 3:
@@ -870,7 +870,7 @@ end
 if $ARGS[0] = 'lina':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A19', 'like'
+	gs 'npc_relationship', 'modify', 'A19', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big19.jpg"></center>'
 	if rand(1,4) <= 3:

locations/salon.qsrc

@@ -155,7 +155,7 @@ if $ARGS[0] = 'services':
 	act 'See the eyelash specialist':gt'salon','eyelashes'
 	
 	gs 'salon', 'discount', 5000
-	if money >= salon_rate or karta + bankDebtLimit >= salon_rate:
+	if (money >= salon_rate or karta + bankDebtLimit >= salon_rate) and salon['skin_care_day'] < daystart - 7:
 		act 'Skin care <<salon_rate>> <b>₽</b>':
 			if masseuse['jobtype'] > 0:  
 				epayments['value'] = 2500
@@ -167,6 +167,10 @@ if $ARGS[0] = 'services':
 			$epayments['description'] = 'skin care pampering'
 			gs 'shortgs', 'payments'
 		end	
+	elseif salon['skin_care_day'] < daystart -7:
+		act 'Skin care (<font color="red"> <<salon_rate>> <b>₽</b> </font>)':
+			msg'You need to wait a week since you last skin care treatment for a new to have any effect.'
+		end	
 	else
 		act 'Skin care (<font color="red"> <<salon_rate>> <b>₽</b> </font>)':
 			msg'You don''t have enough money for this!'
@@ -1757,11 +1761,24 @@ if $ARGS[0] = 'skin_care':
 	cla & *clr
 	minut += 60
 	inhib_exp += rand(1,5)
-	pcs_skin += 20
+	salon['skin_care_day'] = daystart
+	if pcs_skin < 200:
+		pcs_skin += 50
+	elseif pcs_skin <= 400: 
+		pcs_skin += 25
+	elseif pcs_skin <= 600:
+		pcs_skin += 15
+	elseif pcs_skin <= 800:
+		pcs_skin += 10
+	elseif pcs_skin <=995: 
+		pcs_skin += 5
+	else
+		pcs_skin = 1000
+	end
 	gs 'AppearanceSystem', 'UpdateBaseAppearnce'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/facialmask.jpg"></center>'
-	'You get a beauty mask treatment, afterwards your face feels smooth and your skin tight.'
+	'You get a beauty mask treatment, afterwards your face feels smooth and your skin tight. You are told that you should wait a week before getting a new treatment.'
 	act 'Leave':gt 'salon', 'start'
 end
 

locations/sleep.qsrc

@@ -524,6 +524,9 @@ if $ARGS[0] = 'wake':
 	menu_off = 1
 	InSleep = 1
 	gs 'stat'
+    if vomit['hangover'] = 1  or vomit['unlucky'] = 1 or vomit['morning_sick'] = 1:
+        gt 'home_activity', 'vomiting_check'
+    end
 	if MarishaQW["marisha_sleepover"] = 1: gs 'marisha_ev', 'morning'
 	if daystart < 10 and $start_type[1] = 'tg':'The first thing you think as you wake up is, "Damn! It''s is not a dream, I really am a woman now."'
 	if daystart >= 10 and daystart < 30 and $start_type[1] = 'tg':'Looking at your female body, you are still a little surprised it''s actually you.'
@@ -616,10 +619,12 @@ if $ARGS[0] = 'end':
 	slept_in = 0
 	strip_here = 0
 	SleepHorny = 0
-	if fullmorrout = 1 and $loc = 'bedrPar':
+    if fullmorrout = 1 and $loc = 'bedrPar':
 		gt 'vanrPar'
 	elseif fullmorrout = 1 and $loc = 'bedr':
 		gt 'vanr'
+    elseif vomit['morning_sick'] = 1 or vomit['hangover'] = 1 or vomit['unlucky'] = 1:
+        gt 'home_activity', 'vomiting_exit'
 	else
 		gt $loc, $loc_arg
 	end

locations/stat.qsrc

@@ -490,13 +490,20 @@ if minut >= 60:
 	end
 	
 	!! code to trigger vomitting based on morning sickness, hangovers, or just plain bad luck
-	if sleep = 1:
-		if alko > 4:
-			vomit['hangover'] = 1
-		elseif pregchem > 600 and pregchem < 2160 and rand(1,4) = 4:
-			vomit['morning_sick'] = 1
-		elseif rand(1,100) = 100: 
-			vomit['unlucky'] = 1
+    if Insleep = 0:   
+            vomit['daily_check'] = 0
+    end
+
+	if Insleep = 1:
+        if vomit['daily_check'] = 0:
+            vomit['daily_check'] = 1
+	        if alko > 4:
+		    	vomit['hangover'] = 1
+		     elseif pregchem > 600 and pregchem < 2160 and rand(1,4) = 4:
+		    	 vomit['morning_sick'] = 1
+		     elseif rand(1,100) = 100: 
+		    	vomit['unlucky'] = 1
+            end
 		end
 	end
 	

locations/street_event.qsrc

@@ -821,7 +821,7 @@ if $ARGS[1] = 'main':
 					*clr & cla
 					minut += 5
 					'<<$streetev_title>>'
-					'<center><video autoplay loop src="images/locations/shared/street/sharkdress.mp4"></video></center>'
+					'<center><video autoplay loop src="images/locations/shared/street/sharkdress'+ rand(1,2) +'.mp4"></video></center>'
 					'As you walk down the street, someone comes up behind you, grabs the top of your dress and yanks it down around your ankles, which leaves you standing stark naked. You quickly squat down and grab your dress, pulling it back up and into place. By that time, who ever did this is long gone.'
 					*p 'You look around and notice several people staring at you. You are sure they''ve seen everything. '
 					if exhibitionist_lvl = 1:
@@ -886,7 +886,8 @@ if $ARGS[1] = 'main':
 				gt $loc
 			end
 		elseif streetrand > 82:
-			if PCloSkirt > 0 and $pantyworntype ! 'none':
+		!! when sunny and wearing panties
+			if PCloSkirt > 0 and sunWeather = 1 and $pantyworntype ! 'none':
 				*clr & cla
 				menu_off = 1
 				minut += 5
@@ -908,6 +909,55 @@ if $ARGS[1] = 'main':
 				end
 				gs 'stat'
 				act 'Continue':gt $loc
+		!! when rainy and not wearing panties
+			elseif sunWeather = 0 and $pantyworntype = 'none':
+				*clr & cla
+				menu_off = 1
+				minut += 5
+				gs 'stat'
+				'<<$streetev_title>>'
+				'<center><video autoplay loop src="images/locations/shared/street/breeze_rainy.mp4"></video></center>'
+				'A strong windy breeze blows down the street which causes your skirt to blow up entirely, exposing all of your crotch to the people around. You struggle pushing it back down where it belongs, as the breeze continues to expose you.'
+				if exhibitionist_lvl = 1:
+					gs 'arousal', 'flash', -5
+					gs 'arousal', 'end'
+					pcs_mood += 10
+					'You look around and notice several people staring at you. You are sure they''ve seen everything. You can''t help but smile, loving the attention even if it wasn''t your idea. You casually continue on your way, but with an extra bit of sway in your hips.'
+				elseif exhibitionist_lvl > 1:
+					pcs_mood -= 2
+					'You look around and notice several people staring at you. <i>They have probably seen that I don''t wear underwear.</i> you think to yourself and continue on your way.'
+				else
+					pcs_mood -= 10
+					'You look around and notice several people staring at you. You are sure they''ve seen everything. You blush bright red and hurry on your way.'
+				end
+				gs 'stat'
+				act 'Continue':gt $loc
+			else
+				gt $loc
+			end
+		elseif streetrand > 81:
+			cla
+			if PCloSkirt > 0 and PCloOnePiece = 1 and hour >= 10 or hour < 2:
+				*clr & cla
+				menu_off = 1
+				gs 'stat'
+				'<<$streetev_title>>'
+				'<center><img <<$set_imgh>> src="images/locations/shared/street/street_groped'+ rand(1,2) +'.jpg"></center>'
+				'As you walk down the street, someone comes up behind you and grabs your ass, sqeezing it tightly. You flinch while quickly turning around angrily but only seeing your perpetrator running away.'
+				if exhibitionist_lvl = 1:
+					gs 'arousal', 'flash', -5
+					gs 'arousal', 'end'
+					pcs_mood += 10
+					'You can''t help but smile, loving the ''extra'' attention even if it wasn''t your idea. You casually continue on your way, but with an extra bit of sway in your hips.'
+				elseif exhibitionist_lvl > 1:
+					pcs_mood -= 2
+					'You swear loudly in his direction, checking your purse to see if he stole something. You continue on your way, albeit a little more annoyed than you were before.'
+				else
+					pcs_mood -= 10
+					'You blush bright red and hurry on your way.'
+				end
+				gs 'stat'
+				act 'Continue':gt $loc
 			else
 				gt $loc
 			end
@@ -927,6 +977,74 @@ if $ARGS[1] = 'main':
 			else
 				gt $loc
 			end
+		elseif streetrand > 79:
+			cla
+			if $braworntype = 'none' and PCloThinness = 4:
+				*clr & cla
+				menu_off = 1
+				gs 'stat'
+				'<<$streetev_title>>'
+				'<center><video autoplay loop src="images/locations/shared/street/street_no_bra'+ rand(5,6) +'.mp4"></video></center>'
+				'As you walk down the street you feel wobbling your breasts freely under your outfit, which can probably be seen by people walking by too.'
+				if exhibitionist_lvl = 1:
+					gs 'arousal', 'flash', -5
+					gs 'arousal', 'end'
+					pcs_mood += 10
+					'You can''t help but smile, loving the attention. You casually continue on your way, but with an extra bit of sway in your tits.'
+				elseif exhibitionist_lvl > 1:
+					pcs_mood -= 2
+					'You feel ashamed and blush bright red and hurry on your way, thinking it was a bad idea not wearing a bra today and such a thin outfit.'
+				else
+					pcs_mood -= 10
+					'You blush bright red and hurry on your way.'
+				end
+				gs 'stat'
+				act 'Continue':gt $loc
+			elseif $braworntype = 'none' and PCloThinness = 5:
+				*clr & cla
+				menu_off = 1
+				gs 'stat'
+				'<<$streetev_title>>'
+				'<center><video autoplay loop src="images/locations/shared/street/street_no_bra'+ rand(2,4) +'.mp4"></video></center>'
+				'As you walk down the street you feel wobbling your breasts freely under your thin outfit, stretching it, emphasizing the outline of your tits, which can definitely be seen by people walking by too. As you look closely both men and women are staring at your jiggling tits.'
+				if exhibitionist_lvl = 1:
+					gs 'arousal', 'flash', -5
+					gs 'arousal', 'end'
+					pcs_mood += 10
+					'You can''t help but smile, loving the attention. You casually continue on your way, but with an extra bit of sway in your tits.'
+				elseif exhibitionist_lvl > 1:
+					pcs_mood -= 2
+					'You feel ashamed and blush bright red and hurry on your way, thinking it was a bad idea not wearing a bra today and such a thin outfit.'
+				else
+					pcs_mood -= 10
+					'You blush bright red and hurry on your way.'
+				end
+				gs 'stat'
+				act 'Continue':gt $loc
+			elseif $braworntype = 'none' and PCloThinness = 6:
+				*clr & cla
+				menu_off = 1
+				gs 'stat'
+				'<<$streetev_title>>'
+				'<center><video autoplay loop src="images/locations/shared/street/street_no_bra1.mp4"></video></center>'
+				'Your transparent top leaves no space for imagination as you walk down the street, feeling your breasts wobbling freely under your thin outfit. Eyes of people walking by are glued to your tits as you cross them, giving them a clear view. It''s as if you were naked.'
+				if exhibitionist_lvl = 1:
+					gs 'arousal', 'flash', -5
+					gs 'arousal', 'end'
+					pcs_mood += 10
+					'You can''t help but smile, loving the attention. You casually continue on your way, but with an extra bit of sway in your tits.'
+				elseif exhibitionist_lvl > 1:
+					pcs_mood -= 2
+					'You feel ashamed and blush bright red and hurry on your way, thinking it was a bad idea not wearing a bra today and such a transparent outfit. People must be thinking you are such a whore.'
+				else
+					pcs_mood -= 10
+					'You blush bright red and hurry on your way.'
+				end
+				gs 'stat'
+				act 'Continue':gt $loc
+			else
+				gt $loc
+			end
 		elseif streetrand > 78:
 			cla
 			if hour >= 9 or hour < 2:

locations/stripclub.qsrc

@@ -8,18 +8,36 @@ if $ARGS[0] = 'start':
 	$menu_loc = 'stripclub'
 	$menu_arg = 'start'
 	menu_off = 0
+	if sound = 0:
+		if month >=11 and month <= 12 or month >=1 and month <=3:
+			if hour >= 3 and hour <= 17: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/zima.mp3',30
+			if hour >= 18 or hour <= 2: PLAY 'sound/street_club.mp3',30
+		else
+			if hour >= 3 and hour <= 17: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/street_leto.mp3',30
+			if hour >= 18 or hour <= 2: PLAY 'sound/street_club.mp3',30
+		end
+	end
 	gs 'stat'
 	gs 'themes', 'indoors'
-	'<center><b><font color="maroon">Strip Club</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub.jpg"></center>'
+	'<center><b><font color="maroon">Golden Girls Strip Club</font></b></center>'
+	if month >=11 and month <= 12 or month >=1 and month <=3:
+		if hour >= 19 or hour <= 5: '<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/club_night_winter.jpg"></center>'
+		if hour >= 6 and hour <= 18: '<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/club_day_winter.jpg"></center>'
+	else
+		if hour >= 20 and hour <= 23: '<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/club_night_summer_1.jpg"></center>'
+		if hour >= 0 and hour <= 5: '<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/club_night_summer_2.jpg"></center>'
+		if hour >= 6 and hour <= 19: '<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/club_day_summer.jpg"></center>'
+	end
 	*nl
 
 	act 'Leave': gt 'city_redlight', 'start'
 
-	if hour = 2:
+	'There are other strip clubs in this area, the <a href="exec:view''images/locations/city/redlight/stripclub/macho.jpg''">Macho</a>, the <a href="exec:view''images/locations/city/redlight/stripclub/maximus_night.jpg''">Maximus</a>, or the <a href="exec:view''images/locations/city/redlight/stripclub/penthouse_night.jpg''">Penthouse</a>, but they are not as prestigious and popular as the Golden Girls Club.'
+
+	if hour = 3:
 		'The strip club is closing, and a security guard ushers everyone out.'
-	elseif hour > 2 and hour < 11:
-		'The strip club is closed. You notice a sign on the door: The business hours are between 18:00 - 02:00.'
+	elseif hour > 3 and hour < 11:
+		'The strip club is closed. You notice a sign on the door: The business hours are between 18:00 - 04:00.'
 	else
 		if stripdolg > 0:
 			if money >= 50000:
@@ -94,7 +112,7 @@ if $ARGS[0] = 'manager':
 		end
 		'He leads you to one of the private booths and points to the pole. "Show me what you can do."'
 		if pcs_dancero >= 40 and pcs_dancpol >= 30:
-			'You dance sensually, clearly he''s smitten by you. He asks you to sit down. "Our business hours are between 18:00 to 02:00. Some days there are only male strippers performing. We don''t pay strippers, but the customers tip generously. Think of it as an incentive, perform well and you''ll earn a tip."'
+			'You dance sensually, clearly he''s smitten by you. He asks you to sit down. "Our business hours are between 18:00 to 04:00. Some days there are only male strippers performing. We don''t pay strippers, but the customers tip generously. Think of it as an incentive, perform well and you''ll earn a tip."'
 			'"Strippers can perform lap dances for clients at their request for 1000 <b>₽</b> per lap dance. The stripper gets 400 <b>₽</b>, and the rest belongs to the club. They may want further entertainment. As the club doesn''t operate as a brothel, we don''t really accept that kind of business, but we usually turn a blind eye to it."'
 			'"One last thing that I nearly forgot, dancing on stage involves a lot of work on the pole. Unless you do that, it is unlikely you will earn anything. There is no set schedule, the employees choose when they want to come to work. So what do you say, are you interested?"'
 			act 'Accept his offer':
@@ -485,4 +503,3 @@ if $ARGS[0] = 'stpr2':
 end
 
 --- stripclub ---------------------------------
-

locations/stwork.qsrc

@@ -16,6 +16,7 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	gs 'themes', 'indoors'
 	killvar '$sexloc'
+	CLOSE 'sound/street_club.mp3'
 	'<center><b><font color="maroon">Dressing room for strippers</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/backstage' + rand(1,7) + '.jpg"></center>'
 	''