Browse Source

[fixed] merge conflicts

3xpurt 1 year ago
parent
commit
ee5df0a3ef
1 changed files with 0 additions and 2 deletions
  1. 0 2
      locations/home_activity.qsrc

+ 0 - 2
locations/home_activity.qsrc

@@ -155,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:
@@ -164,7 +163,6 @@ 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.'