Skip to content

Nautical Exmination Marshals Office - PROVOST Replacement#1204

Draft
KeiKiyomi wants to merge 55 commits into
AU-14:masterfrom
KeiKiyomi:Nautical-Exmination-Marshals-Office
Draft

Nautical Exmination Marshals Office - PROVOST Replacement#1204
KeiKiyomi wants to merge 55 commits into
AU-14:masterfrom
KeiKiyomi:Nautical-Exmination-Marshals-Office

Conversation

@KeiKiyomi

@KeiKiyomi KeiKiyomi commented Jun 3, 2026

Copy link
Copy Markdown
Contributor

About the PR

Replaces PROVOST with NEMO and adds 5 third parties for admin use per situtation required.

Why / Balance

Will write when PR is done

Technical details

YAML and RSI

Media

image

Requirements

  • By submitting this code and/or assets, I confirm that I either own them or have provided the correct necessary licenses to use and distribute them. I agree to be fully responsible for any legal claims or issues arising from the use of these materials.

Changelog

🆑

  • add: Added Nautrical Examination Marshals Office

@github-actions github-actions Bot added the L Large pull request. label Jun 3, 2026
@github-actions

github-actions Bot commented Jun 3, 2026

Copy link
Copy Markdown
Contributor

RSI Diff Bot; head commit b5d73a5 merging into 7ef1755
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_AU14/Interface/au14map_blips.rsi

State Old New Status
background_nemo Added

Resources/Textures/_AU14/Interface/job_icons.rsi

State Old New Status
hudsquad_nemo_alt_commander Added
hudsquad_nemo_clear_blank Added
hudsquad_nemo_commander Added
hudsquad_nemo_dcc Added
hudsquad_nemo_dp Added
hudsquad_nemo_enforcer Added
hudsquad_nemo_inspector Added
hudsquad_nemo_kill_commander Added
hudsquad_nemo_kill_enforcer Added
hudsquad_nemo_kill_lead_spec Added
hudsquad_nemo_kill_leader Added
hudsquad_nemo_kill_medic Added
hudsquad_nemo_kill_pointman Added
hudsquad_nemo_kill_sgo Added
hudsquad_nemo_kill_synth Added
hudsquad_nemo_lead_clear_blank Added
hudsquad_nemo_lead_enforcer Added
hudsquad_nemo_lead_inspector Added
hudsquad_nemo_lead_kill_inspector Added
hudsquad_nemo_lead_kill_team Added
hudsquad_nemo_lead_pointman Added
hudsquad_nemo_lead_responder Added
hudsquad_nemo_lead_spec Added
hudsquad_nemo_lead_synth Added
hudsquad_nemo_lead_team Added
hudsquad_nemo_medic Added
hudsquad_nemo_medic_lead Added
hudsquad_nemo_pointman Added
hudsquad_nemo_responder Added
hudsquad_nemo_synth Added

Resources/Textures/_RMC14/Objects/Misc/Books/Other/NEMO_SOP.rsi

State Old New Status
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after b5d73a5

@github-actions github-actions Bot added Changes: Sprites Changes sprite image assets. Changes: No C# Contains no C# file changes. Changes: Translations Changes localization files. labels Jun 3, 2026
@troytroy400

Copy link
Copy Markdown
Contributor

None of these third parties are admin-only, they will all spawn naturally. Changed the required players to 400 to avoid this.

@KeiKiyomi

Copy link
Copy Markdown
Contributor Author

None of these third parties are admin-only, they will all spawn naturally. Changed the required players to 400 to avoid this.

Thanks Troy

@NzzyFk

NzzyFk commented Jun 4, 2026

Copy link
Copy Markdown
Contributor

sprites look g to me!

@maertayn

maertayn commented Jun 6, 2026

Copy link
Copy Markdown
Contributor

You really need to learn
git commit --ammend --no-edit

Or even rebasing omfg the amt of "fix" commits

@KeiKiyomi

Copy link
Copy Markdown
Contributor Author

You really need to learn git commit --ammend --no-edit

Or even rebasing omfg the amt of "fix" commits

if it aint broke dont fix it

@maertayn

maertayn commented Jun 6, 2026

Copy link
Copy Markdown
Contributor

You're just bloating git

@KeiKiyomi

Copy link
Copy Markdown
Contributor Author

You're just bloating git

Id be happy to learn if your willing to teach me a better way to fix YAML Linter

@maertayn

maertayn commented Jun 6, 2026

Copy link
Copy Markdown
Contributor

git rebase -i -hash-before-needed-change-

This will allow you to redo made commits, it'll open a text file and list all working tree commits, you'll need to change the prefix of the commit you want to: "edit" (read the instructions)

It'll detach and jump back in time to when you last made the commit.

Then make the changes, and add them (git add .) and move to the next commit or complete (git rebase --continue)

It's really not complicated, just new for you

Idk how github desktop does it though, I'm sure it's got similar functionality.

@KeiKiyomi

Copy link
Copy Markdown
Contributor Author

ohhh okay, thanks @maertayn

@KeiKiyomi KeiKiyomi marked this pull request as draft June 6, 2026 10:45
@github-actions github-actions Bot added the S: Merge Conflict Pull request has merge conflicts. label Jun 8, 2026
@github-actions

github-actions Bot commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

This pull request has conflicts. Please resolve them before review can continue.

@github-actions github-actions Bot removed the S: Merge Conflict Pull request has merge conflicts. label Jun 8, 2026
@KeiKiyomi KeiKiyomi marked this pull request as ready for review June 9, 2026 17:01
@mikusssssss

Copy link
Copy Markdown
Contributor

bro just naming shit....... wheres NEMO???

@KeiKiyomi KeiKiyomi marked this pull request as draft June 9, 2026 21:27
@KeiKiyomi KeiKiyomi marked this pull request as ready for review June 9, 2026 21:28
@KeiKiyomi KeiKiyomi marked this pull request as draft June 9, 2026 21:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Changes: No C# Contains no C# file changes. Changes: Sprites Changes sprite image assets. Changes: Translations Changes localization files. XL Very large pull request.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants