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] Fixes the EMP Barsign sprite not displaying #583

Merged
merged 1 commit into from
Nov 13, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#24951
Original PR: tgstation/tgstation#79599

About The Pull Request

The logic that sets the icon_state had an error in it. When the sign got emp'd, they'd get the NOPOWER flag which was causing them to get the empty icon_state instead of that of the emped barsign.

This just fixes that by adding a conditional check for EMPED, and also resprites the emissive lightmask for the emped barsign to match the individual signs that make up its sprite, where previously it was just a static square.

Also added it to the barsigns unit tests because I can see someone breaking this again.

Why It's Good For The Game

Fixes bug where emped barsigns would show the turned off sprite instead of their animated sprite. Also improves the light mask:

Note: this is in complete darkness. The colored backdrops of the signs are not supposed to be emissive.

Before

dreamseeker_jiXgQtteGK

After

dreamseeker_tCu8YSTJuZ

dreamseeker_Lu3TfIzkWO

Changelog

🆑 vinylspiders
fix: emped bar signs will now display the correct sprite
image: added a more detailed lightmask for the emp bar sign sprite
/:cl:

…4951)

* Fixes the EMP Barsign sprite not displaying (#79599)

## About The Pull Request

The logic that sets the icon_state had an error in it. When the sign got
emp'd, they'd get the `NOPOWER` flag which was causing them to get the
`empty` `icon_state` instead of that of the emped barsign.

This just fixes that by adding a conditional check for `EMPED`, and also
resprites the emissive lightmask for the emped barsign to match the
individual signs that make up its sprite, where previously it was just a
static square.

Also added it to the barsigns unit tests because I can see someone
breaking this again.

## Why It's Good For The Game

Fixes bug where emped barsigns would show the turned off sprite instead
of their animated sprite. Also improves the light mask:

Note: this is in complete darkness. The colored backdrops of the signs
are not supposed to be emissive.

<details> <summary>Before </summary>

![dreamseeker_jiXgQtteGK](https://github.com/tgstation/tgstation/assets/13398309/4c576c3d-8758-4ce8-b1b5-00d0fb341f38)

</details>

<details> <summary>After </summary>

![dreamseeker_tCu8YSTJuZ](https://github.com/tgstation/tgstation/assets/13398309/10c328c9-8e99-47c7-98a4-e6f66c4e5eee)

</details>

![dreamseeker_Lu3TfIzkWO](https://github.com/tgstation/tgstation/assets/13398309/c7251cc0-84ab-432d-85e9-2b93b94b63e4)

## Changelog

:cl:
fix: emped bar signs will now display the correct sprite
image: added a more detailed lightmask for the emp bar sign sprite
/:cl:

---------

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@ users.noreply.github.com>
Co-authored-by: John Willard <53777086+JohnFulpWillard@ users.noreply.github.com>
Co-authored-by: SyncIt21 <110812394+SyncIt21@ users.noreply.github.com>
Co-authored-by: orange man <61334995+comfyorange@ users.noreply.github.com>
Co-authored-by: Profakos <profakos@ gmail.com>
Co-authored-by: Changelogs <action@ github.com>
Co-authored-by: Jacquerel <hnevard@ gmail.com>
Co-authored-by: Andrew <mt.forspam@ gmail.com>
Co-authored-by: DaCoolBoss <142358580+DaCoolBoss@ users.noreply.github.com>

* Fixes the EMP Barsign sprite not displaying

---------

Co-authored-by: Bloop <[email protected]>
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@ users.noreply.github.com>
Co-authored-by: John Willard <53777086+JohnFulpWillard@ users.noreply.github.com>
Co-authored-by: SyncIt21 <110812394+SyncIt21@ users.noreply.github.com>
Co-authored-by: orange man <61334995+comfyorange@ users.noreply.github.com>
Co-authored-by: Profakos <profakos@ gmail.com>
Co-authored-by: Changelogs <action@ github.com>
Co-authored-by: Jacquerel <hnevard@ gmail.com>
Co-authored-by: Andrew <mt.forspam@ gmail.com>
Co-authored-by: DaCoolBoss <142358580+DaCoolBoss@ users.noreply.github.com>
@ReezeBL ReezeBL merged commit ade0726 into master Nov 13, 2023
24 checks passed
@ReezeBL ReezeBL deleted the upstream-mirror-24951 branch November 13, 2023 10:24
AnywayFarus added a commit that referenced this pull request Nov 13, 2023
Iajret pushed a commit that referenced this pull request Jan 24, 2024
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