Merge pull request #5780 from Bone-White/master

Fix for issue #5768
This commit is contained in:
Fox McCloud
2016-10-17 19:16:21 -04:00
committed by GitHub
+2 -1
View File
@@ -292,7 +292,8 @@
defib.on = 0
loc = defib
defib.update_icon()
return unwield()
update_icon()
return unwield(user)
/obj/item/weapon/twohanded/shockpaddles/proc/check_defib_exists(mainunit, var/mob/living/carbon/human/M, var/obj/O)
if(!mainunit || !istype(mainunit, /obj/item/weapon/defibrillator)) //To avoid weird issues from admin spawns