Merge remote-tracking branch 'upstream/master'

locations/NikoWhore.qsrc

@@ -852,7 +852,7 @@ if $ARGS[0] = 'Locker Room 2':
 																			'You can feel your consciousness fading in and out. You can hear some words, but they too seem to fade in and out... "You''ll be a star, <<$pcs_nickname>>. An even bigger whore than Sonia."... "You look all tuckered out. Had a good time?..." "I think we broke our new toy already..." ... "It looks like she passed out... Too much fun maybe."...'
 																			'You hear footsteps as they leave the room and everything starts to fade until you hear... "How could they do this to her?"..."Oh wow, she looks... Sticky."..." This isn''t the time for jokes, Vicky! We need to do something! We can''t just leave her like this!" ...'
 																		
-																			act '...':gs 'clothing', 'wear_last_worn' & gt 'NikoDreams', 'Family'
+																			act '...':gs 'clothing', 'wear_last_worn' & gt 'NikoDreams', 'family'
 																		end
 																	end
 																end

locations/gschool_chats.qsrc

@@ -192,7 +192,6 @@ if $ARGS[0] = 'gopniks':
 					else
 						'You head to the stairwell that the gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations.'
 					end
-					'Artem, Petka, Julia, Natasha, Zinaida, Evgeny, Feofan and Gerasim are sitting around some tables they''ve moved together.'
 				end
 				'Vitek, Dan, Vasily, Lena, Lera, Pauline, Alyona, Anushka, Ekaterina, Radomir, Lavrenti, Arkadi, Roman, Valentin and Niko are hanging around.'
 				gs 'gschool_groups', 'gopniks'

locations/gschool_grounds.qsrc

@@ -44,9 +44,9 @@ if $ARGS[0] = 'main':
 			if week = 1 and NikoIntro = 0:
 				gt 'NikoEv', 'Intro'
 			elseif NikoVolkovQW = 5 and NikoEv = 6 and NikoDate = 0:
-				gt 'NikoDates', 'After School'
+				gt 'NikoDates', 'after_school'
 			elseif NikoVolkovQW = 5 and NikoEv = 8 and NikoDate = 0:
-				gt 'NikoDates', 'After School 2'
+				gt 'NikoDates', 'after_school2'
 			elseif NikoVolkovQW = 10 and NikoEv = 22:
 				gt 'NikoEv2', 'Recovery'
 			end

locations/gschool_lessons.qsrc

@@ -192,7 +192,7 @@ if $ARGS[0] = 'short_break':
 			school_period = 6
 			gt 'gschool_lessons', 'short_break'
 		end
-		if NikoVolkovQW = 10 and NikoEv = 12: school_lunch = 1 & school_period = 6 & gt 'NikoDreams', 'Classroom Dream'
+		if NikoVolkovQW = 10 and NikoEv = 12: school_lunch = 1 & school_period = 6 & gt 'NikoDreams', 'classroom_dream'
 	elseif school_period = 6:
 		if $ARGS[1] = '':
 			if hour = 10:

locations/gschool_lunch.qsrc

@@ -48,10 +48,10 @@ if $ARGS[0] = 'cafeteria':
 	if school_lunch = 0:
 		if NikoVolkovQW = 5 and NikoEv = 5 and NikoDate = 0 and NikoDate_Day ! daystart:
 			school_lunch = 1
-			gt 'NikoDates', 'Hallway Strip'
+			gt 'NikoDates', 'hallway_strip'
 		elseif NikoVolkovQW = 10 and NikoEv = 12:
 			school_lunch = 1
-			gt 'NikoDreams', 'Classroom Dream'
+			gt 'NikoDreams', 'classroom_dream'
 		elseif NikoVolkovQW = 10 and NikoEv = 13 and NikoDate_Day ! daystart:
 			school_lunch = 1
 			gt 'NikoEv2', 'Lunch Chat'

locations/pav_disco.qsrc

@@ -65,7 +65,7 @@ if $ARGS[0] = '':
 		end
 	end
 
-	if NikoVolkovQW = 5 and NikoEv = 7 and NikoDate_Day ! daystart: gt 'NikoDates', 'Disco'
+	if NikoVolkovQW = 5 and NikoEv = 7 and NikoDate_Day ! daystart: gt 'NikoDates', 'disco'
 
 	if hour >= 20 and hour <= 23:
 		'<center><b><font color="maroon">Disco</font></b></center>'

locations/sitrPar.qsrc

@@ -40,7 +40,7 @@ if $ARGS[0] = '':
 		'<a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting by the table and doing his homework.'
 	elseif locat['Kolka'] = 11:
 		if locat['Mother'] = 19 or locat['Stepdad'] = 10:
-			'<a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting in the armchair playing on his phone.'
+			'<a href="exec:npc_rel[''A34''] += 1 & gt ''brother'', ''start''">Kolka</a> is sitting in the armchair playing on his phone.'
 		else
 			'<a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the sofa playing video games.'
 		end