feat: message actions are now sequences of messages with settable delays

9 files changed, 342 insertions, 301 deletions

diff --git a/data/.admin_history.json b/data/.admin_history.json
new file mode 100644
index 0000000..3cebbbd
--- /dev/null
+++ b/data/.admin_history.json
@@ -0,0 +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
diff --git a/data/objects/000_test_object.yaml b/data/objects/000_test_object.yaml
index e465048..2f1ed41 100644
--- a/data/objects/000_test_object.yaml
+++ b/data/objects/000_test_object.yaml
@@ -1,28 +1,28 @@
 color: C4
-description:
-- text: A sinister altar of red biological interfaces. Place scrap here with a bio identifier to produce biojunk. Type 'id' to begin.
+description: A sinister altar of red biological interfaces. Place scrap here with a bio identifier to produce biojunk. Type 'id' to begin.
 gather:
-  bait: ""
-  depleted_message: ""
-  exhausted_message: ""
-  fail_message: ""
-  gather_message: ""
-  respawn_broadcast: ""
   skill: mining
   success:
     base: 0
     cap: 1
     per_level: 0
   tools:
-  - axe
+    - axe
 hidden: false
 id: 000_test_object
 name: 000 test object
+on_use:
+  - action:
+      messages:
+        - delay: 5
+          message: asdfdfs
+        - delay: 3
+          message: sadfdfsadfs
 safespot:
   decay_chance: 0
   decay_ticks: 0
-  max_block_size: ""
   max_occupants: 1
+  respawn_on_hide: false
   respawn_ticks: 0
   tier: 1
   unsafe_chance: 0
diff --git a/data/objects/anvil.yaml b/data/objects/anvil.yaml
index 4c8bc40..efcb8f2 100644
--- a/data/objects/anvil.yaml
+++ b/data/objects/anvil.yaml
@@ -1,9 +1,15 @@
-name: anvil
-color: "FA"
+color: FA
 description:
-  - text: "A heavy iron anvil for hammering metal into shape."
+    - text: A heavy iron anvil for hammering metal into shape.
+name: anvil
 on_use:
-  - item_id: silver_bar
-    message: "You should use this with a mold at a furnace."
-  - item_id: gold_bar
-    message: "You should use this with a mold at a furnace."
+    - 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
diff --git a/data/objects/aps_tower.yaml b/data/objects/aps_tower.yaml
index 7919a5b..4b54d9d 100644
--- a/data/objects/aps_tower.yaml
+++ b/data/objects/aps_tower.yaml
@@ -1,9 +1,11 @@
-name: APS Tower
 color: "21"
 description:
-  - text: "A tall, skeletal metal tower with a pulsing cyan beacon at its apex. A datapad sync panel glows softly at the base."
-inroom_description: "An APS Tower looms here, its beacon pulsing steadily."
+    - text: A tall, skeletal metal tower with a pulsing cyan beacon at its apex. A datapad sync panel glows softly at the base.
+inroom_description: An APS Tower looms here, its beacon pulsing steadily.
+name: APS Tower
 on_use:
-  - message: "You connect your datapad to the APS Tower. Coordinates triangulated and stored."
-    action:
-      aps_node: true
+    - action:
+        aps_node: true
+        messages:
+            - delay: 0
+              message: 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 5d6d53e..c61eebd 100644
--- a/data/objects/iron_gate.yaml
+++ b/data/objects/iron_gate.yaml
@@ -1,14 +1,16 @@
-color: "FA"
+color: FA
 description:
-- text: A heavy iron gate. It looks like it can be pushed open.
+    - text: A heavy iron gate. It looks like it can be pushed open.
 hidden: true
 name: iron gate
 on_use:
-- condition:
-    global_flag: gate_open
-    not: true
-    value: true
-  message: You push the heavy iron gate open.
-  action:
-    set_global_flags:
-      gate_open: true
+    - action:
+        messages:
+            - delay: 0
+              message: You push the heavy iron gate open.
+        set_global_flags:
+            gate_open: true
+      condition:
+        global_flag: gate_open
+        not: true
+        value: true
diff --git a/data/objects/tutorial_lever.yaml b/data/objects/tutorial_lever.yaml
index 9c105ba..371e70b 100644
--- a/data/objects/tutorial_lever.yaml
+++ b/data/objects/tutorial_lever.yaml
@@ -1,22 +1,26 @@
-name: stone lever
-color: "FA"
-hidden: true
-inroom_description: "A stone lever protrudes from the base of the rock formation."
+color: FA
 description:
-  - text: "A weathered stone lever set into a metal bracket. It looks like it can be pulled."
+    - text: A weathered stone lever set into a metal bracket. It looks like it can be pulled.
+hidden: true
+inroom_description: A stone lever protrudes from the base of the rock formation.
+name: stone lever
 on_use:
-  - condition:
-      player_flag: unlocked_rock_cover
-      value: 1
-      not: true
-    message: "You pull the stone lever down. A mechanism clicks into place somewhere in the glade."
-    action:
-      set_player_flags:
-        unlocked_rock_cover: 1
-  - condition:
-      player_flag: unlocked_rock_cover
-      value: 1
-    message: "You push the stone lever back up. The mechanism disengages with a soft clunk."
-    action:
-      set_player_flags:
-        unlocked_rock_cover: 0
+    - 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:
+        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:
+        player_flag: unlocked_rock_cover
+        value: 1
diff --git a/data/rooms/intro/1001.yaml b/data/rooms/intro/1001.yaml
index 8960ea5..13255ba 100644
--- a/data/rooms/intro/1001.yaml
+++ b/data/rooms/intro/1001.yaml
@@ -1,164 +1,176 @@
 block_transport: true
 color: ""
 description:
-  - text: |-
-      A dim, windowless shuttle interior with a few uncomfortable rows of steel seats facing forward. A large framed sign hangs next to the closed cockpit door. The piston-powered staircase is firmly closed at the rear of the craft.
+    - text: |-
+        A dim, windowless shuttle interior with a few uncomfortable rows of steel seats facing forward. A large framed sign hangs next to the closed cockpit door. The piston-powered staircase is firmly closed at the rear of the craft.
 
-      A dim, windowless shuttle interior with a few uncomfortable rows of steel seats facing forward. A large {11}framed sign{/} hangs next to the closed cockpit door. A piston-powered staircase leads down out the back of the small craft with a smiling attendant ready to help disembark.
+        A dim, windowless shuttle interior with a few uncomfortable rows of steel seats facing forward. A large {11}framed sign{/} hangs next to the closed cockpit door. A piston-powered staircase leads down out the back of the small craft with a smiling attendant ready to help disembark.
 exits:
-  down:
-    blocked_message: The piston-powered staircase is firmly closed.
-    condition:
-      all_of: []
-      any_of: []
-      global_flag: ""
-      has_item: ""
-      min_credits: 0
-      not: false
-      player_flag: 1001_touchdown
-      value: null
-    room: 1002
-  east:
-    room: 2001
+    down:
+        blocked_message: The piston-powered staircase is firmly closed.
+        condition:
+            all_of: []
+            any_of: []
+            global_flag: ""
+            has_item: ""
+            min_credits: 0
+            not: false
+            player_flag: 1001_touchdown
+            value: null
+        room: 1002
+    east:
+        room: 2001
 hazard: ""
 id: 1001
 item_spawns: []
 mobs:
-  - id: flight_attendant
+    - id: flight_attendant
 name: Inside Transport Shuttle
 objects:
