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

[PORT] Fix organs being replaced when not needed #2456

Merged
merged 1 commit into from
Jul 5, 2024

Conversation

Absolucy
Copy link
Collaborator

@Absolucy Absolucy commented Jun 28, 2024

About The Pull Request

Port of tgstation#81575

Changelog

🆑 00-Steven
fix: Ethereal heart revive doesn't delete organs alien to your species, like prosthetics, cybernetics, and possibly itself.
fix: Nightmare heart revive doesn't delete organs alien to your species, like itself, upon which it would stop the conversion to shadowperson.
fix: Bloodsucker torpor, doesn't delete organs alien to your species, which would result in things such as wings being lost (therefore preventing ultrakill jokes from lasting more than 10 minutes)
/:cl:

## About The Pull Request

So it seems `regenerate_organs` on species was actually replacing organs
not belonging to the species regardless, which was making it so the
`HEAL_ORGANS` flag which is supposed to heal your organs and supposedly
replace missing ones too.
However, this made it so anything using that would also remove and
replace all organs not native to your species, including prosthetic
organs, cybernetic organs, organs alien to your species, and the
nightmare heart itself when you're not a nightmare and it tries to
revive and convert you.

This just makes it mimic its behaviour when used to convert from one
species to another, which is to not replace organs alien to your
previous species, and making it also not replace those when
`replace_current = FALSE`.
## Why It's Good For The Game

Fixes tgstation#81546.
Fixes ethereal reviving eating your prosthetics.
## Changelog
:cl:
fix: Ethereal heart revive doesn't delete organs alien to your species,
like prosthetics, cybernetics, and possibly itself.
fix: Nightmare heart revive doesn't delete organs alien to your species,
like itself, upon which it would stop the conversion to shadowperson.
/:cl:
@wraith-54321 wraith-54321 merged commit 8a0b289 into Monkestation:master Jul 5, 2024
22 checks passed
github-actions bot added a commit that referenced this pull request Jul 5, 2024
@Absolucy Absolucy deleted the organ-fixes branch July 6, 2024 00:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants