Skip to content

Commit

Permalink
Paygrade shorthand defines. (#5128)
Browse files Browse the repository at this point in the history
# About the pull request
This PR converts all paygrade shorthands (e.g. ME1) into PAY_SHORT_XXX
defines. The reason for this is to ensure any changes are reflected
across the board, and also to allow the shorthand to carry description
of what it is. It can be hard to tell what a paygrade is meant to be
based upon arbitrary letters.

# Explain why it's good for the game

Makes future code changes easier.

# 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:
code: Paygrade shorthands now use defines.
fix: CLF and Survivors are no longer privates.
fix: Civillian Mr/Ms/Mx prefix now works correctly, and is the default
for new ID cards.
/:cl:
  • Loading branch information
realforest2001 committed Dec 6, 2023
1 parent 38ce90b commit 72d3ff6
Show file tree
Hide file tree
Showing 48 changed files with 826 additions and 556 deletions.
35 changes: 35 additions & 0 deletions code/__DEFINES/paygrade_defs/civilian.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
// Paygrade shorthand defines, to allow clearer designation.

// Civilians
/// CIV, Civilian
#define PAY_SHORT_CIV "CIV"

/// CNUR, Nurse
#define PAY_SHORT_CNUR "CNUR"

/// CDOC, Doctor
#define PAY_SHORT_CDOC "CDOC"

/// CCMO, Professor
#define PAY_SHORT_CCMO "CCMO"

/// CREP, Representative
#define PAY_SHORT_CREP "CREP"

/// SYN, Synthetic
#define PAY_SHORT_SYN "SYN"

/// OPR, Operative
#define PAY_SHORT_OPR "OPR"

/// CPO, Officer
#define PAY_SHORT_CPO "CPO"

/// CSPO, Senior Officer
#define PAY_SHORT_CSPO "CSPO"

/// REB, Rebel
#define PAY_SHORT_REB "REB"

/// REBC, Rebel Commander "REBC"
#define PAY_SHORT_REBC "REBC"
20 changes: 20 additions & 0 deletions code/__DEFINES/paygrade_defs/cmb.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Paygrade shorthand defines, to allow clearer designation.

// Colonial Marshal Bureau
/// IHRO, Interstellar Human Rights Observer
#define PAY_SHORT_IHRO "IHRO"

/// ICCL, Interstellar Commerce Commission Corporate Liaison
#define PAY_SHORT_ICCL "ICCL"

/// ICCA, Interstellar Commerce Commission Agent
#define PAY_SHORT_ICCA "ICCA"

/// CMBM, CMB Marshal
#define PAY_SHORT_CMBM "CMBM"

/// CMBD, CMB Deputy
#define PAY_SHORT_CMBD "CMBD"

/// CMBS, CMB Synthetic
#define PAY_SHORT_CMBS "CMBS"
17 changes: 17 additions & 0 deletions code/__DEFINES/paygrade_defs/dutch.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Paygrade shorthand defines, to allow clearer designation.

// Dutches Dozen
/// DTC, Dutch's Dozen Standard Mercenary
#define PAY_SHORT_DTC "DTC"

/// DTCM, Dutch's Dozen Medic
#define PAY_SHORT_DTCM "DTCM"

/// DTCF, Dutch's Dozen Flamethrower Specialist
#define PAY_SHORT_DTCF "DTCF"

/// DTCMG, Dutch's Dozen Machinegunner
#define PAY_SHORT_DTCMG "DTCMG"

/// DTCA, Arnold
#define PAY_SHORT_DTCA "DTCA"
80 changes: 80 additions & 0 deletions code/__DEFINES/paygrade_defs/marines.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
// Paygrade shorthand defines, to allow clearer designation.

// USCM MARINES
/// ME1, Private
#define PAY_SHORT_ME1 "ME1"

/// ME2, Private First Class
#define PAY_SHORT_ME2 "ME2"

/// ME3, Lance Corporal
#define PAY_SHORT_ME3 "ME3"

/// ME4, Corporal
#define PAY_SHORT_ME4 "ME4"

/// ME5, Sergeant
#define PAY_SHORT_ME5 "ME5"

/// ME6, Staff Sergeant
#define PAY_SHORT_ME6 "ME6"

/// ME7, Gunnery Sergeant
#define PAY_SHORT_ME7 "ME7"

/// ME8, Master Sergeant
#define PAY_SHORT_ME8 "ME8"

/// ME8E, First Sergeant
#define PAY_SHORT_ME8E "ME8E"

/// ME9, Master Gunnery Sergeant
#define PAY_SHORT_ME9 "ME9"

/// ME9E, Sergeant Major
#define PAY_SHORT_ME9E "ME9E"

/// ME9C, Sergeant Major of the Colonial Marine Corps
#define PAY_SHORT_ME9C "ME9C"

/// MO1, Second Lieutenant
#define PAY_SHORT_MO1 "MO1"

/// MO2, First Lieutenant
#define PAY_SHORT_MO2 "MO2"
/// MO3, Captain

#define PAY_SHORT_MO3 "MO3"
/// MO4, Major

#define PAY_SHORT_MO4 "MO4"
/// MO5, Lieutenant Colonel

#define PAY_SHORT_MO5 "MO5"
/// MO6, Colonel

#define PAY_SHORT_MO6 "MO6"
/// MO6E, Senior Colonel

#define PAY_SHORT_MO6E "MO6E"
/// MO6C, Division Colonel

#define PAY_SHORT_MO6C "MO6C"
/// MO7, Brigadier General

#define PAY_SHORT_MO7 "MO7"
/// MO8, Major General

#define PAY_SHORT_MO8 "MO8"
/// MO9, Lieutenant General

#define PAY_SHORT_MO9 "MO9"
/// MO10, General

#define PAY_SHORT_MO10 "MO10"

/// MO10C, Assistant Commandant of the Marine Corps
#define PAY_SHORT_MO10C "MO10C"

/// MO10S, Commandant of the Marine Corps
#define PAY_SHORT_MO10S "MO10S"
74 changes: 74 additions & 0 deletions code/__DEFINES/paygrade_defs/navy.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
// Paygrade shorthand defines, to allow clearer designation.

// USCM NAVY
/// NE1, Seaman Recruit
#define PAY_SHORT_NE1 "NE1"

/// NE2M, Seaman Apprentice
#define PAY_SHORT_NE2 "NE2"

/// NE3, Seaman
#define PAY_SHORT_NE3 "NE3"

/// NE4, Petty Officer 3rd Class
#define PAY_SHORT_NE4 "NE4"

/// NE5, Petty Officer 2nd Class
#define PAY_SHORT_NE5 "NE5"

/// NE6, Petty Officer 1st Class
#define PAY_SHORT_NE6 "N36"

/// NE7, Chief Petty Officer
#define PAY_SHORT_NE7 "NE7"

/// NE8, Senior Chief Petty Officer
#define PAY_SHORT_NE8 "NE8"

/// NE8C, Command Senior Chief Petty Officer
#define PAY_SHORT_NE8C "NE8C"

/// NE9, Master Chief Petty Officer
#define PAY_SHORT_NE9 "NE9"

/// NE9C, Command Master Chief Petty Officer
#define PAY_SHORT_NE9C "NE9C"

/// NO1, Ensign
#define PAY_SHORT_NO1 "NO1"

/// NO2, Lieutenant Junior Grade
#define PAY_SHORT_NO2 "NO2"

/// NO3, Lieutenant
#define PAY_SHORT_NO3 "NO3"

/// NO4, Lieutenant Commander
#define PAY_SHORT_NO4 "NO4"

/// NO5, Commander
#define PAY_SHORT_NO5 "NO5"

/// NO6, Captain
#define PAY_SHORT_NO6 "NO6"

/// NO6E, Commodore
#define PAY_SHORT_NO6E "NO6E"

/// NO6C, Senior Commodore
#define PAY_SHORT_NO6C "NO6C"

/// NO7, Rear Admiral (Lower Half)
#define PAY_SHORT_NO7 "NO7"

/// NO8, Rear Admiral (Upper Half)
#define PAY_SHORT_NO8 "NO8"

/// NO9, Vice Admiral
#define PAY_SHORT_NO9 "NO9"

/// NO10, Admiral
#define PAY_SHORT_NO10 "NO10"

/// NO10C, Chief of Naval Operations
#define PAY_SHORT_NO10C "NO10C"
14 changes: 14 additions & 0 deletions code/__DEFINES/paygrade_defs/provost.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Paygrade shorthand defines, to allow clearer designation.

// PROVOST OFFICE
/// PvI, Provost Inspector
#define PAY_SHORT_PVI "PvI"

/// PvM, Provost Marshal
#define PAY_SHORT_PVM "PvM"

/// PvSM, Provost Sector Marshal
#define PAY_SHORT_PVSM "PvSM"

/// PvCM, Provost Chief Marshal
#define PAY_SHORT_PVCM "PvCM"
59 changes: 59 additions & 0 deletions code/__DEFINES/paygrade_defs/upp.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
// Paygrade shorthand defines, to allow clearer designation.

// Union of Progressive Peoples
/// UE,
#define PAY_SHORT_UEC "UEC"

/// UE1, Private
#define PAY_SHORT_UE1 "UE1"

/// UE2, Private First Class
#define PAY_SHORT_UE2 "UE2"

/// UE3, Korporal
#define PAY_SHORT_UE3 "UE3"

/// UE4, unior Serzhant
#define PAY_SHORT_UE4 "UE4"

/// UE5, Serzhant
#define PAY_SHORT_UE5 "UE5"

/// UE6, Master Serzhant
#define PAY_SHORT_UE6 "UE6"

/// UC1, Junior Kommando
#define PAY_SHORT_UC1 "UC1"

/// UC2, 2nd Kommando
#define PAY_SHORT_UC2 "UC2"

/// UC3, 1st Kommando
#define PAY_SHORT_UC3 "UC3"

/// UO1, Leytenant
#define PAY_SHORT_UO1 "UO1"

/// UO2, Senior Leytenant
#define PAY_SHORT_UO2 "UO2"

/// UO3, Kapitan
#define PAY_SHORT_UO3 "UO3"

/// UO4, Mayjor
#define PAY_SHORT_UO4 "UO4"

/// UO5, Leytenant Kolonel
#define PAY_SHORT_UO5 "UO5"

/// UO6, Kolonel
#define PAY_SHORT_UO6 "UO6"

/// UO7, Mayjor General
#define PAY_SHORT_UO7 "UO7"

/// UO8, Leytenant General
#define PAY_SHORT_UO8 "UO8"

/// UO9, Army General
#define PAY_SHORT_UO9 "UO9"
32 changes: 32 additions & 0 deletions code/__DEFINES/paygrade_defs/weyland.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// Paygrade shorthand defines, to allow clearer designation.

// Weyland Yutani
/// WYC1, Trainee
#define PAY_SHORT_WYC1 "WYC1"

/// WYC2, Junior Executive
#define PAY_SHORT_WYC2 "WYC2"

/// WYC3, Executive
#define PAY_SHORT_WYC3 "WYC3"

/// WYC4, Senior Executive
#define PAY_SHORT_WYC4 "WYC4"

/// WYC5, Executive Specialist
#define PAY_SHORT_WYC5 "WYC5"

/// WYC6, Executive Supervisor
#define PAY_SHORT_WYC6 "WYC6"

/// WYC7, Assistant Manager
#define PAY_SHORT_WYC7 "WYC7"

/// WYC8, Division Manager
#define PAY_SHORT_WYC8 "WYC8"

/// WYC9, Chief Executive
#define PAY_SHORT_WYC9 "WYC9"

/// WYC10, Director
#define PAY_SHORT_WYC10 "WYC10"
30 changes: 0 additions & 30 deletions code/datums/paygrades/factions/civillian/civilian.dm

This file was deleted.

Loading

0 comments on commit 72d3ff6

Please sign in to comment.