cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes a spear hard del (#51708)

Browse Source 
* qdel

* rollback
This commit is contained in:
Rohesie
2020-06-19 11:51:33 -04:00
committed by GitHub
parent 3f8c8d67f3
commit 1fdd64532e
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/spear.dm
+9 -7
View File
@@ -38,13 +38,15 @@
/obj/item/spear/CheckParts(list/parts_list)
var/obj/item/shard/tip = locate() in parts_list
if (istype(tip, /obj/item/shard/plasma))
throwforce = 21
icon_prefix = "spearplasma"
AddComponent(/datum/component/two_handed, force_unwielded=11, force_wielded=19, icon_wielded="[icon_prefix]1")
update_icon()
qdel(tip)
..()
if(tip)
if (istype(tip, /obj/item/shard/plasma))
throwforce = 21
icon_prefix = "spearplasma"
AddComponent(/datum/component/two_handed, force_unwielded=11, force_wielded=19, icon_wielded="[icon_prefix]1")
update_icon()
parts_list -= tip
qdel(tip)
return ..()
/obj/item/spear/explosive
name = "explosive lance"