Merge upstream [31.07.2024] #473
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
… to die if wearing thermal insulation (tgstation#85401) ## About The Pull Request When returning to thermal equilibrium, the core temperature and body temperature seem to get stuck in a feedback loop, causing them to sometimes get stuck below or above safe limits and kill the player unless they remove their armor. This fixes that. Here's a pic of slowly returning to safe temperature after being shot a bunch by watcher, whereas originally this would kill you if you had too much thermal insulation.  (Ignore the duplicate var prints, one should be core_skin_change, but messed it up) ## Why It's Good For The Game You don't have to remove your armor to stop from being permanently frozen/hot. ## Changelog :cl: fix: Fixes getting permanently hot or cold if wearing thermal insulation as a lizard /:cl:
## About The Pull Request fixes a really bad bug i introduced with my previous PR, no proper instantiation of gene objects tgstation#85329 would be nice to get this merged fast
## About The Pull Request Closes tgstation#85378 ## Changelog :cl: admin: Subtype vendor no longer requries an ID /:cl:
) ## About The Pull Request Closes tgstation#85385 ## Changelog :cl: fix: Fixed advanced pods showing up as cultist pods /:cl:
## About The Pull Request It was only checking for eye protection, since light-sensitives can have 0 or less eye protection even with sunglasses on, this doesn't make sense. There is now more redundancy, the same check for blind carbons and another check for `is_eyes_covered` which takes in account if your eyes are covered by eyewear or masks. ## Changelog :cl: fix: spray can face spraying will no longer work on light-sensitives with eyewear and people wearing eye covering masks /:cl:
github-actions
bot
added
🖌️ Спрайты
larentoun
approved these changes
Jul 31, 2024
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.
About The Pull Request
Merge upstream [31.07.2024]