From 6b2a3856b161a082f3d6f3e2274153b9f36a7669 Mon Sep 17 00:00:00 2001 From: LiquidPotroh <100733800+LiquidPotroh@users.noreply.github.com> Date: Sat, 2 Dec 2023 11:43:58 +0300 Subject: [PATCH] bugfix: throwing knives neck cut don't make two strikes (#3976) --- code/game/objects/items/weapons/kitchen.dm | 1 + code/modules/martial_arts/throwing_knives.dm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 9f541bcbadb..81341a39056 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -201,6 +201,7 @@ force = initial(force) + MA.knife_bonus_damage if(user.zone_selected == BODY_ZONE_HEAD && user.a_intent == INTENT_HARM) MA.neck_cut(target, user) + return . = ..() /obj/item/kitchen/knife/combat/afterattack(atom/target, mob/user, proximity, params) diff --git a/code/modules/martial_arts/throwing_knives.dm b/code/modules/martial_arts/throwing_knives.dm index 8d44409c4ba..1c8e6476d55 100644 --- a/code/modules/martial_arts/throwing_knives.dm +++ b/code/modules/martial_arts/throwing_knives.dm @@ -30,7 +30,7 @@ attacker.visible_message(span_danger("[attacker] прикладывает нож к горлу [defender]!"), span_danger("Вы прикладываете нож к горлу [defender]!.")) if(do_after(attacker, 20, target = defender)) if(defender.blood_volume > BLOOD_VOLUME_SURVIVE) - defender.blood_volume -= BLOOD_VOLUME_NORMAL - BLOOD_VOLUME_SURVIVE + defender.blood_volume = max(0, defender.blood_volume - (BLOOD_VOLUME_NORMAL - BLOOD_VOLUME_SURVIVE)) //-70% of max blood volume for(var/i in 1 to 2) var/obj/effect/decal/cleanable/blood/B = new(defender.loc) step(B, pick(GLOB.alldirs))