From c29af876c8090d4355a275fc7e5bc3d73c408dc1 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sat, 21 Oct 2023 21:12:41 +0200 Subject: [PATCH] [MIRROR] [NO GBP] Fix cqc kicks to only cause staminaloss when target is on the floor [MDB IGNORE] (#24491) * [NO GBP] Fix cqc kicks to only cause staminaloss when target is on the floor (#79119) ## About The Pull Request A small thing I overlooked in: - #78341 Was that stamina loss was supposed to be triggered from kicks as a replacement for knockout prob chance. Except, this effect was only supposed to happen when the target was _on the floor_. Right now it's spammed for all kicks, meaning people don't even bother using the other CQC combos since spamming LMB will eventually stam crit targets. ## Why It's Good For The Game Oversight for something I missed when I made the original PR. ## Changelog :cl: fix: Fix cqc kicks to only cause staminaloss when target is on the floor /:cl: * [NO GBP] Fix cqc kicks to only cause staminaloss when target is on the floor --------- Co-authored-by: Tim --- code/datums/martial/cqc.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/datums/martial/cqc.dm b/code/datums/martial/cqc.dm index e5b959b340f..cae4cdf14b2 100644 --- a/code/datums/martial/cqc.dm +++ b/code/datums/martial/cqc.dm @@ -102,7 +102,8 @@ var/atom/throw_target = get_edge_target_turf(defender, attacker.dir) defender.throw_at(throw_target, 1, 14, attacker) defender.apply_damage(10, attacker.get_attack_type()) - defender.adjustStaminaLoss(45) + if(defender.body_position == LYING_DOWN && !defender.IsUnconscious()) + defender.adjustStaminaLoss(45) log_combat(attacker, defender, "kicked (CQC)") . = TRUE