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] Healing Virus Selfcure Hotfix #1055

Merged
merged 2 commits into from
Dec 11, 2023
Merged

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25526
Original PR: tgstation/tgstation#80172

About The Pull Request

Fixes a logic issue in how healing viruses were supposed to self-cure that basically never came out in practice but wasn't intended.

Why It's Good For The Game

fix good, makes it so starving nutrition OR negative satiety can mess up a healing virus, makes TRAIT_NOHUNGER properly protect against losing a healing virus without spaceacillin

Changelog

🆑 Higgin
fix: Healing viruses now no longer self-cure for reasons they're not supposed to and do for those that they are.
/:cl:

[NO GBP] Healing Virus Selfcure Hotfix

Co-authored-by: Higgin <[email protected]>
Co-authored-by: Giz <[email protected]>
@Steals-The-PRs Steals-The-PRs added Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота TG Mirror Fix labels Dec 10, 2023
@ReezeBL ReezeBL merged commit 58d5564 into master Dec 11, 2023
22 checks passed
@ReezeBL ReezeBL deleted the upstream-mirror-25526 branch December 11, 2023 07:34
AnywayFarus added a commit that referenced this pull request Dec 11, 2023
Iajret pushed a commit that referenced this pull request Feb 19, 2024
* Reaction & holder tweaks (#81545)

## About The Pull Request
- Fixes #81537. For competing reactions where reaction B consumes the
results formed from reaction A `total_step_added` yields values higher
than the actual volume of products formed causing the reaction to end
early leading to less volume of product formed as explained in the
comment
- Removes `update_total()` from instant reactions as it already does
that for us making it a little faster
- merges `remove_all_direct()` with `remove_all()` to reduce code as
their functionalities are very similar

## Changelog
:cl:
fix: multiple reactions occuring in the same holder like mixing drinks
will yield correct reagent result volumes
code: Removes `update_total()` from instant reactions improving
performance slightly
code: merges `remove_all_direct()` with `remove_all()` to reduce code
size
/:cl:

* Reaction & holder tweaks

---------

Co-authored-by: SyncIt21 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота TG Mirror
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants