cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-14 17:45:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Simplifies the way burning food is handled, kills burns_in_oven and burns_on_grill [MDB IGNORE] (#23502)

Browse Source 
* Simplifies the way burning food is handled, kills burns_in_oven and burns_on_grill

* Update teshari_food.dm

* Merge conflicts

---------

Co-authored-by: A miscellaneous Fern <80640114+FernandoJ8@users.noreply.github.com>
Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-09-04 15:00:25 +02:00
committed by GitHub
parent 87bfa7a61a
commit 8aeccd68fa
24 changed files with 19 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/food/_food.dm
+2 -8
View File
@@ -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.
code/game/objects/items/food/bread.dm
-4
View File
@@ -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
code/game/objects/items/food/cake.dm
-1
View File
@@ -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
code/game/objects/items/food/cheese.dm
-1
View File
@@ -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
code/game/objects/items/food/dough.dm
-3
View File
@@ -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
code/game/objects/items/food/egg.dm
-1
View File
@@ -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
code/game/objects/items/food/lizard.dm
-4
View File
@@ -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)
code/game/objects/items/food/martian.dm
-5
View File
@@ -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
code/game/objects/items/food/meatdish.dm
-6
View File
@@ -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()
code/game/objects/items/food/meatslab.dm
-4
View File
@@ -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)
code/game/objects/items/food/mexican.dm
-1
View File
@@ -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)
code/game/objects/items/food/misc.dm
+6 -3
View File
@@ -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 <i>some point,</i> 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"
code/game/objects/items/food/moth.dm
-7
View File
@@ -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
code/game/objects/items/food/packaged.dm
-1
View File
@@ -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
code/game/objects/items/food/pancakes.dm
-2
View File
@@ -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
code/game/objects/items/food/pastries.dm
-2
View File
@@ -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()
code/game/objects/items/food/pie.dm
-2
View File
@@ -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
code/game/objects/items/food/pizza.dm
-14
View File
@@ -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
code/game/objects/items/food/sandwichtoast.dm
+1 -5
View File
@@ -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
code/game/objects/items/food/vegetables.dm
-2
View File
@@ -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