From 096a8a63c54106c5220c17923b404db367c6c36e Mon Sep 17 00:00:00 2001 From: AnturK Date: Thu, 10 May 2018 09:29:30 +0200 Subject: [PATCH 1/2] Stops qdeleted objects from taking damage. (#37726) * Stops qdeleted objects from taking damage. * Some logging. --- code/game/objects/obj_defense.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index 1e76bc7160..2dadafe2cf 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -1,6 +1,9 @@ //the essential proc to call when an obj must receive damage of any kind. /obj/proc/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) + if(QDELETED(src)) + stack_trace("[src] taking damage after deletion") + return if(sound_effect) play_attack_sound(damage_amount, damage_type, damage_flag) if(!(resistance_flags & INDESTRUCTIBLE) && obj_integrity > 0)