From 87928d43ea215acd90287d2e1f2d0a57355aebc8 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Thu, 12 Mar 2020 06:21:47 -0700 Subject: [PATCH] stamcrit check for fireaxe afterattack() (#11426) * Update twohanded.dm * Update twohanded.dm --- code/game/objects/items/twohanded.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm index 880846fe17..57fc99c663 100644 --- a/code/game/objects/items/twohanded.dm +++ b/code/game/objects/items/twohanded.dm @@ -246,11 +246,11 @@ user.visible_message("[user] axes [user.p_them()]self from head to toe! It looks like [user.p_theyre()] trying to commit suicide!") return (BRUTELOSS) -/obj/item/twohanded/fireaxe/afterattack(atom/A, mob/user, proximity) +/obj/item/twohanded/fireaxe/afterattack(atom/A, mob/living/user, proximity) . = ..() - if(!proximity) + if(!proximity || (user.getStaminaLoss() > STAMINA_SOFTCRIT)) return - if(wielded) //destroys windows and grilles in one hit + if(wielded) //destroys windows and grilles in one hit (or more if it has a ton of health like plasmaglass) if(istype(A, /obj/structure/window)) var/obj/structure/window/W = A W.take_damage(200, BRUTE, "melee", 0)