Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Fix cqc kicks to only cause staminaloss when target is on the floor #204

Merged
merged 1 commit into from
Oct 22, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#24491
Original PR: tgstation/tgstation#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

🆑 timothymtorres
fix: Fix cqc kicks to only cause staminaloss when target is on the floor
/:cl:

… 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. -->

:cl:
fix: Fix cqc kicks to only cause staminaloss when target is on the floor
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: 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 <[email protected]>
@Iajret Iajret merged commit 7cb2aa2 into master Oct 22, 2023
23 checks passed
@Iajret Iajret deleted the upstream-mirror-24491 branch October 22, 2023 13:12
AnywayFarus added a commit that referenced this pull request Oct 22, 2023
Iajret pushed a commit that referenced this pull request Jan 3, 2024
* Fixes TextArea not updating on props change (#80656)

* Fixes TextArea not updating on props change

---------

Co-authored-by: Bloop <[email protected]>
Co-authored-by: NovaBot <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants