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

Adds a way for SLs/SOs/XOs to recommend medals that the CO can then approve/deny. #5202

Merged
merged 17 commits into from
Jan 6, 2024

Conversation

TheGamerdk
Copy link
Contributor

@TheGamerdk TheGamerdk commented Dec 12, 2023

About the pull request

See title

Explain why it's good for the game

Will likely make medals more used, and means the CO doesn't have to scramble to get medal recommendations in the last 3 minutes.

Testing Photographs and Procedure

Screenshots & Videos

How to give recommendations:
image
OR
image

The actual panel for COs:
image

Changelog

🆑
add: SLs, SOs and XOs can now recommend people for medals! Do this by right-clicking your headset, or using the new button in the object panel of the Status Panel!
/:cl:

@github-actions github-actions bot added UI deletes nanoui/html Feature Feature coder badge labels Dec 12, 2023
code/datums/medal_awards.dm Outdated Show resolved Hide resolved
code/datums/medal_awards.dm Show resolved Hide resolved
code/datums/medal_awards.dm Outdated Show resolved Hide resolved
code/datums/medal_awards.dm Outdated Show resolved Hide resolved
code/datums/medal_awards.dm Show resolved Hide resolved
code/datums/medal_awards.dm Outdated Show resolved Hide resolved
code/datums/medal_awards.dm Outdated Show resolved Hide resolved
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code and functionality appears to be okay.

Only thing I really think could be improved would be to reuse the DM defines for the human_medals rather than having now two separate definitions for the medals. But it may be better to just create a unit test for this in the future ever people start changing medals.

@Drulikar Drulikar added the Testmerge Candidate we'll test this while you're asleep and the server has 10 players label Dec 13, 2023
@Drulikar
Copy link
Contributor

The ui_host implementation is still acceptable, but IMO worse than when originally approved.

code/datums/medal_awards.dm Outdated Show resolved Hide resolved
code/datums/medal_awards.dm Outdated Show resolved Hide resolved
@Grithok
Copy link

Grithok commented Dec 16, 2023

If the ASO, a staff officer, tries to give a medal out, they receive this message.

'Only Staff Officers, Executive Officers and Squad Leader are permitted to give medal recommendations!'

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
@TheGamerdk TheGamerdk marked this pull request as ready for review January 5, 2024 21:05
@harryob harryob added this pull request to the merge queue Jan 6, 2024
Merged via the queue into cmss13-devs:master with commit 4c853a2 Jan 6, 2024
27 checks passed
cm13-github added a commit that referenced this pull request Jan 6, 2024
github-merge-queue bot pushed a commit that referenced this pull request Jan 25, 2024
# 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.
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
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:
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 Testmerge Candidate we'll test this while you're asleep and the server has 10 players UI deletes nanoui/html
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants