feat: old standalone trigger systems completely unified into trigger->condition->action system

10 files changed, 149 insertions, 171 deletions

diff --git a/data/.admin_history.json b/data/.admin_history.json
index 3cebbbd..df6291b 100644
--- a/data/.admin_history.json
+++ b/data/.admin_history.json
@@ -1 +1 @@
-{"history":[{"time":"2026-07-09T19:27:54-04:00","description":"Update object 000_test_object","file_path":"data/objects/000_test_object.yaml","old_content":"color: C4\ndescription: A sinister altar of red biological interfaces. Place scrap here with a bio identifier to produce biojunk. Type 'id' to begin.\ngather:\n  skill: mining\n  success:\n    base: 0\n    cap: 1\n    per_level: 0\n  tools:\n    - axe\nhidden: false\nid: 000_test_object\nname: 000 test object\non_use:\n  - action:\n      messages: {}\nsafespot:\n  decay_chance: 0\n  decay_ticks: 0\n  max_occupants: 1\n  respawn_on_hide: false\n  respawn_ticks: 0\n  tier: 1\n  unsafe_chance: 0\n","new_content":"color: C4\ndescription: A sinister altar of red biological interfaces. Place scrap here with a bio identifier to produce biojunk. Type 'id' to begin.\ngather:\n  skill: mining\n  success:\n    base: 0\n    cap: 1\n    per_level: 0\n  tools:\n    - axe\nhidden: false\nid: 000_test_object\nname: 000 test object\non_use:\n  - action:\n      messages:\n        - delay: 5\n          message: asdfdfs\n        - delay: 3\n          message: sadfdfsadfs\nsafespot:\n  decay_chance: 0\n  decay_ticks: 0\n  max_occupants: 1\n  respawn_on_hide: false\n  respawn_ticks: 0\n  tier: 1\n  unsafe_chance: 0\n","is_delete":false,"is_create":false}],"redo":null}
\ No newline at end of file
+{"history":[{"time":"2026-07-09T22:10:38-04:00","description":"update room 1007","file_path":"data/rooms/intro/1007.yaml","old_content":"id: 1007\nname: 'Room #1007'\ncolor: \"\"\ndescription: []\nexits:\n  east:\n    room: 1010\n  north:\n    room: 1008\n  south:\n    room: 1005\nobjects: []\nitem_spawns: []\nmobs: []\non_enter: []\nhazard: \"\"\nblock_transport: false\ntriggers: []\n","new_content":"block_transport: false\ncolor: \"\"\ndescription: []\nexits:\n  east:\n    room: 1010\n  north:\n    room: 1008\n  south:\n    room: 1005\nhazard: \"\"\nid: 1007\nitem_spawns: []\nmobs: []\nname: 'Room #1007'\nobjects: []\non_enter: []\non_exit:\n  - steps: []\ntriggers: []\n","is_delete":false,"is_create":false},{"time":"2026-07-09T22:10:48-04:00","description":"update room 1007","file_path":"data/rooms/intro/1007.yaml","old_content":"block_transport: false\ncolor: \"\"\ndescription: []\nexits:\n  east:\n    room: 1010\n  north:\n    room: 1008\n  south:\n    room: 1005\nhazard: \"\"\nid: 1007\nitem_spawns: []\nmobs: []\nname: 'Room #1007'\nobjects: []\non_enter: []\non_exit:\n  - steps: []\ntriggers: []\n","new_content":"block_transport: false\ncolor: \"\"\ndescription: []\nexits:\n  east:\n    room: 1010\n  north:\n    room: 1008\n  south:\n    room: 1005\nhazard: \"\"\nid: 1007\nitem_spawns: []\nmobs: []\nname: 'Room #1007'\nobjects: []\non_enter: []\non_exit:\n  - steps: []\ntriggers: []\n","is_delete":false,"is_create":false},{"time":"2026-07-09T22:10:49-04:00","description":"update room 1007","file_path":"data/rooms/intro/1007.yaml","old_content":"block_transport: false\ncolor: \"\"\ndescription: []\nexits:\n  east:\n    room: 1010\n  north:\n    room: 1008\n  south:\n    room: 1005\nhazard: \"\"\nid: 1007\nitem_spawns: []\nmobs: []\nname: 'Room #1007'\nobjects: []\non_enter: []\non_exit:\n  - steps: []\ntriggers: []\n","new_content":"block_transport: false\ncolor: \"\"\ndescription: []\nexits:\n  east:\n    room: 1010\n  north:\n    room: 1008\n  south:\n    room: 1005\nhazard: \"\"\nid: 1007\nitem_spawns: []\nmobs: []\nname: 'Room #1007'\nobjects: []\non_enter: []\non_exit:\n  - steps: []\n  - steps: []\ntriggers: []\n","is_delete":false,"is_create":false},{"time":"2026-07-09T22:10:52-04:00","description":"update room 1007","file_path":"data/rooms/intro/1007.yaml","old_content":"block_transport: false\ncolor: \"\"\ndescription: []\nexits:\n  east:\n    room: 1010\n  north:\n    room: 1008\n  south:\n    room: 1005\nhazard: \"\"\nid: 1007\nitem_spawns: []\nmobs: []\nname: 'Room #1007'\nobjects: []\non_enter: []\non_exit:\n  - steps: []\n  - steps: []\ntriggers: []\n","new_content":"block_transport: false\ncolor: \"\"\ndescription: []\nexits:\n  east:\n    room: 1010\n  north:\n    room: 1008\n  south:\n    room: 1005\nhazard: \"\"\nid: 1007\nitem_spawns: []\nmobs: []\nname: 'Room #1007'\nobjects: []\non_enter: []\non_exit:\n  - steps: []\ntriggers: []\n","is_delete":false,"is_create":false},{"time":"2026-07-09T22:10:54-04:00","description":"update room 1007","file_path":"data/rooms/intro/1007.yaml","old_content":"block_transport: false\ncolor: \"\"\ndescription: []\nexits:\n  east:\n    room: 1010\n  north:\n    room: 1008\n  south:\n    room: 1005\nhazard: \"\"\nid: 1007\nitem_spawns: []\nmobs: []\nname: 'Room #1007'\nobjects: []\non_enter: []\non_exit:\n  - steps: []\ntriggers: []\n","new_content":"block_transport: false\ncolor: \"\"\ndescription: []\nexits:\n  east:\n    room: 1010\n  north:\n    room: 1008\n  south:\n    room: 1005\nhazard: \"\"\nid: 1007\nitem_spawns: []\nmobs: []\nname: 'Room #1007'\nobjects: []\non_enter: []\non_exit: []\ntriggers: []\n","is_delete":false,"is_create":false},{"time":"2026-07-09T22:10:56-04:00","description":"update room 1007","file_path":"data/rooms/intro/1007.yaml","old_content":"block_transport: false\ncolor: \"\"\ndescription: []\nexits:\n  east:\n    room: 1010\n  north:\n    room: 1008\n  south:\n    room: 1005\nhazard: \"\"\nid: 1007\nitem_spawns: []\nmobs: []\nname: 'Room #1007'\nobjects: []\non_enter: []\non_exit: []\ntriggers: []\n","new_content":"block_transport: false\ncolor: \"\"\ndescription: []\nexits:\n  east:\n    room: 1010\n  north:\n    room: 1008\n  south:\n    room: 1005\nhazard: \"\"\nid: 1007\nitem_spawns: []\nmobs: []\nname: 'Room #1007'\nobjects: []\non_enter: []\non_exit:\n  - steps: []\ntriggers: []\n","is_delete":false,"is_create":false},{"time":"2026-07-09T22:10:57-04:00","description":"update room 1007","file_path":"data/rooms/intro/1007.yaml","old_content":"block_transport: false\ncolor: \"\"\ndescription: []\nexits:\n  east:\n    room: 1010\n  north:\n    room: 1008\n  south:\n    room: 1005\nhazard: \"\"\nid: 1007\nitem_spawns: []\nmobs: []\nname: 'Room #1007'\nobjects: []\non_enter: []\non_exit:\n  - steps: []\ntriggers: []\n","new_content":"block_transport: false\ncolor: \"\"\ndescription: []\nexits:\n  east:\n    room: 1010\n  north:\n    room: 1008\n  south:\n    room: 1005\nhazard: \"\"\nid: 1007\nitem_spawns: []\nmobs: []\nname: 'Room #1007'\nobjects: []\non_enter: []\non_exit:\n  - condition:\n      all_of: []\n    steps: []\ntriggers: []\n","is_delete":false,"is_create":false},{"time":"2026-07-09T22:11:01-04:00","description":"update room 1007","file_path":"data/rooms/intro/1007.yaml","old_content":"block_transport: false\ncolor: \"\"\ndescription: []\nexits:\n  east:\n    room: 1010\n  north:\n    room: 1008\n  south:\n    room: 1005\nhazard: \"\"\nid: 1007\nitem_spawns: []\nmobs: []\nname: 'Room #1007'\nobjects: []\non_enter: []\non_exit:\n  - condition:\n      all_of: []\n    steps: []\ntriggers: []\n","new_content":"block_transport: false\ncolor: \"\"\ndescription: []\nexits:\n  east:\n    room: 1010\n  north:\n    room: 1008\n  south:\n    room: 1005\nhazard: \"\"\nid: 1007\nitem_spawns: []\nmobs: []\nname: 'Room #1007'\nobjects: []\non_enter: []\non_exit:\n  - steps: []\ntriggers: []\n","is_delete":false,"is_create":false},{"time":"2026-07-09T22:11:02-04:00","description":"update room 1007","file_path":"data/rooms/intro/1007.yaml","old_content":"block_transport: false\ncolor: \"\"\ndescription: []\nexits:\n  east:\n    room: 1010\n  north:\n    room: 1008\n  south:\n    room: 1005\nhazard: \"\"\nid: 1007\nitem_spawns: []\nmobs: []\nname: 'Room #1007'\nobjects: []\non_enter: []\non_exit:\n  - steps: []\ntriggers: []\n","new_content":"block_transport: false\ncolor: \"\"\ndescription: []\nexits:\n  east:\n    room: 1010\n  north:\n    room: 1008\n  south:\n    room: 1005\nhazard: \"\"\nid: 1007\nitem_spawns: []\nmobs: []\nname: 'Room #1007'\nobjects: []\non_enter: []\non_exit: []\ntriggers: []\n","is_delete":false,"is_create":false},{"time":"2026-07-09T22:11:08-04:00","description":"update room 1007","file_path":"data/rooms/intro/1007.yaml","old_content":"block_transport: false\ncolor: \"\"\ndescription: []\nexits:\n  east:\n    room: 1010\n  north:\n    room: 1008\n  south:\n    room: 1005\nhazard: \"\"\nid: 1007\nitem_spawns: []\nmobs: []\nname: 'Room #1007'\nobjects: []\non_enter: []\non_exit: []\ntriggers: []\n","new_content":"block_transport: false\ncolor: \"\"\ndescription: []\nexits:\n  east:\n    room: 1010\n  north:\n    room: 1008\n  south:\n    room: 1005\nhazard: \"\"\nid: 1007\nitem_spawns: []\nmobs: []\nname: 'Room #1007'\nobjects: []\non_enter: []\non_exit: []\non_flag_change:\n  - on_player_flag: \"\"\n    steps: []\non_global_flag_change: []\ntriggers: []\n","is_delete":false,"is_create":false},{"time":"2026-07-09T22:11:18-04:00","description":"update room 1007","file_path":"data/rooms/intro/1007.yaml","old_content":"block_transport: false\ncolor: \"\"\ndescription: []\nexits:\n  east:\n    room: 1010\n  north:\n    room: 1008\n  south:\n    room: 1005\nhazard: \"\"\nid: 1007\nitem_spawns: []\nmobs: []\nname: 'Room #1007'\nobjects: []\non_enter: []\non_exit: []\non_flag_change:\n  - on_player_flag: \"\"\n    steps: []\non_global_flag_change: []\ntriggers: []\n","new_content":"block_transport: false\ncolor: \"\"\ndescription: []\nexits:\n  east:\n    room: 1010\n  north:\n    room: 1008\n  south:\n    room: 1005\nhazard: \"\"\nid: 1007\nitem_spawns: []\nmobs: []\nname: 'Room #1007'\nobjects: []\non_enter: []\non_exit: []\non_flag_change:\n  - condition:\n      all_of: []\n    on_player_flag: \"\"\n    steps: []\non_global_flag_change: []\ntriggers: []\n","is_delete":false,"is_create":false},{"time":"2026-07-09T22:11:26-04:00","description":"update room 1007","file_path":"data/rooms/intro/1007.yaml","old_content":"block_transport: false\ncolor: \"\"\ndescription: []\nexits:\n  east:\n    room: 1010\n  north:\n    room: 1008\n  south:\n    room: 1005\nhazard: \"\"\nid: 1007\nitem_spawns: []\nmobs: []\nname: 'Room #1007'\nobjects: []\non_enter: []\non_exit: []\non_flag_change:\n  - condition:\n      all_of: []\n    on_player_flag: \"\"\n    steps: []\non_global_flag_change: []\ntriggers: []\n","new_content":"block_transport: false\ncolor: \"\"\ndescription: []\nexits:\n  east:\n    room: 1010\n  north:\n    room: 1008\n  south:\n    room: 1005\nhazard: \"\"\nid: 1007\nitem_spawns: []\nmobs: []\nname: 'Room #1007'\nobjects: []\non_enter: []\non_exit: []\non_flag_change:\n  - on_player_flag: \"\"\n    steps: []\non_global_flag_change: []\ntriggers: []\n","is_delete":false,"is_create":false},{"time":"2026-07-09T22:11:27-04:00","description":"update room 1007","file_path":"data/rooms/intro/1007.yaml","old_content":"block_transport: false\ncolor: \"\"\ndescription: []\nexits:\n  east:\n    room: 1010\n  north:\n    room: 1008\n  south:\n    room: 1005\nhazard: \"\"\nid: 1007\nitem_spawns: []\nmobs: []\nname: 'Room #1007'\nobjects: []\non_enter: []\non_exit: []\non_flag_change:\n  - on_player_flag: \"\"\n    steps: []\non_global_flag_change: []\ntriggers: []\n","new_content":"block_transport: false\ncolor: \"\"\ndescription: []\nexits:\n  east:\n    room: 1010\n  north:\n    room: 1008\n  south:\n    room: 1005\nhazard: \"\"\nid: 1007\nitem_spawns: []\nmobs: []\nname: 'Room #1007'\nobjects: []\non_enter: []\non_exit: []\non_flag_change: []\non_global_flag_change: []\ntriggers: []\n","is_delete":false,"is_create":false},{"time":"2026-07-09T22:12:46-04:00","description":"Update object 000_test_object","file_path":"data/objects/000_test_object.yaml","old_content":"color: C4\ndescription: A sinister altar of red biological interfaces. Place scrap here with a bio identifier to produce biojunk. Type 'id' to begin.\ngather:\n    skill: mining\n    success:\n        base: 0\n        cap: 1\n        per_level: 0\n    tools:\n        - axe\nhidden: false\nid: 000_test_object\nname: 000 test object\non_use:\n    - steps:\n        - messages:\n            - asdfdfs\n          wait: 5\n        - messages:\n            - sadfdfsadfs\n          wait: 3\nsafespot:\n    decay_chance: 0\n    decay_ticks: 0\n    max_occupants: 1\n    respawn_on_hide: false\n    respawn_ticks: 0\n    tier: 1\n    unsafe_chance: 0\n","new_content":"color: C4\ndescription: A sinister altar of red biological interfaces. Place scrap here with a bio identifier to produce biojunk. Type 'id' to begin.\ngather:\n  skill: mining\n  success:\n    base: 0\n    cap: 1\n    per_level: 0\n  tools:\n    - axe\nhidden: false\nid: 000_test_object\nname: 000 test object\non_use:\n  - condition:\n      all_of:\n        - global_flag: one\n        - player_flag: two\n        - all_of:\n            - player_flag: three\n            - global_flag: four\nsafespot:\n  decay_chance: 0\n  decay_ticks: 0\n  max_occupants: 1\n  respawn_on_hide: false\n  respawn_ticks: 0\n  tier: 1\n  unsafe_chance: 0\n","is_delete":false,"is_create":false}],"redo":null}
\ No newline at end of file
diff --git a/data/objects/000_test_object.yaml b/data/objects/000_test_object.yaml
index 2f1ed41..7bd79b7 100644
--- a/data/objects/000_test_object.yaml
+++ b/data/objects/000_test_object.yaml
@@ -12,12 +12,13 @@ hidden: false
 id: 000_test_object
 name: 000 test object
 on_use:
-  - action:
-      messages:
-        - delay: 5
-          message: asdfdfs
-        - delay: 3
-          message: sadfdfsadfs
+  - condition:
+      all_of:
+        - global_flag: one
+        - player_flag: two
+        - all_of:
+            - player_flag: three
+            - global_flag: four
 safespot:
   decay_chance: 0
   decay_ticks: 0
diff --git a/data/objects/anvil.yaml b/data/objects/anvil.yaml
index efcb8f2..e58efef 100644
--- a/data/objects/anvil.yaml
+++ b/data/objects/anvil.yaml
@@ -3,13 +3,11 @@ description:
     - text: A heavy iron anvil for hammering metal into shape.
 name: anvil
 on_use:
-    - action:
-        messages:
-            - delay: 0
-              message: You should use this with a mold at a furnace.
-      item_id: silver_bar
-    - action:
-        messages:
-            - delay: 0
-              message: You should use this with a mold at a furnace.
-      item_id: gold_bar
+    - item_id: silver_bar
+      steps:
+        - messages:
+            - You should use this with a mold at a furnace.
+    - item_id: gold_bar
+      steps:
+        - messages:
+            - You should use this with a mold at a furnace.
diff --git a/data/objects/aps_tower.yaml b/data/objects/aps_tower.yaml
index 4b54d9d..b872cae 100644
--- a/data/objects/aps_tower.yaml
+++ b/data/objects/aps_tower.yaml
@@ -4,8 +4,7 @@ description:
 inroom_description: An APS Tower looms here, its beacon pulsing steadily.
 name: APS Tower
 on_use:
