From 29179cfb5e44ca100103e82f9f318eb2d539176b Mon Sep 17 00:00:00 2001 From: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> Date: Mon, 1 Jul 2024 14:55:01 -0400 Subject: [PATCH] Fixes eyestabbing not dealing a correct amount of damage (#26095) * fixes 25161 * Update code/game/objects/items.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> --------- Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --- code/game/objects/items.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 71155d47c9f..13ae04c8d8e 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -652,7 +652,7 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons if(!eyes) // should still get stabbed in the head var/obj/item/organ/external/head/head = H.bodyparts_by_name["head"] if(head) - head.receive_damage(rand(10, 14), 1) + head.receive_damage(force, TRUE) return eyes.receive_damage(rand(3,4), 1) if(eyes.damage >= eyes.min_bruised_damage) @@ -670,10 +670,10 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons if(M.stat != 2) to_chat(M, "You go blind!") var/obj/item/organ/external/affecting = H.get_organ("head") - if(istype(affecting) && affecting.receive_damage(7)) + if(istype(affecting) && affecting.receive_damage(force)) H.UpdateDamageIcon() else - M.take_organ_damage(7) + M.take_organ_damage(force) M.AdjustEyeBlurry(rand(6 SECONDS, 8 SECONDS)) return