Merge remote-tracking branch 'Lusticon/master'

locations/pain.qsrc

@@ -100,8 +100,11 @@ else
     curpain = (pain[1] * pain[2] * pain[3]) /10
     prevpain = pain[$painPart]
 
-    pain[$painPart] = func( 'shortgs','modul',prevpain,curpain)
+    !! lastpain var can be used elsewhere, do not kill it
+    $lastpain = $painPart
+    lastpain = func( 'shortgs','modul',prevpain,curpain)
 
+    pain[$painPart] = lastpain
     if pain[$painPart] > 100: pain[$painPart] = 100
 
     killvar 'prevpain'

locations/uni_dorm.qsrc

@@ -625,9 +625,10 @@ if $ARGS[0] = 'dorm_room':
 	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
 	if mc_inventory['mag_porn'] > 0: 'You''ve hidden your porn magazines under the mattress of your bed.'
 	
+	vika_inroom = 0
+	vika_sleep = 0
 	if hour > 14 and hour < func('bordel', 'open_hour'):
 		vika_inroom = 1
-		vika_sleep = 0
 		if npc_rel['A220'] >= 60 and birthday = day and birthmonth = month and vikaslut = 1 and b_vika_present_Day ! daystart:
 			$vikatext = '<a href="exec:gt''Vika''">Vika</a> seems excited when she notices you. She is trying to hide a box behind her back.'
 		else