UPP Logistics Worker and Political Commissar Addition (#6920)

# About the pull request

This PR adds two new UPP roles for admin events, the UPP Logistics
Technician and the UPP Political Commissar.

The duties of the Logistics Technician are self-evident, however the
duties of the Political Commissar are ill defined. This is intentional
and it is up to a combination of the staff running the event, and the
player, how they want to have the Commissar interact with the UPP
Command Staff, or USCM forces. They are technically considered a
non-combat military personnel, and are not a civilian.

The PR also adds a few bits of organization to the UPP gear preset file.

# Explain why it's good for the game

Adds more options for admins in events. The Logistics Worker can assist
in managning the UPP supply depot/s whereas the Political Officer can
add unique opportunities for roleplay interactions not typically seen.


# Testing Photographs and Procedure

![Screenshot 2024-08-11 14 56
17](https://github.com/user-attachments/assets/e403a058-0c8d-472f-a2f2-d11750a06419)

Left, Logistics Worker
Right, Commissar

# Changelog
:cl:
add: The UPP Logistics Technician has been added as a event role for the
UPP. Their intention is to assist in operating any supply depots and
logistics departments under the control of the UPP, they also possess
engineering and construction skills allowing them to assist in
fortification work as required.
add: The UPP Political Commissar has been added as a event role for the
UPP. They act to ensure the political ideology of the UPP is upheld
within the unit they are attached to. The goals and ranking of this job
are left undefined to add ambiguity as to their ability to influence the
UPP command structure.
/:cl:

---------

Co-authored-by: Steelpoint <[email protected]>

code/__DEFINES/job.dm

@@ -264,6 +264,7 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 #define JOB_UPP_SPECIALIST "UPP Serzhant"
 #define JOB_UPP_LEADER "UPP Master Serzhant"
 #define JOB_UPP_POLICE "UPP Politsiya"
+#define JOB_UPP_SUPPLY "UPP Logistics Technician"
 #define JOB_UPP_LT_OFFICER "UPP Leytenant"
 #define JOB_UPP_LT_DOKTOR "UPP Leytenant Doktor"
 #define JOB_UPP_SRLT_OFFICER "UPP Senior Leytenant"
@@ -291,6 +292,8 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 
 #define JOB_UPP_CREWMAN "UPP Tank Crewman"
 
+#define JOB_UPP_COMMISSAR "UPP Political Commissar"
+
 //-------- CLF --------//
 #define JOB_CLF "CLF Guerilla"
 #define JOB_CLF_ENGI "CLF Field Technician"

code/__DEFINES/paygrade_defs/upp.dm

@@ -43,6 +43,9 @@
 /// UO4, Mayjor
 #define PAY_SHORT_UO4 "UO4"
 
+/// UO4P, Political Commissar
+#define PAY_SHORT_UO4P "UO4P"
+
 /// UO5, Leytenant Kolonel
 #define PAY_SHORT_UO5 "UO5"
 

code/datums/factions/upp.dm

@@ -53,6 +53,10 @@
 			hud_icon_state = "vc"
 		if(JOB_UPP_LT_DOKTOR)
 			hud_icon_state = "doc"
+		if(JOB_UPP_SUPPLY)
+			hud_icon_state = "log"
+		if(JOB_UPP_COMMISSAR)
+			hud_icon_state = "commi"
 	if(hud_icon_state)
 		holder.overlays += image('icons/mob/hud/marine_hud.dmi', H, "upp_[hud_icon_state]")
 

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

@@ -95,6 +95,13 @@
 	pay_multiplier = 2.5
 	officer_grade = GRADE_OFFICER
 
+/datum/paygrade/upp/uo4p
+	paygrade = PAY_SHORT_UO4P
+	name = "Political Commissar"
+	prefix = "Pol."
+	pay_multiplier = 5
+	officer_grade = GRADE_OFFICER
+
 /datum/paygrade/upp/uo5
 	paygrade = PAY_SHORT_UO5
 	name = "Leytenant Kolonel"

code/datums/skills/upp.dm

@@ -83,6 +83,34 @@ UNITED PROGRESSIVE PEOPLES
 		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
 	)
 
+/datum/skills/upp/logistics_technician
+	name = "UPP Logistics Technician"
+	skills = list(
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
+		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
+		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
+		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
+		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
+	)
+
+/datum/skills/upp/commissar
+	name = "UPP Starshy Politruk"
+	skills = list(
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_NOVICE,
+		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
+		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
+		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
+		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
+		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
+		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
+		SKILL_INTEL = SKILL_INTEL_EXPERT,
+	)
+
 /datum/skills/upp/officer
 	name = "UPP Officer"
 	skills = list(

code/modules/cm_marines/marines_consoles.dm

@@ -1115,12 +1115,14 @@ GLOBAL_LIST_EMPTY_TYPED(crewmonitor, /datum/crewmonitor)
 				JOB_UPP_COMMANDO = 22,
 				// 30-39: Security
 				JOB_UPP_POLICE = 31,
+				JOB_UPP_COMMISSAR = 41,
 				// 40-49: MedSci
 				JOB_UPP_LT_DOKTOR = 41,
 				// 50-59: Engineering
 				JOB_UPP_COMBAT_SYNTH = 50,
 				JOB_UPP_CREWMAN = 51,
 				JOB_UPP_SUPPORT_SYNTH = 52,
+				JOB_UPP_SUPPLY = 53,
 				// 60-69: Soldiers
 				JOB_UPP_LEADER = 60,
 				JOB_UPP_SPECIALIST = 61,