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

UPP rank #4380

Merged
merged 2 commits into from
Sep 26, 2023
Merged

UPP rank #4380

merged 2 commits into from
Sep 26, 2023

Conversation

CapCamIII
Copy link
Contributor

@CapCamIII CapCamIII commented Sep 10, 2023

About the pull request

I filled this in bottom to top just read the explain why its good and changelog it has literally everything

Explain why it's good for the game

Presets to fill already existing ranks and complete the UPP officer corps, no reason not to.
Kapitan serves as non-WLed XO, without the BE skill and tool, Maj-Kol serve as CO ranks with possibility of including CO council status in UPP CO roles, General roles for event purposes and the ranks already existed in-code.

Conscript having its own rank being "conscript" makes it more of a meme role, vast majority of UPP soldiers are conscripts lore-wise anyway so doesn't make sense, making them E1 with standard soldiers being E2 makes more sense and cleans up ranks a bit.

UPP rank code had multiple redundant ranks, O1 and O1M for the same rank, but just doctors and normal LTs, no actual mechanical difference, same with E3S and E3M, sapper and medic, acted the exact same ingame but separated ranks for no reason and makes potentially adding new roles a bit harder.

Changelog

🆑
add: Adds upp presets for the unused officer ranks, Kapitan, Lt Kolonel, MajGen, LtGen, Gen, for use in admin events
add: Changes UPP conscript rank from weird conscript only rank to Private, moves UPP soldier to PFC, removing the rank gap between soldier and support
code: Cleans up UPP rank code by deleting redundant ranks
/:cl:

@github-actions github-actions bot added Feature Feature coder badge Code Improvement Make the code longer labels Sep 10, 2023
Copy link
Member

@morrowwolf morrowwolf left a comment

Choose a reason for hiding this comment

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

Otherwise seems fine

code/datums/factions/upp.dm Outdated Show resolved Hide resolved
@morrowwolf morrowwolf marked this pull request as draft September 26, 2023 09:13
@CapCamIII CapCamIII marked this pull request as ready for review September 26, 2023 14:47
@morrowwolf
Copy link
Member

Seems fine, hopefully nothing has been missed.

@morrowwolf morrowwolf added this pull request to the merge queue Sep 26, 2023
Merged via the queue into cmss13-devs:master with commit 56fbf11 Sep 26, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Sep 26, 2023
@CapCamIII CapCamIII deleted the upp-ranks branch September 26, 2023 18:33
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.

2 participants