Merge pull request #2222 from Citadel-Station-13/upstream-merge-29610

[MIRROR] Fixes devil pitchforks being uninitialized
This commit is contained in:
LetterJay
2017-08-02 06:06:33 -05:00
committed by GitHub
+2 -1
View File
@@ -578,6 +578,7 @@
force_wielded = 25
/obj/item/weapon/twohanded/pitchfork/demonic/Initialize()
. = ..()
set_light(3,6,LIGHT_COLOR_RED)
/obj/item/weapon/twohanded/pitchfork/demonic/greater
@@ -695,4 +696,4 @@
sharpness = IS_SHARP
/obj/item/weapon/twohanded/bonespear/update_icon()
icon_state = "bone_spear[wielded]"
icon_state = "bone_spear[wielded]"