cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 22:19:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix custom materials for food recipes

Browse Source
This commit is contained in:
Roxy
2025-06-05 22:47:51 -04:00
parent 3e749adee0
commit 45d06d05df
4 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_skyrat/modules/customization/datums/components/crafting/recipes.dm
+1
View File
@@ -56,6 +56,7 @@
)
result = /obj/item/food/canned/tuna
category = CAT_SEAFOOD
crafting_flags = parent_type::crafting_flags & ~CRAFT_ENFORCE_MATERIALS_PARITY
// Recipes that provide crafting instructions and don't yield any result
modular_skyrat/modules/customization/modules/food_and_drinks/food/teshari_food.dm
+6
View File
@@ -124,6 +124,7 @@
tastes = list("tough, spicy jerky" = 1)
foodtypes = MEAT
crafting_complexity = FOOD_COMPLEXITY_2
custom_materials = list(/datum/material/meat = MEATDISH_MATERIAL_AMOUNT)
/obj/item/food/sirisai_wrap
name = "sirisai wrap"
@@ -139,6 +140,7 @@
tastes = list("cooked cabbage" = 1, "spiced meat" = 1, "minty piru bread" = 1)
foodtypes = MEAT | VEGETABLES
crafting_complexity = FOOD_COMPLEXITY_4
custom_materials = list(/datum/material/meat = MEATDISH_MATERIAL_AMOUNT)
/obj/item/food/sweet_piru_noodles
name = "sweet piru noodles"
@@ -173,6 +175,7 @@
tastes = list("heavily seasoned meat" = 1, "sweetened minty piru noodles" = 1, "zesty chilis" = 1)
foodtypes = VEGETABLES | FRUIT | SUGAR | MEAT
crafting_complexity = FOOD_COMPLEXITY_5
custom_materials = list(/datum/material/meat = MEATDISH_MATERIAL_AMOUNT)
/obj/item/food/sirisai_flatbread
name = "sirisai flatbread"
@@ -189,6 +192,7 @@
tastes = list("crispy minty flatbread" = 1, "minty muli pods" = 1, "tomato sauce" = 1, "tangy spice" = 1, "baked meat" = 1)
foodtypes = VEGETABLES | MEAT
crafting_complexity = FOOD_COMPLEXITY_4
custom_materials = list(/datum/material/meat = MEATDISH_MATERIAL_AMOUNT * 3)
/obj/item/food/sirisai_flatbread/make_processable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/sirisai_flatbread_slice, 4, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice")
@@ -254,6 +258,7 @@
tastes = list("hearty spiced meat" = 1, "baked carrots" = 1, "baked cabbage" = 1, "minty broth" = 1)
foodtypes = VEGETABLES | MEAT
crafting_complexity = FOOD_COMPLEXITY_5
custom_materials = list(/datum/material/meat = MEATDISH_MATERIAL_AMOUNT * 2)
/obj/item/food/stuffed_muli_pod
name = "stuffed muli pod"
@@ -270,6 +275,7 @@
tastes = list("spiced meat" = 1, "minty muli pod" = 1, "super-sweet kiri fruit" = 1, "chili" = 1)
foodtypes = VEGETABLES | FRUIT | MEAT | SUGAR
crafting_complexity = FOOD_COMPLEXITY_3
custom_materials = list(/datum/material/meat = MEATDISH_MATERIAL_AMOUNT)
/obj/item/food/caramel_jelly_toast
name = "caramel jelly toast"
modular_zubbers/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm
+4
View File
@@ -0,0 +1,4 @@
// Having custom_materials set for the 9mm bullet in this recipe breaks unit tests
/datum/crafting_recipe/food/pizza/arnold/New()
crafting_flags &= ~CRAFT_ENFORCE_MATERIALS_PARITY
. = ..()
tgstation.dme
+1
View File
@@ -9322,6 +9322,7 @@
#include "modular_zubbers\code\modules\experisci\experiment\types\scanning_fish.dm"
#include "modular_zubbers\code\modules\fluff\flora\ash_flora.dm"
#include "modular_zubbers\code\modules\food_and_drinks\machinery\stove.dm"
#include "modular_zubbers\code\modules\food_and_drinks\recipes\tablecraft\recipes_pizza.dm"
#include "modular_zubbers\code\modules\food_and_drinks\recipes\tablecraft\recipes_seafood.dm"
#include "modular_zubbers\code\modules\GAGS\greyscale_configs.dm"
#include "modular_zubbers\code\modules\ghost_wavedefence\wave_def.dm"