[MIRROR] Fixes preference menu #2987
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Steals-The-PRs
added
Mirroring conflict
AnywayFarus
added a commit
that referenced
this pull request
Apr 20, 2024
Iajret
pushed a commit
that referenced
this pull request
Jun 12, 2024
…turns applied [MDB IGNORE] (#2987) * Incoming stamina damage while in stamcrit has diminishing returns applied * This was not even used * Update death_consequences_trauma.dm --------- Co-authored-by: MrMelbert <[email protected]> Co-authored-by: Mal <[email protected]>
Iajret
added a commit
that referenced
this pull request
Jun 13, 2024
…turns applied (#3788) * [MIRROR] Incoming stamina damage while in stamcrit has diminishing returns applied [MDB IGNORE] (#2987) * Incoming stamina damage while in stamcrit has diminishing returns applied * This was not even used * Update death_consequences_trauma.dm --------- Co-authored-by: MrMelbert <[email protected]> Co-authored-by: Mal <[email protected]> * Update combat_stamina.dm --------- Co-authored-by: NovaBot <[email protected]> Co-authored-by: MrMelbert <[email protected]> Co-authored-by: Mal <[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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Original PR: NovaSector/NovaSector#2097
About The Pull Request
Pulls the fix from tgstation/tgstation#82778 until that makes its way here. I meant to include this in the mirror itself but forgot to press commit.
Proof of Testing
Screenshots/Videos
Changelog
🆑 vinylspiders
fix: fixes the preference menu bluescreen
/:cl: