diff --git a/modular_skyrat/modules/customization/datums/components/crafting/recipes.dm b/modular_skyrat/modules/customization/datums/components/crafting/recipes.dm index 2e03a77cdab..e4c548c149b 100644 --- a/modular_skyrat/modules/customization/datums/components/crafting/recipes.dm +++ b/modular_skyrat/modules/customization/datums/components/crafting/recipes.dm @@ -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 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 ff7fe82012a..14d840aa428 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 @@ -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" diff --git a/modular_zubbers/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm b/modular_zubbers/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm new file mode 100644 index 00000000000..878e0ca1f01 --- /dev/null +++ b/modular_zubbers/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm @@ -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 + . = ..() diff --git a/tgstation.dme b/tgstation.dme index 1fe6f8881e9..e55ac5ceecc 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -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"