This commit is contained in:
Fox-McCloud
2017-05-13 07:23:56 -04:00
parent 31c9519f3e
commit bbd306d60f
2 changed files with 7 additions and 7 deletions
+1
View File
@@ -86,6 +86,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
var/mob/m = loc
m.unEquip(src, 1)
QDEL_LIST(actions)
master = null
return ..()
/obj/item/proc/check_allowed_items(atom/target, not_inside, target_self)
@@ -1,12 +1,11 @@
/obj/item/weapon/grenade/empgrenade
name = "classic emp grenade"
name = "classic EMP grenade"
desc = "It is designed to wreak havoc on electronic systems."
icon_state = "emp"
item_state = "emp"
origin_tech = "materials=2;magnets=3"
prime()
..()
if(empulse(src, 4, 10))
qdel(src)
return
/obj/item/weapon/grenade/empgrenade/prime()
update_mob()
empulse(src, 4, 10)
qdel(src)