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] cockroaches adapt to icebox atmos #2691

Merged
merged 1 commit into from
Apr 1, 2024
Merged

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1749
Original PR: tgstation/tgstation#82325

About The Pull Request

image
on any zlevel with an ice related ztrait they will turn significantly more cold resistant

Why It's Good For The Game

fixes #82312

Changelog

🆑 mc-oofert
fix:cockroaches adapt to icebox atmos, this is a fix because this prevents CI failures
/:cl:

* cockroaches adapt to icebox atmos (#82325)

## About The Pull Request

![image](https://github.com/tgstation/tgstation/assets/70376633/d1fe33b3-18b6-4189-84e5-f851f6404f80)
on any zlevel with an ice related ztrait they will turn significantly
more cold resistant


## Why It's Good For The Game

fixes  #82312

## Changelog
:cl:
fix:cockroaches adapt to icebox atmos, this is a fix because this
prevents CI failures
/:cl:

* cockroaches adapt to icebox atmos

---------

Co-authored-by: jimmyl <[email protected]>
@ReezeBL ReezeBL merged commit c45a4fb into master Apr 1, 2024
24 checks passed
@ReezeBL ReezeBL deleted the upstream-mirror-1749 branch April 1, 2024 06:57
Iajret pushed a commit that referenced this pull request May 27, 2024
#2691)

* Fixes Rust Victims being permanently exiled to the puke-zone. (#83417)

## About The Pull Request

closes : tgstation/tgstation#83375


## Why It's Good For The Game

Deleting Heretic rust you are standing on now properly deletes the
status effect.

## Changelog

:cl:

fix: Rust debuffs now gets properly removed if you derust a tile you are
standing on.
/:cl:

* Fixes Rust Victims being permanently exiled to the puke-zone.

---------

Co-authored-by: EnterTheJake <[email protected]>
Co-authored-by: NovaBot13 <[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