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

[MIRROR] Alliance United Flotilla branch, and some consistency tweaks to others #2751

Merged
merged 2 commits into from
Nov 24, 2024

Conversation

SierraHelper
Copy link
Collaborator

Оригинальный PR: Baystation12#34814

🆑 JuneauQT
rscadd: Added the Alliance United Flotillas Branch and three ranks for it to ID cards (and all other places Branch can be set.)
tweak: ICCGN and SCGA ranks now have their officer/enlisted badge included in their define.
/:cl:

Adds the AUF Branch to the faction options, with three ranks for your adminbus or antaggery pleasure. Also adds Enlisted and Officer pins to the defines of the ICCGN and SCGA ranks, for consistency with the fleet ones.

The sort_orders for the AUF ranks are based off of the torch ones instead of the SCGA or ICCGN's multiples-of-10 system, but the other pack factions have been left untouched aside from giving them the pins in the defines since I assume there's a reason they're set up like that.

I know that the Alliance 'Ranks' aren't that formal a system (maybe they shouldn't have sort_order values set? is that possible?), but I figured it's probably better to have them present as an option for, say, Raiders or admin events than to not.

@SierraHelper SierraHelper requested a review from a team as a code owner October 25, 2024 06:53
@SierraHelper SierraHelper added 🪞 MIR ЯОЯ 📜 CL валиден Ченджлог не содержит ошибок labels Oct 25, 2024
@Lexanx Lexanx enabled auto-merge (squash) November 24, 2024 01:48
@Lexanx Lexanx merged commit 8307c4c into dev-sierra Nov 24, 2024
11 checks passed
@Lexanx Lexanx deleted the upstream-pr-34814 branch November 24, 2024 01:55
SierraHelper added a commit that referenced this pull request Nov 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🪞 MIR ЯОЯ 📜 CL валиден Ченджлог не содержит ошибок
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants