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] Fix Flaky Failure From Fire #1934

Merged
merged 3 commits into from
Feb 11, 2024
Merged

[MIRROR] Fix Flaky Failure From Fire #1934

merged 3 commits into from
Feb 11, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#889
Original PR: tgstation/tgstation#81399

About The Pull Request

Closes #81396 , Closes #81391 , Closes #81403, Closes #81402

I don't know why but I thought this proc was only called once, when the mob entered the turf. That was silly.

And going back at it, I'm not entirely sure why I tied TRAIT_NO_EXTINGUISH to the element anyways, rather than the lava like it originally was.

While going back over this, I cleaned up the proc a bit.

Changelog

Not necessary

Fix Flaky Failure From Fire

Co-authored-by: MrMelbert <[email protected]>
Co-authored-by: Bloop <[email protected]>
@Steals-The-PRs Steals-The-PRs added Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота TG Mirror labels Feb 11, 2024
@Iajret Iajret merged commit 613bf14 into master Feb 11, 2024
23 checks passed
@Iajret Iajret deleted the upstream-mirror-889 branch February 11, 2024 21:15
Iajret pushed a commit that referenced this pull request Apr 12, 2024
* [NO GBP] Power outage operation fixes for chem master (#82591)

## About The Pull Request
- If the chem master runs out of power mid printing, it will properly
stop the printing process and its animation
- When transferring reagents it correctly checks if we have enough power
without forcing it

## Changelog
:cl:
fix: chem master properly shuts down if it loses power mid printing and
won't transfer reagents for the same
/:cl:

* [NO GBP] Power outage operation fixes for chem master

---------

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
Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота TG Mirror
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants