Merge remote-tracking branch 'rachels/master'

locations/gschool_chats1.qsrc

@@ -367,7 +367,7 @@ if $ARGS[0] = 'katja':
 
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	
-	if meynoldQW = 1:
+	if meynoldQW = 3:
 		act 'Thank Katja for taking you home from the disco':
 			*clr & cla
 			npc_rel['A14'] += 5
@@ -450,6 +450,7 @@ end
 if $ARGS[0] = 'Katjaproblems':
 	cls
 	menu_off = 1
+	meynoldQW = 1
 	gs 'stat'
 	'<center><table><tr><td><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></td><td><img <<$set_imgh>> src="images/pc/npc_headshots/big8.jpg"></tr></td></table></center>'
 	'You see Katja near the lockers, biting her lips and looking around nervously. Leaning against her is none other than Svyatoslav who, according to rumors, has a crush on the redhead (or was it on Christina?). He seems to be trying to convince Katja to go on a date.'
@@ -493,7 +494,6 @@ if $ARGS[0] = 'Katjaproblems':
             'Vicky joins the (now)group embrace and you can think about how all the guys in the hall (and some girls) are going to masturbate furiously tonight thanks to this embarrassing event.'
             'After this little scene, you chat with the twins until it is time to return to class.'												
 		end
-		meynoldQW = 1
 		npc_rel['A14'] += 1
 		npc_rel['A15'] += 1
         gs 'stat'

locations/katjaEv.qsrc

@@ -3115,7 +3115,7 @@ if $ARGS[0] = 'TamVal':
 		'Taking her hand, you force Katja to sit by your side and embrace the redhead, mostly to stop her from driving you crazy.'
 		'"There there Katja. Just stop and breathe."'
 		'She takes your advice, and takes a big gulp of air. That seemed to quieten her down, deflating and returning her to a more "normal" mindstate. Even at that, she is troubled.'
-		'"Sorry <<$pcs_nickname>>, it''s just that a lot of things suddenly made sense. Look, Valentina lived here some time ago here. I don''t know all the history, but she left her mother to live in the city and ended up in some kind of trouble. Mom welcomed her to our home, and...Remember how she climbed to my mom? Valentina was always that way and seemed jealous of Vicky and me and now I''m thinking..."'
+		'"Sorry <<$pcs_nickname>>, it''s just that a lot of things suddenly made sense. Look, Valentina lived here some time ago here. I don''t know all the history, but she left her mother to live in the city and ended up in some kind of trouble. Mom welcomed her to our home, and...Remember how she clung to my mom? Valentina was always that way and seemed jealous of Vicky and me and now I''m thinking..."'
 		'"That maybe your mother and Valentina were, or are, lovers? That troubles you? You don''t like that?"'
 		'Katja looks at you with a mix of emotions in her face. Confusion, surprise, doubt, fear. She opens and closes her mouth, looks at you, blushes and says something surprising...'
 		'"I don''t know...Maybe? I never thought about something like that. Ehm...<<$pcs_nickname>>...What would you think, if I...I mean...Ehm...behaved like Valentina and...tried to kiss you?"'