diff --git a/code/datums/components/crafting/craft.dm b/code/datums/components/crafting/craft.dm index 833bc39581..2f5e6cdf25 100644 --- a/code/datums/components/crafting/craft.dm +++ b/code/datums/components/crafting/craft.dm @@ -103,7 +103,7 @@ if(AM.flags_1 & HOLOGRAM_1) continue . += AM - for(var/slot in list(ITEM_SLOT_RPOCKET, ITEM_SLOT_LPOCKET)) + for(var/slot in ITEM_SLOT_POCKET) . += user.get_item_by_slot(slot) /datum/component/personal_crafting/proc/get_surroundings(mob/user) diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm index f3c0626924..2b6f1a5b81 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -11,3 +11,15 @@ var/subcategory = CAT_NONE var/always_availible = TRUE //Set to FALSE if it needs to be learned first. +/datum/crafting_recipe/New() + if(!(result in reqs)) + blacklist += result + +/** + * Run custom pre-craft checks for this recipe + * + * user: The /mob that initiated the crafting + * collected_requirements: A list of lists of /obj/item instances that satisfy reqs. Top level list is keyed by requirement path. + */ +/datum/crafting_recipe/proc/check_requirements(mob/user, list/collected_requirements) + return TRUE diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm index a42db0b2b5..e204b0c72c 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm @@ -244,6 +244,7 @@ /datum/reagent/consumable/spacemountainwind = 5 ) result = /obj/item/reagent_containers/food/snacks/snowcones/spacemountainwind + subcategory = CAT_ICE /datum/crafting_recipe/food/pwrgame_sc name = "Pwrgame snowcone" @@ -273,4 +274,4 @@ /datum/reagent/colorful_reagent = 1 //Harder to make ) result = /obj/item/reagent_containers/food/snacks/snowcones/rainbow - subcategory = CAT_ICE \ No newline at end of file + subcategory = CAT_ICE