Check

code/__DEFINES/job.dm

@@ -257,7 +257,11 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
 #define JOB_UPP_SRLT_OFFICER "UPP Senior Leytenant"
 #define JOB_UPP_KPT_OFFICER "UPP Kapitan"
 #define JOB_UPP_MAY_OFFICER "UPP Mayjor"
+#define JOB_UPP_LTKOL_OFFICER "UPP Leytenant Kolonel"
 #define JOB_UPP_KOL_OFFICER "UPP Kolonel"
+#define JOB_UPP_MAY_GENERAL "UPP Mayjor General"
+#define JOB_UPP_LT_GENERAL "UPP Leytenant General"
+#define JOB_UPP_GENERAL "UPP Army General"
 
 #define JOB_UPP_COMBAT_SYNTH "UPP Combat Synthetic"
 

code/datums/factions/upp.dm

@@ -25,10 +25,20 @@
 			hud_icon_state = "lt"
 		if(JOB_UPP_SRLT_OFFICER)
 			hud_icon_state = "slt"
-		if(JOB_UPP_MAY_OFFICER)
+		if(JOB_UPP_KPT_OFFICER)
 			hud_icon_state = "may"
+		if(JOB_UPP_MAY_OFFICER)
+			hud_icon_state = "kol"
+		if(JOB_UPP_LTKOL_OFFICER)
+			hud_icon_state = "kol"
 		if(JOB_UPP_KOL_OFFICER)
 			hud_icon_state = "kol"
+		if(JOB_UPP_MAY_GENERAL)
+			hud_icon_state = "kol"
+		if(JOB_UPP_LT_GENERAL)
+			hud_icon_state = "kol"
+		if(JOB_UPP_GENERAL)
+			hud_icon_state = "kol"
 		if(JOB_UPP_COMBAT_SYNTH)
 			hud_icon_state = "synth"
 		if(JOB_UPP_COMMANDO)

code/datums/paygrades/factions/upp/upp.dm

@@ -18,16 +18,11 @@
 	paygrade = "UE2"
 	name = "Private First Class"
 	prefix = "PFC."
+	pay_multiplier = 0.2
 
-/datum/paygrade/upp/ue3m
-	paygrade = "UE3M"
-	name = "Korporal Medic"
-	prefix = "Kpl."
-	pay_multiplier = 0.3
-
-/datum/paygrade/upp/ue3s
-	paygrade = "UE3S"
-	name = "Korporal Sapper"
+/datum/paygrade/upp/ue3
+	paygrade = "UE3"
+	name = "Korporal"
 	prefix = "Kpl."
 	pay_multiplier = 0.3
 
@@ -75,56 +70,50 @@
 	prefix = "Lt."
 	pay_multiplier = 1.25
 
-/datum/paygrade/upp/uo1m
-	paygrade = "UO1M"
-	name = "Leytenant Medic"
-	prefix = "Lt. Med."
-	pay_multiplier = 1.25
-
-/datum/paygrade/upp/uo1e
-	paygrade = "UO1E"
+/datum/paygrade/upp/uo2
+	paygrade = "UO2"
 	name = "Senior Leytenant"
 	prefix = "Sr. LT."
 	pay_multiplier = 1.5
 
-
-/datum/paygrade/upp/uo2
-	paygrade = "UO2"
+/datum/paygrade/upp/uo3
+	paygrade = "UO3"
 	name = "Kapitan"
 	prefix = "Kpt."
 	pay_multiplier = 2
 
-/datum/paygrade/upp/uo3
-	paygrade = "UO3"
+/datum/paygrade/upp/uo4
+	paygrade = "UO4"
 	name = "Mayjor."
 	prefix = "May."
 	pay_multiplier = 2.5
 
-/datum/paygrade/upp/uo4
-	paygrade = "UO4"
+/datum/paygrade/upp/uo5
+	paygrade = "UO5"
 	name = "Leytenant Kolonel"
+	prefix = "Lt. Kol."
 	pay_multiplier = 3
 
-/datum/paygrade/upp/uo5
-	paygrade = "UO5"
+/datum/paygrade/upp/uo6
+	paygrade = "UO6"
 	name = "Kolonel"
 	prefix = "Kol."
 	pay_multiplier = 4
 
-/datum/paygrade/upp/uo6
-	paygrade = "UO6"
+/datum/paygrade/upp/uo7
+	paygrade = "UO7"
 	name = "Mayjor General"
-	prefix = "MayGen."
+	prefix = "May. Gen."
 	pay_multiplier = 5
 
-/datum/paygrade/upp/uo7
-	paygrade = "UO7"
+/datum/paygrade/upp/uo8
+	paygrade = "UO8"
 	name = "Leytenant General"
-	prefix = "LtGen."
+	prefix = "Lt. Gen."
 	pay_multiplier = 6
 
-/datum/paygrade/upp/uo8
-	paygrade = "UO8"
+/datum/paygrade/upp/uo9
+	paygrade = "UO9"
 	name = "Army General"
-	prefix = "ArmGen."
+	prefix = "Gen."
 	pay_multiplier = 7

code/datums/skills.dm

@@ -1304,6 +1304,23 @@ UNITED PROGRESSIVE PEOPLES
 		SKILL_JTAC = SKILL_JTAC_EXPERT,
 	)
 
+/datum/skills/upp/kapitan
+	name = "UPP Kapitan"
+	skills = list(
+		SKILL_CQC = SKILL_CQC_SKILLED,
+		SKILL_POLICE = SKILL_POLICE_SKILLED,
+		SKILL_FIREMAN = SKILL_FIREMAN_EXPERT,
+		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
+		SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER,
+		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
+		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
+		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
+		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
+		SKILL_JTAC = SKILL_JTAC_EXPERT,
+	)
+
 /datum/skills/upp/commander
 	name = "UPP Command Officer"
 	skills = list(