From ee7306b4eab45f55a8d86a392e055f35b910d623 Mon Sep 17 00:00:00 2001 From: skoglol <33292112+kriskog@users.noreply.github.com> Date: Sun, 15 Sep 2019 08:57:37 +0200 Subject: [PATCH] Projectile effects no longer ignore armor. (#46419) --- code/modules/mob/living/living_defense.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 96556bbce53..9355281dfc3 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -48,7 +48,7 @@ var/on_hit_state = P.on_hit(src, armor) if(!P.nodamage && on_hit_state != BULLET_ACT_BLOCK) apply_damage(P.damage, P.damage_type, def_zone, armor) - apply_effects(P.stun, P.knockdown, P.unconscious, P.irradiate, P.slur, P.stutter, P.eyeblur, P.drowsy, FALSE, P.stamina, P.jitter, P.paralyze, P.immobilize) + apply_effects(P.stun, P.knockdown, P.unconscious, P.irradiate, P.slur, P.stutter, P.eyeblur, P.drowsy, armor, P.stamina, P.jitter, P.paralyze, P.immobilize) if(P.dismemberment) check_projectile_dismemberment(P, def_zone) return on_hit_state ? BULLET_ACT_HIT : BULLET_ACT_BLOCK