From 44881a40166b7b6519a4fead5ac658ed72f22c03 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sun, 5 Jul 2015 04:51:47 -0400 Subject: [PATCH] Tweaks a Few Destroy()'s --- code/game/objects/items/weapons/shards.dm | 1 + code/game/objects/structures/grille.dm | 3 ++- code/modules/projectiles/projectile/beams.dm | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/shards.dm b/code/game/objects/items/weapons/shards.dm index 0707df46608..e6f38335a82 100644 --- a/code/game/objects/items/weapons/shards.dm +++ b/code/game/objects/items/weapons/shards.dm @@ -36,6 +36,7 @@ ..() /obj/item/weapon/shard/Destroy() + ..() return QDEL_HINT_PUTINPOOL /obj/item/weapon/shard/attackby(obj/item/I, mob/user, params) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 9af24b455f8..7845a7a5217 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -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) diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index cf74904bed0..f8d2cfd5620 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -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