Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	locations/gschool_sex.qsrc
#	locations/pav_commclubs.qsrc

locations/NikoSlut.qsrc

@@ -1575,7 +1575,7 @@ if $ARGS[0] = 'Friendly Meal':
 	if VKPartner = 1:$VKPartner = 'trucker'
 	if VKPartner = 2:$VKPartner = 'biker'
 	gs'stat'
-	'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/food/Meal 2.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/food/meal2.jpg"></center>'
 	'The <<$VKPartner>> orders you a burger then you both chat until the food arrives. You get a plate with a large burger and fries along with a cup tea. You and the <<$VKPartner>> spend the next few minutes, eating while discussing current events until you both finish your meals.'
 	
 	act 'Finish':gt 'NikoSlut', 'Diner Interior'

locations/lusso.qsrc

@@ -16,6 +16,8 @@ if $ARGS[0] = 'start':
 	*nl
 	'The décor is bright and modern the flowers are real and the dressers made with expensive woods.'
 	'This is clearly a high end underwear shop. Just knowing you are wearing these will make you stand out more and they will feel so nice you might never want to go back to wearing the cheap ill fitting underwear you used to have to put up with. That is of course assuming you can afford the prices here.'
+	act 'Leave': gt 'torgcentr'
+
 	act 'View panties': minut += 5 & gt 'lusso', 'panties'
 
 	act 'View bras': minut += 5 & gt 'lusso', 'bras'

locations/pav_commclubs.qsrc

@@ -94,7 +94,6 @@ if hour >= 12 and hour < 20:
 		
 		act 'Go to your guitar lesson (<<ml_gitlesson_cost>> rubles)': gt 'music_guitarlesson', 'lesson'
 	end
-	
 else
 	'Club''s closed.'
 end

locations/preCSB.qsrc

@@ -104,7 +104,7 @@ end
 if $ARGS[0] = 'intro_4':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/pre/sys/altstart.jpg"></center>'
-	'You find out about her mother Natasha, and how her biological father left before she was born. Her mother remarried shortly afterwards to a man called Vladimir.'
+	'You find out about her mother Natasha, and how her biological father left when you were a baby. Her mother remarried shortly afterwards to a man called Vladimir.'
 	'She has a sister named Anya who is two years older than her. Anya chose to live at home instead of going to college, working at the local grocery in the day and partying at night.'
 	'<<$pcs_nickname>> has a half-brother Kolka, who is a year younger than her and really into football.'
 	'Her mother''s sister, Aunt Luda, lives on the top floor of the same building as her. Her stepfather''s best friend is called Uncle Misha, who lives across the hall. Her mother''s old friend Sergey Shulgin lives on the floor above them, and <<$pcs_nickname>>''s old childhood friend Vasily is his son.'

locations/preSYS.qsrc

@@ -266,7 +266,7 @@ if $ARGS[0] = 'SGStart':
 	gs 'set_home', 2
 
 	'<center><img <<$set_imgh>> src="images/pre/sys/altstart.jpg"></center>'
-	'Your name is <<$pcs_firstname>> <<$pcs_lastname>>, Friends and family sometimes call you <<$pcs_nickname>>. Your mother''s name is <<$npc_firstname[''A29'']>>, and your biological father left before you were born. Your mother married your stepfather, <<$npc_firstname[''A28'']>>, shortly afterwards. <<$npc_firstname[''A33'']>> is your older sister. She is two years older than you and is still living at home while working at the local grocery store. She chose not to attend college and instead spends most of her free time drinking with her friends or going to parties, much to your mother''s dismay. You also have a younger half-brother, <<$npc_firstname[''A34'']>>, who is really into sports, especially football, and is shaping up to be a fine athlete. He is a year younger than you are, and his father is your stepfather.'
+	'Your name is <<$pcs_firstname>> <<$pcs_lastname>>, Friends and family sometimes call you <<$pcs_nickname>>. Your mother''s name is <<$npc_firstname[''A29'']>>, and your biological father left when you were a baby. Your mother married your stepfather, <<$npc_firstname[''A28'']>>, shortly afterwards. <<$npc_firstname[''A33'']>> is your older sister. She is two years older than you and is still living at home while working at the local grocery store. She chose not to attend college and instead spends most of her free time drinking with her friends or going to parties, much to your mother''s dismay. You also have a younger half-brother, <<$npc_firstname[''A34'']>>, who is really into sports, especially football, and is shaping up to be a fine athlete. He is a year younger than you are, and his father is your stepfather.'
 	*nl
 	'Your <<$npc_usedname[''A30'']>> lives in the same building as you do, though you rarely see her except when you pass her in the stairwell. She is your mother''s sister. <<$npc_usedname[''A54'']>>, as everyone calls him, is best friends with your stepfather. <<$npc_firstname[''A11'']>> <<$npc_lastname[''A11'']>>, your childhood friend, is the same age as you and grew up living in the same apartment building on the floor above yours. His father, <<$npc_firstname[''A112'']>>, is an old friend of your mother''s.'
 

locations/salon.qsrc

@@ -277,9 +277,9 @@ if $ARGS[0] = 'lashExtension':
 		if pcs_naturallashes > 0:pcs_naturallashes -= 1
 		pcs_lashes = pcs_naturallashes
 		money -= 500
-		killvar lashextensionnew
-		killvar lashextensionduration
-		killvar lashextensionstyle
+		killvar 'lashextensionnew'
+		killvar 'lashextensionduration'
+		killvar 'lashextensionstyle'
 	end
 	gs 'body_shape', 'basebeautycalc', 1
 	gs 'stat'