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

Finishes #5128 (Paygrade defines) & Fixes Syndie ID #5260

Merged
merged 9 commits into from
Jan 25, 2024

Conversation

realforest2001
Copy link
Member

@realforest2001 realforest2001 commented Dec 20, 2023

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:

@realforest2001 realforest2001 changed the title Finishes #5128 Finishes #5128 (Paygrade defines) Dec 20, 2023
@github-actions github-actions bot added Feature Feature coder badge Code Improvement Make the code longer labels Dec 20, 2023
ghost

This comment was marked as outdated.

Copy link
Member

@fira fira left a 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

code/datums/paygrades/paygrade.dm Outdated Show resolved Hide resolved
Copy link
Contributor

github-actions bot commented Jan 3, 2024

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 Jan 3, 2024
harryob
harryob previously requested changes Jan 6, 2024
code/datums/paygrades/paygrade.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft January 6, 2024 14:27
@realforest2001 realforest2001 marked this pull request as ready for review January 9, 2024 16:22
@github-actions github-actions bot closed this Jan 17, 2024
@realforest2001 realforest2001 removed the Stale beg a maintainer to review your PR label Jan 17, 2024
@realforest2001 realforest2001 changed the title Finishes #5128 (Paygrade defines) Finishes #5128 (Paygrade defines) & Fixes Syndie ID Jan 18, 2024
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jan 18, 2024
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jan 19, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@Birdtalon Birdtalon added this pull request to the merge queue Jan 25, 2024
Merged via the queue into cmss13-devs:master with commit 7830684 Jan 25, 2024
26 checks passed
cm13-github added a commit that referenced this pull request Jan 25, 2024
@realforest2001 realforest2001 deleted the forest/rankfinish branch January 26, 2024 02:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Improvement Make the code longer Feature Feature coder badge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants