Merge pull request #1452 from Fox-McCloud/parents-and-procs

Tweaks a Few Destroy()'s
This commit is contained in:
TheDZD
2015-07-05 17:51:03 -04:00
3 changed files with 4 additions and 1 deletions
@@ -36,6 +36,7 @@
..()
/obj/item/weapon/shard/Destroy()
..()
return QDEL_HINT_PUTINPOOL
/obj/item/weapon/shard/attackby(obj/item/I, mob/user, params)
+2 -1
View File
@@ -37,6 +37,7 @@
icon='icons/fence-ns.dmi'
/obj/structure/grille/Destroy()
..()
return QDEL_HINT_PUTINPOOL //pool grilles
/obj/structure/grille/ex_act(severity)
@@ -44,7 +45,7 @@
/obj/structure/grille/blob_act()
qdel(src)
/obj/structure/grille/Bumped(atom/user)
if(ismob(user)) shock(user, 70)
@@ -76,6 +76,7 @@
return //don't want the emitters to miss
/obj/item/projectile/beam/emitter/Destroy()
..()
return QDEL_HINT_PUTINPOOL
/obj/item/projectile/lasertag