-    - action:
-        aps_node: true
-        messages:
-            - delay: 0
-              message: You connect your datapad to the APS Tower. Coordinates triangulated and stored.
+    - steps:
+        - aps_node: true
+          messages:
+            - You connect your datapad to the APS Tower. Coordinates triangulated and stored.
diff --git a/data/objects/iron_gate.yaml b/data/objects/iron_gate.yaml
index c61eebd..bded3b3 100644
--- a/data/objects/iron_gate.yaml
+++ b/data/objects/iron_gate.yaml
@@ -4,13 +4,12 @@ description:
 hidden: true
 name: iron gate
 on_use:
-    - action:
-        messages:
-            - delay: 0
-              message: You push the heavy iron gate open.
-        set_global_flags:
-            gate_open: true
-      condition:
+    - condition:
         global_flag: gate_open
         not: true
         value: true
+      steps:
+        - messages:
+            - You push the heavy iron gate open.
+          set_global_flags:
+            gate_open: true
diff --git a/data/objects/tutorial_lever.yaml b/data/objects/tutorial_lever.yaml
index 371e70b..51960d0 100644
--- a/data/objects/tutorial_lever.yaml
+++ b/data/objects/tutorial_lever.yaml
@@ -5,22 +5,20 @@ hidden: true
 inroom_description: A stone lever protrudes from the base of the rock formation.
 name: stone lever
 on_use:
-    - action:
-        messages:
-            - delay: 0
-              message: You pull the stone lever down. A mechanism clicks into place somewhere in the glade.
-        set_player_flags:
-            unlocked_rock_cover: 1
-      condition:
+    - condition:
         not: true
         player_flag: unlocked_rock_cover
         value: 1
-    - action:
-        messages:
-            - delay: 0
-              message: You push the stone lever back up. The mechanism disengages with a soft clunk.
-        set_player_flags:
-            unlocked_rock_cover: 0
-      condition:
+      steps:
+        - messages:
+            - You pull the stone lever down. A mechanism clicks into place somewhere in the glade.
+          set_player_flags:
+            unlocked_rock_cover: 1
+    - condition:
         player_flag: unlocked_rock_cover
         value: 1
+      steps:
+        - messages:
+            - You push the stone lever back up. The mechanism disengages with a soft clunk.
+          set_player_flags:
+            unlocked_rock_cover: 0
diff --git a/data/rooms/intro/1001.yaml b/data/rooms/intro/1001.yaml
index 13255ba..5a61bba 100644
--- a/data/rooms/intro/1001.yaml
+++ b/data/rooms/intro/1001.yaml
@@ -32,8 +32,42 @@ objects:
       hidden: true
       name: framed sign
       on_look:
-        - set_player_flags:
-            1001_look_sign: true
+        - steps:
+            - set_player_flags:
+                1001_look_sign: true
+            - broadcast: ""
+              broadcast_global: ""
+              despawn_mob: ""
+              give_item: ""
+              heal: 0
+              set_global_flags: {}
+              set_player_flags: {}
+              spawn_mob: null
+              take_item: ""
+              teleport: 0
+              wait: 5
+            - broadcast: ""
+              broadcast_global: ""
+              despawn_mob: ""
+              give_item: ""
+              heal: 0
+              set_global_flags: {}
+              set_player_flags: {}
+              spawn_mob: null
+              take_item: ""
+              teleport: 0
+              wait: 5
+            - broadcast: ""
+              broadcast_global: ""
+              despawn_mob: ""
+              give_item: ""
+              heal: 0
+              set_global_flags: {}
+              set_player_flags:
+                1001_touchdown: true
+              spawn_mob: null
+              take_item: ""
+              teleport: 0
     - description:
         - text: A sturdy, locked steel door that keeps passengers out of the cockpit. There is a tiny, thin window at eye level.
       hidden: true
@@ -54,123 +88,71 @@ objects:
       hidden: true
       name: pilot
 on_enter:
-    - broadcast: ""
-      broadcast_global: ""
-      condition:
-        all_of: []
-        any_of: []
-        global_flag: ""
-        has_item: ""
-        min_credits: 0
-        not: true
-        player_flag: 1001_welcome
-        value: null
-      delay: 5
-      despawn_mob: ""
-      give_item: ""
-      heal: 0
-      messages:
-        - delay: 0
-          message: '{0B bold}Welcome to The House of Icarus{/}'
-      set_global_flags: {}
-      set_player_flags: {}
-      spawn_mob: null
-      take_item: ""
-      teleport: 0
-    - broadcast: ""
-      broadcast_global: ""
-      condition:
-        all_of: []
-        any_of: []
-        global_flag: ""
-        has_item: ""
-        min_credits: 0
-        not: true
-        player_flag: 1001_welcome
-        value: null
-      delay: 7
-      despawn_mob: ""
-      give_item: ""
-      heal: 0
-      messages:
-        - delay: 0
-          message: '{0B}Type{/} {0A}look sign{/} {0B}or{/} {0A}talk attendant{/} {0B}to get started{/}'
-      set_global_flags: {}
-      set_player_flags:
-        1001_welcome: true
-      spawn_mob: null
-      take_item: ""
-      teleport: 0
-    - broadcast: ""
-      broadcast_global: ""
-      condition:
-        all_of: []
-        any_of: []
-        global_flag: ""
-        has_item: ""
-        min_credits: 0
-        not: true
-        player_flag: 1001_welcome
-        value: null
-      delay: 7
-      despawn_mob: ""
-      give_item: ""
-      heal: 0
-      messages:
-        - delay: 0
-          message: '{0B}Type{/} {0A}help newplayer{/} {0B}for the new player''s guide. That''s it. Explore and have fun.{/}'
-      set_global_flags: {}
-      set_player_flags: {}
-      spawn_mob: null
-      take_item: ""
-      teleport: 0
-triggers:
-    - id: ""
-      on_global_flag: ""
-      on_player_flag: 1001_look_sign
-      room: 0
-      steps:
+    - steps:
         - broadcast: ""
           broadcast_global: ""
-          delay: 5
+          condition:
+            all_of: []
+            any_of: []
+            global_flag: ""
+            has_item: ""
+            min_credits: 0
+            not: true
+            player_flag: 1001_welcome
+            value: null
           despawn_mob: ""
           give_item: ""
           heal: 0
           messages:
-            - delay: 0
-              message: The cabin shakes as the small craft touches down
+            - '{0B bold}Welcome to The House of Icarus{/}'
           set_global_flags: {}
           set_player_flags: {}
           spawn_mob: null
           take_item: ""
           teleport: 0
+          wait: 5
         - broadcast: ""
           broadcast_global: ""
-          delay: 5
+          condition:
+            all_of: []
+            any_of: []
+            global_flag: ""
+            has_item: ""
+            min_credits: 0
+            not: true
+            player_flag: 1001_welcome
+            value: null
           despawn_mob: ""
           give_item: ""
           heal: 0
           messages:
-            - delay: 0
-              message: The pistons hiss as the rear staircase opens
+            - '{0B}Type{/} {0A}look sign{/} {0B}or{/} {0A}talk attendant{/} {0B}to get started{/}'
           set_global_flags: {}
-          set_player_flags: {}
+          set_player_flags:
+            1001_welcome: true
           spawn_mob: null
           take_item: ""
           teleport: 0
+          wait: 7
         - broadcast: ""
           broadcast_global: ""
-          delay: 0
+          condition:
+            all_of: []
+            any_of: []
+            global_flag: ""
+            has_item: ""
+            min_credits: 0
+            not: true
+            player_flag: 1001_welcome
+            value: null
           despawn_mob: ""
           give_item: ""
           heal: 0
           messages:
-            - delay: 0
-              message: ""
+            - '{0B}Type{/} {0A}help newplayer{/} {0B}for the new player''s guide. That''s it. Explore and have fun.{/}'
           set_global_flags: {}
-          set_player_flags:
-            1001_touchdown: true
+          set_player_flags: {}
           spawn_mob: null
           take_item: ""
           teleport: 0
-      value: null
+          wait: 7
diff --git a/data/rooms/intro/1002.yaml b/data/rooms/intro/1002.yaml
index 8863c60..3abfffd 100644
--- a/data/rooms/intro/1002.yaml
+++ b/data/rooms/intro/1002.yaml
@@ -67,26 +67,24 @@ objects:
         - text: The sign simply says 'Processing' in bold red letters. Beneath in smaller text it says 'Welcome to Vesta', seemingly added afterwards to try to give the sign some warmth.
       name: sign
 on_enter:
-    - condition:
-        not: true
-        player_flag: 1002_lined_up
-      delay: 7
-      messages:
-        - delay: 0
-          message: A young boy the crowd openly look you up and down a little bemused, as if you're heading the wrong direction.
-    - condition:
-        not: true
-        player_flag: 1002_lined_up
-      delay: 7
-      messages:
-        - delay: 0
-          message: The pilot pops out of the hatch of the craft and calls out "Shuttle to Passenger Barge Denali. Tickets out, please! Nice and orderly!"
-    - condition:
-        not: true
-        player_flag: 1002_lined_up
-      delay: 7
-      messages:
-        - delay: 0
-          message: The people all shuffle into a line, dragging their luggage out of the path to clear the way for you.
-      set_player_flags:
-        1002_lined_up: true
+    - steps:
+        - condition:
+            not: true
+            player_flag: 1002_lined_up
+          messages:
+            - A young boy the crowd openly look you up and down a little bemused, as if you're heading the wrong direction.
+          wait: 7
+        - condition:
+            not: true
+            player_flag: 1002_lined_up
+          messages:
+            - The pilot pops out of the hatch of the craft and calls out "Shuttle to Passenger Barge Denali. Tickets out, please! Nice and orderly!"
+          wait: 7
+        - condition:
+            not: true
+            player_flag: 1002_lined_up
+          messages:
+            - The people all shuffle into a line, dragging their luggage out of the path to clear the way for you.
+          set_player_flags:
+            1002_lined_up: true
+          wait: 7
diff --git a/data/rooms/intro/1003.yaml b/data/rooms/intro/1003.yaml
index 5cd7d64..05f8c56 100644
--- a/data/rooms/intro/1003.yaml
+++ b/data/rooms/intro/1003.yaml
@@ -17,13 +17,13 @@ mobs:
 name: Processing Building
 objects: []
 on_enter:
-    - condition:
-        not: true
-        player_flag: 1003_first_time
-      delay: 5
-      messages:
-        - delay: 0
-          message: '{bold}The ground rumbles as the shuttle departs the pad behind you!{/}'
-      set_player_flags:
-        1003_first_time: true
+    - steps:
+        - condition:
+            not: true
+            player_flag: 1003_first_time
+          messages:
+            - '{bold}The ground rumbles as the shuttle departs the pad behind you!{/}'
+          set_player_flags:
+            1003_first_time: true
+          wait: 5
 triggers: []
diff --git a/data/rooms/intro/1007.yaml b/data/rooms/intro/1007.yaml
index bc05da9..1d02bfe 100644
--- a/data/rooms/intro/1007.yaml
+++ b/data/rooms/intro/1007.yaml
@@ -1,5 +1,4 @@
-id: 1007
-name: 'Room #1007'
+block_transport: false
 color: ""
 description: []
 exits:
@@ -9,10 +8,14 @@ exits:
     room: 1008
   south:
     room: 1005
-objects: []
+hazard: ""
+id: 1007
 item_spawns: []
 mobs: []
+name: 'Room #1007'
+objects: []
 on_enter: []
-hazard: ""
-block_transport: false
+on_exit: []
+on_flag_change: []
+on_global_flag_change: []
 triggers: []