Merge remote-tracking branch 'Anya/master'

locations/Komp.qsrc

@@ -149,6 +149,9 @@ if $ARGS[0] = 'porno':
 		'You shouldn''t watch porn with your sister in the room, she would notice for sure!'
 
 		act 'Leave this website':gt 'komp', 'brows'
+	elseif $loc = 'artemhome':
+		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/komp.jpg"></center>'
+		'You shouldn''t watch porn on Artem''s computer!'
 	else
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/komp.jpg"></center>'
 		'You go to a porn site and browse for a few minutes, trying to find a hot video.'

locations/gschool_events.qsrc

@@ -1196,7 +1196,7 @@ if $ARGS[0] = 'afterschool_events':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	if christinaQW['subpath'] = 0 and christinaQW['blackmail'] = 0 and christinaQW['fight'] = 0 and rand(1, 4) = 4:
+	if CloSkirtShortness > 0 and christinaQW['subpath'] = 0 and christinaQW['blackmail'] = 0 and christinaQW['fight'] = 0 and rand(1, 4) = 4:
 		gt 'Zvereva_events', 'christina_bu_2'
 	else
 		break_rand = rand(1,32)