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] Correctly fixes the quick carry module #870

Merged
merged 1 commit into from
Nov 29, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25312
Original PR: tgstation/tgstation#79928

About The Pull Request

Messed something up in #79909, now the FAST_MED trait should be correctly applied, as well as the appropriate quick or quicker carry trait. Cleans up the procs a bit too so that things don't have to be redefined.

Why It's Good For The Game

Makes a fix actually fix stuff

Changelog

🆑 Momo8289
fix: The quick carry module should now correctly apply the appropriate traits
/:cl:

… (#25312)

* [NO GBP] Correctly fixes the quick carry module (#79928)

## About The Pull Request
Messed something up in #79909, now the `FAST_MED` trait should be
correctly applied, as well as the appropriate quick or quicker carry
trait. Cleans up the procs a bit too so that things don't have to be
redefined.
## Why It's Good For The Game
Makes a fix actually fix stuff
## Changelog
:cl:
fix: The quick carry module should now correctly apply the appropriate
traits
/:cl:

* [NO GBP] Correctly fixes the quick carry module

---------

Co-authored-by: Nick <[email protected]>
@Iajret Iajret merged commit b5fd7c2 into master Nov 29, 2023
24 checks passed
@Iajret Iajret deleted the upstream-mirror-25312 branch November 29, 2023 14:02
AnywayFarus added a commit that referenced this pull request Nov 29, 2023
Iajret pushed a commit that referenced this pull request Feb 25, 2024
* Enable CPR for synths

* Cleaning up extra conditional

* Swap inversion operator for isnull

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

* Add conditional for checking synth lungs, undo earlier changes

* Change chat message to balloon alert

* Change Nova edit comment

* Relocate heatsink conditional to more sensible line

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

---------

Co-authored-by: Bloop <[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