From ed03cd6b68ec7b8540414f6a6c837ca2c262b039 Mon Sep 17 00:00:00 2001 From: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com> Date: Wed, 30 Sep 2020 13:55:35 -0600 Subject: [PATCH] Restores some functions food had (#53892) Synthmeat steaks are a subtype of plain so that they can be used in burgers the way they could before Colored burgers have color again, as they were just the greyscale sprite --- code/game/objects/items/food/burgers.dm | 8 ++++++++ code/game/objects/items/food/meat.dm | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/food/burgers.dm b/code/game/objects/items/food/burgers.dm index f7ddeb99b69..b9cff655182 100644 --- a/code/game/objects/items/food/burgers.dm +++ b/code/game/objects/items/food/burgers.dm @@ -182,6 +182,7 @@ name = "red burger" desc = "Perfect for hiding the fact it's burnt to a crisp." icon_state = "cburger" + color = COLOR_RED food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/colorful_reagent/powder/red = 10) foodtypes = GRAIN | MEAT @@ -189,6 +190,7 @@ name = "orange burger" desc = "Contains 0% juice." icon_state = "cburger" + color = COLOR_ORANGE food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/colorful_reagent/powder/orange = 10) foodtypes = GRAIN | MEAT @@ -196,6 +198,7 @@ name = "yellow burger" desc = "Bright to the last bite." icon_state = "cburger" + color = COLOR_YELLOW food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/colorful_reagent/powder/yellow = 10) foodtypes = GRAIN | MEAT @@ -203,6 +206,7 @@ name = "green burger" desc = "It's not tainted meat, it's painted meat!" icon_state = "cburger" + color = COLOR_GREEN food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/colorful_reagent/powder/green = 10) foodtypes = GRAIN | MEAT @@ -210,6 +214,7 @@ name = "blue burger" desc = "Is this blue rare?" icon_state = "cburger" + color = COLOR_BLUE food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/colorful_reagent/powder/blue = 10) foodtypes = GRAIN | MEAT @@ -217,6 +222,7 @@ name = "purple burger" desc = "Regal and low class at the same time." icon_state = "cburger" + color = COLOR_PURPLE food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/colorful_reagent/powder/purple = 10) foodtypes = GRAIN | MEAT @@ -224,6 +230,7 @@ name = "black burger" desc = "This is overcooked." icon_state = "cburger" + color = COLOR_ALMOST_BLACK food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/colorful_reagent/powder/black = 10) foodtypes = GRAIN | MEAT @@ -231,6 +238,7 @@ name = "white burger" desc = "Delicous Titanium!" icon_state = "cburger" + color = COLOR_WHITE food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/colorful_reagent/powder/white = 10) foodtypes = GRAIN | MEAT diff --git a/code/game/objects/items/food/meat.dm b/code/game/objects/items/food/meat.dm index 0467e616530..68c16cf9022 100644 --- a/code/game/objects/items/food/meat.dm +++ b/code/game/objects/items/food/meat.dm @@ -466,7 +466,7 @@ /obj/item/food/meat/slab/synthmeat name = "synthmeat" icon_state = "meat_old" - microwaved_type = /obj/item/food/meat/steak/synth + microwaved_type = /obj/item/food/meat/steak/plain/synth desc = "A synthetic slab of meat." foodtypes = RAW | MEAT //hurr durr chemicals we're harmed in the production of this meat thus its non-vegan. @@ -755,7 +755,7 @@ icon_state = "meatproductsteak" tastes = list("enhanced char" = 2, "suspicious tenderness" = 2, "natural & artificial dyes" = 2, "emulsifying agents" = 1) -/obj/item/food/meat/steak/synth +/obj/item/food/meat/steak/plain/synth name = "synthsteak" desc = "A synthetic meat steak. It doesn't look quite right, now does it?" icon_state = "meatsteak_old"