Skip to content

Commit

Permalink
fix (#22893)
Browse files Browse the repository at this point in the history
  • Loading branch information
warface1234455 authored Jan 2, 2025
1 parent 73e220a commit b0e3a0b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion code/game/atom/_atom.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b0e3a0b

Please sign in to comment.