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

Unique observer submenus for non-standard marine squads #6673

Merged
merged 1 commit into from
Jul 29, 2024

Conversation

Steelpoint
Copy link
Contributor

@Steelpoint Steelpoint commented Jul 10, 2024

About the pull request

This PR adds sub-menus for most non-standard marine squads. This includes SOF (Marine Raiders), CBRN, Echo Squad, and Forecon (ERT only, not survivors). This also changes the colour of Foxtrot from Teal to a similar brownish colour.

Explain why it's good for the game

Better tracking of non-standard squads for when they appear.

Testing Photographs and Procedure

Screenshot 2024-07-10 17 57 12

Changelog

🆑
add: Marine Special Forces, Forecon, Echo Squad and CBRN will now appear in their own sub-menu for observers.
ui: Foxtrot's colour in the observe menu now reflects the squads true colour scheme.
/:cl:

@github-actions github-actions bot added UI deletes nanoui/html Feature Feature coder badge labels Jul 10, 2024
@Steelpoint Steelpoint changed the title Commit Unique observer Submenus For Non-Standard Marine Squads Jul 10, 2024
@Steelpoint Steelpoint changed the title Unique observer Submenus For Non-Standard Marine Squads Unique observer submenus For non-standard marine squads Jul 10, 2024
@Steelpoint Steelpoint changed the title Unique observer submenus For non-standard marine squads Unique observer submenus for non-standard marine squads Jul 10, 2024
@Steelpoint
Copy link
Contributor Author

I was torn regarding adding Intel Officers as a separate squad, I decided against it, to avoid cluttering the squad menu at round start, unless a request is made to add them as well.

Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Jul 25, 2024
@Drulikar Drulikar added this pull request to the merge queue Jul 29, 2024
Merged via the queue into cmss13-devs:master with commit bc74e40 Jul 29, 2024
31 checks passed
cm13-github added a commit that referenced this pull request Jul 29, 2024
@Steelpoint Steelpoint deleted the OtherSquads branch July 30, 2024 03:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Stale beg a maintainer to review your PR UI deletes nanoui/html
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants