Merge remote-tracking branch 'Expurt/master'

locations/home_activity.qsrc

@@ -9,7 +9,7 @@ if $ARGS[0] = 'vomiting_check':
 	if at_home = 1 or at_home = 2 or at_home = 3 or at_home = 4 or $loc = 'bedrPar' or at_home = 6 or at_home = 13 or at_home = 15 or $loc = 'mey_home':
 		gs 'home_activity', 'vomiting_images'
 		gt 'home_activity', 'morning_vomit'
-    else
+	else
 		vomit['morning_sick'] = 0
 		vomit['hangover'] = 0
 		vomit['unlucky'] = 0
@@ -55,7 +55,7 @@ if $ARGS[0] = 'vomiting_images':
 		$loc = 'vanr2x'
 	elseif $at_home = 'matryona_mansion':
 		!! location = 'Matryona mansion'
-		
+
 		if ymanrem[4] = 2:
 			$home_activity['vomit_bedroom'] = '<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/y_bedroom.jpg"></center>'
 		elseif ymanrem[4] = 1:
@@ -84,15 +84,15 @@ if $ARGS[0] = 'vomiting_images':
 			$home_activity['vomit_bedroom'] = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.best.jpg"></center>'
 			$home_activity['vomit_bathroom'] = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.best1.jpg"></center>'
 		end
-		
+
 		$loc = 'HotelRoom'
 		$loc_arg = 'shower1'
-		
+
 !!{	elseif $at_home = 'shulga_apartment':
 		!! location = 'Uncle Sergey''s apartment'
 		$home_activity['vomit_bedroom'] = ''
 		$home_activity['vomit_bathroom'] = ''
-		
+
 		'vasilyhome', 'bathroom'}
 	elseif $at_home = 'shared_apartment':
 		!! location = 'Shared apartment in Pavlovsk'
@@ -100,7 +100,7 @@ if $ARGS[0] = 'vomiting_images':
 		$home_activity['vomit_bathroom'] = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/vanrpar.jpg"></center>'
 		$loc = 'pav_shared_apt'
 		$loc_arg = 'bathroom'
-		
+
 !!{	elseif $at_home = 'grandparents_house':
 		!! location = 'Grandparent''s house in Gadukino'
 		$home_activity['vomit_bedroom'] = ''
@@ -126,7 +126,7 @@ if $ARGS[0] = 'morning_vomit':
 	menu_off = 1
 	gs 'pain', 3, 'head', 'ache'
 	gs 'stat'
-    cla & *clr
+	cla & *clr
 	$home_activity['vomit_bedroom']
 	'Before you even open your eyes, your stomach churns. Nausea courses through you, acid burns at the back of your throat, and you know without a doubt:'
 	*nl
@@ -147,11 +147,6 @@ if $ARGS[0] = 'morning_vomit':
 				!! hangover = 1
 				!! change above variable to whatever would make the most sense, this is just a placeholder
 				'<i>Ugh, maybe I had too much to drink last night...</i> you think to yourself as you lay there on the floor.'
-				if $loc = 'mey_home':
-					act'Continue':gt 'mey_home', 'mey_morning_vomit'
-				else
-					act'Continue':gt'home_activity','vomiting_exit'
-				end
 			elseif vomit['morning_sick'] = 1:
 				if knowpreg = 1:
 					if morning_sickness = 0:
@@ -160,7 +155,6 @@ if $ARGS[0] = 'morning_vomit':
 					else
 						'<i>Ugh! Why does pregnancy have to come with so many side effects...</i> you think to yourself as you lay there on the floor.'
 					end
-					act'Continue':gt'home_activity','vomiting_exit'
 				elseif thinkpreg = 1:
 					gs 'home_activity', 'think_preg_react'
 				elseif knowpreg = 0:
@@ -169,15 +163,14 @@ if $ARGS[0] = 'morning_vomit':
 					else
 						'<i>Ugh, I feel awful! I wonder if I should see a doctor?</i> you think to yourself as you lay there on the floor.'
 					end
-					act'Continue':gt'home_activity','vomiting_exit'
 				end
 			elseif vomit['unlucky'] = 1:
 				'<i>Ugh, I feel awful! I wonder if I should see a doctor?</i> you think to yourself as you lay there on the floor.'
-				if $loc = 'mey_home':
-					act'Continue':gt 'mey_home', 'mey_morning_vomit'
-				else
-					act'Continue':gt'sleep','end'
-				end
+			end
+			if $loc = 'mey_home':
+				act'Continue':gt 'mey_home', 'mey_morning_vomit'
+			else
+				act'Continue':gt'home_activity','vomiting_exit'
 			end
 		end
 	end
@@ -246,7 +239,7 @@ if $ARGS[0] = 'think_preg_react':
 		'<i>What am I going to do?</i> you think to yourself.'
 		act'Continue':gt'sleep','end'
 	end
-	
+
 	act'I better not be pregnant':
 		cla & *clr
 		$home_activity['vomit_bathroom']
@@ -255,7 +248,7 @@ if $ARGS[0] = 'think_preg_react':
 		'<i>Oh God,</i> you groan internally. <i>I swear, this better be a stomach bug and not pregnancy. I am not ready for motherhood.</i>'
 		act'Continue':gt'sleep','end'
 	end
-	
+
 	act'I can''t wait for this baby':
 		cla & *clr
 		$home_activity['vomit_bathroom']
@@ -264,7 +257,7 @@ if $ARGS[0] = 'think_preg_react':
 		'<i>I''m so ready for this baby!</i> you think excitedly.'
 		act'Continue':gt'sleep','end'
 	end
-	
+
 	act'Baby good, morning sickness bad':
 		cla & *clr
 		$home_activity['vomit_bathroom']
@@ -282,14 +275,14 @@ if $ARGS[0] = 'preg_scare_react':
 		'<i>I need to take a pregnancy test right now!</i> you think urgently. <i>I need to figure out what is going on!</i>'
 		act'Continue':gt'sleep','end'
 	end
-	
+
 	act'This is really bad':
 		cla & *clr
 		$home_activity['vomit_bathroom']
 		'<i>This is really really bad!</i> you think, the blood draining from your face. <i>I don''t want to be a mom! Not now!</i>'
 		act'Continue':gt'sleep','end'
 	end
-	
+
 	act'This is wonderful!':
 		cla & *clr
 		$home_activity['vomit_bathroom']
@@ -300,7 +293,7 @@ if $ARGS[0] = 'preg_scare_react':
 		end
 		act'Continue':gt'sleep','end'
 	end
-	
+
 	if stat['think_virgin'] = 1:
 		act'This is impossible':
 			cla & *clr
@@ -313,14 +306,14 @@ end
 
 
 if $ARGS[0] = 'vomiting_exit':
-    vomit['morning_sick'] = 0
+	vomit['morning_sick'] = 0
 	vomit['hangover'] = 0
 	vomit['unlucky'] = 0
-	
-    gt $loc, $loc_arg
+
+	gt $loc, $loc_arg
 end
 
-!!{ backup stuff 
+!!{ backup stuff
 
 	  if at_home = 1:
 			!! location = 'City residential apartment'
@@ -344,7 +337,7 @@ end
 			!! location = 'Uncle Sergey''s apartment'
 			$home_activity['vomit_bedroom'] = ''
 			$home_activity['vomit_bathroom'] = ''
-			
+
 			gt 'vasilyhome', 'bathroom'}
 		elseif at_home = 13:
 			gt 'pav_shared_apt', 'bathroom'