Merge remote-tracking branch 'origin/master'

locations/uni_dorm.qsrc

@@ -8,7 +8,6 @@ if $ARGS[0] = 'start':
 	$menu_arg = 'start'
 	menu_off = 0
 	gs 'themes', 'indoors'
-	minut += 1
 	gs 'stat'
 	$uni_dorm['floor'] = 'start'
 	*clr & cla
@@ -27,7 +26,7 @@ if $ARGS[0] = 'start':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm.jpg"></center>'
 			'As you walk by, you take out your student ID and show it to her. She looks for just a second and nods before going back to what she was doing as you head for the elevators.'
-			act 'Take the elevator': gt 'uni_dorm', 'elevator'
+			act 'Take the elevator': minut += 5 & gt 'uni_dorm', 'elevator'
 		end
 	else
 		menu_off = 1
@@ -39,7 +38,7 @@ if $ARGS[0] = 'start':
 				'You walk over to the counter and pull out your ID. "I''m here to visit Djibril."' 
 				'The woman gives you a look of complete disgust. "What, your own kind not good enough for you? Go ahead and take care of those black cocks. He''s on the eighth floor, room 810."' 
 				'She turns away from you and goes back to what she was doing. Not wanting to get into an argument with her, you say nothing and quickly head for the elevator.'
-				act 'Take the elevator': gt 'uni_dorm', 'elevator'
+				act 'Take the elevator': minut += 5 & gt 'uni_dorm', 'elevator'
 			end
 		end
 
@@ -52,7 +51,7 @@ if $ARGS[0] = 'start':
 				'She turns away from you and goes back to what she was doing. Not wanting to get into an argument with her, you say nothing and quickly head for the elevator.'
 				reccoldorm = 1
 				goshiflag = 1
-				act 'Take the elevator': gt 'uni_dorm', 'elevator'
+				act 'Take the elevator': minut += 5 & gt 'uni_dorm', 'elevator'
 			end
 		end
 
@@ -74,7 +73,7 @@ if $ARGS[0] = 'start':
 					'You walk over to the counter and pull out your ID. "I''m here to visit Kendra."' 
 					'The woman gives you a look of complete disgust. "What, a man not good enough for you? Go ahead and serve that black whore. She''s on the eighth floor, room 801."' 
 					'She turns away from you and goes back to what she was doing. Not wanting to get into an argument with her, you say nothing and quickly head for the elevator.'
-					act 'Take the elevator': gt 'uni_dorm', 'elevator'
+					act 'Take the elevator': minut += 5 & gt 'uni_dorm', 'elevator'
 				end
 			end
 		end
@@ -86,7 +85,7 @@ if $ARGS[0] = 'start':
 				'You walk over to the counter and pull out your ID. "I''m here to visit Katja Meynold."' 
 				'The woman smiles. "You''re one of Katja''s friends? She''s such a sweet girl. She''s on the second floor, room 204."'
 				'She lets you in and you thank her before heading for the elevator.'
-				act 'Take the elevator': gt 'uni_dorm', 'elevator'
+				act 'Take the elevator': minut += 5 & gt 'uni_dorm', 'elevator'
 			end
 		end
 		
@@ -97,7 +96,7 @@ if $ARGS[0] = 'start':
 				'You walk over to the counter and pull out your ID. "I''m here to visit Artem Chebotarev."' 
 				'The woman smiles. "You''re one of Artem''s friends? He''s such a sweet boy. He''s on the second floor, room 209."'
 				'She lets you in and you thank her before heading for the elevator.'
-				act 'Take the elevator': gt 'uni_dorm', 'elevator'
+				act 'Take the elevator': minut += 5 & gt 'uni_dorm', 'elevator'
 			end
 		end
 
@@ -109,7 +108,7 @@ if $ARGS[0] = 'start':
 				!!'"Oh. <i>Her</i>," the woman says with a disgusted frown. "That little whore needs some discipline. Her mother should be ashamed of herself for raising such a slut!"'
 				!!'She gives you a judgmental stare. "Your ''friend'' is on the seventh floor, room 707." She points you at the elevator before going back to what she was doing.'
 				!!'You''ve better things to do than stand around and argue with her, so you head for the elevator.'
-				!!act 'Take the elevator': gt 'uni_dorm', 'elevator'
+				!!act 'Take the elevator': minut += 5 & gt 'uni_dorm', 'elevator'
 			!!end
 		!!end
 		
@@ -121,7 +120,7 @@ if $ARGS[0] = 'start':
 				!!'The woman rolls her eyes. "Those two troublemakers really aren''t as funny as they think they are. Anyway, they''re up on the seventh floor, room 702."'
 				!!'She lets you in and you thank her before heading for the elevator.'
 
-				!!act 'Take the elevator': gt 'uni_dorm', 'elevator'
+				!!act 'Take the elevator': minut += 5 & gt 'uni_dorm', 'elevator'
 			!!end
 		!!end
 	end
@@ -132,7 +131,6 @@ if $ARGS[0] = 'elevator':
 	$menu_arg = 'elevator'
 	menu_off = 0
 	gs 'themes', 'indoors'
-	minut += 5
 	gs 'stat'
 	*clr & cla
 	'<center><b><font color="maroon">Dormitory</font></b></center>'
@@ -147,11 +145,11 @@ if $ARGS[0] = 'elevator':
 		minut += 1
 		gt 'uni_grounds', 'main'
 	end
-	act 'Go to the second floor': gt 'uni_dorm', 'second_floor'
-	act 'Go to the sixth floor': gt 'uni_dorm', 'sixth_floor'
-	!!act 'Go to the seventh floor': gt 'uni_dorm', 'seventh_floor'
-	act 'Go to the eighth floor': gt 'uni_dorm', 'eighth_floor'
-	act 'Go to the tenth floor': gt 'uni_dorm', 'tenth_floor'
+	act 'Go to the second floor': minut += 1 & gt 'uni_dorm', 'second_floor'
+	act 'Go to the sixth floor': minut += 1 & gt 'uni_dorm', 'sixth_floor'
+	!!act 'Go to the seventh floor': minut += 1 & gt 'uni_dorm', 'seventh_floor'
+	act 'Go to the eighth floor': minut += 1 & gt 'uni_dorm', 'eighth_floor'
+	act 'Go to the tenth floor': minut += 1 & gt 'uni_dorm', 'tenth_floor'
 end
 
 if $ARGS[0] = 'second_floor':
@@ -162,7 +160,6 @@ if $ARGS[0] = 'second_floor':
 	menu_off = 0
 	$location_type = 'public_indoors'
 	killvar '$locclass'
-	minut += 1
 	$uni_dorm['floor'] = 'second_floor'
 	gs 'katja_meynold_schedule'
 	gs 'artem_chebotarev_schedule'
@@ -177,10 +174,10 @@ if $ARGS[0] = 'second_floor':
 			if rand(0,4) = 0: gt 'uni_dorm_events', 'dorm_floor'	
 		end
 	end
-	act 'Elevator': gt 'uni_dorm', 'elevator'
+	act 'Elevator': minut += 5 & gt 'uni_dorm', 'elevator'
 	if func('homes_properties', 'has_access', 'university_dorm'):
-		act 'Go to the shared lounge': gt 'uni_dorm', 'dorm_lounge'
-		act 'Go to the shared kitchen': gt 'uni_dorm', 'dorm_kitchen'
+		act 'Go to the shared lounge': minut += 1 & gt 'uni_dorm', 'dorm_lounge'
+		act 'Go to the shared kitchen': minut += 1 & gt 'uni_dorm', 'dorm_kitchen'
 		act 'Enter the women''s shower': minut += 1 & gt 'uni_dorm', 'dorm_shower_women'
 		gs 'willpower', 'exhib', 'self'
 		if will_cost <= pcs_willpwr:
@@ -188,6 +185,7 @@ if $ARGS[0] = 'second_floor':
 				gs 'willpower', 'exhib', 'self'
 				gs 'willpower', 'pay', 'self'
 				gs 'stat'
+				minut += 1
 				gt 'uni_dorm', 'dorm_shower_men'
 			end
 		else
@@ -203,6 +201,7 @@ if $ARGS[0] = 'second_floor':
 			gs 'willpower', 'exhib', 'self'
 			gs 'willpower', 'pay', 'self'
 			gs 'stat'
+			minut += 1
 			gt 'uni_dorm', 'mens_restroom'
 		end
 	else
@@ -216,7 +215,7 @@ if $ARGS[0] = 'second_floor':
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 				'Katja opens the door. "Hey <<$pcs_nickname>>, come on in!" She stands aside to let you enter before closing the door behind you.'
 
-				act 'Enter': gt 'katja_dorm', 'start'
+				act 'Enter': minut += 1 & gt 'katja_dorm', 'start'
 			else
 				if locat['katja'] = 29 and sofiaQW['know'] = 1 and rand(0,1) = 0 and week < 5:
 					if rand(0,2) = 0 and sofiaQW['spying_day'] ! daystart:
@@ -256,17 +255,17 @@ if $ARGS[0] = 'second_floor':
 				if artemQW['artlie'] = 2 or artemQW['artembrokenheart'] = 1 or artemQW['artemblok'] = 1:
 					'You stand outside the dorm room, knocking on the door. It''s soon answered by Artem, who frowns as soon as he sees you. "I told you I never wanted to see you again! Please go away."'
 					'He closes the door in your face without another word.'
-					act 'Leave': gt 'uni_dorm', 'second_floor'
+					act 'Leave': minut += 1 & gt 'uni_dorm', 'second_floor'
 				else
 					'You stand outside the dorm room, knocking on the door, hoping Artem will answer.'
 					'He soon opens the door with a smile. "Oh hey <<$pcs_nickname>>. I was just studying, but I can take a break."'
 					'Once you''re inside, he closes the door and heads to the couch to take a seat.'
-					act 'Enter': gt 'artem_dorm', 'start'
+					act 'Enter': minut += 1 & gt 'artem_dorm', 'start'
 				end
 			else
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
 				'You knock on the door, but no one answers. He must be asleep or not home.'
-				act 'Leave': gt 'uni_dorm', 'second_floor'
+				act 'Leave': minut += 5 & gt 'uni_dorm', 'second_floor'
 			end
 		end
 	end
@@ -280,7 +279,6 @@ if $ARGS[0] = 'sixth_floor':
 	menu_off = 0
 	$location_type = 'public_indoors'
 	killvar '$locclass'
-	minut += 1
 	$uni_dorm['floor'] = 'sixth_floor'
 	gs 'stat'
 	*clr & cla
@@ -293,10 +291,10 @@ if $ARGS[0] = 'sixth_floor':
 			if rand(0,4) = 0: gt 'uni_dorm_events', 'dorm_floor'	
 		end
 	end
-	act 'Elevator': gt 'uni_dorm', 'elevator'
+	act 'Elevator': minut += 5 & gt 'uni_dorm', 'elevator'
 	if func('homes_properties', 'has_access', 'university_dorm'):
-		act 'Go to the shared lounge': gt 'uni_dorm', 'dorm_lounge'
-		act 'Go to the shared kitchen': gt 'uni_dorm', 'dorm_kitchen'
+		act 'Go to the shared lounge': minut += 1 & gt 'uni_dorm', 'dorm_lounge'
+		act 'Go to the shared kitchen': minut += 1 & gt 'uni_dorm', 'dorm_kitchen'
 		act 'Enter the women''s shower': minut += 1 & gt 'uni_dorm', 'dorm_shower_women'
 		gs 'willpower', 'exhib', 'self'
 		if will_cost <= pcs_willpwr:
@@ -304,6 +302,7 @@ if $ARGS[0] = 'sixth_floor':
 				gs 'willpower', 'exhib', 'self'
 				gs 'willpower', 'pay', 'self'
 				gs 'stat'
+				minut += 1
 				gt 'uni_dorm', 'dorm_shower_men'
 			end
 		else
@@ -319,6 +318,7 @@ if $ARGS[0] = 'sixth_floor':
 			gs 'willpower', 'exhib', 'self'
 			gs 'willpower', 'pay', 'self'
 			gs 'stat'
+			minut += 1
 			gt 'uni_dorm', 'mens_restroom'
 		end
 	else
@@ -352,7 +352,6 @@ if $ARGS[0] = 'seventh_floor':
 	menu_off = 0
 	$location_type = 'public_indoors'
 	killvar '$locclass'
-	minut += 1
 	$uni_dorm['floor'] = 'seventh_floor'
 	gs 'albina_uni_schedule'
 	gs 'stat'
@@ -366,10 +365,10 @@ if $ARGS[0] = 'seventh_floor':
 			if rand(0,4) = 0: gt 'uni_dorm_events', 'dorm_floor'	
 		end
 	end
-	act 'Elevator': gt 'uni_dorm', 'elevator'
+	act 'Elevator': minut += 5 & gt 'uni_dorm', 'elevator'
 	if func('homes_properties', 'has_access', 'university_dorm'):
-		act 'Go to the shared lounge': gt 'uni_dorm', 'dorm_lounge'
-		act 'Go to the shared kitchen': gt 'uni_dorm', 'dorm_kitchen'
+		act 'Go to the shared lounge': minut += 1 & gt 'uni_dorm', 'dorm_lounge'
+		act 'Go to the shared kitchen': minut += 1 & gt 'uni_dorm', 'dorm_kitchen'
 		act 'Enter the women''s shower': minut += 1 & gt 'uni_dorm', 'dorm_shower_women'
 		gs 'willpower', 'exhib', 'self'
 		if will_cost <= pcs_willpwr:
@@ -377,6 +376,7 @@ if $ARGS[0] = 'seventh_floor':
 				gs 'willpower', 'exhib', 'self'
 				gs 'willpower', 'pay', 'self'
 				gs 'stat'
+				minut += 1
 				gt 'uni_dorm', 'dorm_shower_men'
 			end
 		else
@@ -392,6 +392,7 @@ if $ARGS[0] = 'seventh_floor':
 			gs 'willpower', 'exhib', 'self'
 			gs 'willpower', 'pay', 'self'
 			gs 'stat'
+			minut += 1
 			gt 'uni_dorm', 'mens_restroom'
 		end
 	else
@@ -403,30 +404,30 @@ if $ARGS[0] = 'seventh_floor':
 			if locat['albina'] = 7 or locat['albina'] = 8 or locat['albina'] = 10:
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
 				'You knock on the door, and after a few seconds, Albina opens it. "<<$pcs_nickname>>! Come in, come in." She stands aside to let you enter before closing the door behind you.'
-				act 'Enter': gt 'albina_dorm', 'start'
+				act 'Enter': minut += 1 & gt 'albina_dorm', 'start'
 			elseif locat['albina'] = 15:
 				if AlbinaQW['stripper'] = 1:
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
 					'Just as you''re about to knock on the door, it flies open and Albina walks out with a large bag slung over her shoulder. She''s in such a hurry that she almost collides with you. "Oh. Sorry, <<$pcs_nickname>>. I didn''t see you there."'
 					'"Clearly," you reply as you look at her bag. "Off to work?" you whisper and she nods.'
 					'"Yes, and I''m going to be late if I don''t get a move on. Talk to you later, <<$pcs_nickname>>!" She hurries off without another word, leaving you alone in the hallway.'
-					act 'Leave': gt 'uni_dorm', 'seventh_floor' & minut += 2
+					act 'Leave': minut += 2 & gt 'uni_dorm', 'seventh_floor'
 				else
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
 					'Just as you''re about to knock on the door, it flies open and Albina walks out with a large bag slung over her shoulder. She''s in such a hurry that she almost collides with you. "Oh. Sorry, <<$pcs_nickname>>. I didn''t see you there."'
 					'"Clearly," you reply as you look at her bag. "Why are you in such a rush?" you ask, but she brushes you aside.'
 					'"I just have somewhere I need to be and need to go now before I''m late. I''ll talk to you some other time, <<$pcs_nickname>>." She hurries off without another word, leaving you alone and confused in the hallway.'
-					act 'Leave': gt 'uni_dorm', 'seventh_floor' & minut += 2
+					act 'Leave': minut += 2 & gt 'uni_dorm', 'seventh_floor'
 				end
 			elseif locat['albina'] = 16:
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
 				'You knock on the door, but there''s no answer.'
 				if AlbinaQW['stripper'] = 1:
 					'You then remember what day it is and realise that she''s at work and won''t be back until the early hours of the morning, so you head back to the elevator.'
-					act 'Leave': gt 'uni_dorm', 'elevator'
+					act 'Leave': minut += 1 & gt 'uni_dorm', 'elevator'
 				else
 					'You have no idea where she would be at this time of night, so you head back to the elevator.'
-					act 'Leave': gt 'uni_dorm', 'elevator'
+					act 'Leave': minut += 1 & gt 'uni_dorm', 'elevator'
 				end
 			elseif locat['albina'] = 26:
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
@@ -439,22 +440,22 @@ if $ARGS[0] = 'seventh_floor':
 						'Placing your ear to the door, you can hear a bed squeaking, accompanied by Albina''s loud moans and a boy grunting.'
 						'<b>"FUCK YES, JUST LIKE THAT! DON''T STOP, I''M GONNA FUCKING CUM!!"</b>'
 						'Seeing that you''re not going to get an answer anytime soon, you step away from the door.'
-						act 'Leave': gt 'uni_dorm', 'seventh_floor' & minut += 2
+						act 'Leave': minut += 1 2 gt 'uni_dorm', 'seventh_floor'
 					else
 						'Placing your ear to the door, you can hear a faint gagging sound and the voice of a boy that you can''t quite place.'
 						'"Fuck, keep sucking my dick like that, I''m gonna cum!"'
 						'Realising that they''re almost finished, you back away from the door before you''re caught.'
-						act 'Leave': gt 'uni_dorm', 'seventh_floor' & minut += 2
+						act 'Leave': minut += 1 & gt 'uni_dorm', 'seventh_floor'
 					end
 				else
 					'You knock on the door, but don''t receive an answer. Hearing the faint sound of her bed squeaking and flesh slapping against flesh, you remember that she''s normally having sex right about now.'
 					'You back away from the door, knowing you won''t get an answer.'
-					act 'Leave': gt 'uni_dorm', 'seventh_floor' & minut += 2
+					act 'Leave': minut += 2 & gt 'uni_dorm', 'seventh_floor'
 				end
 			else
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
 				'You knock on the door, but there''s no answer. She''s either asleep or isn''t home.'
-				act 'Leave': gt 'uni_dorm', 'seventh_floor'
+				act 'Leave': minut += 5 & gt 'uni_dorm', 'seventh_floor'
 			end
 		end
 	end
@@ -473,7 +474,6 @@ if $ARGS[0] = 'eighth_floor':
 	menu_off = 0
 	$location_type = 'public_indoors'
 	killvar '$locclass'
-	minut += 1
 	$uni_dorm['floor'] = 'eighth_floor'
 	gs 'stat'
 	*clr & cla
@@ -490,10 +490,10 @@ if $ARGS[0] = 'eighth_floor':
 			if rand(0,4) = 0: gt 'uni_dorm_events', 'dorm_floor8'	
 		end
 	end
-	act 'Elevator': gt 'uni_dorm', 'elevator'
+	act 'Elevator': minut += 5 & gt 'uni_dorm', 'elevator'
 	if func('homes_properties', 'has_access', 'university_dorm'):
-		act 'Go to the shared lounge': gt 'uni_dorm', 'dorm_lounge'
-		act 'Go to the shared kitchen': gt 'uni_dorm', 'dorm_kitchen'
+		act 'Go to the shared lounge': minut += 1 & gt 'uni_dorm', 'dorm_lounge'
+		act 'Go to the shared kitchen': minut += 1 & gt 'uni_dorm', 'dorm_kitchen'
 		act 'Enter the women''s shower': minut += 1 & gt 'uni_dorm', 'dorm_shower_women'
 		gs 'willpower', 'exhib', 'self'
 		if will_cost <= pcs_willpwr:
@@ -501,6 +501,7 @@ if $ARGS[0] = 'eighth_floor':
 				gs 'willpower', 'exhib', 'self'
 				gs 'willpower', 'pay', 'self'
 				gs 'stat'
+				minut += 1
 				gt 'uni_dorm', 'dorm_shower_men'
 			end
 		else
@@ -516,6 +517,7 @@ if $ARGS[0] = 'eighth_floor':
 			gs 'willpower', 'exhib', 'self'
 			gs 'willpower', 'pay', 'self'
 			gs 'stat'
+			minut += 1
 			gt 'uni_dorm', 'mens_restroom'
 		end
 	else
@@ -549,7 +551,7 @@ if $ARGS[0] = 'eighth_floor':
 						'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/door.jpg"></center>'
 						'You can hear Kendra''s voice as you get close to the door. It''s fairly loud and sounds harsh in tone, but you can''t quite make out what she''s saying. You hear a muffled reply that sounds male. It sounds like she''s already busy. You could knock or just leave her to her company.'
 
-						act 'Leave': gt 'uni_dorm', 'eighth_floor'
+						act 'Leave': minut += 2 & gt 'uni_dorm', 'eighth_floor'
 						act 'Knock':
 							kendra_busy = daystart
 							*clr & cla
@@ -587,7 +589,7 @@ if $ARGS[0] = 'eighth_floor':
 													'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
 													'You glance around and see a few other students in the hall and feel yourself already blushing at the idea of kissing her boots. You shake you head. "No I can''t..."'
 													'She gets a angry look in her face. "Fine then don''t come back." Followed by her slamming the door in your face. You don''t think she really means to never come back.'
-													act 'Leave': gt 'uni_dorm', 'eighth_floor'
+													act 'Leave': minut += 1 & gt 'uni_dorm', 'eighth_floor'
 												end
 											else
 												act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -600,12 +602,12 @@ if $ARGS[0] = 'eighth_floor':
 												gs 'arousal', 'BDSM', 1, 'humiliation', 'sub'
 												gs 'arousal', 'end'
 												gs 'stat'
-												act 'Leave': gt 'uni_dorm', 'eighth_floor'
+												act 'Leave': minut += 1 & gt 'uni_dorm', 'eighth_floor'
 											end
 										else
 											'You shake your head. "No thanks. You look busy and I don''t want to disturb you..."'
 											'She laughs loudly and roughly grabs your chin in her hand. "Aww so shy, adorable... but I will break you in time. Maybe next time then." She closes the door and you turn to leave.'
-											act 'Leave': gt 'uni_dorm', 'eighth_floor'
+											act 'Leave': minut += 1 & gt 'uni_dorm', 'eighth_floor'
 										end
 									else
 										if kendraQW['sub'] >= 10:
@@ -620,7 +622,7 @@ if $ARGS[0] = 'eighth_floor':
 													gs 'stat'
 													'You glance around and see a few other students in the hall and feel yourself already blushing at the idea of kissing her boots. You shake you head. "No I can''t..."'
 													'She gets a angry look in her face. "Fine then don''t come back." Followed by her slamming the door in your face. You don''t think she really means to never come back.'
-													act 'Leave': gt 'uni_dorm', 'eighth_floor'
+													act 'Leave': minut += 1 & gt 'uni_dorm', 'eighth_floor'
 												end
 											else
 												act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -633,18 +635,18 @@ if $ARGS[0] = 'eighth_floor':
 												gs 'arousal', 'BDSM', 1, 'humiliation', 'sub'
 												gs 'arousal', 'end'
 												gs 'stat'
-												act 'Leave': gt 'uni_dorm', 'eighth_floor'
+												act 'Leave': minut += 1 & gt 'uni_dorm', 'eighth_floor'
 											end
 										else
 											'You shake your head. "No thanks. Last time was entertaining, but I didn''t come to see that again."'
 											'She laughs loudly and roughly grabs your chin in her hand. "Your loss. I might have let you take a turn with him, or maybe not." She closes the door and you turn to leave.'
-											act 'Leave': gt 'uni_dorm', 'eighth_floor'
+											act 'Leave': minut += 1 & gt 'uni_dorm', 'eighth_floor'
 										end
 									end
 									gs 'arousal', 'end'
 									gs 'stat'
 
-									act 'Leave': gt 'uni_dorm', 'eighth_floor'
+									act 'Leave': minut += 1 & gt 'uni_dorm', 'eighth_floor'
 								end
 							end
 						end
@@ -653,7 +655,7 @@ if $ARGS[0] = 'eighth_floor':
 						if kendraQW['sub'] < 0:
 							'You knock on the door, and after a few seconds, Kendra opens it. "I told you last time, I don''t have time for games and I''m tired of yours. Now get lost." She slams the door in your face.'
 
-							act 'Leave': gt 'uni_dorm', 'eighth_floor'
+							act 'Leave': minut += 2 & gt 'uni_dorm', 'eighth_floor'
 						else
 							if kendraQW['sub'] >= 10:
 								'You knock on the door, and after a few seconds, Kendra opens it. "Well if it isn''t my new favorite white slave bitch. Come in." She stands aside to let you enter before closing the door behind you.'
@@ -667,7 +669,7 @@ if $ARGS[0] = 'eighth_floor':
 					'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/door.jpg"></center>'
 					'You can hear Kendra''s voice as you get close to the door. It''s fairly loud and sounds harsh in tone, but you can''t quite make out what she''s saying. You do hear a muffled reply that sounds male. It sounds like she''s busy right now, so you shouldn''t bother her.'
 
-					act 'Leave': gt 'uni_dorm', 'eighth_floor'
+					act 'Leave': minut += 2 & gt 'uni_dorm', 'eighth_floor'
 				end
 			else
 				minut += 5
@@ -692,7 +694,6 @@ if $ARGS[0] = 'tenth_floor':
 	menu_off = 0
 	$location_type = 'public_indoors'
 	killvar '$locclass'
-	minut += 1
 	$uni_dorm['floor'] = 'tenth_floor'
 	gs 'stat'
 	*clr & cla
@@ -714,13 +715,13 @@ if $ARGS[0] = 'tenth_floor':
 		minut += 6
 		gt 'uni_grounds', 'main'
 	end
-	act 'Elevator': gt 'uni_dorm', 'elevator'
+	act 'Elevator': minut += 5 & gt 'uni_dorm', 'elevator'
 
 	if func('homes_properties', 'has_access', 'university_dorm'):
 		gs 'courtletter'
-		act 'Your room': gt 'uni_dorm', 'dorm_room'
-		act 'Go to the shared lounge': gt 'uni_dorm', 'dorm_lounge'
-		act 'Go to the shared kitchen': gt 'uni_dorm', 'dorm_kitchen'
+		act 'Your room': minut += 1 & gt 'uni_dorm', 'dorm_room'
+		act 'Go to the shared lounge': minut += 1 & gt 'uni_dorm', 'dorm_lounge'
+		act 'Go to the shared kitchen': minut += 1 & gt 'uni_dorm', 'dorm_kitchen'
 		act 'Enter the women''s shower': minut += 1 & gt 'uni_dorm', 'dorm_shower_women'
 		gs 'willpower', 'exhib', 'self'
 		if will_cost <= pcs_willpwr:
@@ -728,6 +729,7 @@ if $ARGS[0] = 'tenth_floor':
 				gs 'willpower', 'exhib', 'self'
 				gs 'willpower', 'pay', 'self'
 				gs 'stat'
+				minut += 1
 				gt 'uni_dorm', 'dorm_shower_men'
 			end
 		else
@@ -743,6 +745,7 @@ if $ARGS[0] = 'tenth_floor':
 			gs 'willpower', 'exhib', 'self'
 			gs 'willpower', 'pay', 'self'
 			gs 'stat'
+			minut += 1
 			gt 'uni_dorm', 'mens_restroom'
 		end
 	else
@@ -760,7 +763,6 @@ if $args[0] = 'dorm_lounge':
 	gs 'shortgs', 'setloc', 'uni_dorm', 'dorm_lounge'
 	$location_type = 'private'
 	menu_off = 0
-	minut += 1
 	gs 'stat'
 	*clr & cla
 	'<center><b>Dorm Lounge</b></center>'
@@ -768,7 +770,7 @@ if $args[0] = 'dorm_lounge':
 	'This is the large shared lounge for this floor. Couches and chairs clustered around a TV on the wall create a square for groups of people to sit at, with just enough space between them to allow people to enter or leave. Several of these squares line the room along with a few vending machines.'
 	'A free <a href="exec: newspaperVars[''dbag''] = 0 & gs ''newspaper'', ''start''">newspaper</a> is available.'
 
-	act 'Return to the corridor': gt 'uni_dorm', $uni_dorm['floor']
+	act 'Return to the corridor': minut += 1 & gt 'uni_dorm', $uni_dorm['floor']
 	act 'Watch TV': gt 'uni_dorm', 'dorm_lounge_watch_tv'
 	act 'Relax': gt 'uni_dorm', 'dorm_lounge_relax'
 	!!act 'Buy snacks':
@@ -781,7 +783,7 @@ if $args[0] = 'dorm_lounge_watch_tv':
 	$location_type = 'private'
 	$menu_loc = 'uni_dorm'
 	$menu_arg = 'dorm_lounge_watch_tv'
-	menu_off = 0
+	menu_off = 1
 	minut += 30
 	pcs_mood += 15
 	gs 'stat'
@@ -799,7 +801,7 @@ if $args[0] = 'dorm_lounge_relax':
 	$location_type = 'private'
 	$menu_loc = 'uni_dorm'
 	$menu_arg = 'dorm_lounge_relax'
-	menu_off = 0
+	menu_off = 1
 	minut += 15
 	pcs_mood += 5
 	gs 'stat'
@@ -807,7 +809,7 @@ if $args[0] = 'dorm_lounge_relax':
 	'<center><b>Dorm Lounge Relax</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_lounge.jpg"></center>'
 	'You take a seat on one of the couches and just chill out for few minutes.'
-	act 'Return to the corridor': gt 'uni_dorm', $uni_dorm['floor']
+	act 'Return to the corridor': minut += 1 & gt 'uni_dorm', $uni_dorm['floor']
 	act 'Keep relaxing': gt 'uni_dorm', 'dorm_lounge_relax'
 end
 
@@ -820,7 +822,6 @@ if $args[0] = 'dorm_kitchen':
 	$menu_arg = 'dorm_kitchen'
 	menu_off = 0
 	food_loc = 0
-	minut += 1
 	gs 'kit_din'
 	gs 'katja_meynold_schedule'
 	gs 'stat'
@@ -840,7 +841,7 @@ if $args[0] = 'dorm_kitchen':
 		end
 	end
 
-	act 'Return to the corridor': gt 'uni_dorm', $uni_dorm['floor']
+	act 'Return to the corridor': minut += 1 & gt 'uni_dorm', $uni_dorm['floor']
 	if $uni_dorm['floor'] = 'tenth_floor':
 		if mc_inventory['food_basic'] > 0:
 			if edahot = 0:
@@ -878,13 +879,12 @@ if $ARGS[0] = 'mens_restroom':
 	$locM = 'uni_dorm'
 	$locM_arg = 'mens_restroom'
 	menu_off = 0
-	minut += 1
 	gs 'stat'
 	*clr & cla
 	'<center><b><font color="maroon">Dormitory - Men''s Restroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/restrooms/bathroom_mens.jpg"></center>'
 	'You peek around the corner. Stalls line the right side of the room, with urinals on the far wall and rows of sinks and <a href="exec:gt ''mirror'', ''start''">mirrors</a> to the left. The room smells strongly of disinfectant and stale piss.'
-	act 'Leave': gt 'uni_dorm', $uni_dorm['floor']
+	act 'Leave': minut += 1 & gt 'uni_dorm', $uni_dorm['floor']
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
@@ -900,13 +900,12 @@ if $ARGS[0] = 'womens_restroom':
 	$locM = 'uni_dorm'
 	$locM_arg = 'womens_restroom'
 	menu_off = 0
-	minut += 1
 	gs 'stat'
 	*clr & cla
 	'<center><b><font color="maroon">Dormitory - Women''s Restroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/restrooms/bathroom_womens.jpg"></center>'
 	'You peek around the corner. Stalls line the right side of the room, with rows of sinks with <a href="exec:gt ''mirror'', ''start''">mirrors</a> to the left. The room smells strongly of disinfectant.'
-	act 'Leave': gt 'uni_dorm', $uni_dorm['floor']
+	act 'Leave': minut += 1 & gt 'uni_dorm', $uni_dorm['floor']
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
@@ -922,13 +921,12 @@ if $ARGS[0] = 'dorm_shower_men':
 	$locM = 'uni_dorm'
 	$locM_arg = 'dorm_shower_men'
 	menu_off = 0
-	minut += 1
 	gs 'stat'
 	*clr & cla
 	'<center><b><font color="maroon">Dormitory - Men''s Communal Showers</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/showers/empty.jpg"></center>'
 	'You open the door and walk down to the end of the L shaped hall to peek around the corner. In the nearest corner is a small alcove with lockers, a few benches, two rows of sinks and some <a href="exec:gt ''mirror'', ''start''">mirrors</a>. On the other side of the room is a walkway that leads off to the communal <a href="exec:gt ''uni_dorm'', ''mens_shower''">showers</a>.'
-	act 'Leave': gt 'uni_dorm', $uni_dorm['floor']
+	act 'Leave': minut += 1 & gt 'uni_dorm', $uni_dorm['floor']
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
@@ -944,13 +942,12 @@ if $ARGS[0] = 'dorm_shower_women':
 	$locM = 'uni_dorm'
 	$locM_arg = 'dorm_shower_women'
 	menu_off = 0
-	minut += 1
 	gs 'stat'
 	*clr & cla
 	'<center><b><font color="maroon">Dormitory - Women''s Communal Showers</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/showers/empty.jpg"></center>'
 	'You open the door and walk down to the end of the L shaped hall, which takes you to the main area of the communal shower room. In the nearest corner is a small alcove with lockers, a few benches, two rows of sinks and some <a href="exec:gt ''mirror'', ''start''">mirrors</a>. On the other side of the room is a walkway that leads off to the communal <a href="exec:gt ''uni_dorm'', ''womens_shower''">showers</a>.'
-	act 'Leave': gt 'uni_dorm', $uni_dorm['floor']
+	act 'Leave': minut += 1 & gt 'uni_dorm', $uni_dorm['floor']
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
@@ -965,13 +962,12 @@ if $ARGS[0] = 'mens_shower':
 	$locM = 'uni_dorm'
 	$locM_arg = 'mens_shower'
 	menu_off = 0
-	minut += 1
 	gs 'stat'
 	*clr & cla
 	'<center><b><font color="maroon">Dormitory - Men''s Showers</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/showers/empty_showers.jpg"></center>'
 	'The room is currently empty, but you can see a line of showers with small baskets on the wall just under the shower heads to store shampoo and other products.'
-	act 'Leave': gt 'uni_dorm', 'dorm_shower_men'
+	act 'Leave': minut += 1 & gt 'uni_dorm', 'dorm_shower_men'
 	gs 'din_van', 'private'
 end
 
@@ -984,13 +980,12 @@ if $ARGS[0] = 'womens_shower':
 	$locM = 'uni_dorm'
 	$locM_arg = 'womens_shower'
 	menu_off = 0
-	minut += 1
 	gs 'stat'
 	*clr & cla
 	'<center><b><font color="maroon">Dormitory - Women''s Showers</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/showers/empty_showers.jpg"></center>'
 	'The room is currently empty, but you can see a line of showers with small baskets on the wall just under the shower heads to store shampoo and other products.'
-	act 'Leave': gt 'uni_dorm', 'dorm_shower_women'
+	act 'Leave': minut += 1 & gt 'uni_dorm', 'dorm_shower_women'
 	gs 'din_van', 'private'
 end
 
@@ -1007,7 +1002,6 @@ if $ARGS[0] = 'dorm_room':
 	menu_off = 0
 	odkomp = 1
 	gs 'themes', 'indoors'
-	minut += 1
 	gs 'stat'
 	gs 'music_actions', 'clear_restrictions'
 	*clr & cla
@@ -1077,6 +1071,7 @@ if $ARGS[0] = 'dorm_room':
 	act 'Walk out to the corridor':
 		if $clothingworntype ! 'nude':
 			odkomp = 0
+			minut += 1
 			gt 'uni_dorm', 'tenth_floor'
 		else
 			msg'<b><font color = red>You need to get dressed first.</font></b>'