Merge remote-tracking branch 'master/master'

locations/KatjaHomeTalk.qsrc

@@ -2014,7 +2014,7 @@ if $ARGS[0] = 'katja_uni_tell':
 	*clr & cla
 	minut += 15
 	katjaQW['know_katja_uni'] = 1
-	if katjaQW['QWstage'] = 2: katjaQW['knows_dorm_room_number'] = 1
+	if katjaQW['QWstage'] >= 2: katjaQW['knows_dorm_room_number'] = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	if katjaQW['know_going_to_teaching_degree'] = 0:

locations/katja_dorm.qsrc

@@ -131,7 +131,7 @@ if $ARGS[0] = 'talk':
 			gt 'Katja_dorm', 'lazar_pussy_talk'
 		else
 			if katjaQW['lazer_anal_talk'] = 0 and katjaQW['lazer_anal'] = 0 and katjaQW['boy_block'] = 0 and katjaQW['slut'] >= 60 and katjaQW['lazar_uni_meet'] = 1 and katjaQW['horny'] >= 40 and npc_sex['A14'] > 0 and katjaQW['sex_clossedness'] = 0:
-			!!If Katja have been corrupted enough, have had sex with the player and Lazar have hit on her and Sveta at the uni cafe. She will if she is horny ask the player if the should have anal sex with him, provided they have not already done so before.
+				!!If Katja have been corrupted enough, have had sex with the player and Lazar have hit on her and Sveta at the uni cafe. She will if she is horny ask the player if the should have anal sex with him, provided they have not already done so before.
 				gt 'Katja_dorm', 'lazar_anal_talk'
 			else
 				if min(katjaQW['horny'],100) > rand(40,400) or (katjaQW['QWstage'] = 2 and katjaQW['boy_block'] = 0 and min(katjaQW['horny'],100) > rand(40,160)) and katjaQW['sex_clossedness'] < 2:

locations/katja_meynold_schedule.qsrc

@@ -235,7 +235,7 @@ else
 			if hour < 7:
 				!!Dormroom - Asleep
 				locat['katja'] = 20
-			elseif hour < 7 and minut < 15:
+			elseif hour = 7 and minut < 15:
 				!!Shered Dorm Shower - Taking A shower.
 				locat['katja'] = 21
 			elseif hour = 7 and minut < 45:
@@ -606,11 +606,11 @@ else
 				elseif hour = 21 and minut < 45:
 					!!Pav streets - walks to the train station/waiting at the platform
 					locat['katja'] = 46
-				elseif hour = 21 or (hour < 23 and minut < 45):
+				elseif hour = 21 or hour = 22 or (hour = 23 and minut < 15):
 					!!Train - traveling from Pav to the city.
 					locat['katja'] = 47
-				elseif hour < 23:
-					!!Metro - traveling from the trainstation to the dorm
+				elseif hour < 23 and minut < 30:
+					!!Metro - traveling from the train station to the dorm
 					locat['katja'] = 48
 				else
 					!!Dormroom - sleeping. 
@@ -664,10 +664,10 @@ else
 				elseif hour = 21 and minut < 45:
 					!!Pav streets - walks to the train station/waiting at the platform
 					locat['katja'] = 46
-				elseif hour = 21 or (hour < 23 and minut < 45):
+				elseif hour = 21 or hour = 22 or (hour < 23 and minut < 15):
 					!!Train - traveling from Pav to the city.
 					locat['katja'] = 47
-				elseif hour < 23:
+				elseif hour < 23 and minut < 30:
 					!!Metro - traveling from the trainstation to the dorm
 					locat['katja'] = 48
 				else