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

Provost Rankpansion #6982

Merged
merged 15 commits into from
Aug 23, 2024
Merged

Provost Rankpansion #6982

merged 15 commits into from
Aug 23, 2024

Conversation

ItsVyzo
Copy link
Contributor

@ItsVyzo ItsVyzo commented Aug 19, 2024

About the pull request

This added the missing Provost positions from the Provost Office hierarchy and gives more options for a more appropriate response when handling ML issues ICly including a Deputy Marshal and Provost Chief Inspector.

it keeps conflicting every single sprite merge 🗡️

Explain why it's good for the game

rank under-response is better than rank over-response for roleplay and immersion

Testing Photographs and Procedure

Screenshots & Videos

image
dreamseeker_Wqypw6erPa
dreamseeker_YLyXXv71vc
dreamseeker_rIGx5diI14
dreamseeker_ivs408zuvU

Changelog

🆑
add: Provost Chief Inspector
add: missing Provost Presets per ML Hierarchy
imageadd: added PCI sprites
imageadd: PCI and Dep. Marshal HUD icons
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Feature Feature coder badge labels Aug 19, 2024
code/datums/paygrades/factions/uscm/provost.dm Outdated Show resolved Hide resolved
code/modules/clothing/under/marine_uniform.dm Outdated Show resolved Hide resolved
code/modules/clothing/suits/marine_coat.dm Outdated Show resolved Hide resolved
code/modules/clothing/head/head.dm Outdated Show resolved Hide resolved
code/modules/clothing/head/head.dm Outdated Show resolved Hide resolved
code/__DEFINES/job.dm Outdated Show resolved Hide resolved
code/__DEFINES/job.dm Outdated Show resolved Hide resolved
code/__DEFINES/paygrade_defs/provost.dm Outdated Show resolved Hide resolved
code/datums/factions/uscm.dm Outdated Show resolved Hide resolved
code/datums/paygrades/factions/uscm/provost.dm Outdated Show resolved Hide resolved
code/modules/cm_marines/marines_consoles.dm Outdated Show resolved Hide resolved
code/modules/gear_presets/uscm_event.dm Outdated Show resolved Hide resolved
code/modules/gear_presets/uscm_event.dm Outdated Show resolved Hide resolved
code/modules/gear_presets/uscm_event.dm Outdated Show resolved Hide resolved
code/modules/gear_presets/uscm_event.dm Outdated Show resolved Hide resolved
code/__DEFINES/job.dm Outdated Show resolved Hide resolved
code/datums/factions/uscm.dm Outdated Show resolved Hide resolved
@Blundir Blundir added the Sprites Approved confirmed no stray pixels label Aug 19, 2024
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 21, 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 Aug 21, 2024
@cm13-github
Copy link
Contributor

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

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

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

@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Aug 22, 2024
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 23, 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 Aug 23, 2024
@cm13-github
Copy link
Contributor

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

@harryob harryob added this pull request to the merge queue Aug 23, 2024
Merged via the queue into cmss13-devs:master with commit 06d35ef Aug 23, 2024
28 checks passed
cm13-github added a commit that referenced this pull request Aug 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants