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

Collapsing screen obj references onto /datum/hud. #4784

Merged
merged 1 commit into from
Jan 30, 2025

Conversation

MistakeNot4892
Copy link
Contributor

@MistakeNot4892 MistakeNot4892 commented Jan 21, 2025

Description of changes

  • Fully implements the stub /decl/hud_element type as a way to dynamically populate and refer to HUD elements on /datum/hud.
  • Reworks UI_ICON_FOO defines to be HUD_FOO and use /decl/hud_element instead.
  • Moves icon updates onto /obj/screen wherever possible.
  • Moves /obj/screen references onto /datum/hud wherever possible.
  • Cleans up and renames HUD element tracking lists on /datum/hud and moves various stuff into procs instead of having it scattered through main code.
  • Privates/protects/lazylists /datum/hud member vars.

Why and what will this PR improve

Much cleaner and easier to expand HUD code.
Fewer bespoke HUD overrides.
Easier to read HUD datum code.

Authorship

Myself.

Changelog

Nothing player-facing.

Issues

  • Borers cannot infest mobs due to UnarmedAttack() changes, unable to test them.

Testing

  • Tested meat human
  • Tested metal human
  • Tested robot
  • Tested AI
  • Tested pAI
  • Tested fox
  • Tested diona
  • Tested construct
  • Tested borer

@MistakeNot4892 MistakeNot4892 added the work in progress This PR is under development and shouldn't be merged. label Jan 21, 2025
@MistakeNot4892 MistakeNot4892 force-pushed the rework/hud branch 6 times, most recently from 7107202 to 1d21267 Compare January 22, 2025 07:22
@MistakeNot4892 MistakeNot4892 changed the title Condensing health indicators onto a root type on the HUD datum. Collapsing screen obj references onto /datum/hud. Jan 22, 2025
@MistakeNot4892 MistakeNot4892 force-pushed the rework/hud branch 8 times, most recently from f0b623d to 691670a Compare January 22, 2025 15:34
@MistakeNot4892 MistakeNot4892 added ready for review This PR is ready for review and merge. and removed work in progress This PR is under development and shouldn't be merged. labels Jan 22, 2025
@MistakeNot4892 MistakeNot4892 marked this pull request as ready for review January 22, 2025 15:45
@MistakeNot4892
Copy link
Contributor Author

Borer stuff is pending some fixes to borers in general, everything else is good to review.

@MistakeNot4892
Copy link
Contributor Author

Also needs a squash rebase I think. None of the changes work very well alone so not much point atomising it.

@MistakeNot4892 MistakeNot4892 force-pushed the rework/hud branch 3 times, most recently from 14b3914 to 5601c8a Compare January 28, 2025 07:26
out-of-phaze
out-of-phaze previously approved these changes Jan 29, 2025
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.

oh this is incredibly good to have, yay

Snake casing hud procs, moving internals onto HUD datum.

Fixing list clear in intent selector.

Moving charge warning to HUD datum.

Breaking up the status UI element and moving fire onto the HUD datum.

Moving oxygen onto the HUD datum.

Moving pressure, bodytemp and toxins onto the HUD datum.

Moving robot module icon onto robot HUD datum.

Moving zone selector onto the HUD datum and selected zone onto the mob.

Moving hydration/nutrition onto HUD datum.

Cleaning up move intent, moving creation to base HUD.

Moving up hint onto HUD datum.

Moving maneuver toggle onto HUD datum.

Moving drop/resist onto HUD datum.

Moving gun mode icons onto the HUD datum.

Breaking up HUD icons to pass CI.

Cleaning up some HUD lists and marking vars as private/protected.

Declifying HUD elements.

Fixes/tweaks to HUD rework PR.

Redeclifying AI hud stuff.

Declifying/cleaning up pAI HUD stuff.

Cleaning up/fixing declified robot HUD.

Tweaking AI HUD after rewrite.

Tweaking borer HUD for rewrite PR.

Readding animal HUD type.

More borer HUD tweaks.

Tweaking construct HUDs.

Fixes FBP health.

Tweaking borer hud.
@out-of-phaze out-of-phaze merged commit 824e2b6 into NebulaSS13:dev Jan 30, 2025
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready for review This PR is ready for review and merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants