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

Declare Ready -> Join Game [when game has already started] #17580

Merged
merged 1 commit into from Jan 7, 2024

Conversation

13spacemen
Copy link
Contributor

About the PR

The "Declare Ready" button shows "Join Game" instead if the game has started
Font is Verdana, bold, size 11, modern sharp rendering, done in Paint.NET

Also hides the "Ready with Antag Token" button when game starts, since you cant even redeem it anyway
This only applies if you're in lobby, with an antag token, and the game starts while you are NOT ready

Why's this needed?

Looks cleaner and better, makes more sense, I always thought it was strange that Goon showed "Declare Ready" when game has already started and it opens up the latejoin menu

Changelog

(u)13spacemen
(+)Declare Ready button becomes Join Game when the game has started

…dy" button

also hide "ready with antag token" option when game starts since you cant redeem it anyway
@boring-cyborg boring-cyborg bot added the C-Sprites Automatically applied on any .dmi or icons folder change label Jan 6, 2024
@github-actions github-actions bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jan 6, 2024
@pgmzeta pgmzeta added the A-UI Modifies UI in some way. Automatically applied on a change to tgui/ label Jan 6, 2024
Copy link
Contributor

@pgmzeta pgmzeta left a comment

Choose a reason for hiding this comment

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

Works as expected, code seems reasonable.

Before Starting Round
image

After Starting Round
image

Copy link
Contributor

@TobleroneSwordfish TobleroneSwordfish left a comment

Choose a reason for hiding this comment

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

lgtm

@github-actions github-actions bot added the S-Ready-For-Final-Review This PR has been looked over by members of the community. (automatic after 2 approvals) label Jan 7, 2024
@ZeWaka ZeWaka merged commit f3971fd into goonstation:master Jan 7, 2024
26 checks passed
github-actions bot pushed a commit that referenced this pull request Jan 7, 2024
@13spacemen 13spacemen deleted the joingame branch January 7, 2024 20:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-UI Modifies UI in some way. Automatically applied on a change to tgui/ C-Sprites Automatically applied on any .dmi or icons folder change S-Ready-For-Final-Review This PR has been looked over by members of the community. (automatic after 2 approvals) size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants