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] removes our modular stamina multiplier, because it's applied ontop of TG's #784

Merged
merged 1 commit into from
Nov 23, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Original PR: Skyrat-SS13/Skyrat-tg#25164

About The Pull Request

removes the modular files stamina multiplier, because normal punches already have one, and it gets kinda wacky-strong

How This Contributes To The Skyrat Roleplay Experience

punches shouldn't be outslinging batons

Proof of Testing

Screenshots/Videos TO DO

Changelog

🆑 RatFromTheJungle
fix: fixes punches doing like triple stamina damage, by removing a 2.6x multiplier.
/:cl:

… TG's (#25164)

* Update combat.dm

* these 2

* Update code/modules/mob/living/carbon/human/_species.dm

---------

Co-authored-by: Bloop <[email protected]>
@ReezeBL ReezeBL merged commit 905fc1d into master Nov 23, 2023
24 checks passed
@ReezeBL ReezeBL deleted the upstream-mirror-25164 branch November 23, 2023 19:15
AnywayFarus added a commit that referenced this pull request Nov 23, 2023
Iajret pushed a commit that referenced this pull request Feb 5, 2024
* Fixes a spurious runtime in AI code

* Update TODO

* Fixes this nonmodular edit

---------

Co-authored-by: Bloop <[email protected]>
Iajret added a commit that referenced this pull request Feb 7, 2024
* [MIRROR] Fixes a spurious runtime in AI code (#784)

* Fixes a spurious runtime in AI code

* Update TODO

* Fixes this nonmodular edit

---------

Co-authored-by: Bloop <[email protected]>

* Update ghost_role.dm

---------

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

Successfully merging this pull request may close these issues.

3 participants