Merge pull request #6705 from Citadel-Station-13/upstream-merge-37726

[MIRROR] Stops qdeleted objects from taking damage.
This commit is contained in:
deathride58
2018-05-11 03:35:35 +00:00
committed by GitHub
+3
View File
@@ -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)