-  - description:
-      - text: "We hope you enjoy your trip on our shuttle! Your pilot is [TYLER].\n\nWhen you arrive at your final destination, please be aware of the following basic commands:\n\n{0B bold}Movement:{/}  {0A}north{/}, {0A}south{/}, {0A}east{/}, {0A}west{/}, {0A}up{/}, {0A}down{/}\n{0B bold}Look:{/}      {0A}look{/}, {0A}look <item/object/mob>{/}, and {0A}map{/}\n{0B bold}Items:{/}     {0A}inv{/} to see your 28-slot inventory\n           {0A}get <item>{/}, {0A}drop <item>{/}, {0A}wear <item>{/}, {0A}remove <item>{/}\n           {0A}use <item> on <item/object>{/}\n           {0A}eq{/} for equiped gear\n{0B bold}Comms:{/}     {0A}talk <mob>{/} for NPC chat\n           {0A}say <msg>{/} and {0A}global <msg>{/} for human chat\n{0B bold}Character:{/} {0A}score{/} and {0A}skills{/} for stats. \n{0B bold}Combat{/}     {0A}attack <mob>{/}\n{0B bold}Skills{/}     Many skills have shortcuts like {0A}mine{/}, {0A}fish{/}, or {0A}chop{/}\n{0B bold}Options{/}    {0A}options{/} for a list of account options\n           {0A}options <opt> <value>{/} to change an option\n\nType {0C bold}what{/} for a list of possible common actions\n\nMake sure to check the {0A}help{/} pages, especially {0A}help newplayer{/}!"
-    hidden: true
-    name: framed sign
-    on_look:
-      - set_player_flags:
-          1001_look_sign: true
-  - 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
-    name: door
-  - description:
-      - text: A thick trim with rounded bolt heads frames the tiny window. It looks like it was cut into the door at some point, potentially as a simple replacement to computerized security systems. Inside the cockpit there's a pilot finishing up landing procedures on a large panel of analog instruments.
-    hidden: true
-    name: window
-  - aliases:
-      - cockpit
-    description:
-      - text: The cramped cockpit is surrounded by buttons, swiches, dials, and analog gauges. The parts are a mix of technologies from the last century. Part of the panel is obscured by a draped cloth as if to hide it from view. Odd.
-    hidden: true
-    name: instrument panel
-  - aliases: []
-    description:
-      - text: That's the guy who took you from the Passenger Barge Denali down here to Vesta. A middle-aged man in a neat white jumpsuit with a matching white sort of conductor's hat. He's following a written procedure checklist and seems to take his job seriously.
-    hidden: true
-    name: pilot
+    - description:
+        - text: "We hope you enjoy your trip on our shuttle! Your pilot is [TYLER].\n\nWhen you arrive at your final destination, please be aware of the following basic commands:\n\n{0B bold}Movement:{/}  {0A}north{/}, {0A}south{/}, {0A}east{/}, {0A}west{/}, {0A}up{/}, {0A}down{/}\n{0B bold}Look:{/}      {0A}look{/}, {0A}look <item/object/mob>{/}, and {0A}map{/}\n{0B bold}Items:{/}     {0A}inv{/} to see your 28-slot inventory\n           {0A}get <item>{/}, {0A}drop <item>{/}, {0A}wear <item>{/}, {0A}remove <item>{/}\n           {0A}use <item> on <item/object>{/}\n           {0A}eq{/} for equiped gear\n{0B bold}Comms:{/}     {0A}talk <mob>{/} for NPC chat\n           {0A}say <msg>{/} and {0A}global <msg>{/} for human chat\n{0B bold}Character:{/} {0A}score{/} and {0A}skills{/} for stats. \n{0B bold}Combat{/}     {0A}attack <mob>{/}\n{0B bold}Skills{/}     Many skills have shortcuts like {0A}mine{/}, {0A}fish{/}, or {0A}chop{/}\n{0B bold}Options{/}    {0A}options{/} for a list of account options\n           {0A}options <opt> <value>{/} to change an option\n\nType {0C bold}what{/} for a list of possible common actions\n\nMake sure to check the {0A}help{/} pages, especially {0A}help newplayer{/}!"
+      hidden: true
+      name: framed sign
+      on_look:
+        - set_player_flags:
+            1001_look_sign: true
+    - 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
+      name: door
+    - description:
+        - text: A thick trim with rounded bolt heads frames the tiny window. It looks like it was cut into the door at some point, potentially as a simple replacement to computerized security systems. Inside the cockpit there's a pilot finishing up landing procedures on a large panel of analog instruments.
+      hidden: true
+      name: window
+    - aliases:
+        - cockpit
+      description:
+        - text: The cramped cockpit is surrounded by buttons, swiches, dials, and analog gauges. The parts are a mix of technologies from the last century. Part of the panel is obscured by a draped cloth as if to hide it from view. Odd.
+      hidden: true
+      name: instrument panel
+    - aliases: []
+      description:
+        - text: That's the guy who took you from the Passenger Barge Denali down here to Vesta. A middle-aged man in a neat white jumpsuit with a matching white sort of conductor's hat. He's following a written procedure checklist and seems to take his job seriously.
+      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
-    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
-    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
-    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
+    - 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:
-      - broadcast: ""
-        broadcast_global: ""
-        delay: 5
-        despawn_mob: ""
-        give_item: ""
-        heal: 0
-        message: The cabin shakes as the small craft touches down
-        set_global_flags: {}
-        set_player_flags: {}
-        spawn_mob: null
-        take_item: ""
-        teleport: 0
-      - broadcast: ""
-        broadcast_global: ""
-        delay: 5
-        despawn_mob: ""
-        give_item: ""
-        heal: 0
-        message: The pistons hiss as the rear staircase opens
-        set_global_flags: {}
-        set_player_flags: {}
-        spawn_mob: null
-        take_item: ""
-        teleport: 0
-      - broadcast: ""
-        broadcast_global: ""
-        delay: 0
-        despawn_mob: ""
-        give_item: ""
-        heal: 0
-        message: ""
-        set_global_flags: {}
-        set_player_flags:
-          1001_touchdown: true
-        spawn_mob: null
-        take_item: ""
-        teleport: 0
-    value: null
+    - id: ""
+      on_global_flag: ""
+      on_player_flag: 1001_look_sign
+      room: 0
+      steps:
+        - broadcast: ""
+          broadcast_global: ""
+          delay: 5
+          despawn_mob: ""
+          give_item: ""
+          heal: 0
+          messages:
+            - delay: 0
+              message: The cabin shakes as the small craft touches down
+          set_global_flags: {}
+          set_player_flags: {}
+          spawn_mob: null
+          take_item: ""
+          teleport: 0
+        - broadcast: ""
+          broadcast_global: ""
+          delay: 5
+          despawn_mob: ""
+          give_item: ""
+          heal: 0
+          messages:
+            - delay: 0
+              message: The pistons hiss as the rear staircase opens
+          set_global_flags: {}
+          set_player_flags: {}
+          spawn_mob: null
+          take_item: ""
+          teleport: 0
+        - broadcast: ""
+          broadcast_global: ""
+          delay: 0
+          despawn_mob: ""
+          give_item: ""
+          heal: 0
+          messages:
+            - delay: 0
+              message: ""
+          set_global_flags: {}
+          set_player_flags:
+            1001_touchdown: true
+          spawn_mob: null
+          take_item: ""
+          teleport: 0
+      value: null
diff --git a/data/rooms/intro/1002.yaml b/data/rooms/intro/1002.yaml
index ca34347..8863c60 100644
--- a/data/rooms/intro/1002.yaml
+++ b/data/rooms/intro/1002.yaml
@@ -1,80 +1,92 @@
-name: "Landing Pad"
 description:
-  - condition:
-      player_flag: 1002_intro_done
-      not: true
-    text: "A large, circular, concrete landing pad sits in the middle of a blue ocean with a transport shuttle taking up nearly all of the walkable area. A crowd of perhaps a dozen people are shambling out of a squat, doorless building to the north. A sign above the entryway reads \"Processing\""
-  - text: "A large, circular, concrete landing pad sits empty in the middle of a blue ocean that stretches to the horizon. North is a concrete path through a squat, doorless building with sign above the entryway reading \"Processing\""
-objects:
-  - name: crowd of people
-    aliases: [line, group, passengers]
-    hidden: true
-    description:
-      - condition:
-          all_of:
-            - player_flag: 1002_intro_done
-              not: true
-            - player_flag: 1002_lined_up
-        text: "A mass of people still onto the crowded platform, blocking your exit!"
-      - condition:
-          all_of:
-            - player_flag: 1002_intro_done
-              not: true
-            - player_flag: 1002_lined_up
-              not: true
-        text: "A dozen or so passengers ready to leave, all with luggage. Their eyes are a mix of impatience, anxiety, and perhaps suspicion."
-  - name: landing craft
-    aliases: [shuttle, ship]
-    hidden: true
-    description:
-      - condition:
-          player_flag: 1002_intro_done
-          not: true
-        text: "The small white craft has short, cute wings, a wide snub-nosed cockpit, and the rear hatch opened into a staircase. The low hum of its power plant vibrates the platform as it idles. You might guess it's a 95 ton Type-QS Passenger Shuttle. Just a guess though."
-  - name: pilot
-    hidden: true
-    description:
-      - condition:
-          all_of:
-            - player_flag: 1002_intro_done
-              not: true
-            - player_flag: 1002_lined_up
-        text: "The pilot stands straight as if about to escort royalty looking down his nose a bit at the passengers. He is quickly and professionally checking tickets."
-  - name: building
-    aliases: [processing]
-    description:
-      - text: "A building with no door on this side that looks like a giant cup of tea spilled towards you. It's built from large chunks of gray rock that must've come from the surface of Vesta."
-  - name: sign
-    description:
-      - 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."
+    - condition:
+        not: true
+        player_flag: 1002_intro_done
+      text: A large, circular, concrete landing pad sits in the middle of a blue ocean with a transport shuttle taking up nearly all of the walkable area. A crowd of perhaps a dozen people are shambling out of a squat, doorless building to the north. A sign above the entryway reads "Processing"
+    - text: A large, circular, concrete landing pad sits empty in the middle of a blue ocean that stretches to the horizon. North is a concrete path through a squat, doorless building with sign above the entryway reading "Processing"
 exits:
-  up:
-    room: 1001
-    condition:
-      player_flag: always_false
-    blocked_message: "You have no ticket, or reason, to leave Vesta."
-  north:
-    room: 1003
-    condition:
-      player_flag: 1002_lined_up
-    blocked_message: "A mass of people is still pouring out of the building!"
-    set_player_flags:
-      1002_intro_done: true
+    north:
+        blocked_message: A mass of people is still pouring out of the building!
+        condition:
+            player_flag: 1002_lined_up
+        room: 1003
+        set_player_flags:
+            1002_intro_done: true
+    up:
+        blocked_message: You have no ticket, or reason, to leave Vesta.
+        condition:
+            player_flag: always_false
+        room: 1001
+name: Landing Pad
+objects:
+    - aliases:
+        - line
+        - group
+        - passengers
+      description:
+        - condition:
+            all_of:
+                - not: true
+                  player_flag: 1002_intro_done
+                - player_flag: 1002_lined_up
+          text: A mass of people still onto the crowded platform, blocking your exit!
+        - condition:
+            all_of:
+                - not: true
+                  player_flag: 1002_intro_done
+                - not: true
+                  player_flag: 1002_lined_up
+          text: A dozen or so passengers ready to leave, all with luggage. Their eyes are a mix of impatience, anxiety, and perhaps suspicion.
+      hidden: true
+      name: crowd of people
+    - aliases:
+        - shuttle
+        - ship
+      description:
+        - condition:
+            not: true
+            player_flag: 1002_intro_done
+          text: The small white craft has short, cute wings, a wide snub-nosed cockpit, and the rear hatch opened into a staircase. The low hum of its power plant vibrates the platform as it idles. You might guess it's a 95 ton Type-QS Passenger Shuttle. Just a guess though.
+      hidden: true
+      name: landing craft
+    - description:
+        - condition:
+            all_of:
+                - not: true
+                  player_flag: 1002_intro_done
+                - player_flag: 1002_lined_up
+          text: The pilot stands straight as if about to escort royalty looking down his nose a bit at the passengers. He is quickly and professionally checking tickets.
+      hidden: true
+      name: pilot
+    - aliases:
+        - processing
+      description:
+        - text: A building with no door on this side that looks like a giant cup of tea spilled towards you. It's built from large chunks of gray rock that must've come from the surface of Vesta.
+      name: building
+    - description:
+        - 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:
-      player_flag: 1002_lined_up
-      not: true
-    delay: 7
-    message: "A young boy the crowd openly look you up and down a little bemused, as if you're heading the wrong direction."
-  - condition:
-      player_flag: 1002_lined_up
-      not: true
-    delay: 7
-    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:
-      player_flag: 1002_lined_up
-      not: true
-    delay: 7
-    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
+    - 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
diff --git a/data/rooms/intro/1003.yaml b/data/rooms/intro/1003.yaml
index c6d3d8a..5cd7d64 100644
--- a/data/rooms/intro/1003.yaml
+++ b/data/rooms/intro/1003.yaml
@@ -1,27 +1,29 @@
-id: 1003
-name: Processing Building
+block_transport: false
 color: ""
 description:
-- text: A short tunnel-like building with queue ropes and desks on each side, and signs directing "Departures" and "Arrivals" above each. An attendant stands doing paperwork on the Departures side. No one is on the Arrivals side.
+    - text: A short tunnel-like building with queue ropes and desks on each side, and signs directing "Departures" and "Arrivals" above each. An attendant stands doing paperwork on the Departures side. No one is on the Arrivals side.
 exits:
-  north:
-    room: 1004
-    condition:
-      player_flag: 1003_talked
-  south:
-    room: 1002
-objects: []
+    north:
+        condition:
+            player_flag: 1003_talked
+        room: 1004
+    south:
+        room: 1002
+hazard: ""
+id: 1003
 item_spawns: []
 mobs:
-- id: spaceport_attendant
+    - id: spaceport_attendant
+name: Processing Building
+objects: []
 on_enter:
-- condition:
-    player_flag: 1003_first_time
-    not: true
-  delay: 5
-  message: "{bold}The ground rumbles as the shuttle departs the pad behind you!{/}"
-  set_player_flags:
-    1003_first_time: true
-hazard: ""
-block_transport: false
+    - 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
 triggers: []