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

Flamethrower tgui #12316

Merged
merged 11 commits into from Jan 1, 2023
Merged

Conversation

TobleroneSwordfish
Copy link
Contributor

@TobleroneSwordfish TobleroneSwordfish commented Dec 6, 2022

[FEATURE] [QOL] [GAME OBJECTS]

About the PR

image
image
Adds a new TGUI component ReagentBar ripped out of the mechanical dropper UI and modifies ProgressBar slightly to handle scaling better.
Also standardizes PortableHoldingTank serialization.

Thanks to Blackrep for design help!

Why's this needed?

TGUI good.

Changelog

(u)LeahTheTech
(*)Flamethrowers now have a shiny new TGUI interface.

@keywordlabeler keywordlabeler bot added A-Game-Objects The point of this PR is to deal with a specific game object C-Feature A new feature or enhancements to existing features C-QoL A quality of life improvement that makes the game easier to play labels Dec 6, 2022
@boring-cyborg boring-cyborg bot added the A-UI Modifies UI in some way. Automatically applied on a change to tgui/ label Dec 6, 2022
@github-actions github-actions bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Dec 6, 2022
@TobleroneSwordfish
Copy link
Contributor Author

!merge_upstream

@github-actions
Copy link
Contributor

github-actions bot commented Dec 6, 2022

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

Not a coderdev however after testing this for a bit all seems to work properly. Very easy to use and I love the chem visualisation and temperature control.

@github-actions github-actions bot added the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Dec 20, 2022
@ZeWaka ZeWaka merged commit dcd21cd into goonstation:master Jan 1, 2023
github-actions bot pushed a commit that referenced this pull request Jan 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Game-Objects The point of this PR is to deal with a specific game object A-UI Modifies UI in some way. Automatically applied on a change to tgui/ C-Feature A new feature or enhancements to existing features C-QoL A quality of life improvement that makes the game easier to play S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants