Skip to content

Commit

Permalink
[MIRROR] [NO GBP] Fix cqc kicks to only cause staminaloss when target…
Browse files Browse the repository at this point in the history
… is on the floor [MDB IGNORE] (#204)

* [NO GBP] Fix cqc kicks to only cause staminaloss when target is on the floor (#79119)

---------

Co-authored-by: Tim <[email protected]>
  • Loading branch information
Steals-The-PRs and timothymtorres authored Oct 22, 2023
1 parent d338bcc commit 7cb2aa2
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion code/datums/martial/cqc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 7cb2aa2

Please sign in to comment.