From 906f2627a72e8168a8fff95ca0d8f1db201a7886 Mon Sep 17 00:00:00 2001 From: Bop Date: Sun, 29 Dec 2024 04:28:36 +0700 Subject: [PATCH] fix --- code/game/atom/_atom.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/atom/_atom.dm b/code/game/atom/_atom.dm index 2c9c02be775e..e681a9526838 100644 --- a/code/game/atom/_atom.dm +++ b/code/game/atom/_atom.dm @@ -424,7 +424,7 @@ if(uses_integrity) playsound(src, P.hitsound, 50, 1) visible_message(span_danger("[src] is hit by \a [P]!"), null, null, COMBAT_MESSAGE_RANGE) - if(!QDELETED(src)) //Bullet on_hit effect might have already destroyed this object + if(!QDELETED(src) && !P.nodamage) //Bullet on_hit effect might have already destroyed this object take_damage(P.damage * P.demolition_mod, P.damage_type, P.armor_flag, 0, turn(P.dir, 180), P.armour_penetration) ///Return true if we're inside the passed in atom