From 6ca4791571f927e4c630306a82e1e285332168e6 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Wed, 8 Jul 2015 23:09:57 -0400 Subject: [PATCH] tweaks --- code/game/atoms.dm | 3 +++ code/game/atoms_movable.dm | 2 -- code/game/objects/effects/effect_system.dm | 5 +---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 1be033e2a4b..c2b5c8e9844 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -30,6 +30,9 @@ var/allow_spin = 1 //Set this to 1 for a _target_ that is being thrown at; if an atom has this set to 1 then atoms thrown AT it will not spin; currently used for the singularity. -Fox /atom/Destroy() + if(reagents) + qdel(reagents) + reagents = null set_opacity(0) invisibility = 101 return ..() diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 86f9fd93271..70e78c96fc2 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -23,8 +23,6 @@ /atom/movable/Destroy() - if(reagents) - qdel(reagents) for(var/atom/movable/AM in contents) qdel(AM) loc = null diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index 47cffd8561b..0af6865e0f8 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -40,10 +40,7 @@ would spawn and follow the beaker, even if it is carried or thrown. var/amount = 8.0 /obj/effect/proc/delete() - loc = null - if(reagents) - qdel(reagents) - return + qdel(src) /obj/effect/effect/water/New()