mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-09 16:05:07 +00:00
1f3894e793
My original plan was to just implement materials into crafting so that items would inherit the materials of their components, allowing for some interesting stuff if the material flags of the item allow it. However to my dismay crafting is a pile of old tech debt, starting from the old `del_reqs` and `CheckParts` which still contain lines about old janky bandaids that are no longer in use nor reachable, up to the `customizable_reagent_holder` component which has some harddel issues when your custom food is sliced, and items used in food recipes not being deleted and instead stored inside the result with no purpose as well as other inconsistencies like stack recipes that transfer materials having counterparts in the UI that don't do that. EDIT: Several things have come up while working on this, so I apologise that it ended up changing over 100+ files. I managed to atomize some of the changes, but it's a bit tedious. EDIT: TLDR because I was told this section is too vague and there's too much going on. This PR: - Improves the dated crafting code (not the UI). - replaced `atom/CheckParts` and `crafting_recipe/on_craft_completion` with `atom/on_craft_completion`. - Reqs used in food recipes are now deleted by default and not stored inside the result (they did nothing). - Renames the customizable_reagent_holder comp and improves it (No harddels/ref issues). - Adds a unit test that tries to craft all recipes to see what's wrong (it skips some of the much more specific reqs for now). - In the unit test is also the code to make sure materials of the crafted item and a non-crafted item of the same type are roughly the same, so far only applied to food. - Some mild material/food refactoring around the fact that food item code has been changed to support materials. Improving the backbone of the crafting system. Also materials and food code. 🆑 refactor: Refactored crafting backend. Report possible pesky bugs. balance: the MEAT backpack (from the MEAT cargo pack) may be a smidge different because of code standardization. /🆑
211 lines
7.1 KiB
Plaintext
211 lines
7.1 KiB
Plaintext
/obj/item/food/eggplantparm
|
|
name = "eggplant parmigiana"
|
|
desc = "The only good recipe for eggplant."
|
|
icon_state = "eggplantparm"
|
|
|
|
food_reagents = list(
|
|
/datum/reagent/consumable/nutriment = 6,
|
|
/datum/reagent/consumable/nutriment/protein = 2,
|
|
/datum/reagent/consumable/nutriment/vitamin = 4,
|
|
)
|
|
tastes = list("eggplant" = 3, "cheese" = 1)
|
|
foodtypes = VEGETABLES | DAIRY
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
venue_value = FOOD_PRICE_NORMAL
|
|
crafting_complexity = FOOD_COMPLEXITY_2
|
|
|
|
/obj/item/food/yakiimo
|
|
name = "yaki imo"
|
|
desc = "Made with roasted sweet potatoes!"
|
|
icon_state = "yakiimo"
|
|
food_reagents = list(
|
|
/datum/reagent/consumable/nutriment = 5,
|
|
/datum/reagent/consumable/nutriment/vitamin = 4,
|
|
)
|
|
tastes = list("sweet potato" = 1)
|
|
foodtypes = VEGETABLES | SUGAR
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
crafting_complexity = FOOD_COMPLEXITY_1
|
|
|
|
/obj/item/food/roastparsnip
|
|
name = "roast parsnip"
|
|
desc = "Sweet and crunchy."
|
|
icon_state = "roastparsnip"
|
|
food_reagents = list(
|
|
/datum/reagent/consumable/nutriment = 3,
|
|
/datum/reagent/consumable/nutriment/vitamin = 4,
|
|
)
|
|
tastes = list("parsnip" = 1)
|
|
foodtypes = VEGETABLES
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
crafting_complexity = FOOD_COMPLEXITY_1
|
|
|
|
// Potatoes
|
|
/obj/item/food/tatortot
|
|
name = "tator tot"
|
|
desc = "A large fried potato nugget that may or may not try to valid you."
|
|
icon_state = "tatortot"
|
|
food_reagents = list(/datum/reagent/consumable/nutriment = 4)
|
|
tastes = list("potato" = 3, "valids" = 1)
|
|
foodtypes = FRIED | VEGETABLES
|
|
food_flags = FOOD_FINGER_FOOD
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
crafting_complexity = FOOD_COMPLEXITY_1
|
|
|
|
/obj/item/food/tatortot/Initialize(mapload)
|
|
. = ..()
|
|
AddElement(/datum/element/dunkable, 10)
|
|
|
|
/obj/item/food/mashed_potatoes
|
|
name = "mashed potatoes"
|
|
desc = "A creamy serving of mashed potatoes, a staple of many Thanksgiving dinners."
|
|
icon = 'icons/obj/food/food.dmi'
|
|
icon_state = "mashed_potatoes"
|
|
food_reagents = list(
|
|
/datum/reagent/consumable/nutriment = 10,
|
|
/datum/reagent/consumable/nutriment/vitamin = 5,
|
|
)
|
|
tastes = list("creamy mashed potatoes" = 1, "garlic" = 1)
|
|
foodtypes = VEGETABLES | DAIRY
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
crafting_complexity = FOOD_COMPLEXITY_2
|
|
|
|
/obj/item/food/baked_potato
|
|
name = "baked potato"
|
|
desc = "A piping hot potato baked in an oven. A bit bland by itself."
|
|
icon_state = "baked_potato"
|
|
food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
|
|
tastes = list("baked potato" = 1)
|
|
foodtypes = VEGETABLES
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
crafting_complexity = FOOD_COMPLEXITY_1
|
|
|
|
/obj/item/food/buttered_baked_potato
|
|
name = "buttered baked potato"
|
|
desc = "A piping hot baked potato, now with a slice of butter mixed in. Perfection."
|
|
icon_state = "buttered_baked_potato"
|
|
food_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 4)
|
|
tastes = list("baked potato" = 1)
|
|
foodtypes = VEGETABLES | DAIRY
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
crafting_complexity = FOOD_COMPLEXITY_2
|
|
|
|
/obj/item/food/loaded_baked_potato
|
|
name = "loaded baked potato"
|
|
desc = "A piping hot baked potato, with the insides scooped out and mixed with bacon bits, cheese, and cabbage."
|
|
icon_state = "loaded_baked_potato"
|
|
food_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/consumable/nutriment/protein = 4)
|
|
tastes = list("baked potato" = 1, "bacon" = 1, "cheese" = 1, "cabbage" = 1)
|
|
foodtypes = VEGETABLES | DAIRY | MEAT
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
crafting_complexity = FOOD_COMPLEXITY_3
|
|
custom_materials = list(/datum/material/meat = MEATDISH_MATERIAL_AMOUNT)
|
|
|
|
// Fries
|
|
/obj/item/food/fries
|
|
name = "space fries"
|
|
desc = "AKA: French Fries, Freedom Fries, etc."
|
|
icon_state = "fries"
|
|
food_reagents = list(/datum/reagent/consumable/nutriment = 4)
|
|
tastes = list("fries" = 3, "salt" = 1)
|
|
foodtypes = VEGETABLES | FRIED
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
venue_value = FOOD_PRICE_CHEAP
|
|
preserved_food = TRUE
|
|
crafting_complexity = FOOD_COMPLEXITY_1
|
|
|
|
/obj/item/food/fries/Initialize(mapload)
|
|
. = ..()
|
|
AddElement(/datum/element/dunkable, 10)
|
|
|
|
/obj/item/food/cheesyfries
|
|
name = "cheesy fries"
|
|
desc = "Fries. Covered in cheese. Duh."
|
|
icon_state = "cheesyfries"
|
|
food_reagents = list(
|
|
/datum/reagent/consumable/nutriment = 6,
|
|
/datum/reagent/consumable/nutriment/vitamin = 2,
|
|
)
|
|
tastes = list("fries" = 3, "cheese" = 1)
|
|
foodtypes = VEGETABLES|DAIRY|FRIED
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
venue_value = FOOD_PRICE_CHEAP
|
|
preserved_food = TRUE
|
|
crafting_complexity = FOOD_COMPLEXITY_2
|
|
|
|
/obj/item/food/cheesyfries/Initialize(mapload)
|
|
. = ..()
|
|
AddElement(/datum/element/dunkable, 10)
|
|
|
|
/obj/item/food/carrotfries
|
|
name = "carrot fries"
|
|
desc = "Tasty fries from fresh carrots."
|
|
icon_state = "carrotfries"
|
|
|
|
food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
|
|
tastes = list("carrots" = 3, "salt" = 1)
|
|
foodtypes = VEGETABLES
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
preserved_food = TRUE
|
|
crafting_complexity = FOOD_COMPLEXITY_1
|
|
|
|
/obj/item/food/carrotfries/Initialize(mapload)
|
|
. = ..()
|
|
AddElement(/datum/element/dunkable, 10)
|
|
|
|
/obj/item/food/poutine
|
|
name = "poutine"
|
|
desc = "Fries covered in cheese curds and gravy."
|
|
icon_state = "poutine"
|
|
food_reagents = list(/datum/reagent/consumable/nutriment = 7)
|
|
tastes = list("potato" = 3, "gravy" = 1, "squeaky cheese" = 1)
|
|
foodtypes = VEGETABLES|DAIRY|FRIED|MEAT
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
venue_value = FOOD_PRICE_CHEAP
|
|
preserved_food = TRUE
|
|
crafting_complexity = FOOD_COMPLEXITY_3
|
|
|
|
/obj/item/food/poutine/Initialize(mapload)
|
|
. = ..()
|
|
AddElement(/datum/element/dunkable, 10)
|
|
|
|
/obj/item/food/sauteed_eggplant
|
|
name = "sauteed eggplant"
|
|
desc = "Thick-cut slices of eggplant sauteed in oil and minced garlic, creating a soft, crispy, healthy snack."
|
|
icon_state = "sauteed_eggplant"
|
|
food_reagents = list(
|
|
/datum/reagent/consumable/nutriment = 8,
|
|
/datum/reagent/consumable/nutriment/vitamin = 4,
|
|
)
|
|
tastes = list("fried eggplant" = 4, "garlic" = 2, "olive oil" = 3)
|
|
foodtypes = VEGETABLES
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
crafting_complexity = FOOD_COMPLEXITY_2
|
|
|
|
/obj/item/food/baba_ghanoush
|
|
name = "baba ghanoush"
|
|
desc = "A thick dip made from mashed eggplant, olive oil, garlic, and lemon juice with some pita bread for dipping. You'll either love it or hate it."
|
|
icon_state = "baba_ghanoush"
|
|
trash_type = /obj/item/reagent_containers/cup/bowl
|
|
food_reagents = list(
|
|
/datum/reagent/consumable/nutriment = 8,
|
|
/datum/reagent/consumable/nutriment/vitamin = 6,
|
|
)
|
|
tastes = list("mashed eggplant" = 5, "pita bread" = 4, "garlic" = 3, "olive oil" = 4, "lemon juice" = 2)
|
|
foodtypes = VEGETABLES | GRAIN
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
crafting_complexity = FOOD_COMPLEXITY_2
|
|
|
|
/obj/item/food/falafel
|
|
name = "falafel"
|
|
desc = "Beans, herbs, onions, and garlic mashed together and formed into a ball, then deep-fried. The herbs give the interior a unique green color."
|
|
icon_state = "falafel"
|
|
food_reagents = list(
|
|
/datum/reagent/consumable/nutriment = 6,
|
|
/datum/reagent/consumable/nutriment/vitamin = 2,
|
|
)
|
|
tastes = list("fava beans" = 5, "garlic" = 3, "onion" = 2, "fresh herbs" = 4)
|
|
foodtypes = VEGETABLES
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
crafting_complexity = FOOD_COMPLEXITY_3
|