Merge remote-tracking branch 'upstream/master'

locations/intro_city.qsrc

@@ -153,7 +153,7 @@ if $ARGS[0] = 'mom_intro':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big29.jpg"></center>'
 	'Your <<$npc_nickname[''A29'']>> finally comes inside, carrying food she made ahead of time for everyone.'
 	'"<<$pcs_nickname>>, this is a pretty rough neighborhood. You need to be really careful of those boys outside. The sooner university starts and you can get out of here, the better. I don''t know why you couldn''t just wait until summer ended to move to the city."'
-	act 'I''ll be fine':
+	act 'Tell her what she wants to hear':
 		gs 'npc_relationship', 'set', 'A29', '50'
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big29.jpg"></center>'
@@ -162,7 +162,7 @@ if $ARGS[0] = 'mom_intro':
 
 		act 'Have lunch': gt 'intro_city', 'lunch_break'
 	end
-	act 'Give it a rest':
+	act 'Snap at her':
 		gs 'npc_relationship', 'set', 'A29', '30'
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big29.jpg"></center>'
@@ -171,7 +171,7 @@ if $ARGS[0] = 'mom_intro':
 
 		act 'Have lunch': gt 'intro_city', 'lunch_break'
 	end
-	act 'Don''t worry':
+	act 'Appreciate her concern':
 		gs 'npc_relationship', 'set', 'A29', '70'
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big29.jpg"></center>'

locations/intro_sg_tg.qsrc

@@ -586,27 +586,26 @@ if $ARGS[0] = 'intro_9':
 																!! default start
 																act 'Start at the end of August':
 																	month = 8
-																		$month = 'August'
-																		grandmaQW['last_month_paid'] = month
-																		day = 26
-																		week = 5
-																		hour = 9
-																		kanicont = 6
-																		gt 'intro_sg_tg', 'intro_end'
-																	end
-
-																	act 'Start at the beginning of June':
-																		month = 6
-																		$month = 'June'
-																		grandmaQW['last_month_paid'] = month
-																		day = 1
-																		week = 3
-																		kanicont = 92
-																		Gspassed = 1
-																		dostupindorf = 1
-																		gt 'intro_sg_tg', 'intro_end'
-																	end
-																end	
+																	$month = 'August'
+																	grandmaQW['last_month_paid'] = month
+																	day = 26
+																	week = 5
+																	hour = 9
+																	kanicont = 6
+																	gt 'intro_sg_tg', 'intro_end'
+																end
+
+																act 'Start at the beginning of June':
+																	month = 6
+																	$month = 'June'
+																	grandmaQW['last_month_paid'] = month
+																	day = 1
+																	week = 3
+																	kanicont = 92
+																	Gspassed = 1
+																	dostupindorf = 1
+																	gt 'intro_sg_tg', 'intro_end'
+																end
 															end
 														end
 													end

locations/intro_uni.qsrc

@@ -147,7 +147,7 @@ if $ARGS[0] = 'mom_intro':
 	'"Yeah, <<$npc_nickname[''A29'']>>! There''s so much to do and see here."'
 	'"Well don''t forget to stay focused on your studies, and stay away from boys for now. There will be plenty of time after you''ve finished studying to think about that stuff."'
 	
-	act 'I''ll be fine':
+	act 'Tell her what she wants to hear':
 		gs 'npc_relationship', 'set', 'A29', '50'
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big29.jpg"></center>'
@@ -156,7 +156,7 @@ if $ARGS[0] = 'mom_intro':
 		
 		act 'Go on tour': gt 'intro_uni', 'tour_intro'
 	end
-	act 'Give it a rest':
+	act 'Snap at her':
 		gs 'npc_relationship', 'set', 'A29', '30'
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big29.jpg"></center>'
@@ -165,7 +165,7 @@ if $ARGS[0] = 'mom_intro':
 		
 		act 'Go on tour': gt 'intro_uni', 'tour_intro'
 	end
-	act 'Don''t worry':
+	act 'Appreciate her concern':
 		gs 'npc_relationship', 'set', 'A29', '70'
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big29.jpg"></center>'

locations/journal_quests.qsrc

@@ -398,7 +398,7 @@ if $ARGS[0] = 'start':
 					'I should get Katja on birth control, then I could take her on some wilder sex adventures once she''s ready.'
 				elseif katjaQW['QWstage'] < 6 or katjaQW['anal_quest'] < 3 or katjaQW['slut'] <= 100:
 					'I should continue to corrupt Katja. There might be more things I can push her to do.'
-				elseif katjaQW['QWstage'] = 6
+				elseif katjaQW['QWstage'] = 6:
 					'Katja wants to talk to me about something at her home. She needs to be somewhat horny to ask me'
 				elseif katjaQW['park_sex'] = 0:
 					'I should take Katja to the park to get her to to hook up with random guys.'