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

Merge upstream [31.07.2024] #473

Merged
merged 14 commits into from
Jul 31, 2024
Merged

Merge upstream [31.07.2024] #473

merged 14 commits into from
Jul 31, 2024

Conversation

Gaxeer
Copy link
Collaborator

@Gaxeer Gaxeer commented Jul 31, 2024

About The Pull Request

Merge upstream [31.07.2024]

thegrb93 and others added 14 commits July 30, 2024 21:31
… 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.

![image](https://github.com/user-attachments/assets/72236ff6-2444-4872-a19c-92d8788f660d)
(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 github-actions bot added 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! 🙏 Слияние с восходящим потоком О великий восходящий поток, спасибо что приносишь нам свои дары контента и багфиксов labels Jul 31, 2024
@Gaxeer Gaxeer merged commit edcab0b into master Jul 31, 2024
21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! 🙏 Слияние с восходящим потоком О великий восходящий поток, спасибо что приносишь нам свои дары контента и багфиксов
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants