From c9fb50dcdcad18151b1dff7470efb4d0e200795d Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Mon, 27 Sep 2021 14:29:57 -0400 Subject: [PATCH] Further fix merge --- code/datums/components/crafting/recipes.dm | 27 ---------------------- 1 file changed, 27 deletions(-) diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm index 444f63b087a..d39d012832f 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -47,8 +47,6 @@ /datum/crafting_recipe/proc/on_craft_completion(mob/user, atom/result) return -<<<<<<< HEAD -======= // Computes the total reagents volume /datum/crafting_recipe/proc/get_parts_reagents_volume() @@ -58,30 +56,6 @@ if(ispath(path, /datum/reagent)) . += L[path] -/datum/crafting_recipe/stunprod - name = "Stunprod" - result = /obj/item/weapon/melee/baton/cattleprod - reqs = list(list(/obj/item/weapon/handcuffs/cable = 1), - list(/obj/item/stack/rods = 1), - list(/obj/item/weapon/tool/wirecutters = 1)) - time = 40 - category = CAT_WEAPONRY - subcategory = CAT_WEAPON - -/datum/crafting_recipe/spear - name = "Spear" - result = /obj/item/weapon/material/twohanded/spear - reqs = list(list(/obj/item/weapon/handcuffs/cable = 1), - list(/obj/item/stack/rods = 1), - list(/obj/item/weapon/material/shard = 1, - /obj/item/weapon/material/butterflyblade = 1) - ) - parts = list(/obj/item/weapon/material/shard = 1, - /obj/item/weapon/material/butterflyblade = 1) - time = 40 - category = CAT_WEAPONRY - subcategory = CAT_WEAPON - // Locate one of the things that set the material type, and update it from the default (glass) /datum/crafting_recipe/spear/on_craft_completion(mob/user, atom/result) var/obj/item/weapon/material/M @@ -98,4 +72,3 @@ var/obj/item/weapon/material/twohanded/spear/S = result S.set_material(M.material.name) qdel(M) ->>>>>>> 5a261195eab... Refactors crafting to support requirement alternatives (#8184)