From f02a5903b2335a7cbcc61a9bb12ac16e5f8f52d6 Mon Sep 17 00:00:00 2001 From: dearmochi Date: Sun, 10 Jan 2021 21:11:33 +0100 Subject: [PATCH] Boxing gloves haymaker now weakens instead of sleeping (#15148) --- code/modules/martial_arts/brawling.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/martial_arts/brawling.dm b/code/modules/martial_arts/brawling.dm index d5d2e35b338..e35b040f010 100644 --- a/code/modules/martial_arts/brawling.dm +++ b/code/modules/martial_arts/brawling.dm @@ -14,7 +14,7 @@ A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) var/atk_verb = pick("left hook","right hook","straight punch") - + var/damage = rand(5, 8) + A.dna.species.punchdamagelow if(!damage) playsound(D.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) @@ -39,7 +39,7 @@ D.visible_message("[A] has knocked [D] out with a haymaker!", \ "[A] has knocked [D] out with a haymaker!") D.apply_effect(10,WEAKEN,armor_block) - D.SetSleeping(5) + D.Weaken(5) D.forcesay(GLOB.hit_appends) else if(D.lying) D.forcesay(GLOB.hit_appends)