From 775085e2ccb258c80ce5752973e12e47f27ff60a Mon Sep 17 00:00:00 2001 From: BonniePandora Date: Tue, 24 Sep 2024 23:01:04 +0100 Subject: [PATCH] Abbreviation adjustment --- code/datums/paygrades/factions/uscm/army.dm | 56 ++++++++++----------- code/datums/paygrades/factions/uscm/navy.dm | 6 +-- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/code/datums/paygrades/factions/uscm/army.dm b/code/datums/paygrades/factions/uscm/army.dm index 5fe70a9886..4399ab02a3 100644 --- a/code/datums/paygrades/factions/uscm/army.dm +++ b/code/datums/paygrades/factions/uscm/army.dm @@ -9,7 +9,7 @@ /datum/paygrade/army/e1 paygrade = PAY_SHORT_AE1 name = "Private" - prefix = "Pvt." + prefix = "PV1." rank_pin = /obj/item/clothing/accessory/ranks/army/e1 ranking = 0 pay_multiplier = 1.4 @@ -17,7 +17,7 @@ /datum/paygrade/army/e2 paygrade = PAY_SHORT_AE2 name = "Private" - prefix = "Pvt." + prefix = "PV2." rank_pin = /obj/item/clothing/accessory/ranks/army/e2 ranking = 1 pay_multiplier = 1.5 @@ -33,7 +33,7 @@ /datum/paygrade/army/e4 paygrade = PAY_SHORT_AE4 name = "Corporal" - prefix = "Cpl." + prefix = "CPL." rank_pin = /obj/item/clothing/accessory/ranks/army/e4 ranking = 3 pay_multiplier = 1.8 @@ -41,7 +41,7 @@ /datum/paygrade/army/e4e paygrade = PAY_SHORT_AE4E name = "Specialist" - prefix = "Spc." + prefix = "SPC." rank_pin = /obj/item/clothing/accessory/ranks/army/e4e ranking = 4 pay_multiplier = 1.8 @@ -49,7 +49,7 @@ /datum/paygrade/army/e5 paygrade = PAY_SHORT_AE5 name = "Sergeant" - prefix = "Sgt." + prefix = "SGT." rank_pin = /obj/item/clothing/accessory/ranks/army/e5 ranking = 5 pay_multiplier = 2 @@ -57,7 +57,7 @@ /datum/paygrade/army/e6 paygrade = PAY_SHORT_AE6 name = "Staff Sergeant" - prefix = "SSgt." + prefix = "SSGT." rank_pin = /obj/item/clothing/accessory/ranks/army/e6 ranking = 6 pay_multiplier = 2.2 @@ -73,7 +73,7 @@ /datum/paygrade/army/e8 paygrade = PAY_SHORT_AE8 name = "Master Sergeant" - prefix = "MSgt." + prefix = "MSG." rank_pin = /obj/item/clothing/accessory/ranks/army/e8 ranking = 8 pay_multiplier = 2.5 @@ -81,7 +81,7 @@ /datum/paygrade/army/e8e paygrade = PAY_SHORT_AE8E name = "First Sergeant" - prefix = "1Sgt." + prefix = "1SG." rank_pin = /obj/item/clothing/accessory/ranks/army/e8e ranking = 9 pay_multiplier = 2.5 @@ -89,7 +89,7 @@ /datum/paygrade/army/e9 paygrade = PAY_SHORT_AE9 name = "Sergeant Major" - prefix = "SgtMaj." + prefix = "SGM." rank_pin = /obj/item/clothing/accessory/ranks/army/e9 ranking = 10 pay_multiplier = 2.75 @@ -97,7 +97,7 @@ /datum/paygrade/army/e9e paygrade = PAY_SHORT_AE9E name = "Command Sergeant Major" - prefix = "CSMJ." + prefix = "CSM." rank_pin = /obj/item/clothing/accessory/ranks/army/e9e ranking = 11 pay_multiplier = 2.75 @@ -115,7 +115,7 @@ /datum/paygrade/army/w1 paygrade = PAY_SHORT_AW1 name = "Warrant Officer" - prefix = "WO." + prefix = "WO1." rank_pin = /obj/item/clothing/accessory/ranks/army/w1 ranking = 13 pay_multiplier = 2.4 //Pay on par with E7 to begin with @@ -123,7 +123,7 @@ /datum/paygrade/army/w2 paygrade = PAY_SHORT_AW2 name = "Chief Warrant Officer 2" - prefix = "CWO." + prefix = "CW2." rank_pin = /obj/item/clothing/accessory/ranks/army/w2 ranking = 14 pay_multiplier = 2.5 @@ -131,7 +131,7 @@ /datum/paygrade/army/w3 paygrade = PAY_SHORT_AW3 name = "Chief Warrant Officer 3" - prefix = "CWO3." + prefix = "CW3." rank_pin = /obj/item/clothing/accessory/ranks/army/w3 ranking = 15 pay_multiplier = 2.7 @@ -139,7 +139,7 @@ /datum/paygrade/army/w1 paygrade = PAY_SHORT_AW4 name = "Chief Warrant Officer 4" - prefix = "CWO4." + prefix = "CW4." rank_pin = /obj/item/clothing/accessory/ranks/army/w4 ranking = 16 pay_multiplier = 2.9 @@ -147,7 +147,7 @@ /datum/paygrade/army/w5 paygrade = PAY_SHORT_AW5 name = "Chief Warrant Officer 5" - prefix = "CWO5." + prefix = "CW5." rank_pin = /obj/item/clothing/accessory/ranks/army/w5 ranking = 17 pay_multiplier = 3 @@ -157,7 +157,7 @@ /datum/paygrade/army/o1 paygrade = PAY_SHORT_AO1 name = "Second Lieutenant" - prefix = "2ndLt." + prefix = "2LT." rank_pin = /obj/item/clothing/accessory/ranks/army/o1 ranking = 18 pay_multiplier = 3 @@ -166,7 +166,7 @@ /datum/paygrade/army/o2 paygrade = PAY_SHORT_AO2 name = "First Lieutenant" - prefix = "1stLt." + prefix = "1LT." rank_pin = /obj/item/clothing/accessory/ranks/army/o2 ranking = 19 pay_multiplier = 3.1 @@ -175,7 +175,7 @@ /datum/paygrade/army/o3 paygrade = PAY_SHORT_AO3 name = "Captain" - prefix = "Capt." + prefix = "CPT." rank_pin = /obj/item/clothing/accessory/ranks/army/o3 ranking = 20 pay_multiplier = 3.3 @@ -184,7 +184,7 @@ /datum/paygrade/army/o4 paygrade = PAY_SHORT_AO4 name = "Major" - prefix = "Maj." + prefix = "MAJ." rank_pin = /obj/item/clothing/accessory/ranks/army/o4 ranking = 21 pay_multiplier = 3.5 @@ -193,7 +193,7 @@ /datum/paygrade/army/o5 paygrade = PAY_SHORT_AO5 name = "Lieutenant Colonel" - prefix = "LtCol." + prefix = "LTC." rank_pin = /obj/item/clothing/accessory/ranks/army/o5 ranking = 22 pay_multiplier = 3.7 @@ -202,7 +202,7 @@ /datum/paygrade/army/o6 paygrade = PAY_SHORT_AO6 name = "Colonel" - prefix = "Col." + prefix = "COL." rank_pin = /obj/item/clothing/accessory/ranks/army/o6 ranking = 23 pay_multiplier = 3.9 @@ -211,7 +211,7 @@ /datum/paygrade/army/o6e paygrade = PAY_SHORT_AO6E name = "Senior Colonel" - prefix = "Snr Col." + prefix = "SCL." rank_pin = /obj/item/clothing/accessory/ranks/army/o6e ranking = 24 pay_multiplier = 4.2 @@ -220,7 +220,7 @@ /datum/paygrade/army/o6c paygrade = PAY_SHORT_AO6C name = "Division Colonel" - prefix = "Div Col." + prefix = "DCL." rank_pin = /obj/item/clothing/accessory/ranks/army/o6c ranking = 25 pay_multiplier = 4.5 @@ -230,7 +230,7 @@ /datum/paygrade/army/o7 paygrade = PAY_SHORT_AO7 name = "Brigadier General" - prefix = "BGen." + prefix = "BG." rank_pin = /obj/item/clothing/accessory/ranks/army/o7 ranking = 26 pay_multiplier = 6 @@ -239,7 +239,7 @@ /datum/paygrade/army/o8 paygrade = PAY_SHORT_AO8 name = "Major General" - prefix = "MajGen." + prefix = "MG." rank_pin = /obj/item/clothing/accessory/ranks/army/o8 ranking = 27 pay_multiplier = 6.1 @@ -248,7 +248,7 @@ /datum/paygrade/army/o9 paygrade = PAY_SHORT_AO9 name = "Lieutenant General" - prefix = "LtGen." + prefix = "LTG." rank_pin = /obj/item/clothing/accessory/ranks/army/o9 ranking = 28 pay_multiplier = 6.2 @@ -257,7 +257,7 @@ /datum/paygrade/army/o10 paygrade = PAY_SHORT_AO10 name = "General" - prefix = "Gen." + prefix = "GEN." rank_pin = /obj/item/clothing/accessory/ranks/army/o10 ranking = 29 pay_multiplier = 6.5 @@ -266,7 +266,7 @@ /datum/paygrade/army/o10c paygrade = PAY_SHORT_AO10C name = "General of the Army" - prefix = "Gen.A" + prefix = "GEN.A" rank_pin = /obj/item/clothing/accessory/ranks/army/o10c ranking = 30 pay_multiplier = 7 diff --git a/code/datums/paygrades/factions/uscm/navy.dm b/code/datums/paygrades/factions/uscm/navy.dm index a8cd3a57a1..0c2c44ae6d 100644 --- a/code/datums/paygrades/factions/uscm/navy.dm +++ b/code/datums/paygrades/factions/uscm/navy.dm @@ -33,7 +33,7 @@ /datum/paygrade/navy/e4 paygrade = PAY_SHORT_NE4 name = "Petty Officer 3rd Class" - prefix = "PO1." + prefix = "PO3." rank_pin = /obj/item/clothing/accessory/ranks/navy/e4 ranking = 3 pay_multiplier = 2.3 @@ -99,7 +99,7 @@ /datum/paygrade/navy/w1 paygrade = PAY_SHORT_NW1 name = "Warrant Officer" - prefix = "WO." + prefix = "WO1." rank_pin = /obj/item/clothing/accessory/ranks/navy/w1 ranking = 11 pay_multiplier = 3.1 //Pay on par with E7 to begin with @@ -107,7 +107,7 @@ /datum/paygrade/navy/w2 paygrade = PAY_SHORT_NW2 name = "Chief Warrant Officer 2" - prefix = "CWO." + prefix = "CWO2." rank_pin = /obj/item/clothing/accessory/ranks/navy/w2 ranking = 12 pay_multiplier = 3.2