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.

Sign up for GitHub

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

Jump to bottom

Screen object unification. #3446

Merged
merged 6 commits into from
Jan 5, 2024
Merged

Screen object unification. #3446

merged 6 commits into from
Jan 5, 2024

Conversation

MistakeNot4892
Copy link
Contributor

@MistakeNot4892 MistakeNot4892 commented Oct 16, 2023 •
edited
Loading

Description of changes

  • Unifies a lot of /obj/screen functionality on the base object.
  • Centralizes the code in its own folder.
  • Does a lot of cleanup and refactoring in the process of updating screen objects to use handle_click() etc.

Why and what will this PR improve

Screen object code is a mess and this cleans it up significantly. Will help a lot with the eventual HUD datum rewrite I have in the pipeline.

Testing

  • Intent selector
  • Zone selector
  • Inventory
  • Hands
  • Make sure gear highlights didn't get clobbered
  • Exosuits
  • Constructs
  • Robots
  • pAIs
  • AIs
  • Spells
  • Ability master
  • Action buttons
  • Gun fire mode selector
  • Credits
  • Global HUDs (NVG, thermals)
  • Pain/welding overlays
  • Radials
  • Click catchers
  • Cataloguer overlay
  • Holomaps
  • Storage
  • Probably other stuff I will remember later

Authorship

Myself.

Changelog

Nothing player-facing.

@MistakeNot4892 MistakeNot4892 added the work in progress This PR is under development and shouldn't be merged. label Oct 16, 2023
@MistakeNot4892 MistakeNot4892 force-pushed the throwmode branch 15 times, most recently from 367b02c to f0dea94 Compare October 21, 2023 00:38
@MistakeNot4892 MistakeNot4892 added ready for review This PR is ready for review and merge. ❄️frozen❄️ Do not merge until the dev freeze is over. and removed work in progress This PR is under development and shouldn't be merged. labels Oct 21, 2023
@MistakeNot4892 MistakeNot4892 marked this pull request as ready for review October 21, 2023 00:38
@MistakeNot4892
Copy link
Contributor Author

Tested and ready to go.

@MistakeNot4892 MistakeNot4892 removed the ❄️frozen❄️ Do not merge until the dev freeze is over. label Nov 4, 2023
@MistakeNot4892 MistakeNot4892 force-pushed the throwmode branch 4 times, most recently from 9faa31d to 3a1f25d Compare December 8, 2023 21:33
@PsyCommando
Copy link
Contributor

I just have a slight comment/request.
The action bar used to react to the incapacitation state of the character, so when they'd go unconscious or something the buttons would be grayed out and translucent. (It also used to get stuck like that cause state updates didn't cause the ui to update consistently. But that's something else XD )

Maybe that feature could be built-in the base screen object? So you could just toggle it on the elements you want to go disabled when they can't be used?

@MistakeNot4892
Copy link
Contributor Author

Sorry, that's out of scope for this.
I am generalizing it a bit in the HUD rewrite though.

@PsyCommando
Copy link
Contributor

Sorry, that's out of scope for this. I am generalizing it a bit in the HUD rewrite though.

That's all good!

@MistakeNot4892 MistakeNot4892 force-pushed the throwmode branch 3 times, most recently from 07b8c32 to cadf871 Compare December 18, 2023 14:59
@MistakeNot4892 MistakeNot4892 mentioned this pull request Dec 28, 2023
Merged
out-of-phaze
out-of-phaze requested changes Jan 4, 2024
View reviewed changes
Copy link
Member

@out-of-phaze out-of-phaze left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Partial review, hasn't made any progress in the past few weeks so I'll probably give the rest of the PR a cursory look-over and then approve.

code/_onclick/hud/deity.dm Show resolved Hide resolved
code/_onclick/hud/screen/screen_intent.dm Show resolved Hide resolved
code/_onclick/hud/screen/screen_intent.dm Show resolved Hide resolved
@out-of-phaze out-of-phaze merged commit 5688c73 into NebulaSS13:dev Jan 5, 2024
11 checks passed
@MistakeNot4892 MistakeNot4892 deleted the throwmode branch February 11, 2024 10:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@out-of-phaze out-of-phaze out-of-phaze approved these changes

Assignees
No one assigned
Labels
ready for review This PR is ready for review and merge.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@MistakeNot4892 @PsyCommando @out-of-phaze