feat: admin gui map, item, and objects mostly complete

40 files changed, 45 insertions, 45 deletions

diff --git a/data/items/consumables/amp_potion.yaml b/data/items/consumables/amp_potion.yaml
index 22f9dd7..bef5891 100644
--- a/data/items/consumables/amp_potion.yaml
+++ b/data/items/consumables/amp_potion.yaml
@@ -9,7 +9,7 @@ craft:
           quantity: 1
     level: 12
     type: pharmacy
-    wait: 4
+    ticks_per_cycle: 4
     xp: 50
 description: A glowing gold potion that amplifies physical strength.
 name: amp potion
diff --git a/data/items/consumables/anchovies.yaml b/data/items/consumables/anchovies.yaml
index 1d1dfdd..5fe9bf4 100644
--- a/data/items/consumables/anchovies.yaml
+++ b/data/items/consumables/anchovies.yaml
@@ -11,7 +11,7 @@ craft:
         - fire
         - cooking_range
     type: cooking
-    wait: 6
+    ticks_per_cycle: 6
     xp: 30
 description: Some nicely cooked anchovies.
 eat_message: You eat the anchovies.
diff --git a/data/items/consumables/avantoe_potion_unf.yaml b/data/items/consumables/avantoe_potion_unf.yaml
index 8cee682..a37966a 100644
--- a/data/items/consumables/avantoe_potion_unf.yaml
+++ b/data/items/consumables/avantoe_potion_unf.yaml
@@ -8,7 +8,7 @@ craft:
         - items:
             - vial_of_water
           quantity: 1
-    wait: 0
+    ticks_per_cycle: 0
 description: An unfinished potion with avantoe floating in water.
 name: avantoe potion (unf)
 stackable: false
diff --git a/data/items/consumables/bio_serum.yaml b/data/items/consumables/bio_serum.yaml
index 68147b1..9959feb 100644
--- a/data/items/consumables/bio_serum.yaml
+++ b/data/items/consumables/bio_serum.yaml
@@ -9,7 +9,7 @@ craft:
           quantity: 1
     level: 5
     type: pharmacy
-    wait: 4
+    ticks_per_cycle: 4
     xp: 38
 description: A green serum that neutralizes biological toxins and restores health.
 name: bio serum
diff --git a/data/items/consumables/bread.yaml b/data/items/consumables/bread.yaml
index 6ded8b0..ef14f1a 100644
--- a/data/items/consumables/bread.yaml
+++ b/data/items/consumables/bread.yaml
@@ -11,7 +11,7 @@ craft:
     station:
         - cooking_range
     type: cooking
-    wait: 6
+    ticks_per_cycle: 6
     xp: 40
 description: A fresh loaf of bread, still warm from the oven.
 eat_message: You eat the bread. Warm and satisfying.
diff --git a/data/items/consumables/bread_dough.yaml b/data/items/consumables/bread_dough.yaml
index cce972d..9909c58 100644
--- a/data/items/consumables/bread_dough.yaml
+++ b/data/items/consumables/bread_dough.yaml
@@ -1,6 +1,8 @@
 color: DE
 craft:
-  - ingredients:
+  - end_message: ""
+    fail: ""
+    ingredients:
       - byproducts:
           - empty_pot
         items:
@@ -13,17 +15,15 @@ craft:
           - bucket_of_water
           - jug_of_water
         quantity: 1
-    end_message: testend
-    fail: ""
     level: 0
-    success_message: testmsg
     output_qty: 0
-    start_message: teststart
+    start_message: ""
     station: []
     subtype: ""
+    success_message: ""
+    ticks_per_cycle: 2
     tool: ""
     type: combine
-    wait: 2
     xp: 0
 description: A ball of uncooked bread dough. It needs to be baked.
 id: bread_dough
diff --git a/data/items/consumables/cadantine_potion_unf.yaml b/data/items/consumables/cadantine_potion_unf.yaml
index d222ed4..3630312 100644
--- a/data/items/consumables/cadantine_potion_unf.yaml
+++ b/data/items/consumables/cadantine_potion_unf.yaml
@@ -8,7 +8,7 @@ craft:
         - items:
             - vial_of_water
           quantity: 1
-    wait: 0
+    ticks_per_cycle: 0
 description: An unfinished potion with cadantine floating in water.
 name: cadantine potion (unf)
 stackable: false
diff --git a/data/items/consumables/dwarf_weed_potion_unf.yaml b/data/items/consumables/dwarf_weed_potion_unf.yaml
index 084a434..9d4076b 100644
--- a/data/items/consumables/dwarf_weed_potion_unf.yaml
+++ b/data/items/consumables/dwarf_weed_potion_unf.yaml
@@ -8,7 +8,7 @@ craft:
         - items:
             - vial_of_water
           quantity: 1
-    wait: 0
+    ticks_per_cycle: 0
 description: An unfinished potion with dwarf weed floating in water.
 name: dwarf weed potion (unf)
 stackable: false
diff --git a/data/items/consumables/full_restore.yaml b/data/items/consumables/full_restore.yaml
index 178914e..48f32e9 100644
--- a/data/items/consumables/full_restore.yaml
+++ b/data/items/consumables/full_restore.yaml
@@ -9,7 +9,7 @@ craft:
           quantity: 1
     level: 63
     type: pharmacy
-    wait: 4
+    ticks_per_cycle: 4
     xp: 143
 description: A powerful orange potion that completely restores health.
 name: full restore
diff --git a/data/items/consumables/guam_potion_unf.yaml b/data/items/consumables/guam_potion_unf.yaml
index b758ac1..3175d81 100644
--- a/data/items/consumables/guam_potion_unf.yaml
+++ b/data/items/consumables/guam_potion_unf.yaml
@@ -8,7 +8,7 @@ craft:
         - items:
             - vial_of_water
           quantity: 1
-    wait: 0
+    ticks_per_cycle: 0
     success_message: "You mix %i1 and %i2 into %n!!!"
 description: An unfinished potion with guam floating in water.
 name: guam potion (unf)
diff --git a/data/items/consumables/harralander_potion_unf.yaml b/data/items/consumables/harralander_potion_unf.yaml
index cf4873f..4620d73 100644
--- a/data/items/consumables/harralander_potion_unf.yaml
+++ b/data/items/consumables/harralander_potion_unf.yaml
@@ -8,7 +8,7 @@ craft:
         - items:
             - vial_of_water
           quantity: 1
-    wait: 0
+    ticks_per_cycle: 0
 description: An unfinished potion with harralander floating in water.
 name: harralander potion (unf)
 stackable: false
diff --git a/data/items/consumables/herring.yaml b/data/items/consumables/herring.yaml
index 165802b..fe01452 100644
--- a/data/items/consumables/herring.yaml
+++ b/data/items/consumables/herring.yaml
@@ -11,7 +11,7 @@ craft:
         - fire
         - cooking_range
     type: cooking
-    wait: 6
+    ticks_per_cycle: 6
     xp: 50
 description: A nicely cooked herring.
 eat_message: You eat the herring.
diff --git a/data/items/consumables/irit_potion_unf.yaml b/data/items/consumables/irit_potion_unf.yaml
index b358c07..887de6d 100644
--- a/data/items/consumables/irit_potion_unf.yaml
+++ b/data/items/consumables/irit_potion_unf.yaml
@@ -8,7 +8,7 @@ craft:
         - items:
             - vial_of_water
           quantity: 1
-    wait: 0
+    ticks_per_cycle: 0
 description: An unfinished potion with irit floating in water.
 name: irit potion (unf)
 stackable: false
diff --git a/data/items/consumables/kwuarm_potion_unf.yaml b/data/items/consumables/kwuarm_potion_unf.yaml
index 801d301..6515b7c 100644
--- a/data/items/consumables/kwuarm_potion_unf.yaml
+++ b/data/items/consumables/kwuarm_potion_unf.yaml
@@ -8,7 +8,7 @@ craft:
         - items:
             - vial_of_water
           quantity: 1
-    wait: 0
+    ticks_per_cycle: 0
 description: An unfinished potion with kwuarm floating in water.
 name: kwuarm potion (unf)
 stackable: false
diff --git a/data/items/consumables/lantadyme_potion_unf.yaml b/data/items/consumables/lantadyme_potion_unf.yaml
index 069cf22..ba3c53a 100644
--- a/data/items/consumables/lantadyme_potion_unf.yaml
+++ b/data/items/consumables/lantadyme_potion_unf.yaml
@@ -8,7 +8,7 @@ craft:
         - items:
             - vial_of_water
           quantity: 1
-    wait: 0
+    ticks_per_cycle: 0
 description: An unfinished potion with lantadyme floating in water.
 name: lantadyme potion (unf)
 stackable: false
diff --git a/data/items/consumables/marrentill_potion_unf.yaml b/data/items/consumables/marrentill_potion_unf.yaml
index f39094e..7d42926 100644
--- a/data/items/consumables/marrentill_potion_unf.yaml
+++ b/data/items/consumables/marrentill_potion_unf.yaml
@@ -8,7 +8,7 @@ craft:
         - items:
             - vial_of_water
           quantity: 1
-    wait: 0
+    ticks_per_cycle: 0
 description: An unfinished potion with marrentill floating in water.
 name: marrentill potion (unf)
 stackable: false
diff --git a/data/items/consumables/nano_restore.yaml b/data/items/consumables/nano_restore.yaml
index ddb355a..88b75ab 100644
--- a/data/items/consumables/nano_restore.yaml
+++ b/data/items/consumables/nano_restore.yaml
@@ -9,7 +9,7 @@ craft:
           quantity: 1
     level: 22
     type: pharmacy
-    wait: 4
+    ticks_per_cycle: 4
     xp: 63
 description: An orange potion containing nanobots that restore diminished attributes.
 name: nano restore
diff --git a/data/items/consumables/pastry_dough.yaml b/data/items/consumables/pastry_dough.yaml
index 8c106e0..6cf7020 100644
--- a/data/items/consumables/pastry_dough.yaml
+++ b/data/items/consumables/pastry_dough.yaml
@@ -8,7 +8,7 @@ craft:
         - items:
             - bucket_of_water
           quantity: 1
-    wait: 2
+    ticks_per_cycle: 2
 description: A ball of uncooked pastry dough. It needs to be baked.
 name: pastry dough
 stackable: false
diff --git a/data/items/consumables/pie_dish.yaml b/data/items/consumables/pie_dish.yaml
index 959cb65..799108f 100644
--- a/data/items/consumables/pie_dish.yaml
+++ b/data/items/consumables/pie_dish.yaml
@@ -14,7 +14,7 @@ craft:
         cap: 0.95
         per_level: 0.02
     type: crafting
-    wait: 4
+    ticks_per_cycle: 4
     xp: 10
 description: A clay pie dish for baking pies.
 name: pie dish
diff --git a/data/items/consumables/pizza_dough.yaml b/data/items/consumables/pizza_dough.yaml
index c8e29dc..b323f92 100644
--- a/data/items/consumables/pizza_dough.yaml
+++ b/data/items/consumables/pizza_dough.yaml
@@ -8,7 +8,7 @@ craft:
         - items:
             - bucket_of_water
           quantity: 1
-    wait: 2
+    ticks_per_cycle: 2
 description: A ball of uncooked pizza dough. It needs to be baked.
 name: pizza dough
 stackable: false
diff --git a/data/items/consumables/ranarr_potion_unf.yaml b/data/items/consumables/ranarr_potion_unf.yaml
index 3adfbf7..a91a79a 100644
--- a/data/items/consumables/ranarr_potion_unf.yaml
+++ b/data/items/consumables/ranarr_potion_unf.yaml
@@ -8,7 +8,7 @@ craft:
         - items:
             - vial_of_water
           quantity: 1
-    wait: 0
+    ticks_per_cycle: 0
 description: An unfinished potion with ranarr floating in water.
 name: ranarr potion (unf)
 stackable: false
diff --git a/data/items/consumables/restoration_compound.yaml b/data/items/consumables/restoration_compound.yaml
index 79eac7a..e9d9c86 100644
--- a/data/items/consumables/restoration_compound.yaml
+++ b/data/items/consumables/restoration_compound.yaml
@@ -9,7 +9,7 @@ craft:
           quantity: 1
     level: 81
     type: pharmacy
-    wait: 4
+    ticks_per_cycle: 4
     xp: 180
 description: A teal compound that enhances all combat capabilities.
 name: restoration compound
diff --git a/data/items/consumables/salmon.yaml b/data/items/consumables/salmon.yaml
index b29f935..ca0c2bd 100644
--- a/data/items/consumables/salmon.yaml
+++ b/data/items/consumables/salmon.yaml
@@ -11,7 +11,7 @@ craft:
         - fire
         - cooking_range
     type: cooking
-    wait: 6
+    ticks_per_cycle: 6
     xp: 90
 description: A nicely cooked salmon.
 eat_message: You eat the salmon. Savory and satisfying!
diff --git a/data/items/consumables/sardine.yaml b/data/items/consumables/sardine.yaml
index 0c4f53e..2004598 100644
--- a/data/items/consumables/sardine.yaml
+++ b/data/items/consumables/sardine.yaml
@@ -11,7 +11,7 @@ craft:
         - fire
         - cooking_range
     type: cooking
-    wait: 6
+    ticks_per_cycle: 6
     xp: 40
 description: A nicely cooked sardine.
 eat_message: You eat the sardine.
diff --git a/data/items/consumables/science_serum.yaml b/data/items/consumables/science_serum.yaml
index 4915ea8..a049864 100644
--- a/data/items/consumables/science_serum.yaml
+++ b/data/items/consumables/science_serum.yaml
@@ -9,7 +9,7 @@ craft:
           quantity: 1
     level: 76
     type: pharmacy
-    wait: 4
+    ticks_per_cycle: 4
     xp: 173
 description: A violet serum that heightens scientific cognition.
 name: science serum
diff --git a/data/items/consumables/shield_potion.yaml b/data/items/consumables/shield_potion.yaml
index 88d1967..7e3bcbf 100644
--- a/data/items/consumables/shield_potion.yaml
+++ b/data/items/consumables/shield_potion.yaml
@@ -9,7 +9,7 @@ craft:
           quantity: 1
     level: 30
     type: pharmacy
-    wait: 4
+    ticks_per_cycle: 4
     xp: 75
 description: A deep blue potion that reinforces defensive capability.
 name: shield potion
diff --git a/data/items/consumables/shrimps.yaml b/data/items/consumables/shrimps.yaml
index be11251..7e93f63 100644
--- a/data/items/consumables/shrimps.yaml
+++ b/data/items/consumables/shrimps.yaml
@@ -11,7 +11,7 @@ craft:
         - fire
         - cooking_range
     type: cooking
-    wait: 6
+    ticks_per_cycle: 6
     xp: 30
 description: Some nicely cooked shrimps.
 eat_message: You eat the shrimps. Tasty!
diff --git a/data/items/consumables/snapdragon_potion_unf.yaml b/data/items/consumables/snapdragon_potion_unf.yaml
index d3e8a9e..8b27c4b 100644
--- a/data/items/consumables/snapdragon_potion_unf.yaml
+++ b/data/items/consumables/snapdragon_potion_unf.yaml
@@ -8,7 +8,7 @@ craft:
         - items:
             - vial_of_water
           quantity: 1
-    wait: 0
+    ticks_per_cycle: 0
 description: An unfinished potion with snapdragon floating in water.
 name: snapdragon potion (unf)
 stackable: false
diff --git a/data/items/consumables/stim_potion.yaml b/data/items/consumables/stim_potion.yaml
index c61e4fb..b1d604a 100644
--- a/data/items/consumables/stim_potion.yaml
+++ b/data/items/consumables/stim_potion.yaml
@@ -9,7 +9,7 @@ craft:
           quantity: 1
     level: 1
     type: pharmacy
-    wait: 4
+    ticks_per_cycle: 4
     xp: 25
 description: A bubbling red potion that temporarily boosts attack capability.
 name: stim potion
diff --git a/data/items/consumables/super_amp.yaml b/data/items/consumables/super_amp.yaml
index f8fd85c..5805dca 100644
--- a/data/items/consumables/super_amp.yaml
+++ b/data/items/consumables/super_amp.yaml
@@ -9,7 +9,7 @@ craft:
           quantity: 1
     level: 55
     type: pharmacy
-    wait: 4
+    ticks_per_cycle: 4
     xp: 125
 description: A concentrated gold potion that significantly amplifies physical strength.
 name: super amp
diff --git a/data/items/consumables/super_bio_serum.yaml b/data/items/consumables/super_bio_serum.yaml
index d4003a4..cd27998 100644
--- a/data/items/consumables/super_bio_serum.yaml
+++ b/data/items/consumables/super_bio_serum.yaml
@@ -9,7 +9,7 @@ craft:
           quantity: 1
     level: 48
     type: pharmacy
-    wait: 4
+    ticks_per_cycle: 4
     xp: 106
 description: A concentrated green serum that powerfully restores health.
 name: super bio serum
diff --git a/data/items/consumables/super_shield.yaml b/data/items/consumables/super_shield.yaml
index 90389d6..5a106b9 100644
--- a/data/items/consumables/super_shield.yaml
+++ b/data/items/consumables/super_shield.yaml
@@ -9,7 +9,7 @@ craft:
           quantity: 1
     level: 66
     type: pharmacy
-    wait: 4
+    ticks_per_cycle: 4
     xp: 150
 description: A concentrated blue potion that provides significant defensive enhancement.
 name: super shield
diff --git a/data/items/consumables/super_stim.yaml b/data/items/consumables/super_stim.yaml
index 27662a5..579c6bd 100644
--- a/data/items/consumables/super_stim.yaml
+++ b/data/items/consumables/super_stim.yaml
@@ -9,7 +9,7 @@ craft:
           quantity: 1
     level: 45
     type: pharmacy
-    wait: 4
+    ticks_per_cycle: 4
     xp: 100
 description: A potent red potion that dramatically boosts attack capability.
 name: super stim
diff --git a/data/items/consumables/super_stim_cell.yaml b/data/items/consumables/super_stim_cell.yaml
index 37c4af2..ec30361 100644
--- a/data/items/consumables/super_stim_cell.yaml
+++ b/data/items/consumables/super_stim_cell.yaml
@@ -9,7 +9,7 @@ craft:
           quantity: 1
     level: 52
     type: pharmacy
-    wait: 4
+    ticks_per_cycle: 4
     xp: 118
 description: A concentrated yellow energy supplement that fully restores stamina.
 name: super stim cell
diff --git a/data/items/consumables/targeting_serum.yaml b/data/items/consumables/targeting_serum.yaml
index 74b3e73..012ce5f 100644
--- a/data/items/consumables/targeting_serum.yaml
+++ b/data/items/consumables/targeting_serum.yaml
@@ -9,7 +9,7 @@ craft:
           quantity: 1
     level: 72
     type: pharmacy
-    wait: 4
+    ticks_per_cycle: 4
     xp: 163
 description: A pink serum that sharpens ranged targeting.
 name: targeting serum
diff --git a/data/items/consumables/tarromin_potion_unf.yaml b/data/items/consumables/tarromin_potion_unf.yaml
index c8798f6..e34c957 100644
--- a/data/items/consumables/tarromin_potion_unf.yaml
+++ b/data/items/consumables/tarromin_potion_unf.yaml
@@ -8,7 +8,7 @@ craft:
         - items:
             - vial_of_water
           quantity: 1
-    wait: 0
+    ticks_per_cycle: 0
 description: An unfinished potion with tarromin floating in water.
 name: tarromin potion (unf)
 stackable: false
diff --git a/data/items/consumables/tech_serum.yaml b/data/items/consumables/tech_serum.yaml
index 01ad080..5886f5b 100644
--- a/data/items/consumables/tech_serum.yaml
+++ b/data/items/consumables/tech_serum.yaml
@@ -9,7 +9,7 @@ craft:
           quantity: 1
     level: 38
     type: pharmacy
-    wait: 4
+    ticks_per_cycle: 4
     xp: 88
 description: A cyan serum that enhances technology interface.
 name: tech serum
diff --git a/data/items/consumables/toadflax_potion_unf.yaml b/data/items/consumables/toadflax_potion_unf.yaml
index aa56ef7..9ace030 100644
--- a/data/items/consumables/toadflax_potion_unf.yaml
+++ b/data/items/consumables/toadflax_potion_unf.yaml
@@ -8,7 +8,7 @@ craft:
         - items:
             - vial_of_water
           quantity: 1
-    wait: 0
+    ticks_per_cycle: 0
 description: An unfinished potion with toadflax floating in water.
 name: toadflax potion (unf)
 stackable: false
diff --git a/data/items/consumables/torstol_potion_unf.yaml b/data/items/consumables/torstol_potion_unf.yaml
index 89e8f8c..7d15317 100644
--- a/data/items/consumables/torstol_potion_unf.yaml
+++ b/data/items/consumables/torstol_potion_unf.yaml
@@ -8,7 +8,7 @@ craft:
         - items:
             - vial_of_water
           quantity: 1
-    wait: 0
+    ticks_per_cycle: 0
 description: An unfinished potion with torstol floating in water.
 name: torstol potion (unf)
 stackable: false
diff --git a/data/items/consumables/trout.yaml b/data/items/consumables/trout.yaml
index 91933d6..fc52b07 100644
--- a/data/items/consumables/trout.yaml
+++ b/data/items/consumables/trout.yaml
@@ -11,7 +11,7 @@ craft:
         - fire
         - cooking_range
     type: cooking
-    wait: 6
+    ticks_per_cycle: 6
     xp: 70
 description: A nicely cooked trout.
 eat_message: You eat the trout. Delicious!