mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 05:00:55 +01:00
[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) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> 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 <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> Oversight for something I missed when I made the original PR. ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> 🆑 fix: Fix cqc kicks to only cause staminaloss when target is on the floor /🆑 <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> * [NO GBP] Fix cqc kicks to only cause staminaloss when target is on the floor --------- Co-authored-by: Tim <timothymtorres@gmail.com>
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user