Wait anywhere

sugarcube/src/PassageFooter.tw

@@ -36,6 +36,14 @@
 				<<gt _jobData.workPassage>>
 			<</act>>
 		<</for>>
+
+		<<if _tags.includes('outdoors') and _tags.includes('public')>>>>
+			<<actCLA 'Wait'>>
+				<<gs 'obj_din_wait'>>
+			<</actCLA>>
+		<</if>>
+		
+
 	<<elseif _tags.includes('quest')>>
 		<!-- This should be able to be returned to -->
 		<<set _menuDeactivated = false>>

sugarcube/src/autogenerated/unsorted/liames.tw

@@ -65,9 +65,6 @@
 <</actCLA>>
 
 <</if>>
-<<actCLA 'wait'>>
-	<<gs 'obj_din_wait'>>
-<</actCLA>>
 <<if $housing.home == 'old_town_apartment'>>
 	<<if $vladimirday == $time.daystart and getvar("$vladimirQW") == 30 and $time.hour >= 16 and $time.weekday == 6>>
 		<<link "There''s an Audi parked in front of your apartment, and standing beside it, you notice Vladimir">><<gt 'qwmeet' '2'>><</link>>.

sugarcube/src/locations/city/city_center.tw

@@ -30,9 +30,6 @@ setup.locations.city_center = {label: 'City Center',image: 'locations/city/cityc
 
 
 	<<gs 'music_actions' 'music_icon'>>*/
-	<<actCLA 'Wait'>>
-		<<gs 'obj_din_wait'>>
-	<</actCLA>>
 	<<gs 'taxi'>>
 
 	<p>

sugarcube/src/locations/city/city_industrial.tw

@@ -31,9 +31,7 @@
 		<!-- !! We've got an event today, check it's location:-->
 		<<gs 'emp_functions' 'disp_evt' 3>>
 	<</if>>*/
-	<<actCLA 'Wait'>>
-		<<gs 'obj_din_wait'>>
-	<</actCLA>>
+
 	/*<<gs 'taxi'>>
 	<<if getvar("$car") > 0>>
 		<<if getvar("$wrek") == 0 and ((cardrive == 7 and func('autoservisF', 'is_open') == 0) or (cardrive == 9 and func('autotraidF', 'is_open') == 0))>>

sugarcube/src/locations/city/city_island.tw

@@ -23,9 +23,7 @@ The university and shops and clubs that cater to the students dominate this area
 		<<gt 'metro_city_island' 'start'>>
 	<</actCLA>>
 <</if>>
-<<actCLA 'Wait'>>
-	<<gs 'obj_din_wait'>>
-<</actCLA>>
+
 <<gs 'taxi'>>
 <<gs 'camera' 'check_location'>>
 <<if $time.hour >= 8 and $time.hour <= 22>>

sugarcube/src/locations/city/city_redlight.tw

@@ -38,9 +38,6 @@
 	<<else>>
 		The Hookah Lounge is currently closed and will reopen at 19:00.
 	<</if>>
-	<<actCLA 'Wait'>>
-		<<gs 'obj_din_wait'>>
-	<</actCLA>>
 	<<gs 'taxi'>>
 	<<if getvar("$car") > 0>>
 		<<if getvar("$wrek") == 0 and ((cardrive == 7 and func('autoservisF', 'is_open') == 0) or (cardrive == 9 and func('autotraidF', 'is_open') == 0))>>

sugarcube/src/locations/city/city_residential.tw

@@ -49,9 +49,6 @@ setup.locations.city_residential = {label: 'Residential Area',image: 'locations/
 	<!-- !! We've got an event today, check it's location:-->
 	<<gs 'emp_functions' 'disp_evt' 3>>
 <</if>>
-<<actCLA 'Wait'>>
-	<<gs 'obj_din_wait'>>
-<</actCLA>>
 <<gs 'taxi'>>*/
 
 <<if $time.hour >= 8 and $time.hour <= 22>>

sugarcube/src/locations/pavlov/hotel/pav_hotel.tw

@@ -235,9 +235,6 @@ setup.npcs["pav_hotel_receptionist"] = {
 		<</if>>
 	<</actCLA>>
 <</if>>
-<<actCLA 'Kill some time in the hotel lobby'>>
-	<<gs 'obj_din_wait'>>
-<</actCLA>>
 <<if $location_var[$here][0] == 'Pavlin'>>
 	<<set $menu_off = 1>>
 	<<image "characters/pavlovsk/pavlin/pavlin.jpg">>

sugarcube/src/locations/pavlov/pav_commcenter.tw

@@ -89,9 +89,6 @@
 		<</actCLA>>
 
 	<</if>>
-	<<actCLA 'Wait'>>
-		<<gs 'obj_din_wait'>>
-	<</actCLA>>
 	<<if getvar("$locat['Anya']") == 10>>
 		Your sister <<link "Anya">><<gt 'sister' 'pav_commcenter'>><</link>> is sitting with a group of boys and girls, drinking beer.
 

sugarcube/src/locations/pavlov/pav_commercial.tw

@@ -145,9 +145,6 @@
 <<ConnectedLocation 'Highway' 'road' 20 'locations/highway/road.jpg' 15>>
 
 /*<<gs 'music_actions' 'music_icon'>>*/
-<<actCLA 'Wait'>>
-	<<gs 'obj_din_wait'>>
-<</actCLA>>
 /*<!-- !!if rand(0,2) ! 0:gs 'din_bad' & dynamic $mobile_check-->
 
 <!-- !-- Random prostitution solicitation check -------------------------->

sugarcube/src/locations/pavlov/pav_industrial.tw

@@ -64,9 +64,6 @@ Opening hours are Monday through Friday:
 <<else>>
 	<br>The tailor is closed right now.
 <</if>>
-<<actCLA 'Wait'>>
-	<<gs 'obj_din_wait'>>
-<</actCLA>>
 /*<!-- !!if rand(0,2) ! 0:gs 'din_bad' & dynamic $mobile_check-->
 <<if $npcs.get('A113','QW') == 1 and $time.daybelisex != $time.daystart and $time.hour >= 9 and $time.hour <= 23 and $time.weekday == 7>>
 	<<set $menu_off = 1>>

sugarcube/src/locations/pavlov/pav_train_hall.tw

@@ -127,9 +127,6 @@
 
 		<</if>>
 	<</if>>*/
-	<<actCLA 'Wait'>>
-		<<gs 'obj_din_wait'>>
-	<</actCLA>>
 /* :: pav_train_platforms[public outdoors]
 	<h2>Pavlovsk station platforms</h2>
 	<<image "locations/shared/train/pavplat.jpg">>

sugarcube/src/locations/pavlov/residential/pav_residential.tw

@@ -194,9 +194,7 @@
 <<ConnectedLocation 'Train Station' 'pav_train_hall' '' 'locations/pavlovsk/trainstation/pavtrainstation_day.jpg' 15>>
 <<ConnectedLocation 'Pushkin' 'liam' '' 'locations/pushkin/liam.jpg' 30>>
 
-<<actCLA 'Wait'>>
-	<<gs 'obj_din_wait'>>
-<</actCLA>>
+
 	<!-- Succubus-Stuff
 	<<if ($time.hour > 20 or $time.hour < 4) and getvar("$succubusQW") == 5 and $suchuntday != $time.daystart>>
 		<<actCLA 'Go hunting near the community center (this can take a lot of time)'>>

sugarcube/src/locations/pushkin/liam.tw

@@ -64,9 +64,6 @@
 		<</actCLA>>
 	<</actCLA>>
 <</if>>*/
-<<actCLA 'Wait'>>
-	<<gs 'obj_din_wait'>>
-<</actCLA>>
 <!-- !-- Random prostitution solicitation check -------------------------->
 <!--<<if getvar("$prostitute['blocked']") == 0>>
 	<<gs 'prostitution_functions' 'check_solicitation_event'>>