Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit b0e3a0b

Browse files
fix (#22893)
1 parent 73e220a commit b0e3a0b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

code/game/atom/_atom.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@
424424
if(uses_integrity)
425425
playsound(src, P.hitsound, 50, 1)
426426
visible_message(span_danger("[src] is hit by \a [P]!"), null, null, COMBAT_MESSAGE_RANGE)
427-
if(!QDELETED(src)) //Bullet on_hit effect might have already destroyed this object
427+
if(!QDELETED(src) && !P.nodamage) //Bullet on_hit effect might have already destroyed this object
428428
take_damage(P.damage * P.demolition_mod, P.damage_type, P.armor_flag, 0, turn(P.dir, 180), P.armour_penetration)
429429

430430
///Return true if we're inside the passed in atom

0 commit comments

Comments
 (0)