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 a TG mirror i accidentialy Broke #2827

Merged
merged 1 commit into from
Apr 11, 2024
Merged

Conversation

Steals-The-PRs
Copy link
Collaborator

Original PR: NovaSector/NovaSector#1910

Not player facing as this will make the Changelog match up with what it is supposed to be, i just did a dumb while sleepy and broke the mirror

@ReezeBL ReezeBL merged commit 3bd1f8e into master Apr 11, 2024
26 checks passed
@ReezeBL ReezeBL deleted the upstream-mirror-1910 branch April 11, 2024 13:44
Iajret pushed a commit that referenced this pull request Jun 4, 2024
* Fixes incorrect arguments in Status Displays (#83611)

## About The Pull Request

Introduced in #83296 (9c58d7d1b9bd9cd447289cb02d0c49772b75a24a)

Args for `generate_status_text()`: `line_y, message, x_offset,
text_color, header_text_color, line_pair`

The positional args we were feeding it via
`/obj/machinery/status_display/proc/update_message()`: `line_y, message,
text_color, header_text_color, x_offset, line_pair`

This PR just moves `x_offset` to the proper position so we aren't
plugging the wrong numbers into the positional arguments.
## Why It's Good For The Game

Was likely broken, now it is fixed. In my test case, I found that it
would break really weirdly and badly without this fix and worked fine
with this fix. Probably due to the keys actually working. Anyways this
was almost definitely the correct behavior seeing as x_offset is always
the third argument everywhere so
## Changelog

:cl:
fix: Status displays should now no longer sporadically randomly break
when in the custom message mode
/:cl:

* Fixes incorrect arguments in Status Displays

---------

Co-authored-by: san7890 <[email protected]>
Co-authored-by: NovaBot13 <[email protected]>
ReezeBL pushed a commit that referenced this pull request Jun 5, 2024
* Fixes incorrect arguments in Status Displays (#83611)

## About The Pull Request

Introduced in #83296 (9c58d7d1b9bd9cd447289cb02d0c49772b75a24a)

Args for `generate_status_text()`: `line_y, message, x_offset,
text_color, header_text_color, line_pair`

The positional args we were feeding it via
`/obj/machinery/status_display/proc/update_message()`: `line_y, message,
text_color, header_text_color, x_offset, line_pair`

This PR just moves `x_offset` to the proper position so we aren't
plugging the wrong numbers into the positional arguments.
## Why It's Good For The Game

Was likely broken, now it is fixed. In my test case, I found that it
would break really weirdly and badly without this fix and worked fine
with this fix. Probably due to the keys actually working. Anyways this
was almost definitely the correct behavior seeing as x_offset is always
the third argument everywhere so
## Changelog

:cl:
fix: Status displays should now no longer sporadically randomly break
when in the custom message mode
/:cl:

* Fixes incorrect arguments in Status Displays

---------

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