diff --git a/code/modules/crafting/craft.dm b/code/modules/crafting/craft.dm index 2e5c7d99082..36f0da802cc 100644 --- a/code/modules/crafting/craft.dm +++ b/code/modules/crafting/craft.dm @@ -89,7 +89,8 @@ /datum/personal_crafting/proc/get_surroundings(mob/user) . = list() - .["other"] = list() + .["other"] = list() //paths go in here + .["toolsother"] = list() // items go in here for(var/obj/item/I in get_environment(user)) if(I.flags_2 & HOLOGRAM_2) continue @@ -102,22 +103,24 @@ if(RC.is_drainable()) for(var/datum/reagent/A in RC.reagents.reagent_list) .["other"][A.type] += A.volume - .["other"][I.type] += 1 + .["other"][I.type] += 1 + .["toolsother"][I] += 1 /datum/personal_crafting/proc/check_tools(mob/user, datum/crafting_recipe/R, list/contents) - if(!R.tools.len) + if(!R.tools.len) //does not run if no tools are needed return TRUE var/list/possible_tools = list() var/list/tools_used = list() - for(var/obj/item/I in user.contents) + for(var/obj/item/I in user.contents) //searchs the inventory of the mob if(istype(I, /obj/item/storage)) for(var/obj/item/SI in I.contents) - if(SI.tool_behaviour) //Only add things that we could actually use as a tool + if(SI.tool_behaviour) //filters for tool behaviours possible_tools += SI if(I.tool_behaviour) possible_tools += I - possible_tools |= contents["other"] - main_loop: + + possible_tools |= contents["toolsother"] // this add contents to possible_tools + main_loop: // checks if all tools found are usable with the recipe for(var/A in R.tools) for(var/obj/item/I in possible_tools) if(A == I.tool_behaviour) @@ -129,26 +132,49 @@ return FALSE return TRUE -/datum/personal_crafting/proc/construct_item(mob/user, datum/crafting_recipe/R) +/datum/personal_crafting/proc/check_pathtools(mob/user, datum/crafting_recipe/R, list/contents) + if(!R.pathtools.len) //does not run if no tools are needed + return TRUE + var/list/other_possible_tools = list() + for(var/obj/item/I in user.contents) // searchs the inventory of the mob + if(istype(I, /obj/item/storage)) + for(var/obj/item/SI in I.contents) + other_possible_tools += SI.type // filters type paths + other_possible_tools += I.type + + other_possible_tools |= contents["other"] // this adds contents to the other_possible_tools + main_loop: // checks if all tools found are usable with the recipe + for(var/A in R.pathtools) + for(var/I in other_possible_tools) + if(ispath(I,A)) + continue main_loop + return FALSE + return TRUE + +/datum/personal_crafting/proc/construct_item(mob/user, datum/crafting_recipe/R) var/list/contents = get_surroundings(user) var/send_feedback = 1 if(check_contents(R, contents)) if(check_tools(user, R, contents)) - if(do_after(user, R.time, target = user)) - contents = get_surroundings(user) - if(!check_contents(R, contents)) - return ", missing component." - if(!check_tools(user, R, contents)) - return ", missing tool." - var/list/parts = del_reqs(R, user) - var/atom/movable/I = new R.result (get_turf(user.loc)) - I.CheckParts(parts, R) - if(isitem(I)) - user.put_in_hands(I) - if(send_feedback) - feedback_add_details("object_crafted","[I.type]") - return 0 - return "." + if(check_pathtools(user, R, contents)) + if(do_after(user, R.time, target = user)) + contents = get_surroundings(user) + if(!check_contents(R, contents)) + return ", missing component." + if(!check_tools(user, R, contents)) + return ", missing tool." + if(!check_pathtools(user, R, contents)) + return ", missing tool." + var/list/parts = del_reqs(R, user) + var/atom/movable/I = new R.result (get_turf(user.loc)) + I.CheckParts(parts, R) + if(isitem(I)) + user.put_in_hands(I) + if(send_feedback) + feedback_add_details("object_crafted","[I.type]") + return 0 + return "." + return ", missing tool." return ", missing tool." return ", missing component." @@ -413,12 +439,15 @@ catalyst_text = replacetext(catalyst_text, ",", "", -1) data["catalyst_text"] = catalyst_text - for(var/a in R.tools) + for(var/a in R.pathtools) if(ispath(a, /obj/item)) var/obj/item/b = a tool_text += " [initial(b.name)]," else tool_text += " [a]," + for(var/a in R.tools) + var/b = a + tool_text += " [b]," tool_text = replacetext(tool_text, ",", "", -1) data["tool_text"] = tool_text diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index 63a3b953864..ec334979cd2 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -3,7 +3,8 @@ var/reqs[] = list() //type paths of items consumed associated with how many are needed var/blacklist[] = list() //type paths of items explicitly not allowed as an ingredient var/result //type path of item resulting from this craft - var/tools[] = list() //type paths of items needed but not consumed + var/tools[] = list() //tool behaviours of items needed but not consumed + var/pathtools[] = list() //type paths of items needed but not consumed var/time = 30 //time in deciseconds var/parts[] = list() //type paths of items that will be placed in the result var/chem_catalysts[] = list() //like tools but for reagents @@ -307,7 +308,7 @@ time = 15 reqs = list(/obj/item/stack/sheet/wood = 1, /obj/item/stack/cable_coil = 5) - tools = list(/obj/item/kitchen/knife) // Gotta carve the wood into handles + pathtools = list(/obj/item/kitchen/knife) // Gotta carve the wood into handles category = CAT_WEAPONRY subcategory = CAT_WEAPON @@ -328,8 +329,7 @@ /obj/item/stack/cable_coil = 10, /obj/item/stack/sheet/plastic = 3, /obj/item/stack/sheet/wood = 5) - tools = list(TOOL_WELDER, - TOOL_SCREWDRIVER) + tools = list(TOOL_WELDER, TOOL_SCREWDRIVER) category = CAT_WEAPONRY subcategory = CAT_WEAPON @@ -354,7 +354,7 @@ result = /obj/item/stack/tile/carpet/black time = 20 reqs = list(/obj/item/stack/tile/carpet = 1) - tools = list(/obj/item/toy/crayon) + pathtools = list(/obj/item/toy/crayon) category = CAT_MISC /datum/crafting_recipe/showercurtain @@ -559,7 +559,7 @@ reqs = list(/datum/reagent/paint/red = 10, /datum/reagent/paint/black = 30, /obj/item/storage/toolbox = 1) //Paint in reagents so it doesnt take the container up, yet still take it from the beaker - tools = list(/obj/item/reagent_containers/glass/rag = 1) //need something to paint with it + pathtools = list(/obj/item/reagent_containers/glass/rag = 1) //need something to paint with it category = CAT_MISC /datum/crafting_recipe/snowman @@ -578,152 +578,153 @@ result = /obj/item/decorations/sticky_decorations/flammable/heart reqs = list(/obj/item/paper = 1, /obj/item/stack/tape_roll = 1) - tools = list(/obj/item/wirecutters, - /obj/item/toy/crayon/red)//cutters act as makeshift scissors. I doubt the barber wants to have their scissors stolen when somone wants to decorate + tools = list(TOOL_WIRECUTTER) //cutters act as makeshift scissors. I doubt the barber wants to have their scissors stolen when somone wants to decorate + pathtools = list(/obj/item/toy/crayon/red) category = CAT_DECORATIONS subcategory = CAT_DECORATION /datum/crafting_recipe/paper_craft/single_eye name = "Paper Eye" result = /obj/item/decorations/sticky_decorations/flammable/singleeye - tools = list(/obj/item/wirecutters, - /obj/item/pen, - /obj/item/toy/crayon/blue) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/pen, /obj/item/toy/crayon/blue) category = CAT_DECORATIONS subcategory = CAT_DECORATION /datum/crafting_recipe/paper_craft/googlyeyes name = "Paper Googly Eye" result = /obj/item/decorations/sticky_decorations/flammable/googlyeyes - tools = list(/obj/item/wirecutters, - /obj/item/pen) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/pen) category = CAT_DECORATIONS subcategory = CAT_DECORATION /datum/crafting_recipe/paper_craft/clock name = "Paper Clock" result = /obj/item/decorations/sticky_decorations/flammable/paperclock - tools = list(/obj/item/wirecutters, - /obj/item/pen) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/pen) category = CAT_DECORATIONS subcategory = CAT_DECORATION /datum/crafting_recipe/paper_craft/jack_o_lantern name = "Paper Jack o'Lantern" result = /obj/item/decorations/sticky_decorations/flammable/jack_o_lantern - tools = list(/obj/item/wirecutters, - /obj/item/pen, - /obj/item/toy/crayon/orange, - /obj/item/toy/crayon/green)//pen ink is black + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/pen, + /obj/item/toy/crayon/orange, + /obj/item/toy/crayon/green)//pen ink is black category = CAT_DECORATIONS subcategory = CAT_HOLIDAY /datum/crafting_recipe/paper_craft/ghost name = "Paper Ghost" result = /obj/item/decorations/sticky_decorations/flammable/ghost - tools = list(/obj/item/wirecutters, - /obj/item/pen)//it's white paper why need a white crayon? + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/pen)//it's white paper why need a white crayon? category = CAT_DECORATIONS subcategory = CAT_HOLIDAY /datum/crafting_recipe/paper_craft/spider name = "Paper Spider" result = /obj/item/decorations/sticky_decorations/flammable/spider - tools = list(/obj/item/wirecutters, - /obj/item/pen, - /obj/item/toy/crayon/red) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/pen, + /obj/item/toy/crayon/red) category = CAT_DECORATIONS subcategory = CAT_HOLIDAY /datum/crafting_recipe/paper_craft/spiderweb name = "Paper Spiderweb" result = /obj/item/decorations/sticky_decorations/flammable/spiderweb - tools = list(/obj/item/wirecutters) + tools = list(TOOL_WIRECUTTER) + pathtools = list() category = CAT_DECORATIONS subcategory = CAT_HOLIDAY /datum/crafting_recipe/paper_craft/skull name = "Paper Skull" result = /obj/item/decorations/sticky_decorations/flammable/skull - tools = list(/obj/item/wirecutters, - /obj/item/pen) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/pen) category = CAT_DECORATIONS subcategory = CAT_HOLIDAY /datum/crafting_recipe/paper_craft/skeleton name = "Paper Skeleton" result = /obj/item/decorations/sticky_decorations/flammable/skeleton - tools = list(/obj/item/wirecutters, - /obj/item/pen) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/pen) category = CAT_DECORATIONS subcategory = CAT_HOLIDAY /datum/crafting_recipe/paper_craft/cauldron name = "Paper Cauldron" result = /obj/item/decorations/sticky_decorations/flammable/cauldron - tools = list(/obj/item/wirecutters, - /obj/item/pen) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/pen) category = CAT_DECORATIONS subcategory = CAT_HOLIDAY /datum/crafting_recipe/paper_craft/snowman name = "Paper Snowman" result = /obj/item/decorations/sticky_decorations/flammable/snowman - tools = list(/obj/item/wirecutters, - /obj/item/pen, - /obj/item/toy/crayon/orange) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/pen, + /obj/item/toy/crayon/orange) category = CAT_DECORATIONS subcategory = CAT_HOLIDAY /datum/crafting_recipe/paper_craft/christmas_stocking name = "Paper Christmas Stocking" result = /obj/item/decorations/sticky_decorations/flammable/christmas_stocking - tools = list(/obj/item/wirecutters, - /obj/item/toy/crayon/red) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/toy/crayon/red) category = CAT_DECORATIONS subcategory = CAT_HOLIDAY /datum/crafting_recipe/paper_craft/christmas_tree name = "Paper Christmas Tree" result = /obj/item/decorations/sticky_decorations/flammable/christmas_tree - tools = list(/obj/item/wirecutters, - /obj/item/toy/crayon/red, - /obj/item/toy/crayon/yellow, - /obj/item/toy/crayon/blue, - /obj/item/toy/crayon/green) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/toy/crayon/red, + /obj/item/toy/crayon/yellow, + /obj/item/toy/crayon/blue, + /obj/item/toy/crayon/green) category = CAT_DECORATIONS subcategory = CAT_HOLIDAY /datum/crafting_recipe/paper_craft/snowflake name = "Paper Snowflake" result = /obj/item/decorations/sticky_decorations/flammable/snowflake - tools = list(/obj/item/wirecutters) + tools = list(TOOL_WIRECUTTER) + pathtools = list() category = CAT_DECORATIONS subcategory = CAT_HOLIDAY /datum/crafting_recipe/paper_craft/candy_cane name = "Paper Candy Cane" result = /obj/item/decorations/sticky_decorations/flammable/candy_cane - tools = list(/obj/item/wirecutters, - /obj/item/toy/crayon/red) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/toy/crayon/red) category = CAT_DECORATIONS subcategory = CAT_HOLIDAY /datum/crafting_recipe/paper_craft/mistletoe name = "Paper Mistletoe" result = /obj/item/decorations/sticky_decorations/flammable/mistletoe - tools = list(/obj/item/wirecutters, - /obj/item/toy/crayon/red, - /obj/item/toy/crayon/green) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/toy/crayon/red, + /obj/item/toy/crayon/green) category = CAT_DECORATIONS subcategory = CAT_HOLIDAY /datum/crafting_recipe/paper_craft/holly name = "Paper Holly" result = /obj/item/decorations/sticky_decorations/flammable/holly - tools = list(/obj/item/wirecutters, - /obj/item/toy/crayon/red, - /obj/item/toy/crayon/green) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/toy/crayon/red, + /obj/item/toy/crayon/green) category = CAT_DECORATIONS subcategory = CAT_HOLIDAY @@ -733,7 +734,8 @@ result = /obj/item/decorations/sticky_decorations/flammable/tinsel reqs = list(/obj/item/paper = 1, /obj/item/stack/tape_roll = 2) - tools = list(/obj/item/wirecutters) + tools = list(TOOL_WIRECUTTER) + pathtools = list() category = CAT_DECORATIONS subcategory = CAT_HOLIDAY @@ -743,8 +745,8 @@ result = /obj/item/decorations/sticky_decorations/flammable/tinsel/red reqs = list(/obj/item/paper = 1, /obj/item/stack/tape_roll = 2) - tools = list(/obj/item/wirecutters, - /obj/item/toy/crayon/red) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/toy/crayon/red) category = CAT_DECORATIONS subcategory = CAT_HOLIDAY @@ -754,8 +756,8 @@ result = /obj/item/decorations/sticky_decorations/flammable/tinsel/blue reqs = list(/obj/item/paper = 1, /obj/item/stack/tape_roll = 2) - tools = list(/obj/item/wirecutters, - /obj/item/toy/crayon/blue) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/toy/crayon/blue) category = CAT_DECORATIONS subcategory = CAT_HOLIDAY @@ -765,8 +767,8 @@ result = /obj/item/decorations/sticky_decorations/flammable/tinsel/yellow reqs = list(/obj/item/paper = 1, /obj/item/stack/tape_roll = 2) - tools = list(/obj/item/wirecutters, - /obj/item/toy/crayon/yellow) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/toy/crayon/yellow) category = CAT_DECORATIONS subcategory = CAT_HOLIDAY @@ -776,8 +778,8 @@ result = /obj/item/decorations/sticky_decorations/flammable/tinsel/purple reqs = list(/obj/item/paper = 1, /obj/item/stack/tape_roll = 2) - tools = list(/obj/item/wirecutters, - /obj/item/toy/crayon/purple) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/toy/crayon/purple) category = CAT_DECORATIONS subcategory = CAT_HOLIDAY @@ -787,8 +789,8 @@ result = /obj/item/decorations/sticky_decorations/flammable/tinsel/green reqs = list(/obj/item/paper = 1, /obj/item/stack/tape_roll = 2) - tools = list(/obj/item/wirecutters, - /obj/item/toy/crayon/green) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/toy/crayon/green) category = CAT_DECORATIONS subcategory = CAT_HOLIDAY @@ -798,8 +800,8 @@ result = /obj/item/decorations/sticky_decorations/flammable/tinsel/orange reqs = list(/obj/item/paper = 1, /obj/item/stack/tape_roll = 2) - tools = list(/obj/item/wirecutters, - /obj/item/toy/crayon/orange) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/toy/crayon/orange) category = CAT_DECORATIONS subcategory = CAT_HOLIDAY @@ -809,8 +811,8 @@ result = /obj/item/decorations/sticky_decorations/flammable/tinsel/black reqs = list(/obj/item/paper = 1, /obj/item/stack/tape_roll = 2) - tools = list(/obj/item/wirecutters, - /obj/item/pen) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/pen) category = CAT_DECORATIONS subcategory = CAT_HOLIDAY @@ -820,17 +822,17 @@ result = /obj/item/decorations/sticky_decorations/flammable/tinsel/halloween reqs = list(/obj/item/paper = 1, /obj/item/stack/tape_roll = 2) - tools = list(/obj/item/wirecutters, - /obj/item/pen, - /obj/item/toy/crayon/orange) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/pen, + /obj/item/toy/crayon/orange) category = CAT_DECORATIONS subcategory = CAT_HOLIDAY /datum/crafting_recipe/paper_craft/arrowed_heart name = "Paper Arrowed Heart" result = /obj/item/decorations/sticky_decorations/flammable/arrowed_heart - tools = list(/obj/item/wirecutters, - /obj/item/toy/crayon/red) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/toy/crayon/red) category = CAT_DECORATIONS subcategory = CAT_HOLIDAY @@ -840,24 +842,24 @@ reqs = list(/obj/item/paper = 1, /obj/item/stack/tape_roll = 2, /obj/item/stack/cable_coil = 2) - tools = list(/obj/item/wirecutters, - /obj/item/toy/crayon/red) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/toy/crayon/red) category = CAT_DECORATIONS subcategory = CAT_HOLIDAY /datum/crafting_recipe/paper_craft/four_leaf_clover name = "Paper Four Leaf Clover" result = /obj/item/decorations/sticky_decorations/flammable/four_leaf_clover - tools = list(/obj/item/wirecutters, - /obj/item/toy/crayon/green) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/toy/crayon/green) category = CAT_DECORATIONS subcategory = CAT_HOLIDAY /datum/crafting_recipe/paper_craft/pot_of_gold name = "Paper Pot of Gold" result = /obj/item/decorations/sticky_decorations/flammable/pot_of_gold - tools = list(/obj/item/wirecutters, - /obj/item/pen, + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/pen, /obj/item/toy/crayon/red, /obj/item/toy/crayon/yellow, /obj/item/toy/crayon/orange, @@ -871,8 +873,8 @@ name = "Paper Leprechaun Hat" time = 10 result = /obj/item/decorations/sticky_decorations/flammable/leprechaun_hat - tools = list(/obj/item/wirecutters, - /obj/item/pen, + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/pen, /obj/item/toy/crayon/yellow, /obj/item/toy/crayon/green) category = CAT_DECORATIONS @@ -881,8 +883,8 @@ /datum/crafting_recipe/paper_craft/easter_bunny name = "Paper Easter Bunny" result = /obj/item/decorations/sticky_decorations/flammable/easter_bunny - tools = list(/obj/item/wirecutters, - /obj/item/pen, + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/pen, /obj/item/toy/crayon/blue, /obj/item/toy/crayon/purple) category = CAT_DECORATIONS @@ -891,40 +893,40 @@ /datum/crafting_recipe/paper_craft/easter_egg_blue name = "Blue Paper Easter Egg" result = /obj/item/decorations/sticky_decorations/flammable/easter_egg - tools = list(/obj/item/wirecutters, - /obj/item/toy/crayon/blue) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/toy/crayon/blue) category = CAT_DECORATIONS subcategory = CAT_HOLIDAY /datum/crafting_recipe/paper_craft/easter_egg_yellow name = "Yellow Paper Easter Egg" result = /obj/item/decorations/sticky_decorations/flammable/easter_egg/yellow - tools = list(/obj/item/wirecutters, - /obj/item/toy/crayon/yellow) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/toy/crayon/yellow) category = CAT_DECORATIONS subcategory = CAT_HOLIDAY /datum/crafting_recipe/paper_craft/easter_egg_red name = "Red Paper Easter Egg" result = /obj/item/decorations/sticky_decorations/flammable/easter_egg/red - tools = list(/obj/item/wirecutters, - /obj/item/toy/crayon/red) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/toy/crayon/red) category = CAT_DECORATIONS subcategory = CAT_HOLIDAY /datum/crafting_recipe/paper_craft/easter_egg_purple name = "Purple Paper Easter Egg" result = /obj/item/decorations/sticky_decorations/flammable/easter_egg/purple - tools = list(/obj/item/wirecutters, - /obj/item/toy/crayon/purple) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/toy/crayon/purple) category = CAT_DECORATIONS subcategory = CAT_HOLIDAY /datum/crafting_recipe/paper_craft/easter_egg_orange name = "Orange Paper Easter Egg" result = /obj/item/decorations/sticky_decorations/flammable/easter_egg/orange - tools = list(/obj/item/wirecutters, - /obj/item/toy/crayon/orange) + tools = list(TOOL_WIRECUTTER) + pathtools = list(/obj/item/toy/crayon/orange) category = CAT_DECORATIONS subcategory = CAT_HOLIDAY @@ -934,7 +936,7 @@ result = /obj/structure/decorative_structures/metal/statue/metal_angel reqs = list(/obj/item/stack/sheet/metal = 10, /obj/item/stack/sheet/mineral/gold = 6) - tools = list(/obj/item/weldingtool) + tools = list(TOOL_WELDER) category = CAT_DECORATIONS subcategory = CAT_LARGE_DECORATIONS @@ -945,7 +947,7 @@ reqs = list(/obj/item/stack/sheet/metal = 10, /obj/item/stack/sheet/mineral/plasma = 3, /obj/item/stack/sheet/mineral/gold = 8) - tools = list(/obj/item/weldingtool) + tools = list(TOOL_WELDER) category = CAT_DECORATIONS subcategory = CAT_LARGE_DECORATIONS @@ -955,7 +957,7 @@ result = /obj/structure/decorative_structures/metal/statue/sun reqs = list(/obj/item/stack/sheet/metal = 6, /obj/item/stack/sheet/mineral/gold = 4) - tools = list(/obj/item/weldingtool) + tools = list(TOOL_WELDER) category = CAT_DECORATIONS subcategory = CAT_LARGE_DECORATIONS @@ -966,7 +968,7 @@ reqs = list(/obj/item/stack/sheet/metal = 6, /obj/item/stack/sheet/mineral/silver = 6, /obj/item/stack/sheet/mineral/gold = 4) - tools = list(/obj/item/weldingtool) + tools = list(TOOL_WELDER) category = CAT_DECORATIONS subcategory = CAT_LARGE_DECORATIONS @@ -976,7 +978,7 @@ result = /obj/structure/decorative_structures/metal/statue/tesla reqs = list(/obj/item/stack/sheet/metal = 4, /obj/item/stack/sheet/glass = 8) - tools = list(/obj/item/weldingtool) + tools = list(TOOL_WELDER) category = CAT_DECORATIONS subcategory = CAT_LARGE_DECORATIONS @@ -987,7 +989,7 @@ reqs = list(/obj/item/stack/sheet/metal = 8, /obj/item/stock_parts/cell = 3, /obj/item/stack/cable_coil = 4) - tools = list(/obj/item/weldingtool) + tools = list(TOOL_WELDER) category = CAT_DECORATIONS subcategory = CAT_LARGE_DECORATIONS @@ -1010,9 +1012,9 @@ /obj/item/stack/rods = 4, /obj/item/stock_parts/cell = 1, /obj/item/stack/cable_coil = 4)//thing is a wireframe construct with an electro magnetic hover field - tools = list(/obj/item/wirecutters, - /obj/item/pen, - /obj/item/weldingtool, + tools = list(TOOL_WIRECUTTER, + TOOL_WELDER) + pathtools = list(/obj/item/pen, /obj/item/toy/crayon/red) category = CAT_DECORATIONS subcategory = CAT_LARGE_DECORATIONS diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm index a0988951855..2a2ee410522 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm @@ -95,7 +95,7 @@ /obj/item/reagent_containers/food/snacks/boiledrice = 1, /obj/item/reagent_containers/food/snacks/boiled_shrimp = 4, ) - tools = list(/obj/item/kitchen/sushimat) + pathtools = list(/obj/item/kitchen/sushimat) result = /obj/item/reagent_containers/food/snacks/sliceable/Ebi_maki category = CAT_FOOD subcategory = CAT_SUSHI @@ -116,7 +116,7 @@ /obj/item/reagent_containers/food/snacks/boiledrice = 1, /obj/item/fish_eggs/salmon = 4, ) - tools = list(/obj/item/kitchen/sushimat) + pathtools = list(/obj/item/kitchen/sushimat) result = /obj/item/reagent_containers/food/snacks/sliceable/Ikura_maki category = CAT_FOOD subcategory = CAT_SUSHI @@ -137,7 +137,7 @@ /obj/item/reagent_containers/food/snacks/boiledrice = 1, /obj/item/reagent_containers/food/snacks/fried_tofu = 4, ) - tools = list(/obj/item/kitchen/sushimat) + pathtools = list(/obj/item/kitchen/sushimat) result = /obj/item/reagent_containers/food/snacks/sliceable/Inari_maki category = CAT_FOOD subcategory = CAT_SUSHI @@ -158,7 +158,7 @@ /obj/item/reagent_containers/food/snacks/boiledrice = 1, /obj/item/reagent_containers/food/snacks/salmonmeat = 4, ) - tools = list(/obj/item/kitchen/sushimat) + pathtools = list(/obj/item/kitchen/sushimat) result = /obj/item/reagent_containers/food/snacks/sliceable/Sake_maki category = CAT_FOOD subcategory = CAT_SUSHI @@ -179,7 +179,7 @@ /obj/item/reagent_containers/food/snacks/boiledrice = 1, /obj/item/reagent_containers/food/snacks/salmonsteak = 4, ) - tools = list(/obj/item/kitchen/sushimat) + pathtools = list(/obj/item/kitchen/sushimat) result = /obj/item/reagent_containers/food/snacks/sliceable/SmokedSalmon_maki category = CAT_FOOD subcategory = CAT_SUSHI @@ -200,7 +200,7 @@ /obj/item/reagent_containers/food/snacks/boiledrice = 1, /obj/item/fish_eggs/goldfish = 4, ) - tools = list(/obj/item/kitchen/sushimat) + pathtools = list(/obj/item/kitchen/sushimat) result = /obj/item/reagent_containers/food/snacks/sliceable/Masago_maki category = CAT_FOOD subcategory = CAT_SUSHI @@ -221,7 +221,7 @@ /obj/item/reagent_containers/food/snacks/boiledrice = 1, /obj/item/fish_eggs/shark = 4, ) - tools = list(/obj/item/kitchen/sushimat) + pathtools = list(/obj/item/kitchen/sushimat) result = /obj/item/reagent_containers/food/snacks/sliceable/Tobiko_maki category = CAT_FOOD subcategory = CAT_SUSHI @@ -242,7 +242,7 @@ /obj/item/reagent_containers/food/snacks/sushi_Tobiko = 4, /obj/item/reagent_containers/food/snacks/egg = 4, ) - tools = list(/obj/item/kitchen/sushimat) + pathtools = list(/obj/item/kitchen/sushimat) result = /obj/item/reagent_containers/food/snacks/sliceable/TobikoEgg_maki category = CAT_FOOD subcategory = CAT_SUSHI @@ -253,7 +253,7 @@ /obj/item/reagent_containers/food/snacks/sushi_Tobiko = 4, /obj/item/reagent_containers/food/snacks/egg = 4, ) - tools = list(/obj/item/kitchen/sushimat) + pathtools = list(/obj/item/kitchen/sushimat) result = /obj/item/reagent_containers/food/snacks/sliceable/TobikoEgg_maki category = CAT_FOOD subcategory = CAT_SUSHI @@ -274,7 +274,7 @@ /obj/item/reagent_containers/food/snacks/boiledrice = 1, /obj/item/reagent_containers/food/snacks/catfishmeat = 4, ) - tools = list(/obj/item/kitchen/sushimat) + pathtools = list(/obj/item/kitchen/sushimat) result = /obj/item/reagent_containers/food/snacks/sliceable/Tai_maki category = CAT_FOOD subcategory = CAT_SUSHI