diff --git a/code/datums/components/bakeable.dm b/code/datums/components/bakeable.dm index 8b4964abf45..cafdd0bd8d4 100644 --- a/code/datums/components/bakeable.dm +++ b/code/datums/components/bakeable.dm @@ -105,4 +105,4 @@ else if(current_bake_time <= required_bake_time) examine_list += span_notice("[parent] seems to be almost finished baking!") else - examine_list += span_danger("[parent] should probably not be baked for much longer!") + examine_list += span_danger("[parent] should probably not be put in the oven.") diff --git a/code/datums/components/grillable.dm b/code/datums/components/grillable.dm index 0c73e349523..a3c65287fcf 100644 --- a/code/datums/components/grillable.dm +++ b/code/datums/components/grillable.dm @@ -139,7 +139,7 @@ else if(current_cook_time <= required_cook_time) examine_list += span_notice("[parent] seems to be almost finished cooking!") else - examine_list += span_danger("[parent] should probably not be cooked for much longer!") + examine_list += span_danger("[parent] should probably not be put on the grill.") ///Ran when an object moves from the grill /datum/component/grillable/proc/on_moved(atom/source, atom/OldLoc, Dir, Forced) diff --git a/code/game/objects/items/food/_food.dm b/code/game/objects/items/food/_food.dm index 6d4362cb67f..e502dde6667 100644 --- a/code/game/objects/items/food/_food.dm +++ b/code/game/objects/items/food/_food.dm @@ -30,10 +30,6 @@ var/trash_type ///How much junkiness this food has? God I should remove junkiness soon var/junkiness - ///Will this food turn into badrecipe on a grill? Don't use this for everything; preferably mostly for food that is made on a grill to begin with so it burns after some time - var/burns_on_grill = FALSE - ///Will this food turn into badrecipe in an oven? Don't use this for everything; preferably mostly for food that is made in an oven to begin with so it burns after some time - var/burns_in_oven = FALSE ///Price of this food if sold in a venue var/venue_value ///Food that's immune to decomposition. @@ -101,14 +97,12 @@ ///This proc handles grillable components, overwrite if you want different grill results etc. /obj/item/food/proc/make_grillable() - if(burns_on_grill) - AddComponent(/datum/component/grillable, /obj/item/food/badrecipe, rand(20 SECONDS, 30 SECONDS), FALSE) + AddComponent(/datum/component/grillable, /obj/item/food/badrecipe, rand(20 SECONDS, 30 SECONDS), FALSE) return ///This proc handles bakeable components, overwrite if you want different bake results etc. /obj/item/food/proc/make_bakeable() - if(burns_in_oven) - AddComponent(/datum/component/bakeable, /obj/item/food/badrecipe, rand(25 SECONDS, 40 SECONDS), FALSE) + AddComponent(/datum/component/bakeable, /obj/item/food/badrecipe, rand(25 SECONDS, 40 SECONDS), FALSE) return /// This proc handles the microwave component. Overwrite if you want special microwave results. diff --git a/code/game/objects/items/food/bread.dm b/code/game/objects/items/food/bread.dm index f4f935f032a..08722f101c5 100644 --- a/code/game/objects/items/food/bread.dm +++ b/code/game/objects/items/food/bread.dm @@ -48,7 +48,6 @@ foodtypes = GRAIN w_class = WEIGHT_CLASS_SMALL venue_value = FOOD_PRICE_CHEAP - burns_in_oven = TRUE slice_type = /obj/item/food/breadslice/plain crafting_complexity = FOOD_COMPLEXITY_1 @@ -520,7 +519,6 @@ tastes = list("french toast" = 1, "syrup" = 1, "golden deliciousness" = 1) foodtypes = GRAIN | BREAKFAST w_class = WEIGHT_CLASS_SMALL - burns_on_grill = TRUE crafting_complexity = FOOD_COMPLEXITY_2 /obj/item/food/raw_breadstick @@ -552,7 +550,6 @@ tastes = list("fluffy bread" = 1, "butter" = 2) foodtypes = GRAIN | DAIRY w_class = WEIGHT_CLASS_SMALL - burns_in_oven = TRUE crafting_complexity = FOOD_COMPLEXITY_2 /obj/item/food/raw_croissant @@ -578,7 +575,6 @@ tastes = list("fluffy bread" = 1, "butter" = 2) foodtypes = GRAIN | DAIRY | BREAKFAST w_class = WEIGHT_CLASS_SMALL - burns_in_oven = TRUE crafting_complexity = FOOD_COMPLEXITY_2 // Enhanced weaponised bread diff --git a/code/game/objects/items/food/cake.dm b/code/game/objects/items/food/cake.dm index 1a93ab96df2..5d33c332ff6 100644 --- a/code/game/objects/items/food/cake.dm +++ b/code/game/objects/items/food/cake.dm @@ -43,7 +43,6 @@ ) tastes = list("sweetness" = 2, "cake" = 5) foodtypes = GRAIN | DAIRY | SUGAR - burns_in_oven = TRUE slice_type = /obj/item/food/cakeslice/plain /obj/item/food/cakeslice/plain diff --git a/code/game/objects/items/food/cheese.dm b/code/game/objects/items/food/cheese.dm index 1081ecb2ef1..ac8817e8bb2 100644 --- a/code/game/objects/items/food/cheese.dm +++ b/code/game/objects/items/food/cheese.dm @@ -138,7 +138,6 @@ tastes = list("aged cheese" = 1) foodtypes = DAIRY | VEGETABLES w_class = WEIGHT_CLASS_SMALL - burns_on_grill = TRUE rat_heal = 10 crafting_complexity = FOOD_COMPLEXITY_3 diff --git a/code/game/objects/items/food/dough.dm b/code/game/objects/items/food/dough.dm index 2bd80f06b7e..6ca618bc6e0 100644 --- a/code/game/objects/items/food/dough.dm +++ b/code/game/objects/items/food/dough.dm @@ -42,7 +42,6 @@ food_reagents = list(/datum/reagent/consumable/nutriment = 7) tastes = list("bread" = 1) foodtypes = GRAIN - burns_in_oven = TRUE crafting_complexity = FOOD_COMPLEXITY_1 /obj/item/food/pizzabread/Initialize(mapload) @@ -75,7 +74,6 @@ w_class = WEIGHT_CLASS_SMALL tastes = list("bun" = 1) // the bun tastes of bun. foodtypes = GRAIN - burns_in_oven = TRUE crafting_complexity = FOOD_COMPLEXITY_1 /obj/item/food/bun/Initialize(mapload) @@ -137,5 +135,4 @@ w_class = WEIGHT_CLASS_SMALL tastes = list("pastry" = 1) foodtypes = GRAIN | DAIRY - burns_in_oven = TRUE crafting_complexity = FOOD_COMPLEXITY_2 diff --git a/code/game/objects/items/food/egg.dm b/code/game/objects/items/food/egg.dm index d71fe0670d1..555b16e24b6 100644 --- a/code/game/objects/items/food/egg.dm +++ b/code/game/objects/items/food/egg.dm @@ -204,7 +204,6 @@ GLOBAL_VAR_INIT(chicks_from_eggs, 0) tastes = list("egg" = 4) foodtypes = MEAT | FRIED | BREAKFAST w_class = WEIGHT_CLASS_SMALL - burns_on_grill = TRUE crafting_complexity = FOOD_COMPLEXITY_1 /obj/item/food/rawegg diff --git a/code/game/objects/items/food/lizard.dm b/code/game/objects/items/food/lizard.dm index 970df893802..e6a7bb73753 100644 --- a/code/game/objects/items/food/lizard.dm +++ b/code/game/objects/items/food/lizard.dm @@ -284,7 +284,6 @@ ) tastes = list("fish" = 1) foodtypes = SEAFOOD - burns_on_grill = TRUE w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_2 @@ -447,7 +446,6 @@ food_reagents = list(/datum/reagent/consumable/nutriment = 8) tastes = list("bread" = 1, "earthy heat" = 1) foodtypes = VEGETABLES | NUTS - burns_on_grill = TRUE crafting_complexity = FOOD_COMPLEXITY_2 /obj/item/food/rootroll @@ -459,7 +457,6 @@ w_class = WEIGHT_CLASS_SMALL tastes = list("roll" = 1) // the roll tastes of roll. foodtypes = VEGETABLES | NUTS - burns_in_oven = TRUE crafting_complexity = FOOD_COMPLEXITY_2 //Bread Dishes @@ -474,7 +471,6 @@ foodtypes = VEGETABLES | NUTS w_class = WEIGHT_CLASS_SMALL venue_value = FOOD_PRICE_CHEAP - burns_in_oven = TRUE slice_type = /obj/item/food/breadslice/root /obj/item/food/bread/root/Initialize(mapload) diff --git a/code/game/objects/items/food/martian.dm b/code/game/objects/items/food/martian.dm index 8e2c1fcd291..f001e0beccf 100644 --- a/code/game/objects/items/food/martian.dm +++ b/code/game/objects/items/food/martian.dm @@ -166,7 +166,6 @@ food_reagents = list( /datum/reagent/consumable/nutriment = 15 ) - burns_in_oven = TRUE tastes = list("bread" = 10) foodtypes = GRAIN | VEGETABLES venue_value = FOOD_PRICE_TRASH @@ -943,7 +942,6 @@ ) tastes = list("winter spices" = 2, "ambrosia vulgaris" = 2, "cake" = 5) foodtypes = GRAIN | SUGAR | DAIRY - burns_in_oven = TRUE /obj/item/food/cake/spekkoek/make_processable() AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/spekkoek, 5, 3 SECONDS, table_required = TRUE) @@ -1177,8 +1175,6 @@ /datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/salt = 1, ) - burns_on_grill = TRUE - burns_in_oven = TRUE tastes = list("bread" = 1, "salt" = 1) foodtypes = GRAIN w_class = WEIGHT_CLASS_SMALL @@ -1208,7 +1204,6 @@ /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment = 4, ) - burns_on_grill = TRUE tastes = list("chicken" = 1, "umami sauce" = 1) foodtypes = MEAT w_class = WEIGHT_CLASS_SMALL diff --git a/code/game/objects/items/food/meatdish.dm b/code/game/objects/items/food/meatdish.dm index 1942345d79e..07cd70ea013 100644 --- a/code/game/objects/items/food/meatdish.dm +++ b/code/game/objects/items/food/meatdish.dm @@ -428,7 +428,6 @@ foodtypes = MEAT food_flags = FOOD_FINGER_FOOD w_class = WEIGHT_CLASS_SMALL - burns_on_grill = TRUE venue_value = FOOD_PRICE_CHEAP crafting_complexity = FOOD_COMPLEXITY_1 @@ -497,7 +496,6 @@ tastes = list("meat" = 1) foodtypes = MEAT w_class = WEIGHT_CLASS_SMALL - burns_on_grill = TRUE crafting_complexity = FOOD_COMPLEXITY_1 ///Exists purely for the crafting recipe (because itll take subtypes) @@ -554,7 +552,6 @@ food_flags = FOOD_FINGER_FOOD eatverbs = list("bite", "chew", "nibble", "deep throat", "gobble", "chomp") w_class = WEIGHT_CLASS_SMALL - burns_on_grill = TRUE venue_value = FOOD_PRICE_CHEAP crafting_complexity = FOOD_COMPLEXITY_2 @@ -616,7 +613,6 @@ tastes = list("meat" = 1, "onions" = 1, "garlic" = 1) foodtypes = MEAT w_class = WEIGHT_CLASS_SMALL - burns_on_grill = TRUE crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/meatbun @@ -662,7 +658,6 @@ tastes = list("hot peppers" = 1, "cobwebs" = 1) foodtypes = MEAT w_class = WEIGHT_CLASS_SMALL - burns_on_grill = TRUE crafting_complexity = FOOD_COMPLEXITY_1 /obj/item/food/spidereggsham @@ -990,7 +985,6 @@ tastes = list("juicy meat" = 3, "onions" = 1, "garlic" = 1, "ketchup" = 1) foodtypes = MEAT | VEGETABLES w_class = WEIGHT_CLASS_NORMAL - burns_in_oven = TRUE crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/meatloaf/make_processable() diff --git a/code/game/objects/items/food/meatslab.dm b/code/game/objects/items/food/meatslab.dm index 4824cc7729d..483aa736074 100644 --- a/code/game/objects/items/food/meatslab.dm +++ b/code/game/objects/items/food/meatslab.dm @@ -347,7 +347,6 @@ ) tastes = list("bacon" = 1) foodtypes = MEAT | BREAKFAST - burns_on_grill = TRUE crafting_complexity = FOOD_COMPLEXITY_1 /obj/item/food/meat/slab/gondola @@ -410,7 +409,6 @@ ) tastes = list("crab" = 1) foodtypes = SEAFOOD - burns_on_grill = TRUE crafting_complexity = FOOD_COMPLEXITY_1 /obj/item/food/meat/slab/chicken @@ -469,7 +467,6 @@ ) foodtypes = MEAT tastes = list("meat" = 1) - burns_on_grill = TRUE crafting_complexity = FOOD_COMPLEXITY_1 /obj/item/food/meat/steak/Initialize(mapload) @@ -685,7 +682,6 @@ food_reagents = list(/datum/reagent/consumable/nutriment/protein = 2) tastes = list("meat" = 1) foodtypes = MEAT - burns_on_grill = TRUE crafting_complexity = FOOD_COMPLEXITY_1 /obj/item/food/meat/cutlet/Initialize(mapload) diff --git a/code/game/objects/items/food/mexican.dm b/code/game/objects/items/food/mexican.dm index e2f2d0a6056..58c50ba5863 100644 --- a/code/game/objects/items/food/mexican.dm +++ b/code/game/objects/items/food/mexican.dm @@ -250,7 +250,6 @@ tastes = list("hard corn tortilla" = 1) foodtypes = GRAIN | FRIED w_class = WEIGHT_CLASS_SMALL - burns_on_grill = TRUE crafting_complexity = FOOD_COMPLEXITY_1 /obj/item/food/hard_taco_shell/Initialize(mapload) diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm index 01f2c13a2b2..e60ae0989ee 100644 --- a/code/game/objects/items/food/misc.dm +++ b/code/game/objects/items/food/misc.dm @@ -99,6 +99,12 @@ if(stink_particles) particles = new stink_particles +// We override the parent procs here to prevent burned messes from cooking into burned messes. +/obj/item/food/badrecipe/make_grillable() + return +/obj/item/food/badrecipe/make_bakeable() + return + /obj/item/food/badrecipe/moldy name = "moldy mess" desc = "A rancid, disgusting culture of mold and ants. Somewhere under there, at some point, there was food." @@ -365,7 +371,6 @@ ) tastes = list("bell pepper" = 1, "char" = 1) foodtypes = VEGETABLES - burns_in_oven = TRUE crafting_complexity = FOOD_COMPLEXITY_1 /obj/item/food/pierogi @@ -622,8 +627,6 @@ tastes = list("pita bread" = 2) foodtypes = GRAIN w_class = WEIGHT_CLASS_TINY - burns_on_grill = TRUE - burns_in_oven = TRUE /obj/item/food/tzatziki_sauce name = "tzatziki sauce" diff --git a/code/game/objects/items/food/moth.dm b/code/game/objects/items/food/moth.dm index ff10e8da511..3bb3c8738d4 100644 --- a/code/game/objects/items/food/moth.dm +++ b/code/game/objects/items/food/moth.dm @@ -28,7 +28,6 @@ tastes = list("cheese" = 1, "char" = 1) foodtypes = DAIRY w_class = WEIGHT_CLASS_SMALL - burns_on_grill = TRUE crafting_complexity = FOOD_COMPLEXITY_4 /obj/item/food/mothic_salad @@ -143,7 +142,6 @@ tastes = list("cheese" = 1) foodtypes = DAIRY w_class = WEIGHT_CLASS_SMALL - burns_in_oven = TRUE crafting_complexity = FOOD_COMPLEXITY_1 /obj/item/food/baked_cheese_platter @@ -192,7 +190,6 @@ tastes = list("cheese" = 1, "pesto" = 1, "pasta" = 1) foodtypes = VEGETABLES | GRAIN | NUTS w_class = WEIGHT_CLASS_NORMAL - burns_in_oven = TRUE crafting_complexity = FOOD_COMPLEXITY_5 /obj/item/food/green_lasagne/make_processable() @@ -242,7 +239,6 @@ tastes = list("rice" = 1, "potato" = 1, "veggies" = 1) foodtypes = VEGETABLES | GRAIN w_class = WEIGHT_CLASS_NORMAL - burns_in_oven = TRUE crafting_complexity = FOOD_COMPLEXITY_1 /obj/item/food/big_baked_rice/make_processable() @@ -275,7 +271,6 @@ tastes = list("corn" = 1, "char" = 1) foodtypes = VEGETABLES w_class = WEIGHT_CLASS_SMALL - burns_in_oven = TRUE crafting_complexity = FOOD_COMPLEXITY_1 /obj/item/food/buttered_baked_corn @@ -339,7 +334,6 @@ tastes = list("veggies" = 1, "roasted peppers" = 1, "char" = 1) foodtypes = VEGETABLES w_class = WEIGHT_CLASS_SMALL - burns_in_oven = TRUE crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/mozzarella_sticks @@ -385,7 +379,6 @@ tastes = list("creamy cheese" = 1, "herbs" = 1, "onion" = 1, "bell pepper" = 1) foodtypes = DAIRY | VEGETABLES w_class = WEIGHT_CLASS_SMALL - burns_in_oven = TRUE crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/fueljacks_lunch diff --git a/code/game/objects/items/food/packaged.dm b/code/game/objects/items/food/packaged.dm index bf1a56e4b25..59f6d6a4db6 100644 --- a/code/game/objects/items/food/packaged.dm +++ b/code/game/objects/items/food/packaged.dm @@ -190,7 +190,6 @@ food_reagents = list( /datum/reagent/consumable/nutriment/vitamin = 3 ) - burns_on_grill = TRUE tastes = list("meat" = 1) foodtypes = MEAT w_class = WEIGHT_CLASS_SMALL diff --git a/code/game/objects/items/food/pancakes.dm b/code/game/objects/items/food/pancakes.dm index c1428c5fb9c..6e4d33fb350 100644 --- a/code/game/objects/items/food/pancakes.dm +++ b/code/game/objects/items/food/pancakes.dm @@ -9,7 +9,6 @@ tastes = list("pancakes" = 1) foodtypes = GRAIN | SUGAR | BREAKFAST w_class = WEIGHT_CLASS_SMALL - burns_on_grill = TRUE venue_value = FOOD_PRICE_CHEAP ///Used as a base name while generating the icon states when stacked var/stack_name = "pancakes" @@ -21,7 +20,6 @@ icon_state = "rawpancakes_1" food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) tastes = list("milky batter" = 1) - burns_on_grill = FALSE stack_name = "rawpancakes" crafting_complexity = FOOD_COMPLEXITY_1 diff --git a/code/game/objects/items/food/pastries.dm b/code/game/objects/items/food/pastries.dm index 21930def909..cf6499f54c4 100644 --- a/code/game/objects/items/food/pastries.dm +++ b/code/game/objects/items/food/pastries.dm @@ -440,7 +440,6 @@ tastes = list("brownie" = 1, "chocolatey goodness" = 1) foodtypes = GRAIN | JUNKFOOD | SUGAR w_class = WEIGHT_CLASS_SMALL - burns_in_oven = TRUE crafting_complexity = FOOD_COMPLEXITY_2 /obj/item/food/brownie_sheet/make_processable() @@ -490,7 +489,6 @@ tastes = list("brownie" = 1, "chocolatey goodness" = 1, "peanut butter" = 1) foodtypes = GRAIN | JUNKFOOD | SUGAR | NUTS w_class = WEIGHT_CLASS_SMALL - burns_in_oven = TRUE crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/peanut_butter_brownie_sheet/make_processable() diff --git a/code/game/objects/items/food/pie.dm b/code/game/objects/items/food/pie.dm index 10d24c2f782..cd4d0c03b1a 100644 --- a/code/game/objects/items/food/pie.dm +++ b/code/game/objects/items/food/pie.dm @@ -37,7 +37,6 @@ ) tastes = list("pie" = 1) foodtypes = GRAIN - burns_in_oven = TRUE crafting_complexity = FOOD_COMPLEXITY_2 /obj/item/food/pie/cream @@ -427,5 +426,4 @@ ) tastes = list("pie" = 1, "the far off year of 2010" = 1) foodtypes = GRAIN - burns_in_oven = TRUE crafting_complexity = FOOD_COMPLEXITY_2 diff --git a/code/game/objects/items/food/pizza.dm b/code/game/objects/items/food/pizza.dm index 345971b5a79..fdbb1e33c87 100644 --- a/code/game/objects/items/food/pizza.dm +++ b/code/game/objects/items/food/pizza.dm @@ -12,7 +12,6 @@ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1) foodtypes = GRAIN | DAIRY | VEGETABLES venue_value = FOOD_PRICE_CHEAP - burns_in_oven = TRUE crafting_complexity = FOOD_COMPLEXITY_2 /// type is spawned 6 at a time and replaces this pizza when processed by cutting tool var/obj/item/food/pizzaslice/slice_type @@ -21,7 +20,6 @@ /obj/item/food/pizza/raw foodtypes = GRAIN | DAIRY | VEGETABLES | RAW - burns_in_oven = FALSE slice_type = null crafting_complexity = FOOD_COMPLEXITY_2 @@ -66,7 +64,6 @@ name = "raw pizza margherita" icon_state = "pizzamargherita_raw" foodtypes = GRAIN | VEGETABLES | DAIRY | RAW - burns_in_oven = FALSE slice_type = null /obj/item/food/pizza/margherita/raw/make_bakeable() @@ -112,7 +109,6 @@ name = "raw meatpizza" icon_state = "meatpizza_raw" foodtypes = GRAIN | VEGETABLES| DAIRY | MEAT | RAW - burns_in_oven = FALSE slice_type = null /obj/item/food/pizza/meat/raw/make_bakeable() @@ -145,7 +141,6 @@ name = "raw mushroom pizza" icon_state = "mushroompizza_raw" foodtypes = GRAIN | VEGETABLES | DAIRY | RAW - burns_in_oven = FALSE slice_type = null /obj/item/food/pizza/mushroom/raw/make_bakeable() @@ -179,7 +174,6 @@ name = "raw vegetable pizza" icon_state = "vegetablepizza_raw" foodtypes = GRAIN | VEGETABLES | DAIRY | RAW - burns_in_oven = FALSE slice_type = null crafting_complexity = FOOD_COMPLEXITY_3 @@ -215,7 +209,6 @@ name = "raw donkpocket pizza" icon_state = "donkpocketpizza_raw" foodtypes = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD | RAW - burns_in_oven = FALSE slice_type = null /obj/item/food/pizza/donkpocket/raw/make_bakeable() @@ -248,7 +241,6 @@ name = "raw dank pizza" icon_state = "dankpizza_raw" foodtypes = GRAIN | VEGETABLES | DAIRY | RAW - burns_in_oven = FALSE slice_type = null /obj/item/food/pizza/dank/raw/make_bakeable() @@ -281,7 +273,6 @@ name = "raw sassysage pizza" icon_state = "sassysagepizza_raw" foodtypes = GRAIN | VEGETABLES | DAIRY | MEAT | RAW - burns_in_oven = FALSE slice_type = null /obj/item/food/pizza/sassysage/raw/make_bakeable() @@ -316,7 +307,6 @@ name = "raw Hawaiian pizza" icon_state = "pineapplepizza_raw" foodtypes = GRAIN | VEGETABLES | DAIRY | MEAT | FRUIT | PINEAPPLE | RAW - burns_in_oven = FALSE slice_type = null /obj/item/food/pizza/pineapple/raw/make_bakeable() @@ -377,7 +367,6 @@ name = "raw Arnold pizza" icon_state = "arnoldpizza_raw" foodtypes = GRAIN | DAIRY | VEGETABLES | RAW - burns_in_oven = FALSE slice_type = null /obj/item/food/pizza/arnold/raw/make_bakeable() @@ -461,7 +450,6 @@ name = "raw energy pizza" icon_state = "energypizza_raw" foodtypes = TOXIC - burns_in_oven = FALSE slice_type = null /obj/item/food/pizza/energy/raw/make_bakeable() @@ -504,7 +492,6 @@ tastes = list("baked dough" = 1, "juicy meat" = 1, "melted cheese" = 1, "tomato sauce" = 1) foodtypes = GRAIN | DAIRY | MEAT w_class = WEIGHT_CLASS_SMALL - burns_in_oven = TRUE crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/raw_vegetarian_calzone @@ -534,5 +521,4 @@ tastes = list("baked dough" = 1, "baked vegetables" = 1, "tomato sauce" = 1) foodtypes = GRAIN | VEGETABLES w_class = WEIGHT_CLASS_SMALL - burns_in_oven = TRUE crafting_complexity = FOOD_COMPLEXITY_3 diff --git a/code/game/objects/items/food/sandwichtoast.dm b/code/game/objects/items/food/sandwichtoast.dm index ffb3b4be3af..f1d4f6bd7ee 100644 --- a/code/game/objects/items/food/sandwichtoast.dm +++ b/code/game/objects/items/food/sandwichtoast.dm @@ -28,8 +28,6 @@ crafting_complexity = FOOD_COMPLEXITY_2 /obj/item/food/sandwich/cheese/make_grillable() - if(burns_on_grill) - return ..() AddComponent(/datum/component/grillable, /obj/item/food/sandwich/cheese/grilled, rand(30 SECONDS, 60 SECONDS), TRUE) /obj/item/food/sandwich/cheese/grilled @@ -42,8 +40,7 @@ /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/carbon = 4, ) - foodtypes = GRAIN | DAIRY - burns_on_grill = TRUE + tastes = list("toast" = 2, "cheese" = 3, "butter" = 1) crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/sandwich/jelly @@ -84,7 +81,6 @@ tastes = list("toast" = 1) foodtypes = GRAIN w_class = WEIGHT_CLASS_SMALL - burns_on_grill = TRUE slot_flags = ITEM_SLOT_MASK crafting_complexity = FOOD_COMPLEXITY_2 diff --git a/code/game/objects/items/food/vegetables.dm b/code/game/objects/items/food/vegetables.dm index 5438e5e9302..7da97abc484 100644 --- a/code/game/objects/items/food/vegetables.dm +++ b/code/game/objects/items/food/vegetables.dm @@ -25,7 +25,6 @@ tastes = list("sweet potato" = 1) foodtypes = VEGETABLES | SUGAR w_class = WEIGHT_CLASS_SMALL - burns_in_oven = TRUE crafting_complexity = FOOD_COMPLEXITY_1 /obj/item/food/roastparsnip @@ -79,7 +78,6 @@ tastes = list("baked potato" = 1) foodtypes = VEGETABLES w_class = WEIGHT_CLASS_SMALL - burns_in_oven = TRUE crafting_complexity = FOOD_COMPLEXITY_1 /obj/item/food/buttered_baked_potato diff --git a/modular_skyrat/modules/customization/modules/food_and_drinks/food/teshari_food.dm b/modular_skyrat/modules/customization/modules/food_and_drinks/food/teshari_food.dm index 228916b4869..ff7fe82012a 100644 --- a/modular_skyrat/modules/customization/modules/food_and_drinks/food/teshari_food.dm +++ b/modular_skyrat/modules/customization/modules/food_and_drinks/food/teshari_food.dm @@ -27,7 +27,6 @@ tastes = list("minty bread" = 1) foodtypes = VEGETABLES w_class = WEIGHT_CLASS_SMALL - burns_on_grill = TRUE crafting_complexity = FOOD_COMPLEXITY_2 /obj/item/food/piru_loaf/make_processable() @@ -70,7 +69,6 @@ food_reagents = list(/datum/reagent/consumable/nutriment = 8) tastes = list("minty flatbread" = 1) foodtypes = VEGETABLES - burns_on_grill = TRUE crafting_complexity = FOOD_COMPLEXITY_2 /obj/item/food/piru_pasta @@ -93,7 +91,6 @@ /datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/kiri_jelly = 6 ) - burns_in_oven = TRUE w_class = WEIGHT_CLASS_SMALL tastes = list("crispy sweetness" = 1, "caramelized jelly" = 1) foodtypes = FRUIT | SUGAR @@ -109,7 +106,6 @@ /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/consumable/muli_juice = 4 ) - burns_in_oven = TRUE w_class = WEIGHT_CLASS_SMALL tastes = list("zesty mintyness" = 1) foodtypes = VEGETABLES diff --git a/modular_skyrat/modules/imported_vendors/code/vendor_food.dm b/modular_skyrat/modules/imported_vendors/code/vendor_food.dm index 011b494936e..2fe1e97965d 100644 --- a/modular_skyrat/modules/imported_vendors/code/vendor_food.dm +++ b/modular_skyrat/modules/imported_vendors/code/vendor_food.dm @@ -27,9 +27,9 @@ /obj/item/trash/empty_side_pack/tizira icon_state = "foodpack_tizira_trash" - + /* MEALS */ - + /* * NT Meals */ @@ -75,7 +75,7 @@ food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/capsaicin = 10) tastes = list("bread" = 2, "chicken?" = 2, "overwhelming spice" = 2, "laziness" = 1) foodtypes = MEAT | GRAIN | DAIRY - + /* * Yangyu Meals */ @@ -125,7 +125,7 @@ icon_state = "foodtray_fuel_jacks_meal" tastes = list("potato" = 2, "cabbage" = 2, "cheese?" = 2, "laziness" = 1) foodtypes = DAIRY | VEGETABLES - + /* * Tiziran Meals */ @@ -157,7 +157,7 @@ name = "random side spawner" desc = "I hope I get one that actually matches my meal." icon_state = "loot" - + /* * NT Sides */ @@ -195,7 +195,7 @@ desc = "A small stack of tough flatbread, and a small spread of cheese for each." tastes = list("tough bread" = 2, "cheese" = 2) foodtypes = GRAIN | DAIRY - + /* * Yangyu Sides */ @@ -234,7 +234,7 @@ trash_type = /obj/item/trash/empty_side_pack/yangyu tastes = list("vinegar" = 4) foodtypes = VEGETABLES - + /* * Mothic Sides */ @@ -273,7 +273,7 @@ trash_type = /obj/item/trash/empty_side_pack/moth tastes = list("seeds" = 2, "char" = 2) foodtypes = NUTS - + /* * Tiziran Sides */