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] Refactors mil_rank sort_order #2911

Merged
merged 1 commit into from
Nov 24, 2024
Merged

Conversation

SierraHelper
Copy link
Collaborator

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

🆑 JuneauQT
tweak: Refactors ranking orders of Fleet and Expeditionary Corps ranks to the newer standard
bugfix: The 'Admiral' and 'Commandant of the Expeditionary Corps' ranks of the Expedtionary Corps now function correctly.
tweak; Refactors ranking orders of SCGA and ICCGN to match the integration of Fleet and Corps into the standard.
/:cl:

Updates the Fleet and Corps ranks to the standard used by the ICCGN and SCGA. Also alters the ICCGN and SCGA ranks to the slightly modified standard now used by the fleet and corps.

The new sort_order for ranks is as follows:

  • Every Pay Grade's sort_order is a multiple of 10.
  • Sub-ranks (I.E. Master Chief variations) now increment the sort_order by 1. To the best of my knowledge this is roughly analagous to why we use the seperation-by-10 system in the first place.
  • Officer ranks are now higher than Enlisted ranks by 100, similarly to how they were originally higher by 10.
  • The 'Officer' access check now checks for a sort_order higher than 100. This should not create issues unless an E-10 rank is added.
  • /datum/mil_rank/grade now divides the rank's sort_order by 10 (after subtracting 100 for sort_orders that fall into the officer band.)
  • The torch uniform datums have been updated to ensure the vendor functions correctly.
  • The corps admiral rank has been more properly added (it was missing from rank_types)
  • The corps commandant rank has been implemented to begin with, since we had the (unused) item and sprite. Its paygrade has been corrected on the rank tab item and its sprite name.

I've confirmed that, at the very least, O-Mess and the Uniform Vendors still function appropriately. If anything ever makes the paygrade variable publicly visible again sub-ranks will render with decimal values, but this is probably fine.

@SierraHelper SierraHelper requested a review from a team as a code owner November 24, 2024 18:53
@SierraHelper SierraHelper added the 📜 CL валиден Ченджлог не содержит ошибок label Nov 24, 2024
@github-actions github-actions bot added the ⛰️ Спрайты PR затрагивает спрайты label Nov 24, 2024
@Lexanx Lexanx merged commit aa32635 into dev-sierra Nov 24, 2024
25 checks passed
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 ЯОЯ ⛰️ Спрайты PR затрагивает спрайты 📜 CL валиден Ченджлог не содержит ошибок
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants