Added %i, %n, %b to production skill messages to consistent color inputs, item names, and byproducts

37 files changed, 17 insertions, 37 deletions

diff --git a/data/items/consumables/amp_potion.yaml b/data/items/consumables/amp_potion.yaml
index ac98966..bce0752 100644
--- a/data/items/consumables/amp_potion.yaml
+++ b/data/items/consumables/amp_potion.yaml
@@ -8,7 +8,6 @@ craft:
             - limpwurt_root
           quantity: 1
     level: 12
-    message: You mix an amp potion.
     skill: pharmacy
     type: pharmacy
     wait: 4
diff --git a/data/items/consumables/anchovies.yaml b/data/items/consumables/anchovies.yaml
index 535585a..a8c88f1 100644
--- a/data/items/consumables/anchovies.yaml
+++ b/data/items/consumables/anchovies.yaml
@@ -7,7 +7,6 @@ craft:
     fail: burnt_fish
     fail_message: You accidentally burn the anchovies.
     level: 1
-    message: Cooked to perfection. It looks great!
     skill: cooking
     station:
         - fire
diff --git a/data/items/consumables/avantoe_potion_unf.yaml b/data/items/consumables/avantoe_potion_unf.yaml
index bd2ebb1..868dd6f 100644
--- a/data/items/consumables/avantoe_potion_unf.yaml
+++ b/data/items/consumables/avantoe_potion_unf.yaml
@@ -1,6 +1,6 @@
 color: "48"
 craft:
-    type: combine
+    type: pharmacy
     consume:
         - items:
             - avantoe
diff --git a/data/items/consumables/bio_serum.yaml b/data/items/consumables/bio_serum.yaml
index 6a7e181..0ef934c 100644
--- a/data/items/consumables/bio_serum.yaml
+++ b/data/items/consumables/bio_serum.yaml
@@ -8,7 +8,6 @@ craft:
             - antitoxin_powder
           quantity: 1
     level: 5
-    message: You mix a bio serum.
     skill: pharmacy
     type: pharmacy
     wait: 4
diff --git a/data/items/consumables/bread.yaml b/data/items/consumables/bread.yaml
index a00a3ef..9268822 100644
--- a/data/items/consumables/bread.yaml
+++ b/data/items/consumables/bread.yaml
@@ -7,7 +7,7 @@ craft:
     fail: burnt_meat
     fail_message: You burn the bread to a crisp.
     level: 1
-    message: You bake the dough into a fresh loaf of bread.
+    message: "You bake the dough into a %n."
     skill: cooking
     station:
         - cooking_range
diff --git a/data/items/consumables/cadantine_potion_unf.yaml b/data/items/consumables/cadantine_potion_unf.yaml
index 5d5db0b..d39c1af 100644
--- a/data/items/consumables/cadantine_potion_unf.yaml
+++ b/data/items/consumables/cadantine_potion_unf.yaml
@@ -1,6 +1,6 @@
 color: "48"
 craft:
-    type: combine
+    type: pharmacy
     consume:
         - items:
             - cadantine
diff --git a/data/items/consumables/dwarf_weed_potion_unf.yaml b/data/items/consumables/dwarf_weed_potion_unf.yaml
index 44f2eab..6314187 100644
--- a/data/items/consumables/dwarf_weed_potion_unf.yaml
+++ b/data/items/consumables/dwarf_weed_potion_unf.yaml
@@ -1,6 +1,6 @@
 color: "48"
 craft:
-    type: combine
+    type: pharmacy
     consume:
         - items:
             - dwarf_weed
diff --git a/data/items/consumables/full_restore.yaml b/data/items/consumables/full_restore.yaml
index 28204e8..2e1c234 100644
--- a/data/items/consumables/full_restore.yaml
+++ b/data/items/consumables/full_restore.yaml
@@ -8,7 +8,6 @@ craft:
             - arachnid_enzyme
           quantity: 1
     level: 63
-    message: You mix a full restore.
     skill: pharmacy
     type: pharmacy
     wait: 4
diff --git a/data/items/consumables/guam_potion_unf.yaml b/data/items/consumables/guam_potion_unf.yaml
index caddd74..6387f21 100644
--- a/data/items/consumables/guam_potion_unf.yaml
+++ b/data/items/consumables/guam_potion_unf.yaml
@@ -1,6 +1,6 @@
 color: "48"
 craft:
-    type: combine
+    type: pharmacy
     consume:
         - items:
             - guam
@@ -9,6 +9,7 @@ craft:
             - vial_of_water
           quantity: 1
     wait: 0
+    message: "You mix %i1 and %i2 into %n!!!"
 description: An unfinished potion with guam floating in water.
 id: guam_potion_unf
 name: guam potion (unf)
diff --git a/data/items/consumables/harralander_potion_unf.yaml b/data/items/consumables/harralander_potion_unf.yaml
index 22a7611..f4a768c 100644
--- a/data/items/consumables/harralander_potion_unf.yaml
+++ b/data/items/consumables/harralander_potion_unf.yaml
@@ -1,6 +1,6 @@
 color: "48"
 craft:
-    type: combine
+    type: pharmacy
     consume:
         - items:
             - harralander
diff --git a/data/items/consumables/herring.yaml b/data/items/consumables/herring.yaml
index 1e20697..1baaaa0 100644
--- a/data/items/consumables/herring.yaml
+++ b/data/items/consumables/herring.yaml
@@ -7,7 +7,6 @@ craft:
     fail: burnt_fish
     fail_message: You accidentally burn the herring.
     level: 5
-    message: Cooked to perfection. It looks great!
     skill: cooking
     station:
         - fire
diff --git a/data/items/consumables/irit_potion_unf.yaml b/data/items/consumables/irit_potion_unf.yaml
index 841487e..8d7c7e6 100644
--- a/data/items/consumables/irit_potion_unf.yaml
+++ b/data/items/consumables/irit_potion_unf.yaml
@@ -1,6 +1,6 @@
 color: "48"
 craft:
-    type: combine
+    type: pharmacy
     consume:
         - items:
             - irit
diff --git a/data/items/consumables/kwuarm_potion_unf.yaml b/data/items/consumables/kwuarm_potion_unf.yaml
index 9ab2f67..75feea4 100644
--- a/data/items/consumables/kwuarm_potion_unf.yaml
+++ b/data/items/consumables/kwuarm_potion_unf.yaml
@@ -1,6 +1,6 @@
 color: "48"
 craft:
-    type: combine
+    type: pharmacy
     consume:
         - items:
             - kwuarm
diff --git a/data/items/consumables/lantadyme_potion_unf.yaml b/data/items/consumables/lantadyme_potion_unf.yaml
index 52ff04f..addbce0 100644
--- a/data/items/consumables/lantadyme_potion_unf.yaml
+++ b/data/items/consumables/lantadyme_potion_unf.yaml
@@ -1,6 +1,6 @@
 color: "48"
 craft:
-    type: combine
+    type: pharmacy
     consume:
         - items:
             - lantadyme
diff --git a/data/items/consumables/marrentill_potion_unf.yaml b/data/items/consumables/marrentill_potion_unf.yaml
index 8a01b4a..f3ccdd8 100644
--- a/data/items/consumables/marrentill_potion_unf.yaml
+++ b/data/items/consumables/marrentill_potion_unf.yaml
@@ -1,6 +1,6 @@
 color: "48"
 craft:
-    type: combine
+    type: pharmacy
     consume:
         - items:
             - marrentill
diff --git a/data/items/consumables/nano_restore.yaml b/data/items/consumables/nano_restore.yaml
index dc55b1b..9bea071 100644
--- a/data/items/consumables/nano_restore.yaml
+++ b/data/items/consumables/nano_restore.yaml
@@ -8,7 +8,6 @@ craft:
             - arachnid_enzyme
           quantity: 1
     level: 22
-    message: You mix a nano restore.
     skill: pharmacy
     type: pharmacy
     wait: 4
diff --git a/data/items/consumables/pie_dish.yaml b/data/items/consumables/pie_dish.yaml
index a562b9e..338ce52 100644
--- a/data/items/consumables/pie_dish.yaml
+++ b/data/items/consumables/pie_dish.yaml
@@ -6,7 +6,7 @@ craft:
           quantity: 1
     fail_message: The pie dish cracks in the oven and is ruined.
     level: 7
-    message: You fire the pie dish in the oven successfully.
+    message: "You fire the %i1 in the oven."
     skill: crafting
     station:
         - pottery_oven
diff --git a/data/items/consumables/ranarr_potion_unf.yaml b/data/items/consumables/ranarr_potion_unf.yaml
index 941f5da..6e8359e 100644
--- a/data/items/consumables/ranarr_potion_unf.yaml
+++ b/data/items/consumables/ranarr_potion_unf.yaml
@@ -1,6 +1,6 @@
 color: "48"
 craft:
-    type: combine
+    type: pharmacy
     consume:
         - items:
             - ranarr
diff --git a/data/items/consumables/restoration_compound.yaml b/data/items/consumables/restoration_compound.yaml
index 1bb2a14..d1f9035 100644
--- a/data/items/consumables/restoration_compound.yaml
+++ b/data/items/consumables/restoration_compound.yaml
@@ -8,7 +8,6 @@ craft:
             - crushed_nest
           quantity: 1
     level: 81
-    message: You mix a restoration compound.
     skill: pharmacy
     type: pharmacy
     wait: 4
diff --git a/data/items/consumables/salmon.yaml b/data/items/consumables/salmon.yaml
index e7988ed..dabc280 100644
--- a/data/items/consumables/salmon.yaml
+++ b/data/items/consumables/salmon.yaml
@@ -7,7 +7,6 @@ craft:
     fail: burnt_fish
     fail_message: You accidentally burn the salmon.
     level: 25
-    message: Cooked to perfection. It looks great!
     skill: cooking
     station:
         - fire
diff --git a/data/items/consumables/sardine.yaml b/data/items/consumables/sardine.yaml
index c094185..885d0f4 100644
--- a/data/items/consumables/sardine.yaml
+++ b/data/items/consumables/sardine.yaml
@@ -7,7 +7,6 @@ craft:
     fail: burnt_fish
     fail_message: You accidentally burn the sardine.
     level: 1
-    message: Cooked to perfection. It looks great!
     skill: cooking
     station:
         - fire
diff --git a/data/items/consumables/science_serum.yaml b/data/items/consumables/science_serum.yaml
index b77cf58..4763e1d 100644
--- a/data/items/consumables/science_serum.yaml
+++ b/data/items/consumables/science_serum.yaml
@@ -8,7 +8,6 @@ craft:
             - potato_cactus
           quantity: 1
     level: 76
-    message: You mix a science serum.
     skill: pharmacy
     type: pharmacy
     wait: 4
diff --git a/data/items/consumables/shield_potion.yaml b/data/items/consumables/shield_potion.yaml
index a0b65c2..3b8b1c7 100644
--- a/data/items/consumables/shield_potion.yaml
+++ b/data/items/consumables/shield_potion.yaml
@@ -8,7 +8,6 @@ craft:
             - white_berries
           quantity: 1
     level: 30
-    message: You mix a shield potion.
     skill: pharmacy
     type: pharmacy
     wait: 4
diff --git a/data/items/consumables/shrimps.yaml b/data/items/consumables/shrimps.yaml
index 03a7edb..dcfc0c4 100644
--- a/data/items/consumables/shrimps.yaml
+++ b/data/items/consumables/shrimps.yaml
@@ -7,7 +7,6 @@ craft:
     fail: burnt_fish
     fail_message: You accidentally burn the shrimps.
     level: 1
-    message: Cooked to perfection. It looks great!
     skill: cooking
     station:
         - fire
diff --git a/data/items/consumables/snapdragon_potion_unf.yaml b/data/items/consumables/snapdragon_potion_unf.yaml
index fc91a84..a49de71 100644
--- a/data/items/consumables/snapdragon_potion_unf.yaml
+++ b/data/items/consumables/snapdragon_potion_unf.yaml
@@ -1,6 +1,6 @@
 color: "48"
 craft:
-    type: combine
+    type: pharmacy
     consume:
         - items:
             - snapdragon
diff --git a/data/items/consumables/stim_potion.yaml b/data/items/consumables/stim_potion.yaml
index e9ac25f..34e7282 100644
--- a/data/items/consumables/stim_potion.yaml
+++ b/data/items/consumables/stim_potion.yaml
@@ -8,7 +8,6 @@ craft:
             - eye_of_newt
           quantity: 1
     level: 1
-    message: You mix a stim potion.
     skill: pharmacy
     type: pharmacy
     wait: 4
diff --git a/data/items/consumables/super_amp.yaml b/data/items/consumables/super_amp.yaml
index 361c99b..6105611 100644
--- a/data/items/consumables/super_amp.yaml
+++ b/data/items/consumables/super_amp.yaml
@@ -8,7 +8,6 @@ craft:
             - limpwurt_root
           quantity: 1
     level: 55
-    message: You mix a super amp.
     skill: pharmacy
     type: pharmacy
     wait: 4
diff --git a/data/items/consumables/super_bio_serum.yaml b/data/items/consumables/super_bio_serum.yaml
index 9f5796e..5e4a9cd 100644
--- a/data/items/consumables/super_bio_serum.yaml
+++ b/data/items/consumables/super_bio_serum.yaml
@@ -8,7 +8,6 @@ craft:
             - antitoxin_powder
           quantity: 1
     level: 48
-    message: You mix a super bio serum.
     skill: pharmacy
     type: pharmacy
     wait: 4
diff --git a/data/items/consumables/super_shield.yaml b/data/items/consumables/super_shield.yaml
index 9dc6430..9d0f8dd 100644
--- a/data/items/consumables/super_shield.yaml
+++ b/data/items/consumables/super_shield.yaml
@@ -8,7 +8,6 @@ craft:
             - white_berries
           quantity: 1
     level: 66
-    message: You mix a super shield.
     skill: pharmacy
     type: pharmacy
     wait: 4
diff --git a/data/items/consumables/super_stim.yaml b/data/items/consumables/super_stim.yaml
index 38275ac..00f3aa1 100644
--- a/data/items/consumables/super_stim.yaml
+++ b/data/items/consumables/super_stim.yaml
@@ -8,7 +8,6 @@ craft:
             - eye_of_newt
           quantity: 1
     level: 45
-    message: You mix a super stim.
     skill: pharmacy
     type: pharmacy
     wait: 4
diff --git a/data/items/consumables/super_stim_cell.yaml b/data/items/consumables/super_stim_cell.yaml
index 3fb5761..6879a87 100644
--- a/data/items/consumables/super_stim_cell.yaml
+++ b/data/items/consumables/super_stim_cell.yaml
@@ -8,7 +8,6 @@ craft:
             - blight_spore
           quantity: 1
     level: 52
-    message: You mix a super stim cell.
     skill: pharmacy
     type: pharmacy
     wait: 4
diff --git a/data/items/consumables/targeting_serum.yaml b/data/items/consumables/targeting_serum.yaml
index 5c94040..1d61b64 100644
--- a/data/items/consumables/targeting_serum.yaml
+++ b/data/items/consumables/targeting_serum.yaml
@@ -8,7 +8,6 @@ craft:
             - catalyst_wine
           quantity: 1
     level: 72
-    message: You mix a targeting serum.
     skill: pharmacy
     type: pharmacy
     wait: 4
diff --git a/data/items/consumables/tarromin_potion_unf.yaml b/data/items/consumables/tarromin_potion_unf.yaml
index c7d7dd3..5c15bd9 100644
--- a/data/items/consumables/tarromin_potion_unf.yaml
+++ b/data/items/consumables/tarromin_potion_unf.yaml
@@ -1,6 +1,6 @@
 color: "48"
 craft:
-    type: combine
+    type: pharmacy
     consume:
         - items:
             - tarromin
diff --git a/data/items/consumables/tech_serum.yaml b/data/items/consumables/tech_serum.yaml
index c763216..1ce7d15 100644
--- a/data/items/consumables/tech_serum.yaml
+++ b/data/items/consumables/tech_serum.yaml
@@ -8,7 +8,6 @@ craft:
             - snape_grass
           quantity: 1
     level: 38
-    message: You mix a tech serum.
     skill: pharmacy
     type: pharmacy
     wait: 4
diff --git a/data/items/consumables/toadflax_potion_unf.yaml b/data/items/consumables/toadflax_potion_unf.yaml
index 305807d..fce21ec 100644
--- a/data/items/consumables/toadflax_potion_unf.yaml
+++ b/data/items/consumables/toadflax_potion_unf.yaml
@@ -1,6 +1,6 @@
 color: "48"
 craft:
-    type: combine
+    type: pharmacy
     consume:
         - items:
             - toadflax
diff --git a/data/items/consumables/torstol_potion_unf.yaml b/data/items/consumables/torstol_potion_unf.yaml
index a25fdee..ace9c6e 100644
--- a/data/items/consumables/torstol_potion_unf.yaml
+++ b/data/items/consumables/torstol_potion_unf.yaml
@@ -1,6 +1,6 @@
 color: "48"
 craft:
-    type: combine
+    type: pharmacy
     consume:
         - items:
             - torstol
diff --git a/data/items/consumables/trout.yaml b/data/items/consumables/trout.yaml
index bb2b69c..4811991 100644
--- a/data/items/consumables/trout.yaml
+++ b/data/items/consumables/trout.yaml
@@ -7,7 +7,6 @@ craft:
     fail: burnt_fish
     fail_message: You accidentally burn the trout.
     level: 15
-    message: Cooked to perfection. It looks great!
     skill: cooking
     station:
         - fire