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] Refactors fire overlays once again to make it not get stuck so often #1931

Merged
merged 1 commit into from
Feb 11, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#877
Original PR: tgstation/tgstation#81367

About The Pull Request

Maybe finally fixes #77701

A big reason why this kept happening is because fire uses standing overlays. But fire isn't managed by mobs anymore. Meaning in some situations, fire can cease to exist but the overlay can still be on the mob. So it gets stuck.

So like, why use standing overlays anymore? We can just hook update_overlays signal.
Isn't that neat.

Changelog

🆑 Melbert
refactor: Fire effects get added to mobs in a different way now. Maybe it will get stuck less. Report any oddities.
/:cl:

…so often (#877)

* Refactors fire overlays once again to make it not get stuck so often

* Fix conflict

I went back about 20-30 prs on tg to figure out where we missed something but I am not fully sure when this was last changed apart from 21 months ago which matches up with TG

* Unchanged files, fixed

* Hi yes, I like my robotic XENOS

---------

Co-authored-by: MrMelbert <[email protected]>
Co-authored-by: SomeRandomOwl <[email protected]>
@Iajret Iajret merged commit cf3ab7a into master Feb 11, 2024
24 checks passed
@Iajret Iajret deleted the upstream-mirror-877 branch February 11, 2024 10:58
AnywayFarus added a commit that referenced this pull request Feb 11, 2024
Iajret pushed a commit that referenced this pull request Apr 12, 2024
* Rephrases advisory level descriptions (#82585)

## About The Pull Request

Some of the station alert descriptions contained grammatical errors.
This PR corrects some word choice, punctuation, and grammar mistakes as
well as editing some sections for clarity. For example, Pulsar Star's
current warning

> "Your sector's advisory level is Pulsar Star. A large unknown
electromagnetic field has stormed through nearby surveillance equipment.
No surveillance data has been able to be obtained showing no credible
threats to Nanotrasen assets within the Spinward Sector. The Department
advises maintaining high alert against potential threats, regardless of
a lack of information."

has been changed to 
     

> "Your sector's advisory level is Pulsar Star. A large, unknown
electromagnetic field has stormed through nearby surveillance equipment
causing major data loss. Partial data was recovered and showed no
credible threats to Nanotrasen assets within the Spinward Sector;
however, the Department of Intelligence advises maintaining high alert
against potential threats due to the lack of complete data."

## Why It's Good For The Game

Readability is important

## Changelog
:cl:
spellcheck: grammar fixes in the roundstart advisory warnings
/:cl:

---------

Co-authored-by: MrMelbert <[email protected]>

* Rephrases advisory level descriptions

---------

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