cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 10:33:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix meat/chickensteak recipe collision (#29323)

Browse Source
This commit is contained in:
warriorstar-orion
2025-05-15 03:37:32 -04:00
committed by GitHub
parent 7bd8293673
commit 6456e9269a
7 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/cooking_defines.dm
+1
View File
@@ -49,6 +49,7 @@
#define PCWJ_USE_STOVE(temperature, time, options...) new/datum/cooking/recipe_step/use_machine/stovetop(temperature, time, list(##options))
#define PCWJ_USE_ICE_CREAM_MIXER(time, options...) new/datum/cooking/recipe_step/use_machine/ice_cream_mixer(time, list(##options))
#define PCWJ_USE_DEEP_FRYER(time, options...) new/datum/cooking/recipe_step/use_machine/deepfryer(time, list(##options))
#define PCWJ_ADD_MEATHUNK(options...) new/datum/cooking/recipe_step/add_item/meathunk(list(##options))
#define PCWJ_CONTAINER_AVAILABLE 1
#define PCWJ_CONTAINER_BUSY 2
code/modules/cooking/recipes/deep_fryer_recipes.dm
+1 -1
View File
@@ -332,7 +332,7 @@
catalog_category = COOKBOOK_CATEGORY_DONUTS
steps = list(
PCWJ_ADD_ITEM(/obj/item/food/cookiedough),
PCWJ_ADD_ITEM(/obj/item/food/meat),
PCWJ_ADD_MEATHUNK(),
PCWJ_ADD_REAGENT("ketchup", 5),
PCWJ_USE_DEEP_FRYER(20 SECONDS),
)
code/modules/cooking/recipes/grill_recipes.dm
+6 -27
View File
@@ -12,8 +12,8 @@
product_type = /obj/item/food/bbqribs
catalog_category = COOKBOOK_CATEGORY_MEAT
steps = list(
PCWJ_ADD_ITEM(/obj/item/food/meat),
PCWJ_ADD_ITEM(/obj/item/food/meat),
PCWJ_ADD_MEATHUNK(),
PCWJ_ADD_MEATHUNK(),
PCWJ_ADD_REAGENT("bbqsauce", 5),
PCWJ_USE_GRILL(J_MED, 10 SECONDS),
)
@@ -98,8 +98,8 @@
catalog_category = COOKBOOK_CATEGORY_MEAT
steps = list(
PCWJ_ADD_ITEM(/obj/item/stack/rods),
PCWJ_ADD_ITEM(/obj/item/food/meat),
PCWJ_ADD_ITEM(/obj/item/food/meat),
PCWJ_ADD_MEATHUNK(),
PCWJ_ADD_MEATHUNK(),
PCWJ_USE_GRILL(J_MED, 10 SECONDS),
)
@@ -108,7 +108,7 @@
product_type = /obj/item/food/meatsteak
catalog_category = COOKBOOK_CATEGORY_MEAT
steps = list(
PCWJ_ADD_ITEM(/obj/item/food/meat),
PCWJ_ADD_MEATHUNK(),
PCWJ_ADD_REAGENT("sodiumchloride", 1),
PCWJ_ADD_REAGENT("blackpepper", 1),
PCWJ_USE_GRILL(J_MED, 10 SECONDS),
@@ -221,33 +221,12 @@
PCWJ_USE_GRILL(J_MED, 10 SECONDS),
)
/datum/cooking/recipe/syntisteak
container_type = /obj/item/reagent_containers/cooking/grill_grate
product_type = /obj/item/food/meatsteak
catalog_category = COOKBOOK_CATEGORY_MEAT
steps = list(
PCWJ_ADD_ITEM(/obj/item/food/meat/syntiflesh),
PCWJ_ADD_REAGENT("sodiumchloride", 1),
PCWJ_ADD_REAGENT("blackpepper", 1),
PCWJ_USE_GRILL(J_MED, 10 SECONDS),
)
/datum/cooking/recipe/syntitelebacon
container_type = /obj/item/reagent_containers/cooking/grill_grate
product_type = /obj/item/food/telebacon
catalog_category = COOKBOOK_CATEGORY_MEAT
steps = list(
PCWJ_ADD_ITEM(/obj/item/food/meat/syntiflesh),
PCWJ_ADD_ITEM(/obj/item/assembly/signaler),
PCWJ_USE_GRILL(J_MED, 10 SECONDS),
)
/datum/cooking/recipe/telebacon
container_type = /obj/item/reagent_containers/cooking/grill_grate
product_type = /obj/item/food/telebacon
catalog_category = COOKBOOK_CATEGORY_MEAT
steps = list(
PCWJ_ADD_ITEM(/obj/item/food/meat),
PCWJ_ADD_MEATHUNK(),
PCWJ_ADD_ITEM(/obj/item/assembly/signaler),
PCWJ_USE_GRILL(J_MED, 10 SECONDS),
)
code/modules/cooking/recipes/oven_recipes.dm
+14 -14
View File
@@ -540,7 +540,7 @@
PCWJ_ADD_ITEM(/obj/item/food/sliced/cheesewedge),
PCWJ_ADD_ITEM(/obj/item/food/sliced/pineapple),
PCWJ_ADD_ITEM(/obj/item/food/sliced/pineapple),
PCWJ_ADD_ITEM(/obj/item/food/meat),
PCWJ_ADD_MEATHUNK(),
PCWJ_ADD_PRODUCE(/obj/item/food/grown/tomato),
PCWJ_USE_OVEN(J_MED, 15 SECONDS),
)
@@ -576,8 +576,8 @@
product_type = /obj/item/food/lasagna
catalog_category = COOKBOOK_CATEGORY_PIZZAS
steps = list(
PCWJ_ADD_ITEM(/obj/item/food/meat),
PCWJ_ADD_ITEM(/obj/item/food/meat),
PCWJ_ADD_MEATHUNK(),
PCWJ_ADD_MEATHUNK(),
PCWJ_ADD_ITEM(/obj/item/food/sliced/cheesewedge),
PCWJ_ADD_ITEM(/obj/item/food/sliced/cheesewedge),
PCWJ_ADD_ITEM(/obj/item/food/sliced/cheesewedge),
@@ -665,9 +665,9 @@
PCWJ_ADD_ITEM(/obj/item/food/dough),
PCWJ_ADD_ITEM(/obj/item/food/dough),
PCWJ_ADD_ITEM(/obj/item/food/dough),
PCWJ_ADD_ITEM(/obj/item/food/meat),
PCWJ_ADD_ITEM(/obj/item/food/meat),
PCWJ_ADD_ITEM(/obj/item/food/meat),
PCWJ_ADD_MEATHUNK(),
PCWJ_ADD_MEATHUNK(),
PCWJ_ADD_MEATHUNK(),
PCWJ_ADD_ITEM(/obj/item/food/sliced/cheesewedge),
PCWJ_ADD_ITEM(/obj/item/food/sliced/cheesewedge),
PCWJ_ADD_ITEM(/obj/item/food/sliced/cheesewedge),
@@ -680,7 +680,7 @@
catalog_category = COOKBOOK_CATEGORY_MEAT
steps = list(
PCWJ_ADD_ITEM(/obj/item/food/sliceable/flatdough),
PCWJ_ADD_ITEM(/obj/item/food/meat),
PCWJ_ADD_MEATHUNK(),
PCWJ_USE_OVEN(J_MED, 10 SECONDS),
)
@@ -690,9 +690,9 @@
catalog_category = COOKBOOK_CATEGORY_PIZZAS
steps = list(
PCWJ_ADD_ITEM(/obj/item/food/sliceable/flatdough),
PCWJ_ADD_ITEM(/obj/item/food/meat),
PCWJ_ADD_ITEM(/obj/item/food/meat),
PCWJ_ADD_ITEM(/obj/item/food/meat),
PCWJ_ADD_MEATHUNK(),
PCWJ_ADD_MEATHUNK(),
PCWJ_ADD_MEATHUNK(),
PCWJ_ADD_ITEM(/obj/item/food/sliced/cheesewedge),
PCWJ_ADD_PRODUCE(/obj/item/food/grown/tomato),
PCWJ_USE_OVEN(J_MED, 15 SECONDS),
@@ -1059,10 +1059,10 @@
product_type = /obj/item/food/sliceable/turkey
catalog_category = COOKBOOK_CATEGORY_MEAT
steps = list(
PCWJ_ADD_ITEM(/obj/item/food/meat),
PCWJ_ADD_ITEM(/obj/item/food/meat),
PCWJ_ADD_ITEM(/obj/item/food/meat),
PCWJ_ADD_ITEM(/obj/item/food/meat),
PCWJ_ADD_MEATHUNK(),
PCWJ_ADD_MEATHUNK(),
PCWJ_ADD_MEATHUNK(),
PCWJ_ADD_MEATHUNK(),
PCWJ_ADD_ITEM(/obj/item/food/stuffing),
PCWJ_ADD_ITEM(/obj/item/food/stuffing),
PCWJ_USE_OVEN(J_MED, 15 SECONDS),
code/modules/cooking/recipes/stove_recipes.dm
+4 -4
View File
@@ -51,7 +51,7 @@
product_type = /obj/item/food/soup/chicken_noodle_soup
catalog_category = COOKBOOK_CATEGORY_SOUPS
steps = list(
PCWJ_ADD_ITEM(/obj/item/food/meat),
PCWJ_ADD_MEATHUNK(),
PCWJ_ADD_ITEM(/obj/item/food/boiledspaghetti),
PCWJ_ADD_PRODUCE(/obj/item/food/grown/carrot),
PCWJ_ADD_REAGENT("water", 10),
@@ -88,7 +88,7 @@
product_type = /obj/item/food/soup/coldchili
catalog_category = COOKBOOK_CATEGORY_SOUPS
steps = list(
PCWJ_ADD_ITEM(/obj/item/food/meat),
PCWJ_ADD_MEATHUNK(),
PCWJ_ADD_PRODUCE(/obj/item/food/grown/icepepper),
PCWJ_ADD_PRODUCE(/obj/item/food/grown/tomato),
PCWJ_USE_STOVE(J_MED, 20 SECONDS),
@@ -178,7 +178,7 @@
product_type = /obj/item/food/soup/hotchili
catalog_category = COOKBOOK_CATEGORY_SOUPS
steps = list(
PCWJ_ADD_ITEM(/obj/item/food/meat),
PCWJ_ADD_MEATHUNK(),
PCWJ_ADD_PRODUCE(/obj/item/food/grown/chili),
PCWJ_ADD_PRODUCE(/obj/item/food/grown/tomato),
PCWJ_USE_STOVE(J_MED, 20 SECONDS),
@@ -326,7 +326,7 @@
product_type = /obj/item/food/soup/stew
catalog_category = COOKBOOK_CATEGORY_SOUPS
steps = list(
PCWJ_ADD_ITEM(/obj/item/food/meat),
PCWJ_ADD_MEATHUNK(),
PCWJ_ADD_PRODUCE(/obj/item/food/grown/tomato),
PCWJ_ADD_PRODUCE(/obj/item/food/grown/potato),
PCWJ_ADD_PRODUCE(/obj/item/food/grown/carrot),
code/modules/cooking/steps/recipe_step_add_meathunk.dm
+20
View File
@@ -0,0 +1,20 @@
RESTRICT_TYPE(/datum/cooking/recipe_step/add_item/meathunk)
/// A specialized add-item step for specific meat subtypes
/datum/cooking/recipe_step/add_item/meathunk
/// A list of subtypes of meat which aren't appropriate substitutes for the generic "hunk of meat" base type in recipes
var/list/exclude_meat_subtypes = list(
/obj/item/food/meat/chicken,
/obj/item/food/meat/patty_raw,
/obj/item/food/meat/patty,
/obj/item/food/meat/raw_meatball,
)
/datum/cooking/recipe_step/add_item/meathunk/New(options)
..(/obj/item/food/meat, options)
/datum/cooking/recipe_step/add_item/meathunk/check_conditions_met(obj/added_item, datum/cooking/recipe_tracker/tracker)
if(is_type_in_list(added_item, exclude_meat_subtypes))
return PCWJ_CHECK_INVALID
return ..()
paradise.dme
+1
View File
@@ -1960,6 +1960,7 @@
#include "code\modules\cooking\recipes\sushi_mat_recipes.dm"
#include "code\modules\cooking\steps\recipe_step.dm"
#include "code\modules\cooking\steps\recipe_step_add_item.dm"
#include "code\modules\cooking\steps\recipe_step_add_meathunk.dm"
#include "code\modules\cooking\steps\recipe_step_add_produce.dm"
#include "code\modules\cooking\steps\recipe_step_add_reagent.dm"
#include "code\modules\cooking\steps\recipe_step_use_machine.dm"