Merge branch 'master' of awatar/glife into master

[fixed] 'condom_steal' talk/hear event

locations/korrPar.qsrc

@@ -36,7 +36,7 @@ gs 'courtletter'
 
 if (hour ! 16 or hour ! 17) and blockBedrPar = 1:blockBedrPar = 0
 
-if locat['Mother'] = 1 and hour = 22 and minut < 30 and motherQW['con_steal_talk'] + 4 < daystart and prezikday + 4 > daystart and rand(1,5) = 1: gt 'mother', 'condom_steal', 'talk'
+if locat['Mother'] = 1 and hour = 22 and minut < 30 and motherQW['con_steal_talk'] + 4 < daystart and prezikday + 4 > daystart and rand(1,5) = 1: gt 'mother', 'condom_steal', iif(locat['Stepdad'] = 1, 'talk', 'hear')
 
 act '<b>Leave and go to the stairwell</b>':
 	if $clothingworntype ! 'nude':

locations/mother.qsrc

@@ -1772,7 +1772,7 @@ if $ARGS[0] = 'condom_steal':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 		'As you walk through the corridor, you overhear some annoyed grunts coming form your parents room. You quickly take a peek, seeing your <<$npc_nickname[''A29'']>> rummaging through some of their stuff. "Where the hell are they..." you hear her quietly ask to herself. "I know I put them here, I always put them here..."'
 		'Not noticing you, she keeps rummaging as you quietly slip out, not wanting to bring attention to yourself.'
-	elseif $ARGS[0] = 'talk':
+	elseif $ARGS[1] = 'talk':
 		!! Mom talking to step dad about the missing condoms
 		*clr & cla
 		motherQW['con_steal_talk'] = daystart