Add wait variables

packages/presence.yaml

@@ -510,10 +510,8 @@ script:
         message: "clear_notification"
         tag: skip-away
     - if:
-      - condition: template
-        value_template: "{{ is_state('input_boolean.away_mode_skipped','on') or is_state('group.adults','home') }}"
+      - "{{ not wait.completed }}"
       then:
-        - stop: Away Mode Skipped
       - service: light.turn_off
         target:
           area_id:
@@ -576,6 +574,8 @@ script:
         target:
           entity_id: media_player.living_room_tv
       - service: script.security_arm_away
+      else:
+      - stop: Away Mode Skipped
       mode: single
       icon: mdi:shield-lock
   family_is_home_day:

scripts.yaml

@@ -293,7 +293,7 @@ going_upstairs:
       to: 'on'
     timeout:
       hours: 0
-      minutes: 5
+      minutes: 20
       seconds: 0
       milliseconds: 0
     alias: Wait until the door opens
@@ -304,7 +304,7 @@ going_upstairs:
     alias: Turn off the lights
   - wait_template: '{{ is_state(''binary_sensor.upstairs_bathroom_occupied'',''on'')
       or is_state(''input_boolean.goodnight'',''on'') }}'
-    timeout: 00:10:00
+    timeout: '{{ wait.remaining }}'
     alias: Wait until I'm in the bathroom or in bed
   - if:
     - condition: state