cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-21 11:07:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Further fix merge

Browse Source
This commit is contained in:
Aronai Sieyes
2021-09-27 14:29:57 -04:00
parent c1103ff8cd
commit c9fb50dcdc
1 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/crafting/recipes.dm
-27
View File
@@ -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)