Merge remote-tracking branch 'maankamara/master'

# Conflicts:
#	locations/katja_procedural.qsrc

locations/katja_chat.qsrc

@@ -138,6 +138,7 @@ if $ARGS[0] = 'uni_cafe':
 end
 
 if $ARGS[0] = 'chat':
+	killvar '$carry_arg'
 	gs 'katja_meynold_schedule' 
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
@@ -192,6 +193,7 @@ if $ARGS[0] = 'chat':
 end
 
 if $ARGS[0] = 'chat1':
+	killvar '$carry_arg'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	!! Reaction on the first time you meet Sofia, Katja''s roommate.
 	if sofiaQW['know'] = 1 and sofiaQW['QWstage'] = 0: gt 'katja_chat', 'sofia1'
@@ -297,6 +299,7 @@ if $ARGS[0] = 'coffee_hole':
 end
 
 if $ARGS[0] = 'brunch':
+	killvar '$carry_arg'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/Coffe_hole2.jpg"></center>'
 	gs 'npc_relationship', 'modify', 'A14', 'like', 3, 'coffe_hole2'
 	minut += 10

locations/katja_procedural.qsrc

@@ -166,9 +166,9 @@ if $ARGS[0] = 'face_color':
 end
 
 if $ARGS[0] = 'makeup':
+	$carry_arg[1] = $ARGS[1]
+	$carry_arg[2] = $ARGS[2]
 	'Katja looks at you with a smile. "<<$pcs_nickname>>, I bet you would look great with a little make-up on you! What do you say?"'
-	$temp_loc = $ARGS[1]
-	$temp_loc_arg = $ARGS[2]
 	act 'Let her put makeup on you':
 		*clr & cla
 		pcs_hairbsh = 1
@@ -184,7 +184,7 @@ if $ARGS[0] = 'makeup':
 			'Katja subtly applies some neutral tones, with a light application of makeup to bring out your natural beauty.'
 			if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
 
-			act 'Thank Katja for the makeup': gt $temp_loc, $temp_loc_arg
+			act 'Thank Katja for the makeup': gt $carry_arg[1], $carry_arg[2]
 		end
 
 		act 'Normal make-up':
@@ -193,7 +193,7 @@ if $ARGS[0] = 'makeup':
 			'Katja applies some mildly vibrate tones and colors of makeup to cover your minor imperfections and enhance your best features.'
 			if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
 
-			act 'Thank Katja for the makeup': gt $temp_loc, $temp_loc_arg
+			act 'Thank Katja for the makeup': gt $carry_arg[1], $carry_arg[2]
 		end
 
 		act 'Heavy make-up':
@@ -202,9 +202,9 @@ if $ARGS[0] = 'makeup':
 			'Katja applies some deeper, richer shades of makeup that are thick enough to cover most imperfections while drawing attention to your eyes and lips.'
 			if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
 
-			act 'Thank Katja for the makeup': gt $temp_loc, $temp_loc_arg
+			act 'Thank Katja for the makeup': gt $carry_arg[1], $carry_arg[2]
 		end
-		act 'You really don''t need it': gt $temp_loc, $temp_loc_arg
+		act 'You really don''t need it': gt $carry_arg[1], $carry_arg[2]
 	end
 end