-
Notifications
You must be signed in to change notification settings - Fork 566
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
Finishes #5128 (Paygrade defines) & Fixes Syndie ID #5260
Finishes #5128 (Paygrade defines) & Fixes Syndie ID #5260
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me at a first pass
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 |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Conflicts have been resolved. A maintainer will review the pull request shortly. |
About the pull request
As title. This PR continues my work from #5128 and adds the defines for PMCs, Mercenaries, VAI and TWE.
I have also changed how the global lists for highcommand (both USCM and WY) work and have made a new global list of all USCM officers to allow for easy reference in #5202.
To do the above I have added a default_faction var on paygrades, along with a variable to indicate if a paygrade refers to an "officer" or not, and if the officer is a "flag" officer, for senior leadership.
I have also updated the Syndicate ID card to work properly.
Explain why it's good for the game
Testing Photographs and Procedure
Screenshots & Videos
Put screenshots and videos here with an empty line between the screenshots and the
<details>
tags.Changelog
🆑
add: Adds paygrade defines for PMCs, VAI, Mercenaries and TWE.
code: Adds code to populate reference lists for certain paygrades.
fix: Fixes PMC synth not using the correct grade.
add: Syndicate ID card repathed and works with paygrades.
/:cl: