From c764fdbd3aca048a6b1a6481b61033f152215f1b Mon Sep 17 00:00:00 2001
From: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>
Date: Sun, 13 Feb 2022 23:17:26 -0700
Subject: [PATCH] [Semi-Modular] Fixes broken HuDs, removes unused Sergeant/CDO
 jobs, SolGov to SolFed, and other job/hud cleanup (#11461)

* Goodbye SolGov, Hello SolFed (also a few Breach Control tweaks)

* Removes Sergeant/CDO (They were already unused)

* HuD fixes/remove Mindshield from NRI (for HuD purposes)

* oops forgot space police trim

* goodbye map landmarks

* remove the catwalk-over-tile mistake i once made

* PDA overrides

* nvm windows are better

* pre-merge #11484

* updates our unique dmi with new syndie icon :)

* better organization/corrections officer icons
---
 .../map_files/Blueshift/BlueShift_middle.dmm  |   6 ---
 .../KiloStation/KiloStation_skyrat.dmm        |  22 +--------
 .../MetaStation/MetaStation_skyrat.dmm        |  14 ++----
 _maps/map_files/NSSJourney/NSSJourney.dmm     |  15 ++----
 code/__DEFINES/atom_hud.dm                    |  23 +++++++++
 code/__DEFINES/jobs.dm                        |  32 ++++++-------
 code/game/machinery/computer/crew.dm          |   7 ++-
 code/modules/antagonists/ert/ert.dm           |   2 +-
 code/modules/events/market_crash.dm           |   2 +-
 .../jobs/job_types/security_officer.dm        |   2 +-
 .../file_system/programs/jobmanagement.dm     |   3 +-
 config/dynamic.json                           |   2 -
 config/jobs.txt                               |   1 -
 .../master_files/code/datums/id_trim/jobs.dm  |   6 +++
 .../datums/id_trim/{solgov.dm => solfed.dm}   |  15 +++---
 .../code/game/objects/items/cards_ids.dm      |  10 ++--
 .../traitor/objectives/kill_pet.dm            |   2 +-
 .../master_files/icons/mob/huds/hud.dmi       | Bin 10993 -> 12355 bytes
 .../master_files/icons/obj/card.dmi           | Bin 6892 -> 6769 bytes
 .../modules/Midroundtraitor/code/event.dm     |   2 +-
 modular_skyrat/modules/admin/code/sooc.dm     |   2 +-
 .../code/alt_job_titles.dm                    |   3 --
 .../culture/faction/faction_generic.dm        |   1 +
 .../customization/modules/jobs/_job.dm        |   6 ---
 .../modules/goofsec/code/department_guards.dm |   5 ++
 .../goofsec/code/sec_clothing_overrides.dm    |  13 ++++++
 .../modules/goofsec/code/sol_fed.dm           |  30 ++++++------
 .../modules/icspawning/code/cards_ids.dm      |   1 +
 .../donator/personal/donator_personal.dm      |  10 ++--
 .../code/trauma_team/truama_team_outfit.dm    |   6 +++
 modular_skyrat/modules/novaya_ert/code/id.dm  |   2 +
 .../modules/novaya_ert/code/outfit.dm         |   3 ++
 .../oneclickantag/code/oneclickantag.dm       |   2 +-
 .../code/antag_restricted_jobs.dm             |   6 ---
 .../pepperball_gun.dm                         |   0
 .../code/junior_officer/junior_officer.dm     |   3 --
 .../junior_officer/junior_officer_clothes.dm  |  30 ------------
 .../code/peacekeeper/peacekeeper_clothing.dm  |  44 ++++++++++++++++++
 .../code/security_sergeant/secseg_clothes.dm  |  13 ------
 tgstation.dme                                 |   7 +--
 40 files changed, 176 insertions(+), 177 deletions(-)
 rename modular_skyrat/master_files/code/datums/id_trim/{solgov.dm => solfed.dm} (54%)
 rename modular_skyrat/modules/sec_haul/code/{junior_officer => guns}/pepperball_gun.dm (100%)
 delete mode 100644 modular_skyrat/modules/sec_haul/code/junior_officer/junior_officer.dm
 delete mode 100644 modular_skyrat/modules/sec_haul/code/junior_officer/junior_officer_clothes.dm
 delete mode 100644 modular_skyrat/modules/sec_haul/code/security_sergeant/secseg_clothes.dm

diff --git a/_maps/map_files/Blueshift/BlueShift_middle.dmm b/_maps/map_files/Blueshift/BlueShift_middle.dmm
index d477e2f1c06..7fcf0917a3a 100644
--- a/_maps/map_files/Blueshift/BlueShift_middle.dmm
+++ b/_maps/map_files/Blueshift/BlueShift_middle.dmm
@@ -80,7 +80,6 @@
 /obj/structure/chair{
 	dir = 4
 	},
-/obj/effect/landmark/start/junior_officer,
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
 	dir = 4
 	},
@@ -13642,7 +13641,6 @@
 /obj/structure/chair{
 	dir = 4
 	},
-/obj/effect/landmark/start/junior_officer,
 /turf/open/floor/iron,
 /area/security/office)
 "eJG" = (
@@ -22435,7 +22433,6 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
-/obj/effect/landmark/start/junior_officer,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 1
 	},
@@ -28311,7 +28308,6 @@
 /turf/open/floor/iron/dark,
 /area/security/brig)
 "kDd" = (
-/obj/effect/landmark/start/junior_officer,
 /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4,
 /turf/open/floor/iron,
 /area/security/brig)
@@ -55104,7 +55100,6 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 8
 	},
-/obj/effect/landmark/start/junior_officer,
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
 	dir = 5
 	},
@@ -60778,7 +60773,6 @@
 	dir = 8
 	},
 /obj/structure/cable,
-/obj/effect/landmark/start/junior_officer,
 /turf/open/floor/iron,
 /area/security/office)
 "xwM" = (
diff --git a/_maps/map_files/KiloStation/KiloStation_skyrat.dmm b/_maps/map_files/KiloStation/KiloStation_skyrat.dmm
index 6a112244cb0..7024d7b4d36 100644
--- a/_maps/map_files/KiloStation/KiloStation_skyrat.dmm
+++ b/_maps/map_files/KiloStation/KiloStation_skyrat.dmm
@@ -30120,23 +30120,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
 /area/hallway/secondary/exit/departure_lounge)
-"cml" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/structure/cable,
-/obj/effect/landmark/start/junior_officer,
-/turf/open/floor/iron,
-/area/security/brig)
 "cmm" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/effect/decal/cleanable/blood/old,
@@ -52736,7 +52719,6 @@
 	},
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment,
-/obj/effect/landmark/start/junior_officer,
 /turf/open/floor/iron,
 /area/security/brig)
 "kuu" = (
@@ -103754,7 +103736,7 @@ cpw
 crL
 crY
 akm
-cml
+cmz
 bYm
 ama
 aiP
@@ -104782,7 +104764,7 @@ cqW
 ctv
 aei
 clo
-cml
+cmz
 bYm
 ama
 aiT
diff --git a/_maps/map_files/MetaStation/MetaStation_skyrat.dmm b/_maps/map_files/MetaStation/MetaStation_skyrat.dmm
index 3e84d3c6499..7bfdc5bb8b4 100644
--- a/_maps/map_files/MetaStation/MetaStation_skyrat.dmm
+++ b/_maps/map_files/MetaStation/MetaStation_skyrat.dmm
@@ -10856,9 +10856,8 @@
 /turf/open/floor/iron/dark,
 /area/security/lockers)
 "ckq" = (
-/obj/structure/lattice/catwalk,
 /obj/structure/window/reinforced/spawner,
-/turf/open/floor/iron/dark/smooth_large,
+/turf/open/floor/catwalk_floor/iron_dark,
 /area/hallway/secondary/entry)
 "cku" = (
 /obj/structure/closet,
@@ -45321,11 +45320,6 @@
 /obj/structure/grille/broken,
 /turf/open/space/basic,
 /area/space/nearstation)
-"nYN" = (
-/obj/structure/cable,
-/obj/effect/landmark/start/junior_officer,
-/turf/open/floor/iron,
-/area/security/brig)
 "nZb" = (
 /obj/machinery/computer/slot_machine{
 	pixel_y = 2
@@ -57053,7 +57047,6 @@
 /obj/machinery/navbeacon/wayfinding,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/landmark/start/junior_officer,
 /turf/open/floor/iron,
 /area/security/brig)
 "slV" = (
@@ -59015,12 +59008,11 @@
 /turf/open/floor/iron,
 /area/engineering/atmos)
 "sWk" = (
-/obj/structure/lattice/catwalk,
 /obj/machinery/camera/directional/west{
 	c_tag = "Arrivals - Aft Arm - Lounge"
 	},
 /obj/structure/window/reinforced/spawner,
-/turf/open/floor/iron/dark/smooth_large,
+/turf/open/floor/catwalk_floor/iron_dark,
 /area/hallway/secondary/entry)
 "sWD" = (
 /obj/machinery/firealarm/directional/west,
@@ -104313,7 +104305,7 @@ mxo
 lIb
 fNA
 eGx
-nYN
+pln
 mFN
 aiq
 azP
diff --git a/_maps/map_files/NSSJourney/NSSJourney.dmm b/_maps/map_files/NSSJourney/NSSJourney.dmm
index 6afabca9544..529a9b81761 100644
--- a/_maps/map_files/NSSJourney/NSSJourney.dmm
+++ b/_maps/map_files/NSSJourney/NSSJourney.dmm
@@ -36983,13 +36983,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/security/office)
-"dSk" = (
-/obj/structure/cable,
-/obj/effect/landmark/start/junior_officer,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/security/brig)
 "dSm" = (
 /obj/structure/cable,
 /obj/machinery/power/apc/auto_name/directional/east,
@@ -89016,7 +89009,7 @@ guI
 frB
 agn
 tbC
-dSk
+aEh
 oKN
 pnU
 snm
@@ -89273,7 +89266,7 @@ kdi
 aii
 agn
 qEg
-dSk
+aEh
 pmL
 vad
 jXa
@@ -89530,7 +89523,7 @@ rDW
 hgP
 adR
 ibI
-dSk
+aEh
 oKN
 pnU
 snm
@@ -89787,7 +89780,7 @@ egw
 xiQ
 czy
 xqA
-dSk
+aEh
 yls
 agj
 agj
diff --git a/code/__DEFINES/atom_hud.dm b/code/__DEFINES/atom_hud.dm
index 9caa2677550..8336af376f6 100644
--- a/code/__DEFINES/atom_hud.dm
+++ b/code/__DEFINES/atom_hud.dm
@@ -117,6 +117,29 @@
 
 #define SECHUD_CHEF "hudchef"
 
+///SKYRAT EDIT ADDITION - (Semi)MODULAR JOBS
+//SR Security
+#define SECHUD_CORRECTIONS_OFFICER "hudcorrectionsofficer"
+#define SECHUD_SECURITY_MEDIC "hudsecuritymedic"
+//SR Departmental Guards
+#define SECHUD_ENGINEERING_GUARD "hudengineeringguard"
+#define SECHUD_ORDERLY "hudorderly"
+#define SECHUD_CUSTOMS_AGENT "hudcustomsagent"
+#define SECHUD_BOUNCER "hudbouncer"
+#define SECHUD_SCIENCE_GUARD "hudscienceguard"
+//SR Nanotrasen
+#define SECHUD_BLUESHIELD "hudblueshield"
+#define SECHUD_NT_REP "hudnanotrasenrepresentative"
+//SR SolFed
+#define SECHUD_SPACE_POLICE "hudspacepolice"
+#define SECHUD_SOLFED "hudsolfed"
+#define SECHUD_SOLFED_LIASON "hudsolfedliasion"
+//SR Misc
+#define SECHUD_BARBER "hudbarber"
+#define SECHUD_VANGUARD_OPERATIVE "hudexpeditionarytrooper"
+#define SECHUD_SCRAMBLED "hudscrambled"
+///SKYRAT EDIT ADDITION END
+
 #define SECHUD_DEATH_COMMANDO "huddeathcommando"
 
 #define SECHUD_EMERGENCY_RESPONSE_TEAM_COMMANDER "hudemergencyresponseteamcommander"
diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm
index 2d7826b98ee..0f1f7ce34e7 100644
--- a/code/__DEFINES/jobs.dm
+++ b/code/__DEFINES/jobs.dm
@@ -50,8 +50,6 @@
 #define JOB_SECURITY_OFFICER_SUPPLY "Security Officer (Cargo)"
 #define JOB_CORRECTIONS_OFFICER "Corrections Officer" // SKYRAT EDIT ADDITION
 #define JOB_SECURITY_MEDIC "Security Medic" // SKYRAT EDIT ADDITION
-#define JOB_SECURITY_SERGEANT "Security Sergeant" // SKYRAT EDIT ADDITION
-#define JOB_CIVIL_DISPUTES_OFFICER "Civil Disputes Officer" // SKYRAT EDIT ADDITION
 //Engineering
 #define JOB_STATION_ENGINEER "Station Engineer"
 #define JOB_ATMOSPHERIC_TECHNICIAN "Atmospheric Technician"
@@ -113,8 +111,8 @@
 // SKYRAT EDIT ADDITION START
 // Off-Station
 #define JOB_SPACE_POLICE "Space Police"
-#define JOB_SOLGOV "SolGov"
-#define JOB_SOLGOV_LIASON "SolGov Liason"
+#define JOB_SOLFED "SolFed"
+#define JOB_SOLFED_LIASON "SolFed Liason"
 // SKYRAT EDIT ADDITION END
 
 
@@ -151,20 +149,18 @@
 #define JOB_DISPLAY_ORDER_EXP_CORPS 31 //SKYRAT EDIT ADDITON
 #define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 32
 #define JOB_DISPLAY_ORDER_WARDEN 33
-#define JOB_DISPLAY_ORDER_SECURITY_SERGEANT 34 //SKYRAT EDIT ADDITON
-#define JOB_DISPLAY_ORDER_DETECTIVE 35
-#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 36
-#define JOB_DISPLAY_ORDER_JUNIOR_SECURITY_OFFICER 37
-#define JOB_DISPLAY_ORDER_SECURITY_MEDIC 38 //SKYRAT EDIT ADDITON
-#define JOB_DISPLAY_ORDER_PRISONER 39
-#define JOB_DISPLAY_ORDER_BRIGOFF 40 //SKYRAT EDIT ADDITON
-#define JOB_DISPLAY_ORDER_NANOTRASEN_REPRESENTATIVE 41 //SKYRAT EDIT ADDITON
-#define JOB_DISPLAY_ORDER_BLUESHIELD 42 //SKYRAT EDIT ADDITON
-#define JOB_DISPLAY_ORDER_ORDERLY 43 //SKYRAT EDIT ADDITION
-#define JOB_DISPLAY_ORDER_SCIENCE_GUARD 44 //SKYRAT EDIT ADDITION
-#define JOB_DISPLAY_ORDER_BOUNCER 45 //SKYRAT EDIT ADDITION
-#define JOB_DISPLAY_ORDER_ENGINEER_GUARD 46 //SKYRAT EDIT ADDITION
-#define JOB_DISPLAY_ORDER_CUSTOMS_AGENT 47 //SKYRAT EDIT ADDITION
+#define JOB_DISPLAY_ORDER_DETECTIVE 34
+#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 35
+#define JOB_DISPLAY_ORDER_SECURITY_MEDIC 36 //SKYRAT EDIT ADDITON
+#define JOB_DISPLAY_ORDER_PRISONER 37
+#define JOB_DISPLAY_ORDER_BRIGOFF 38 //SKYRAT EDIT ADDITON
+#define JOB_DISPLAY_ORDER_NANOTRASEN_REPRESENTATIVE 29 //SKYRAT EDIT ADDITON
+#define JOB_DISPLAY_ORDER_BLUESHIELD 40 //SKYRAT EDIT ADDITON
+#define JOB_DISPLAY_ORDER_ORDERLY 41 //SKYRAT EDIT ADDITION
+#define JOB_DISPLAY_ORDER_SCIENCE_GUARD 42 //SKYRAT EDIT ADDITION
+#define JOB_DISPLAY_ORDER_BOUNCER 43 //SKYRAT EDIT ADDITION
+#define JOB_DISPLAY_ORDER_ENGINEER_GUARD 44 //SKYRAT EDIT ADDITION
+#define JOB_DISPLAY_ORDER_CUSTOMS_AGENT 45 //SKYRAT EDIT ADDITION
 
 #define DEPARTMENT_UNASSIGNED "No department assigned"
 
diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm
index e27967777cd..ad21c404d1d 100644
--- a/code/game/machinery/computer/crew.dm
+++ b/code/game/machinery/computer/crew.dm
@@ -108,10 +108,9 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 		JOB_SECURITY_OFFICER_SCIENCE = 15,
 		JOB_SECURITY_OFFICER_SUPPLY = 16,
 		*/
-		JOB_SECURITY_SERGEANT = 13, // SKYRAT EDIT ADDITION
-		JOB_SECURITY_MEDIC = 14, // SKYRAT EDIT ADDITION
-		JOB_CORRECTIONS_OFFICER = 15, // SKYRAT EDIT ADDITION
-		JOB_DETECTIVE = 17,
+		JOB_SECURITY_MEDIC = 13, // SKYRAT EDIT ADDITION
+		JOB_CORRECTIONS_OFFICER = 14, // SKYRAT EDIT ADDITION
+		JOB_DETECTIVE = 15,
 		// 20-29: Medbay
 		JOB_CHIEF_MEDICAL_OFFICER = 20,
 		JOB_CHEMIST = 21,
diff --git a/code/modules/antagonists/ert/ert.dm b/code/modules/antagonists/ert/ert.dm
index 9e2d27d67c0..6459c0e83fb 100644
--- a/code/modules/antagonists/ert/ert.dm
+++ b/code/modules/antagonists/ert/ert.dm
@@ -282,7 +282,7 @@
 /datum/antagonist/ert/families/greet()
 	. = ..()
 	var/missiondesc
-	missiondesc += "<BR><B><font size=5 color=red>You are NOT a Nanotrasen Employee. You work for Sol Gov.</font></B>"
+	missiondesc += "<BR><B><font size=5 color=red>You are NOT a Nanotrasen Employee. You work for SolFed.</font></B>"
 	missiondesc += "<BR><B><font size=5 color=red>You are NOT a deathsquad. You are here to help innocents escape violence, criminal activity, and other dangerous things.</font></B>"
 	missiondesc += "<BR>You are responding to emergency calls from the station for immediate SolFed Police assistance!\n"
 	missiondesc += "<BR><B>Your Mission</B>:"
diff --git a/code/modules/events/market_crash.dm b/code/modules/events/market_crash.dm
index 6a5360ff616..b18003b2ea9 100644
--- a/code/modules/events/market_crash.dm
+++ b/code/modules/events/market_crash.dm
@@ -20,7 +20,7 @@
 	var/list/poss_reasons = list("the alignment of the moon and the sun",\
 		"some risky housing market outcomes",\
 		"The B.E.P.I.S. team's untimely downfall",\
-		"speculative SolGov grants backfiring",\
+		"speculative SolFed grants backfiring",\
 		"greatly exaggerated reports of Nanotrasen accountancy personnel committing mass suicide") //Skyrat Edit; original was "speculative Terragov grants backfiring"
 	var/reason = pick(poss_reasons)
 	priority_announce("Due to [reason], prices for on-station vendors will be increased for a short period.", "Nanotrasen Accounting Division")
diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm
index 657544c5ce7..6a7916c3ca4 100644
--- a/code/modules/jobs/job_types/security_officer.dm
+++ b/code/modules/jobs/job_types/security_officer.dm
@@ -7,7 +7,7 @@
 	faction = FACTION_STATION
 	total_positions = 8 //Handled in /datum/controller/occupations/proc/setup_officer_positions() // SKYRAT EDIT: SET TO 8, WAS 5
 	spawn_positions = 8 //Handled in /datum/controller/occupations/proc/setup_officer_positions() // SKYRAT EDIT: SEE ABOVE
-	supervisors = "the head of security, and the head of your assigned department (if applicable)"	// SKYRAT EDIT: Adds mention of the security sergeant.
+	supervisors = "the head of security, and the head of your assigned department (if applicable)"
 	selection_color = "#ffeeee"
 	minimal_player_age = 7
 	exp_requirements = 300
diff --git a/code/modules/modular_computers/file_system/programs/jobmanagement.dm b/code/modules/modular_computers/file_system/programs/jobmanagement.dm
index 1d9726d0deb..27a52422a7f 100644
--- a/code/modules/modular_computers/file_system/programs/jobmanagement.dm
+++ b/code/modules/modular_computers/file_system/programs/jobmanagement.dm
@@ -20,8 +20,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 		JOB_HEAD_OF_PERSONNEL,
 		JOB_HEAD_OF_SECURITY,
 		JOB_RESEARCH_DIRECTOR,
-		JOB_SECURITY_SERGEANT, // SKYRAT EDIT ADD START
-		JOB_SECURITY_MEDIC,
+		JOB_SECURITY_MEDIC, // SKYRAT EDIT ADD START
 		JOB_CLOWN,
 		JOB_BLUESHIELD,
 		JOB_NT_REP, // SKYRAT EDIT ADD END
diff --git a/config/dynamic.json b/config/dynamic.json
index fdd1d33e4d6..5f407131d45 100644
--- a/config/dynamic.json
+++ b/config/dynamic.json
@@ -30,8 +30,6 @@
 				"Warden",
 				"Detective",
 				"Security Medic",
-				"Security Sergeant",
-				"Civil Disputes Officer",
 				"Head of Security",
 				"Captain",
 				"Nanotrasen Representative",
diff --git a/config/jobs.txt b/config/jobs.txt
index 0d9a83530e1..ec413fc05b8 100644
--- a/config/jobs.txt
+++ b/config/jobs.txt
@@ -72,7 +72,6 @@ Science Guard=2,2
 # Security
 
 Warden=1,1
-Security Sergeant=1,1
 Detective=2,2
 Security Officer=6,6
 Security Medic=1,1
diff --git a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm
index 64fa7e7903f..9b07e54179c 100644
--- a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm
+++ b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm
@@ -46,6 +46,7 @@
 	assignment = "Blueshield"
 	trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
 	trim_state = "trim_blueshield"
+	sechud_icon_state = SECHUD_BLUESHIELD
 	extra_access = list(ACCESS_SECURITY, ACCESS_BRIG, ACCESS_COURT, ACCESS_CARGO, ACCESS_GATEWAY) // Someone needs to come back and order these alphabetically, this is a nightmare
 	minimal_access = list(
 		ACCESS_FORENSICS_LOCKERS, ACCESS_SEC_DOORS, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_ENGINE, ACCESS_MAINT_TUNNELS, ACCESS_RESEARCH,
@@ -59,6 +60,7 @@
 	assignment = "Nanotrasen Representative"
 	trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
 	trim_state = "trim_nanotrasenrepresentative"
+	sechud_icon_state = SECHUD_NT_REP
 	extra_access = list()
 	minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_WEAPONS,
 				ACCESS_MEDICAL, ACCESS_PSYCHOLOGY, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS,
@@ -75,6 +77,7 @@
 	assignment = "Security Medic"
 	trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
 	trim_state = "trim_securitymedic"
+	sechud_icon_state = SECHUD_SECURITY_MEDIC
 	extra_access = list(ACCESS_FORENSICS_LOCKERS)
 	minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_MECH_SECURITY, ACCESS_MINERAL_STOREROOM,
 	ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP, ACCESS_MAINT_TUNNELS)
@@ -92,6 +95,7 @@
 	assignment = "Vanguard Operative"
 	trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
 	trim_state = "trim_expeditionarytrooper"
+	sechud_icon_state = SECHUD_VANGUARD_OPERATIVE
 	extra_access = list()
 	minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_TELEPORTER, ACCESS_GATEWAY, ACCESS_TECH_STORAGE,
 		ACCESS_CENT_GENERAL, ACCESS_RESEARCH, ACCESS_RND)
@@ -101,6 +105,7 @@
 	assignment = "Corrections Officer"
 	trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
 	trim_state = "trim_brigoff"
+	sechud_icon_state = SECHUD_CORRECTIONS_OFFICER
 	extra_access = list()
 	minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT,
 				ACCESS_MAINT_TUNNELS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP)
@@ -112,6 +117,7 @@
 	assignment = "Barber"
 	trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
 	trim_state = "trim_barber"
+	sechud_icon_state = SECHUD_BARBER
 	extra_access = list()
 	minimal_access = list(ACCESS_THEATRE, ACCESS_MAINT_TUNNELS, ACCESS_BARBER, ACCESS_SERVICE)
 	config_job = "barber"
diff --git a/modular_skyrat/master_files/code/datums/id_trim/solgov.dm b/modular_skyrat/master_files/code/datums/id_trim/solfed.dm
similarity index 54%
rename from modular_skyrat/master_files/code/datums/id_trim/solgov.dm
rename to modular_skyrat/master_files/code/datums/id_trim/solfed.dm
index de8c41f521e..b2c540327cf 100644
--- a/modular_skyrat/master_files/code/datums/id_trim/solgov.dm
+++ b/modular_skyrat/master_files/code/datums/id_trim/solfed.dm
@@ -1,15 +1,18 @@
-/datum/id_trim/solgov
+/datum/id_trim/solfed
 	trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
-	assignment = "SolGov"
-	trim_state = "trim_solgov"
+	assignment = "SolFed"
+	trim_state = "trim_solfed"
+	sechud_icon_state = SECHUD_SOLFED
 
 /datum/id_trim/solgov/New()
 	. = ..()
 	access = SSid_access.get_region_access_list(list(REGION_CENTCOM, REGION_ALL_STATION))
 
-/datum/id_trim/solgov/liasion
-	assignment = "SolGov Liasion"
+/datum/id_trim/solfed/liasion
+	assignment = "SolFed Liasion"
+	sechud_icon_state = SECHUD_SOLFED_LIASON
 
 /datum/id_trim/space_police //Overrides the normal /tg/ ERTSEC Icon, these guys aren't NT!
 	trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
-	trim_state = "trim_solgov"
+	trim_state = "trim_spacepolice"
+	sechud_icon_state = SECHUD_SPACE_POLICE
diff --git a/modular_skyrat/master_files/code/game/objects/items/cards_ids.dm b/modular_skyrat/master_files/code/game/objects/items/cards_ids.dm
index d44bb24ed6d..79ca8499589 100644
--- a/modular_skyrat/master_files/code/game/objects/items/cards_ids.dm
+++ b/modular_skyrat/master_files/code/game/objects/items/cards_ids.dm
@@ -23,9 +23,9 @@
 	. = ..()
 	AddElement(/datum/element/polychromic, list("#666666", "#CCBBAA", "#0000FF"))
 
-//SOLGOV//
-/obj/item/card/id/advanced/solgov
-	name = "solgov identification card"
+//SOLFED//
+/obj/item/card/id/advanced/solfed
+	name = "solfed identification card"
 	icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
-	icon_state = "card_solgov"
-	assigned_icon_state = "assigned_solgov"
+	icon_state = "card_solfed"
+	assigned_icon_state = "assigned_solfed"
diff --git a/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/kill_pet.dm b/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/kill_pet.dm
index 50d5138e449..2364c92de89 100644
--- a/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/kill_pet.dm
+++ b/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/kill_pet.dm
@@ -40,7 +40,7 @@
 	// Emag E-N so it overloads
 	if(istype(target_pet, /mob/living/simple_animal/pet/dog/corgi/borgi))
 		name = "Emag the roboticist's most-prized borgi, E-N"
-		description = "We received an untracable contract from someone addressed 'ianfan2489@solgov.nt', they want the robotic clone of Ian dead- and it has to be dramatic. We will supply you with a cryptographic sequencer from our basic loadout options to shortcircuit E-N's safety, it will give you a single attempt to use it. Oh, and remember to run like hell when you do... "
+		description = "We received an untracable contract from someone addressed 'ianfan2489@solfed.nt', they want the robotic clone of Ian dead- and it has to be dramatic. We will supply you with a cryptographic sequencer from our basic loadout options to shortcircuit E-N's safety, it will give you a single attempt to use it. Oh, and remember to run like hell when you do... "
 		telecrystal_reward = 3 // Because these are more complicated than 'kill the pet', the reward is bigger
 		telecrystal_penalty = 3 // Same cost as an emag on sale
 
diff --git a/modular_skyrat/master_files/icons/mob/huds/hud.dmi b/modular_skyrat/master_files/icons/mob/huds/hud.dmi
index b67aa7e78deabc48fe67219e1cac57d1e9f7e592..d5fa8b0eba0c1bdf21a81c498f6fcc7e63f7c1e3 100644
GIT binary patch
literal 12355
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
T8?7-2_=7yueNc7J_Qn4KQ)c6;

literal 10993
zcmch7cUV(hw`V8<Djfs_=_)EBC{1ZWIu<~xbP$jxMS2V2r5U6Pf+84@E>*ffh=@`|
z>4e^ULg*nRkYo<;H}l<RX1<ww|G4+&d6JyHvd`XU@4d=z{Z`@(^t74I@ty;LKuo$i
z8ipVcRqpAVfew&t%GH{KK(voTjGy{xIQcsGxO)4!dU=9CLD@O)9_wGyWsL3rUFCAc
zOqG%5a_GG3cbBL)5wzwNK5k#jW@ea2S8Ot0^_(0l|E?A`k8M?6yrYwBO}-I0Q57G!
z53Z_=@9j5Bqi?vG^?HACdB>%uF@3USvGpCl{-Huf!#)l?(ew4Lq>X=kv%~Az3Y*7=
zZeOgjxrcjf97gtucq8LyO4MJkck@S0GcN0?ZXE<~1=X1O7MQ%W$;QG-myIQ|=$_a}
zk22tM(nO{ez{8@~_S}z>Cl)?PFsr;mLVWMWeiRT${?^6ga~P05<J{%2siMs1gx`P#
z!4u-~FN|BAmll;{bCTlme#Wg`F`*CZ;L}|b<PXlv%nd6WamyRz4c|9j&^el-<Nk>d
zkWHs*RN7@JhI%;~OH}$@wMoT=SR?Vc30A75-;Q}@KkqiF-O1zd45_?gFjABn!CxOB
z=KJ*B-2>ON{P;Kg_kCIQn7<djZKh2LXB{q)&|z^L@s*&8+`r)`n%<brBOjLb$zt%w
z8+_KQq{orI>u+d<OAKq%;)`y_WGcF~X3`FQ_&kw5)mh7bS@3cC$d(X)x5fJLNxT*F
z_v<^%Zwj^67Yu5By@TzH?Q~6j)ixgFus;p3x2NT@Dp)xu9x*V;+TLcKdasz*xIBdA
zP-MLjpZF#hB7<i4DajQ0oCD=@>_Zs^3<TGhc3J!XGOscE{@|}PdMsOdXhVk4(~E2O
zjh;KBqYjnx-iNi`OFpL+mi5suhQC05#--Rd=Z~&oe@|eFeA3YCTYJnkAJpFFFjl>9
zopPjigGK3@R!>L{L8!g7h75D*8V1ik&MiDpzvy3&rP=>3UXvbvZRXmv7wOx{K}Zg1
zC@oETIjKOEYn)-3{!SvBL!zir=eUK>dbdTwtwO<H1G^cqJ8F(K9EXg4do&&8gGF&~
zayu=gM+Xd_>C%m29pX|F^1dV(ObrKedYH6p7)|L;wO`G}se6oEc}<rl;k5HTr#!~O
zk7Agr$b)!2J-BYNoTODH5-1gN;cL`jSvRD3{YphQR8mfP5-vd6){xnJC|lP??_>0W
z>uTMSlisZaW!Gyp3qq6eA&>~(Csizr8_V78k9j9L+p0&V9YuX;?h$FVXRO88l;`Oa
z(YD0`qm(Eu9GHtS<hzl8f~bad(VJm;>o0F<r0@qrz7qzK^PW%S(;vJTv+@-k-JhS(
zxBSwD6dZy}dV;y+;kUL|x8uw3@?(KNe_B784QswhCQBi2wauQGO!sZC+J?J#&U95Z
za@)QR+^>=!%l!F@fDL<P9+JS&`kmmlBap9LThG{MfVt0)-hJ8rm7`OOnEU*amCOp;
zu5S8B;vKQ2_Pf45YKSVo)J_&hY$Rh#I_Apx->)<Su+sH*Yi4B=B6UsW-8TjXw`s-}
zKgGRRDN=~=|NLc?K086poYQiZi8E;6+7!2GRXhRb^pZeu+mj3$PC#*Ar)mI!gh09)
z_l<+Hu`|#V<CUE4-EA5UNlk`c_9ga|*Wm6OjJKr&#N7kZb{wn*W~$>JCRDR?EKyHP
z-o5(v$RTbzy_*+-G8y?rElz%V)7yIKkD=}le^%49CY?YYro?wYOJaCM%rhUdRcea#
zlk(R#?m<=$PCoVHr=-_NpFa`(;1}E0?kSVP`h5F_XZk`Vu~@8)+fzhHeOY~_%`Jp~
z*dJoD6+Qrs;|_Ds1Fp$c6{TZyh=3P=h{KrzdWi7b+is}-3t?!S+1E*2=J5e$ZJ&^Z
zJ0GKl#uY#QU|LK5s2plowVm<c4>7!=zy?`SQSqFVl$11rX>7{K!YM+W(YVlkF|)+d
zuO1M>AVOO&Xll4}Ze(_L%dE;qLPR9KZNC5pdvWsNyrxD00s*P6KgJGOb{)G4Dqnv&
z^KmV?&<5Hrzk0;d7=G>L40J0*0!M5aOTrBoB|o-mbjB}?V7T}D;G-F>TZKs@y}dWq
zPFi^}4F$F~dxTc-TDC9y7-Hx9`O-1CoJSUN`6oBWn6jL|8yYubxck*=uld<++};oh
zwR%1#a&xM&3cY*Xs7OZzu8#<hci(kb4rXH`%-K#{6%ny*3C)1PE~O?H*&rpItx~4t
z4_CPRQN`Pr9+CQR$kZ>xv%^(z{@e2u<tzNj0=ibH8iL{!M`nHYF@Ywo*Wy-qkj7$7
z#s%4o`e`VI1W4MTo!vj2B!2q$^ztq)7-7EDDeoKwu4Ib~ruY_}RD@v5-Pkt-2($}i
zdQSNQkM?&!=Y7ia=fEg%@^CcJ0=I4k0j&>iH{A(~+{kxL<tzQrT~9zX{bt!o!l>v`
zX|$f7`SAJUt<);Wq1VcJZc<?wb}MuQBSt8eWZGl@k;#Z*$qnd8h~RBs-F_i|kwm)|
zPLAkV7i&6NV7r<Rw~HB12#-A8M$S1NaD-73Qm^I<vQ4q2=-^;oB4HXDeeVsK1=n5K
zH`-Q*_jw2KqjHzSCm)A$)&Ywb7lp6aWcY%ixp(&BZn=L2Mtqy9?`Ph74p^2(=HL79
z4*|ZP$Nb`{XgR}=KKYQr<yZQ35fKwnA+{%9=`I^Gf8;)#5tZC*(H01@D!kk*WA3GD
z_i|F=wUKvr<U<S8Gsro;AFCslqCxg^%5MkzX_BF4HsfPF#d9^^aB@tR4(A$lu&(30
zM%9{b`W>iukrIZXybYb4FH$Fmt7VJq;zvHlR@^>gS#T)xBJujTNPV%r`=fTQQsw{i
z)`pLfIcNHg@9Xc=f$Rp}MT0<6_d!&kN35zK5C<(Q=o>8+?SGZ%F@*HZHq13aa1%<d
z!X!7flW*aA+v<)GQI*K>4zCjM4-5sTnNMd;5fp?vcaPbs>=)c0v#lqMr&J-)QKIzL
zP=e%~@&Zvl@lqJ+!uFvxvL8eoFo%$J-eTvDp&}wa#1TB>Iv)K5Jkn4iSYh2ygtxqK
zgoAxM_5wqcP<w1SMBVy&^w?+RY;+@(Sn#7u5{Y%GLI%zXGH?1TrVt^cmChujTg7a0
zFIgW85y0&Z6T@d1>%yV#W3}N^6Dy>kUVW%y?wq36!CB{I80=(Xcd2HG>4c)t2uF5Y
zzYB^uyGF{@ehLCH@`?%pEougkT_lJa^iC)O1iH%b-!94`694+3m2?nA>NjgWuH@U?
zrt4RbUng=0LBHe7a#Tqxq;jZ;$L3?`)ae%!cH5TJ(9mFv4)pWO-kAfZ6sgdx7l(US
zCHh)J$cIp=?z!XIW@Bzbj}Ua*fpqe<vJbx`YYI*aIBrpxOLHq%DH<X3xs|tRmXfwB
zz7XYI8<FB+KC-6V=VQL-q5<!FpCpi5+7F7%g8$rt{%{oEe339?>sWIEG;(lJbxtvS
z+K&h7%deN80~6#KD<(~NQu5Sa-A#<OkJn}RUrIU_!K;m`B>Z^!hrXL<js9LQ6VAw;
z*GIW16|Y_4+D*#Q3j0(uOSTxUey^3dkOZQ>vz7kPl$c-0d~s&_>fn^9B&p>A=%Y{1
z14^H`qSMI6n(o2jPURmrT*VZ8lt{~(V(-vLED)4;FNMKc+ls=t4n~|-F79^ChM3QW
zY<3ze=6$KyCyigsd_S7p0Dci=0>K<wjySVZr`YFzm~yLBv_R`1$R)%59I0D<lFcW;
zEJjs=9#EMu4Zle*1f>EaeU_@b8hD^!%on~gf%8<}zph9Y+fZ`M0)FWhXTNW{6>XH2
zl%c?mLAE_leQ@kP%Dtg{32i>NM{uU4bsS$`ZTOr|o*!}IGtpMnmC;ts8-_sseEOwx
z?Yt-}hL{i$!C0$8%_5p>l<Begl1a^-mXn`KqvNSNE&Cz#L{+tnT-y5!w{&cquOccW
z)S)HcXyUJww;v4oBT~<1z~fK5&~_-B8w7GmR$V+6J})Ztyq)Tz{A#&A@rZMJ@Q+7n
zf5f@YhCcl6_3?Z?uzp3G|8cDq{8Z8BIWPT}x{?3gOUcB+vVmiS){O`Q8-F<@bh!{3
z$jf&-^d}ws;K)c`!n70`iphz?A=@xnk4742DJb09>>4`;{IYP3VCKC{Tqc26rxcFo
zn#p@VCE{>q9_z-X(AtNd6nO{{8@NsC&_8-voAC?d&ec=eEB6{^oRN&c)wJTq6H7gR
zY+m3y`4PvVsj-~r<g1~vyeDf3T>p`udqmRo2IeJm2zs%xrS5NM0pXzE8ey%W@iDwe
z8mA{@0lrJAe7`q6I%R_H!b8XLA_~Xgkz^EeFYoCCo*b<%`+H>$vE=QXyjrvRaY*1E
zgpl~Z&Ju15dT^OHwVZq_+L*z7lq?jW)~*b+=~F55f&S(`{FO@IcWZ9q*bt4&l=R${
zE`q48&h0p^eEHL8bxlM>@$k|k<!H}<K0q;B@rK?jhW5en1%hgifz7)SXk%Mj;<hqq
z_zE`t?m0v!aOceFBljWQi<D+2OWP!NS%*HqKNtrVJ<?!5oPdt{7Ncm)tRig43};mu
zbaFCT$iEq#1nWNG`&iywb!D4_Uaizk!2+GqC?Njokss{=F-y}2(DO1c1Fjg+IiV1l
z@+&ITY;5%)82!fpP-lmjl3Zf}x7tFk=uP+6f*=<#MLBwKU_XGK%Au{=EXk_M798CV
zjGoRPZ%HJ_C@{2h@KdcIG9_-24wGTY5ufsN_ZW1v*FloDwX(agyXSceY1ju@{whCD
z&p#;i>t+<&z&pv!ifN0)=yENU`wRk)9}f<{7-UO<>BwXcae}cNYC6XZk6M;kKDBdT
z!|L?fe`>3k7SES!*)8~4`dv;hH1bCEBVT0MK$vt0GFA+NY_}E9IP<HBjEV|LoNnSW
zV3DB-;d<5$Pq4fOLnU2{4AXA3?8u`RKiv){uJuC=S?}vAd2?-<g3pZUEaYF*I<pp%
z5Pt4l@tlT6Hr}Q)8>cG>k5q2{DuKJ`{TEKg0OMMX!d2jr{*WSjX{M=~@S<Y-(5Uw;
zAkfagImG|EsQpiK8@w#yQ|qhZx+0GN4D3Dx?ZuI5F2atO`D_f`g7jdaix1F7aH6Y^
zxaNrxTTiIu8M8|6j7A+|&cL6(CrBzZeXuRra^y3(>mIbsukl_;Xss`RYD3}sOCQq4
z5Y`VUnmiRqSFJ#Bwf8H)SvJ@&B>Cu;9XeN#Im|Nf!G3dISqn~E5WNc0AX1qPfkYOq
z=L`^@=CwgcE)1S8Hv}X8pq*yq*a*+jmIhqgVRf2{g5vgqE?y5?_s`?kGG5?cy*(mV
zmo&P@noUqdH9jYY<nyO+p{G!db&s2;c#&9%Z1i=%riE)VN<|*SjJ5=4VP1u-Db_<s
z#WC+E?C30IcQ84oy1yQ;EGmQ+^HjfYe;{he{Qju4(cAqt^=nCI-F4auMfLU90zsOB
z!v+^rQQC7Ojb(z$q$1Z3u-|20^xSFFFT3-5%lOrx4s)MO=5R7t_-p#He9O{kPFBt5
zhd+1LfJ_lh7et5djzxUBsUT9OCuRZ0ET*Z}bS`f96ZT$+?z=XP^m~%-^%0IZH_cz;
zYL%EWh$Heju~@$OW*U%C=+R}`|3={9!p`;{I73}=c+-$#V&eElz*Q8uA6{$-ZI3(?
zhZBSxJb6p(<!(HJcwNf4p4R!`;1CWc##oRFx&T-E`v+NYN&)<ZykPyIR3Cya?j~)7
z?CM)>I4vZ7te*w=0yV`MJ?O`5u|>_x#%PP#>xxD!d1uaZ9qFcB?Lm*0l?ixxd1cDa
z28rVIc6@95ccA_Y@8d85oA=&@Fx<4AUUYtR9AOT@kiZT8ZQzY4XR%7f!(K!wl7X*~
zTm=pKkR7&LFCy~RDgIEqQN87F5e%kF(i*35VFiUnYP?^iJ(gxym*Ox5(mf#ke0vOh
zC@cJ^d-PtWp+<=kE9OLI(l_1O4qdALCHM6FaWeve*wc5X#HZT^E&Sx(azBUrG?j;7
z+9h&*%8@#_Od`3H_+?^ZSk-hzg)iv+5`|Zn-<(`<4G2G;y?e7>OK8yhfu+omhKAgn
zPo4!<)fcIq13cqfZfh>ZZ%3(K<J=CGYacw*Oi4k`d|U1f;1i};r^kb9)-B;i2YP;&
z9l12<-Xt~Ui++;PRKGgA;hr3!MhfC_job2#mwFvQJ$X~x4&|R;U!h<>?((_**)XG|
z@52YeoRyTO=q^qTeX5w_GP9}-V2=xI6cZxeXbEKjX-vz!>*c}06cn4c;f}fAw_Q<t
ziNTP>0Z*(4gXp%4HHNJu<0@Nec1V0uxN+54O?{-Mpb@*4>R`Snmd#-3dR4g<jT`MC
zH_}PWMVPlaV=8U*iGKd2h^OAOp+)w5`ZVO}P3f?(bBF1=4x>f)rI{34hV1}_7<L_>
zbq+k_1ASwL|0g9YvdA}lJh!qRlD}(i`?q<ssov32<w0fps$}-|v`5kZ47DZ5JNIR0
zwbQE7&%s{X|GBruBA|3l3?5cfS6|-)fKkWZ42ieL{QUe0ks#6R$c}1xuUVyw@}Ak3
z6#TkFj6fRR=a}EKeiu_9PBi<M?V2)4XlCLyGvyVXo>>dxv_ZnspB6e?T<l)o+Kv}7
z+_Y#Yfpes0KY<iP8F_an1n;k!dr?O)Totw(KVLiZDUGecbLN-KCe=C7<ZQ`zoAMZ9
z33v^W2>?(IqjdnZ-q5e}C%s(iyn+Jzt*1O70Vj7E1w9zlHbFZRAb0TO;v<umH)9fB
z7rvr9-k??PlGt`B_ytRjG19ElSdVySk)>eu^6c2&b!gDo^LvCv_t0{sQyY2pZ5%})
z7qEPkK#~_cOp@V%8s5NlCGxF_>1AIFJ={!n9WFAN3HX!!pq?Cg=KM*4ZW_Q=>~`{%
zzA^}cKgu(Jfp3X)fTQ)G8etWBZH@l8JLET(q^V@<%%}N{{@=W%)C#62x@c653_W_W
zJz1<Ogs@ZE0|xVU<5HcxQ9EC*e(i-iPu!Kn?x7mz{*OPV%3*XYAeYjtSbnwc8!$Bw
ztW>s~hsB}?it}8|=RsCbLFuZ@rY&Vh?&6e!t&`|?7qRFhoX*WM27XYM7VKd2NLC;E
z(>yy;-Q16s7Ub%{+aSgC!F9X`^Db8TWM(s)@;ni_KZ_de1;AkVXl&mPUPMJ%=0h+3
zZNaZw*nhOHvLTY%xG+SE`$qAm10!!@a!Xe}v&6TcI|6XFUyZY^LULy4RGE385?!m7
zw+{Bbf(%b>S;MP7%)OVk_Hh4+66lVH+L$FX^IbF2yWY;16OF6<>xA))vp4DqQih=Q
zJMHr%FZ((U<mh3A1jmi`G|mUEKmz$~02uF4D<BM}ztNsAOTEZ>DdLgheD<Rqo2x;#
z<|-+v!(LA;@;Ed>RNbvE^Ntc>HzUR7F+3p0$v?8s+Y6P?C_Zg#y7DD_(x^HLSQPvz
z7z@w^r!k%(jrBj0pw8z94Tv>Xt||T`u_LxwZ#0J`6Ytp$9Ji+XD`R@u5yVxj<kdQG
z@lzyAt=Wt9FA)8ix~Cq;<+g(A7pbCczWVpA`Sc{aw{`={@7pG{xHrQ>R0~ofaTA(b
zGq1R7zJAyu*js@OQ6dpn0xB=Oe8?eS<^sLFU3g98A?kIx<s?Krc#c6>2Eg~=mx~%~
zY{4!Qm)O|MDMK&cBc4T#G32dd@>9gu3`&jBc+8T1C9l!hD#4jh4G5I{GqV{(!Gw^2
z{Elec9o)lhJqj^1KC$!<PGwcwl^QazvS7|xuejQ1d|5bp01F`cQ#}6%-DN9E^6xw&
z76<E={HScY{TQ8TW^+;jgJrAWl&|8x(nYKMw0#;CoR?G0sxZ00@ia!CRgFPeqhk#i
z!Vy(&{u!6QVALHP>^<T+N(A=7Sleiu6^vuPee5?@hkj*rzJ9B0CuR%E^+{AnJVUt7
z(-r4IbMAhf$CO+eQ5aSk<lL-F%7cMEr<Df6=B9!T4g&-@<5{ypULBn+j(c?XG1>-f
z>u1<a_yxwX8QjHkkzHRI_${Z6vRc$M5F7p~hi(LodNgqr6dK<!naR48%k(6SUp*%p
z#LjlFWrb#M(M+>GlbH$tc=INu?huT*%4+SmcW1h8HrZr%W0v+Yy>mbJ<DHY=KT^B9
z=0NF)Pp_gff21Z9fxecYRM%1b1Wm)kg8?-Y8(!LIEZ1j-19#^2H7_+*vVdsXW&b~<
z$Fm<W&H6cpk*VfpkBFBLP(<R@R3g-`SJixs9<=Vx&KA5|rfl{Iq3$JGj-de^m_XRo
z)(>n?+z4|p&1OChCjNLL2&8O6#mOHhMNI{mzZ=)|h~j7M`yf!kl}BnN&t!@Av~-|}
zLBFtk-})j&!MSxqik}k(xQp+x$RR(%ADC1{<t){|L(^ohi3fr}bUai5S=J;jDQJC>
zx?*mJ52t_m2otYmf~G7jZI}E_Sv??`OeL3&+2Yz$0pJ5ARECh8bIL}L-$HRj4-b#G
zL?Cb!!C_xy<`9x7t^@oTT&*=Y9?}l$gOf}Zpof-;7I6XOlfat&HKcSI<#*ZkFX^f_
zcT?!v6G_G7$s9V;{V}k3jN1KkF_8;gewHnAV(w$BztP)A+o?56NNq!KKCX708;C*w
zVo5HnImvZ8YoZdU4^$<>{|`z^Yr4iQ{q&6s07-S;RB~|uT;;#w3GD?`S*#T;1eyct
zaL-S>wr<{L5dx{ovHjn4qN7R#D(rcBIe`%#L+{96yK~^A0?aS>FDS8W{A>sx2y}78
z5kYnLrDqQ2CFeqBkTz-I$y_r;Gjsb1c<p@0bIRe*W>SawC_@Rr+4~gd=c_~Loe^Za
zrc)QQvZB`au<hyW=Cdbjn!IRkpA~Df8*dA~el?#~D7LWu(MBSCDw{@?0kp-bBU(t3
zgf)c`UJh<V&nT<~Qg%IEJv}RxO#4YwnV))(pR@>;f0n#eg(5Fhy3rb6;|zeomiGx4
zx%iB(ar#)};<a#vWo?=S4#V!?>u(=CuUGHliR@OB0m;P3X?x}D$uT;cwMrwhgRJZD
zUi$~)p9NvGxAho{=VMdFXW!pqNxC5@;noJ=|F(cN$sy?jhKL2RkO-$;`KxUPrE}9l
z3(~=R%f+AY`0Y9Hl$#}8JcyTWQG4E0G-CZ)_YIJQma6^o+d5@jrNgh1CG73*C>8LK
z?4m1kFOyJoKbZs_@TZs+O-Vm})FGg?r|FE+ef!|b_2pJw5N$@i`iu<5^5ZNgTWy~_
zZP<zG!^GaqDS=6^OKPJFwT|7f$qb^o!u^uFeLfimCM3ZrRB}>t>_dR=S_x}6dH$EC
zmZ}B!y!x^F6p6h`u3hu;5V^8pE$sg5TV8ThdCo`W>3gKSK;q+Q5HFWZae<*N64>%`
z=g^;1+nMW05sTRVi-{47#WRt4yecBuku(vpnVc&22h!<)3JrXFqpk9=;ADJ&p9BLK
z>Vayvn0{}be_W@yS?`~XC9Z2ngQz27jn2ZM$BLN8x)*BaLAg|j!)osL&26j1BQarG
zbyr6X5S1!T>4lp!s2(y&9(6SHHV!#gl6NYO3dSz%h2|ttjv^9{md>69f4Q}b|ITNe
zznC|oWB+##!hq8XzOC)BI&%rEGT;F5xproBfs<cCc5?F`!0+<v@Z>%Es6;4b)p)XN
zfL2b>P!p0}bnZM|LBt!qw^w3@+*$DaTEbzx8wVd4fK**wOG)+9U!0YEKV{vHU^^;8
zAfB2-;A~qO?Od04*Z{k<(>X6ay;wZQs~n~QSP0J^a2>05bh-;tj#m&HekIY#rxDvu
z=iI{nWJjA1(PMAfmML!jEa0KOu}WY1{`bBJyOz94W+<Kq`rSZMoY$?kb=5$pzZ=tt
zB^i1DPdYVvUxlzA1p?_9AuFlA`d4Z{AY5r%TZ=9(Sl?4d1BY3mf-NTPcGZl87nIfG
zK4s-cShoo1lY$${=bS-*hxC8g+xiV4vNOd0)1dH6=On)mkku+rE&&<`m=wwjDQP@9
z=80tJhqkTXXuR5w>^1YOpG@|vZ?IXmotb*yv{hGY84DqW+tS=vZcTqsDAQON*k)%6
z_ER8yN?TohPGVxnN$#B**=AR;lg^_t<(j;NG~oa~epdUe_nB45--qzg$uJ$i4lL@8
z$`8oY25FL_s#Z75bX@UKD|$^Bou}$5L#WpKEoGCR$G3!L7r1<E@Py>RrqoncsgW2x
z=(KEcPoAP}#q_T%{W4UtS5$2H8H1B<eFR6+C4y{xNubJZzz6?tc{9KGy$=XUA7hO;
zJj(7L{m>4-icOA{T2L(4P(1z&GPrw&3qT%piJ(gZ4BgA?;9om2fDhWFZYm4+Rf46z
zkJe9L=oSkhb!jXUSz_fY2DRZ+xvUWox)j^RoRyoo*^+mA%~egXl$W?AUR*v_vQuEJ
z1mKYUMx6Ifv=wY8`)O$zA+0P7AjZ)wI-vYB)vR*L1GQ`Kg8nlqIzJ-X-tc|f*|&cG
z_NdSfdVR{cjTLKV_WN-;g`P#Fy|IniH%yp6#eVLsd3d`tn1d~Kstqqd=xk($VZx9w
zm=bX}xj;Y-+5D`MGCu4jR(aeb*2$sPafyo7@m=WZvH*XC7eO+$5dXTnMT9T2fEP5i
z&wVuA0DWj>mW?aEQ@eAMN+#juIc8NBFanM7*+Mjyjkw)&4p>~m%<1E0rgs@>N_N&L
zU%S81uOI{91%}&OEaZ=Vp2wL#{B55en7=Qrxlj%0`^CVYluHsUO0%-(?j7bT1yip3
zEI>~Xu+}m|B#NQLiFj;+?qD7RD0A`V7KrD9OYmMYxpMF6y)cc}ACeyQL9dLuOQq=r
zgl~(#;uy<;5T6DwjeT@i?cf1cVl_CEGk&&!U!}bu&H5SSyYrFnY^bXTqU8BG>?AG-
z4W%7vtN^oWW=@;a-h+D<+gl5&l4Sm=?t6f`8_t0M5^6iSO@U+qwyct>u4ED7k4s}^
zo*{frXjzq6dA#wJsb+Q9t)4dzftq5?9NEQ>mTE)AZnDTR0I*2M>`DaC*KMW!<yiJ}
zcF?W|YayFz3I7~j{Gpjglp*PI6u+(pRPIDjbL~V`{adq2#DQ$wWkHDLnTWSPJPcky
z7v*?zBFn~H%d_#GQo?rDf)Pn<B15dj;p4HL<FV_mQg(dX0QxaH{VzaSh~M}ir5HTs
z157>8F?Ksw<d6GR(pf41Q~BW(m@M7TN#Q&&@$0_@Fcq-?ydnmP-q6tS>U>(Epqt#K
zEk5Y35H*7;P>>(vxd1V`UQhzZ5&=p>3<Yj=-{0{<;y*$!Qp{L)&#-x!RGE_61j_2$
zsv0z)&kJF5<~E0l4!z<R4s}Ze(OLju6CTD_GeS0y4=H;>fk?pjkd*gcq1y-wsXwg6
zjQ~gtU7?0k^@m_Vt=HiX9W?HwWYOgOmKwnJ9KV1wbptHr+Kpbz>{;_)LD<M=SgqYd
zhcR=nNChDKR{dUH<FY2OHFiu5HLTbPI*@bC(V>W4ik`oI*KG8xTTiI1iDWpmDV|=h
z{T_}4_bc-_xzhOS=%J@c72hG`#FR!fH-T@x9^Rg$^GWR~PBsLMr7%&nD_GH35?B|f
z$wL)q{OU_a(7HAYEszGVCd|6k@={%?w|1v+sIE6!<j2o`&$Yq55hx2(jvv%Fw2mLv
zM-?OPp2>U+B(TVsC+ZdbF75^RamHn1tGcCHMk;X>e;e+4lNPHo?)gjJzH`IX(tT(e
z#pA4jl-L4;U%}hu#S4busZ-AI1L#-NEcLYz3yGUzIUyKqxUIiC$&=UZj6s$x)kvqT
z(81@%_@lv<5UUTRfjm1s^r{Y`5d&rI36IdS!V4O+ff`4k#AJ{foQ_uwx49Gg;cS=L
zO^`ZY?fe~2sqK{wjI;Zn^ms}*wC#ql>#8-BLNUm1BqHi*RGWFI@`?&D3R&BKF8)4F
zx{IS@<fmojMcIMR3YY79^@2udhO31|5()l{SvacoC0^Fg1q7SyzrwCGnm|Ay3_>v2
z7A&_4qr(OKDjH#MdtAS9E18^4tf^#C<sOR|P*-+-!?a2{ZPJSh9Z0>C^nZ9~yl<{q
z1;n2aVPI5IWnF^bmT`lCHbf!@irbUa(4)JSWArJ^)C@F3W;`y4<gU*u5kw#ke}nZ7
z$Zub@XQ%#mYFa=Ys;U2;<gun>jm`mzqOtZE;=BDY+;@S)3_Sw&f%uSa&!PUU6vg{D
zCwduWTc2lCNCpZjKtalXc=6E*$sA1KGrLFG!-zP4yupq@><ao#!f{0N)n)44n(DAF
zXyJ*1cVHkEFBo?O)x+z)`<p=T?fvjP9V0pY<Q5^|I!SN78`qaia2cb!IXzP^Jly+t
zok*>*adrc|yUWGKb`K~$iHMvQpMYxBhO>gvc67!+szpLCXOfiZ0giP-T<$22L+mxI
zTfKL+d&RxM6onwHekgr4Fnyd2UHr9$Y+0Yn?VOv#Rs<5Owwtv+wuFR^?nBAe(kq83
zMI$KLEPR5%M`?e!Vf)J|3p|B5IqBErlF)A?i6b{puGAJ9T59}8ce#$NC6=Uxnzz_`
zC~6d(d}3M1zZI<?X5K>x{FA;`Icqb@X8s=9k%pEPw2&+I;mfH1L0PS%&~^9<K*$~U
zbte0iOhTgd86q=n$4Uj==qGXNh}C}LXQxD>xxCt8rZ#{kMcKd3S>7$Q133MA)F$=b
zflebvvnd;&g*msqd4;2ITD3iQccLxeR}*=*-zYZIPXXpGw?MHfOt^IMQD2Xa(jr|p
zFM<1uI{GZ9TSm7`l_o`ek_<0P`ev~nQQqOaFTwp8_3+$>_0qdc_9G5*)bi|FAYs4n
z6|gOaYr0%ocINV*#!{YKqSCZILg%RR>;eTOMET_nm>GsMK?i@m@u(tWy`;-+xz;td
z%8F)41yrMS2ET_fyocpdz99BVkvfhJe#mgsLa~`CA!2Cka$2aK3IOY-ujUBBkn<g+
zuUCEwz5W<r#0VD(XR|Qk+5O=qtEsLNdf*@tJ}Ge%JTv(|1Ut}k^-RQ}>^q@p=w|N*
zlAJavC`J7MzCRm({B9qp<KDSP`n%%v^t8^TxUpOQsKbWfw6<iF(yt^-x@b4z%ynsw
po))B4BcK}g?;6B^>>nj3(7oSNA@>V3@<G5$S5r@;Qq3;%e*iZ9)^h*=

diff --git a/modular_skyrat/master_files/icons/obj/card.dmi b/modular_skyrat/master_files/icons/obj/card.dmi
index f7e6ee04953d925300971ba32c2b922ddf57b2d8..0b5ad5e7ae5ef2e4a4ab7b18f7f42f8c8ca6b810 100644
GIT binary patch
literal 6769
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
VGtq>^!r%WWnHZWI)al)b{tvI|%+&w@

literal 6892
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
E3tE`ovj6}9

diff --git a/modular_skyrat/modules/Midroundtraitor/code/event.dm b/modular_skyrat/modules/Midroundtraitor/code/event.dm
index 2bfede9276e..66c24838962 100644
--- a/modular_skyrat/modules/Midroundtraitor/code/event.dm
+++ b/modular_skyrat/modules/Midroundtraitor/code/event.dm
@@ -2,7 +2,7 @@
 	name = "Lone Infiltrator"
 	antag_datum = /datum/antagonist/traitor/infiltrator
 	antag_flag = ROLE_LONE_INFILTRATOR
-	restricted_roles = list(JOB_CYBORG, JOB_AI, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_HEAD_OF_SECURITY, JOB_CAPTAIN, JOB_CORRECTIONS_OFFICER, JOB_VANGUARD_OPERATIVE, JOB_NT_REP, JOB_BLUESHIELD, JOB_CIVIL_DISPUTES_OFFICER, JOB_SECURITY_SERGEANT, JOB_ORDERLY, JOB_BOUNCER, JOB_CUSTOMS_AGENT, JOB_ENGINEERING_GUARD, JOB_SCIENCE_GUARD) //SKYRAT EDIT - Sec_haul
+	restricted_roles = list(JOB_CYBORG, JOB_AI, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_HEAD_OF_SECURITY, JOB_CAPTAIN, JOB_CORRECTIONS_OFFICER, JOB_VANGUARD_OPERATIVE, JOB_NT_REP, JOB_BLUESHIELD, JOB_ORDERLY, JOB_BOUNCER, JOB_CUSTOMS_AGENT, JOB_ENGINEERING_GUARD, JOB_SCIENCE_GUARD) //SKYRAT EDIT - Sec_haul
 	required_candidates = 1
 	weight = 5 //Slightly less common than normal midround traitors.
 	cost = 15 //But also slightly more costly.
diff --git a/modular_skyrat/modules/admin/code/sooc.dm b/modular_skyrat/modules/admin/code/sooc.dm
index e428eb81ef4..2e32a2bf27f 100644
--- a/modular_skyrat/modules/admin/code/sooc.dm
+++ b/modular_skyrat/modules/admin/code/sooc.dm
@@ -16,7 +16,7 @@ GLOBAL_LIST_EMPTY(ckey_to_sooc_name)
 	if(!mob)
 		return
 
-	var/static/list/job_lookup = list(JOB_CAPTAIN=TRUE, JOB_HEAD_OF_SECURITY=TRUE, JOB_WARDEN=TRUE, JOB_DETECTIVE=TRUE, JOB_SECURITY_OFFICER=TRUE, JOB_CORRECTIONS_OFFICER=TRUE, JOB_SECURITY_MEDIC=TRUE, JOB_SECURITY_SERGEANT=TRUE, JOB_CIVIL_DISPUTES_OFFICER=TRUE, JOB_BLUESHIELD=TRUE, JOB_ENGINEERING_GUARD=TRUE, JOB_ORDERLY=TRUE, JOB_SCIENCE_GUARD=TRUE, JOB_CUSTOMS_AGENT=TRUE, JOB_BOUNCER=TRUE)
+	var/static/list/job_lookup = list(JOB_CAPTAIN=TRUE, JOB_HEAD_OF_SECURITY=TRUE, JOB_WARDEN=TRUE, JOB_DETECTIVE=TRUE, JOB_SECURITY_OFFICER=TRUE, JOB_CORRECTIONS_OFFICER=TRUE, JOB_SECURITY_MEDIC=TRUE, JOB_BLUESHIELD=TRUE, JOB_ENGINEERING_GUARD=TRUE, JOB_ORDERLY=TRUE, JOB_SCIENCE_GUARD=TRUE, JOB_CUSTOMS_AGENT=TRUE, JOB_BOUNCER=TRUE)
 	if(!holder)
 		var/job = mob?.mind.assigned_role.title
 		if(!job || !job_lookup[job])
diff --git a/modular_skyrat/modules/alternative_job_titles/code/alt_job_titles.dm b/modular_skyrat/modules/alternative_job_titles/code/alt_job_titles.dm
index d014a040a6c..b7618f63814 100644
--- a/modular_skyrat/modules/alternative_job_titles/code/alt_job_titles.dm
+++ b/modular_skyrat/modules/alternative_job_titles/code/alt_job_titles.dm
@@ -146,9 +146,6 @@
 /datum/job/security_officer
 	alt_titles = list("Security Officer", "Security Operative", "Peacekeeper")
 
-/datum/job/security_sergeant
-	alt_titles = list("Security Sergeant", "Security Squad Leader", "Security Task Force Leader", "Security Fireteam Leader", "Security Enforcer") //why are these all so edgy, you're a mall cop
-
 /datum/job/shaft_miner
 	alt_titles = list("Shaft Miner", "Excavator", "Spelunker", "Drill Technician", "Prospector")
 
diff --git a/modular_skyrat/modules/customization/modules/culture/faction/faction_generic.dm b/modular_skyrat/modules/customization/modules/culture/faction/faction_generic.dm
index 8f65347022e..dfdbfaeaa96 100644
--- a/modular_skyrat/modules/customization/modules/culture/faction/faction_generic.dm
+++ b/modular_skyrat/modules/customization/modules/culture/faction/faction_generic.dm
@@ -18,6 +18,7 @@
 	technology, means their installations are often considered unsafe and hazardous."
 	economic_power = 1.2
 
+//To-Do: change to SolFed
 /datum/cultural_info/faction/solgov
 	name = "Sol Central Government"
 	description = "The Sol Central Government, commonly referred to as SolGov or the SCG, is a federal republic \
diff --git a/modular_skyrat/modules/customization/modules/jobs/_job.dm b/modular_skyrat/modules/customization/modules/jobs/_job.dm
index 6496c048ce4..8d02a4937ee 100644
--- a/modular_skyrat/modules/customization/modules/jobs/_job.dm
+++ b/modular_skyrat/modules/customization/modules/jobs/_job.dm
@@ -58,15 +58,9 @@
 /datum/job/warden
 	banned_quirks = list(SEC_RESTRICTED_QUIRKS)
 
-/datum/job/security_sergeant
-	banned_quirks = list(SEC_RESTRICTED_QUIRKS)
-
 /datum/job/security_medic
 	banned_quirks = list(SEC_RESTRICTED_QUIRKS)
 
-/datum/job/junior_officer
-	banned_quirks = list(SEC_RESTRICTED_QUIRKS)
-
 /datum/job/blueshield
 	banned_quirks = list(SEC_RESTRICTED_QUIRKS)
 
diff --git a/modular_skyrat/modules/goofsec/code/department_guards.dm b/modular_skyrat/modules/goofsec/code/department_guards.dm
index de5b7ee4280..8b5ece9b543 100644
--- a/modular_skyrat/modules/goofsec/code/department_guards.dm
+++ b/modular_skyrat/modules/goofsec/code/department_guards.dm
@@ -124,6 +124,7 @@
 	assignment = "Orderly"
 	trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
 	trim_state = "trim_orderly"
+	sechud_icon_state = SECHUD_ORDERLY
 	extra_access = list(ACCESS_SEC_DOORS, ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM)
 	minimal_access = list(ACCESS_SEC_DOORS, ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM)
 	config_job = "orderly"
@@ -191,6 +192,7 @@
 	assignment = "Science Guard"
 	trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
 	trim_state = "trim_calhoun"
+	sechud_icon_state = SECHUD_SCIENCE_GUARD
 	extra_access = list(ACCESS_SEC_DOORS, ACCESS_ROBOTICS, ACCESS_RND, ACCESS_ORDNANCE, ACCESS_ORDNANCE_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY,
 					ACCESS_MECH_SCIENCE, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE, ACCESS_GENETICS, ACCESS_AUX_BASE)
 	minimal_access = list(ACCESS_SEC_DOORS, ACCESS_ROBOTICS, ACCESS_RND, ACCESS_ORDNANCE, ACCESS_ORDNANCE_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY,
@@ -266,6 +268,7 @@
 	assignment = "Bouncer"
 	trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
 	trim_state = "trim_bouncer"
+	sechud_icon_state = SECHUD_BOUNCER
 	extra_access = list(ACCESS_SEC_DOORS, ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM, ACCESS_THEATRE)
 	minimal_access = list(ACCESS_SEC_DOORS, ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM, ACCESS_THEATRE, ACCESS_SERVICE)
 	config_job = "bouncer"
@@ -333,6 +336,7 @@
 	assignment = "Customs Agent"
 	trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
 	trim_state = "trim_customs"
+	sechud_icon_state = SECHUD_CUSTOMS_AGENT
 	extra_access = list(ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM)
 	minimal_access = list(ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM)
 	config_job = "customs_agent"
@@ -400,6 +404,7 @@
 	assignment = "Engineering Guard"
 	trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
 	trim_state = "trim_engiguard"
+	sechud_icon_state = SECHUD_ENGINEERING_GUARD
 	extra_access = list(ACCESS_SEC_DOORS, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_MECH_ENGINE, ACCESS_AUX_BASE,
 					ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_TCOMSAT, ACCESS_MINERAL_STOREROOM)
 	minimal_access = list(ACCESS_SEC_DOORS, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_MECH_ENGINE, ACCESS_AUX_BASE,
diff --git a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm
index 262f08a46a2..92d1fef78d5 100644
--- a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm
+++ b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm
@@ -467,3 +467,16 @@
 	if(H.jumpsuit_style == PREF_SKIRT)
 		to_chat(H, span_alertwarning("Lopland Peacekeeper uniforms don't include a Skirt variant! You've been equipped with a jumpsuit instead."))
 		uniform = /obj/item/clothing/under/rank/security/officer
+
+//PDA Greyscale Overrides
+/obj/item/pda/security
+	greyscale_colors = "#2B356D#1E1E1E"
+
+/obj/item/pda/detective
+	greyscale_colors = "#90714F#1E1E1E"
+
+/obj/item/pda/warden
+	greyscale_colors = "#2F416E#1E1E1E#ACACAC"
+
+/obj/item/pda/heads/hos
+	greyscale_colors = "#2B356D#1E1E1E"
diff --git a/modular_skyrat/modules/goofsec/code/sol_fed.dm b/modular_skyrat/modules/goofsec/code/sol_fed.dm
index 35d4cbc1970..e806533b03c 100644
--- a/modular_skyrat/modules/goofsec/code/sol_fed.dm
+++ b/modular_skyrat/modules/goofsec/code/sol_fed.dm
@@ -172,6 +172,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
 			var/obj/item/gangster_cellphone/phone = new() // biggest gang in the city
 			phone.gang_id = cell_phone_number
 			phone.name = "[cell_phone_number] branded cell phone"
+			phone.w_class = WEIGHT_CLASS_SMALL	//They get that COMPACT phone hell yea
 			var/phone_equipped = phone.equip_to_best_slot(cop)
 			if(!phone_equipped)
 				to_chat(cop, "Your [phone.name] has been placed at your feet.")
@@ -315,14 +316,14 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
 	belt = /obj/item/gun/energy/disabler
 	r_pocket = /obj/item/lighter
 	l_pocket = /obj/item/restraints/handcuffs
-	id = /obj/item/card/id/advanced/solgov
+	id = /obj/item/card/id/advanced/solfed
 	backpack_contents = list(/obj/item/storage/box/survival = 1,
 		/obj/item/storage/box/handcuffs = 1,
 		/obj/item/melee/baton/security/loaded = 1,
 		/obj/item/solfed_reporter/swat_caller = 1,
 		/obj/item/beamout_tool = 1)
 
-	id_trim = /datum/id_trim/solgov
+	id_trim = /datum/id_trim/solfed
 
 /datum/antagonist/ert/request_911/atmos
 	name = "Breach Control Technician"
@@ -336,23 +337,23 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
 	uniform = /obj/item/clothing/under/rank/engineering/engineer/hazard
 	shoes = /obj/item/clothing/shoes/workboots
 	ears = /obj/item/radio/headset/headset_eng
-	head = /obj/item/clothing/head/hardhat/red
 	mask = /obj/item/clothing/mask/gas/atmos
 	belt = /obj/item/storage/belt/utility/full
 	suit_store = /obj/item/tank/internals/oxygen/yellow
-	id = /obj/item/card/id/advanced/solgov
+	id = /obj/item/card/id/advanced/solfed
+	l_pocket = /obj/item/extinguisher/mini
 	backpack_contents = list(/obj/item/storage/box/survival = 1,
-		/obj/item/extinguisher = 2,
+		/obj/item/extinguisher = 1,
 		/obj/item/storage/box/smart_metal_foam = 2,
 		/obj/item/solfed_reporter/swat_caller = 1,
 		/obj/item/beamout_tool = 1)
-	id_trim = /datum/id_trim/solgov
+	id_trim = /datum/id_trim/solfed
 
 //////////////////////////////
 /// Breach Control MODsuit ///
 /obj/item/mod/control/pre_equipped/atmospheric/breach_control //Just a different kit as 811 wont be raiding Robotics; otherwise the same look (For now???)
 	theme = /datum/mod_theme/atmospheric
-	ui_theme = "neutral"	//Le yellow Sol
+	theme = /datum/mod_theme/atmospheric/breach_control
 	applied_cell = /obj/item/stock_parts/cell/super
 	initial_modules = list(
 		/obj/item/mod/module/storage/large_capacity,
@@ -363,6 +364,9 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
 		/obj/item/mod/module/tether,
 		/obj/item/mod/module/visor/meson,
 	)
+
+/datum/mod_theme/atmospheric/breach_control	//Implement a unique skin for this eventually
+	ui_theme = "neutral"	//Le yellow Sol
 //////////////////////////////
 //////////////////////////////
 
@@ -379,7 +383,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
 	shoes = /obj/item/clothing/shoes/sneakers/white
 	ears = /obj/item/radio/headset/headset_med
 	head = /obj/item/clothing/head/soft/paramedic
-	id = /obj/item/card/id/advanced/solgov
+	id = /obj/item/card/id/advanced/solfed
 	suit =  /obj/item/clothing/suit/toggle/labcoat/paramedic
 	gloves = /obj/item/clothing/gloves/color/latex/nitrile
 	belt = /obj/item/storage/belt/medical/paramedic
@@ -390,7 +394,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
 		/obj/item/solfed_reporter/swat_caller = 1,
 		/obj/item/beamout_tool = 1)
 
-	id_trim = /datum/id_trim/solgov
+	id_trim = /datum/id_trim/solfed
 
 /datum/antagonist/ert/request_911/condom_destroyer
 	name = "Armed S.W.A.T. Officer"
@@ -426,7 +430,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
 	suit = /obj/item/clothing/suit/armor/riot
 	r_pocket = /obj/item/lighter
 	l_pocket = /obj/item/restraints/handcuffs
-	id = /obj/item/card/id/advanced/solgov
+	id = /obj/item/card/id/advanced/solfed
 	l_hand = /obj/item/gun/ballistic/shotgun/riot
 	backpack_contents = list(/obj/item/storage/box/survival = 1,
 		/obj/item/storage/box/handcuffs = 1,
@@ -435,7 +439,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
 		/obj/item/solfed_reporter/treason_reporter = 1,
 		/obj/item/beamout_tool = 1)
 
-	id_trim = /datum/id_trim/solgov
+	id_trim = /datum/id_trim/solfed
 
 /datum/antagonist/ert/request_911/treason_destroyer
 	name = "Sol Federation Military"
@@ -471,14 +475,14 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
 	glasses = /obj/item/clothing/glasses/sunglasses
 	ears = /obj/item/radio/headset/headset_sec/alt
 	l_pocket = /obj/item/restraints/handcuffs
-	id = /obj/item/card/id/advanced/solgov
+	id = /obj/item/card/id/advanced/solfed
 	r_hand = /obj/item/gun/ballistic/automatic/assault_rifle/m16
 	backpack_contents = list(/obj/item/storage/box/handcuffs = 1,
 		/obj/item/melee/baton/security/loaded = 1,
 		/obj/item/ammo_box/magazine/m16 = 4
 	)
 
-	id_trim = /datum/id_trim/solgov
+	id_trim = /datum/id_trim/solfed
 
 /obj/item/solfed_reporter
 	name = "SolFed Reporter"
diff --git a/modular_skyrat/modules/icspawning/code/cards_ids.dm b/modular_skyrat/modules/icspawning/code/cards_ids.dm
index 7a4c2edff7e..35911a7c0ca 100644
--- a/modular_skyrat/modules/icspawning/code/cards_ids.dm
+++ b/modular_skyrat/modules/icspawning/code/cards_ids.dm
@@ -12,3 +12,4 @@
 	assignment = "Bluespace Technician"
 	trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
 	trim_state = "trim_bluespacetech"
+	sechud_icon_state = SECHUD_SCRAMBLED
diff --git a/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm b/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm
index 6ffddf6da7c..dece7e71ffb 100644
--- a/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm
+++ b/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm
@@ -73,13 +73,13 @@
 	name = "Peacekeeper jacket"
 	item_path = /obj/item/clothing/suit/armor/vest/warden/rax
 	ckeywhitelist = list("raxraus")
-	restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER,JOB_CIVIL_DISPUTES_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_SERGEANT, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER)
+	restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER)
 
 /datum/loadout_item/under/jumpsuit/rax_banded_uniform
 	name = "Banded Uniform"
 	item_path = /obj/item/clothing/under/rank/security/rax
 	ckeywhitelist = list("raxraus")
-	restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER,JOB_CIVIL_DISPUTES_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_SERGEANT, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER)
+	restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER)
 
 /datum/loadout_item/suit/rax_aerostatic_jacket
 	name = "Navy Aerostatic Jacket"
@@ -105,19 +105,19 @@
 	name = "HepUnit Standard Helmet"
 	item_path = /obj/item/clothing/head/helmet/sec/peacekeeper/jax
 	ckeywhitelist = list("candlejax")
-	restricted_roles = list(JOB_VANGUARD_OPERATIVE,JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER,JOB_CIVIL_DISPUTES_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_SERGEANT, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER)
+	restricted_roles = list(JOB_VANGUARD_OPERATIVE,JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER)
 
 /datum/loadout_item/head/emissionhelm
 	name = "Emission's Helmet"
 	item_path = /obj/item/clothing/head/helmet/space/plasmaman/candlejax
 	ckeywhitelist = list("candlejax")
-	restricted_roles = list(JOB_SHAFT_MINER,JOB_VANGUARD_OPERATIVE,JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER,JOB_CIVIL_DISPUTES_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_SERGEANT, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER)
+	restricted_roles = list(JOB_SHAFT_MINER, JOB_VANGUARD_OPERATIVE, JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER)
 
 /datum/loadout_item/under/jumpsuit/emissionsuit
 	name = "Emission's Suit"
 	item_path = /obj/item/clothing/under/plasmaman/security/candlejax
 	ckeywhitelist = list("candlejax")
-	restricted_roles = list(JOB_SHAFT_MINER,JOB_VANGUARD_OPERATIVE,JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER,JOB_CIVIL_DISPUTES_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_SERGEANT, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER)
+	restricted_roles = list(JOB_SHAFT_MINER, JOB_VANGUARD_OPERATIVE, JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER)
 
 /datum/loadout_item/head/avipilot
 	name = "Smuggler's Flying Cap"
diff --git a/modular_skyrat/modules/modular_ert/code/trauma_team/truama_team_outfit.dm b/modular_skyrat/modules/modular_ert/code/trauma_team/truama_team_outfit.dm
index 03c8df9648c..e7adf45e4ea 100644
--- a/modular_skyrat/modules/modular_ert/code/trauma_team/truama_team_outfit.dm
+++ b/modular_skyrat/modules/modular_ert/code/trauma_team/truama_team_outfit.dm
@@ -50,8 +50,14 @@
 	new /obj/item/weaponcell/medical/utility/temperature(src)
 	new /obj/item/weaponcell/medical/utility/bed(src)
 
+/datum/id_trim/centcom/ert/medical/ntrauma
+	assignment = "Trauma Team Specialist"
+	trim_state = "trim_highcleric"	//This is the CMO trim for the RPG Titles; considering its 'angelic' sprite, its fitting for these guardian angels
+	sechud_icon_state = SECHUD_SCRAMBLED
+
 /obj/item/card/id/advanced/centcom/ert/medical/ntrauma
 	registered_name = "Trauma Team Specialist"
+	trim = /datum/id_trim/centcom/ert/medical/ntrauma
 	icon_state = "battlecruisercaller"	//Read desc
 	desc = "A semi-standard black Identification card rigged with what appears to be a small transmitter wired to a small disk - presumably filled with access tokens. Not NT standard, sure, but effectively the same card as their ERTs."
 
diff --git a/modular_skyrat/modules/novaya_ert/code/id.dm b/modular_skyrat/modules/novaya_ert/code/id.dm
index aa8c6034b1c..1927f6da01d 100644
--- a/modular_skyrat/modules/novaya_ert/code/id.dm
+++ b/modular_skyrat/modules/novaya_ert/code/id.dm
@@ -9,6 +9,7 @@
 	assignment = "Novaya Rossiyskaya Imperiya Soldier"
 	trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
 	trim_state = "trim_nri"
+	sechud_icon_state = "hud_nri"
 
 /datum/id_trim/nri/New()
 	. = ..()
@@ -18,6 +19,7 @@
 /datum/id_trim/nri/commander
 	assignment = "Novaya Rossiyskaya Imperiya Platoon Commander"
 	trim_state = "trim_nri_commander"
+	sechud_icon_state = "hud_nri_commander"
 
 /datum/id_trim/nri/heavy
 	assignment = "Novaya Rossiyskaya Imperiya Heavy Soldier"
diff --git a/modular_skyrat/modules/novaya_ert/code/outfit.dm b/modular_skyrat/modules/novaya_ert/code/outfit.dm
index c54193dd069..b1c09bfe0dc 100644
--- a/modular_skyrat/modules/novaya_ert/code/outfit.dm
+++ b/modular_skyrat/modules/novaya_ert/code/outfit.dm
@@ -38,3 +38,6 @@
 
 	id_trim = /datum/id_trim/nri/commander
 
+/datum/outfit/centcom/ert/nri/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+	return
+	//Two reasons for this; one, Russians arent NT and dont need implants used mostly for NT-sympathizers. Two, the HuD looks ugly with the blue mindshield outline.
diff --git a/modular_skyrat/modules/oneclickantag/code/oneclickantag.dm b/modular_skyrat/modules/oneclickantag/code/oneclickantag.dm
index 6fa0afbdbf1..cabb702702a 100644
--- a/modular_skyrat/modules/oneclickantag/code/oneclickantag.dm
+++ b/modular_skyrat/modules/oneclickantag/code/oneclickantag.dm
@@ -84,7 +84,7 @@ If anyone can figure out how to get Obsessed to work I would be very appreciativ
 
 /datum/admins/
 	var/MAKEANTAG_RESTRICTLIST = list()
-	var/MAKEANTAG_PL_DEFAULT_SECURITY = list(JOB_PRISONER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_HEAD_OF_SECURITY, JOB_CAPTAIN, JOB_CORRECTIONS_OFFICER, JOB_CIVIL_DISPUTES_OFFICER, JOB_SECURITY_MEDIC, JOB_SECURITY_SERGEANT, JOB_BLUESHIELD, JOB_ORDERLY, JOB_BOUNCER, JOB_CUSTOMS_AGENT, JOB_ENGINEERING_GUARD, JOB_SCIENCE_GUARD)
+	var/MAKEANTAG_PL_DEFAULT_SECURITY = list(JOB_PRISONER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_HEAD_OF_SECURITY, JOB_CAPTAIN, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC, JOB_BLUESHIELD, JOB_ORDERLY, JOB_BOUNCER, JOB_CUSTOMS_AGENT, JOB_ENGINEERING_GUARD, JOB_SCIENCE_GUARD)
 	var/MAKEANTAG_PL_DEFAULT_HEADS = list(JOB_CAPTAIN,JOB_HEAD_OF_PERSONNEL,JOB_RESEARCH_DIRECTOR,JOB_CHIEF_ENGINEER,JOB_CHIEF_MEDICAL_OFFICER,JOB_HEAD_OF_SECURITY,JOB_QUARTERMASTER)
 	var/MAKEANTAG_PL_DEFAULT_SILICON = list(JOB_AI, JOB_CYBORG)
 
diff --git a/modular_skyrat/modules/protected_roles/code/antag_restricted_jobs.dm b/modular_skyrat/modules/protected_roles/code/antag_restricted_jobs.dm
index 4a72f9e2262..6f686380053 100644
--- a/modular_skyrat/modules/protected_roles/code/antag_restricted_jobs.dm
+++ b/modular_skyrat/modules/protected_roles/code/antag_restricted_jobs.dm
@@ -27,18 +27,12 @@
 /datum/job/blueshield
 	antagonist_restricted = TRUE
 
-/datum/job/security_sergeant
-	antagonist_restricted = TRUE
-
 /datum/job/security_medic
 	antagonist_restricted = TRUE
 
 /datum/job/brigoff
 	antagonist_restricted = TRUE
 
-/datum/job/junior_officer
-	antagonist_restricted = TRUE
-
 /datum/job/orderly
 	antagonist_restricted = TRUE
 
diff --git a/modular_skyrat/modules/sec_haul/code/junior_officer/pepperball_gun.dm b/modular_skyrat/modules/sec_haul/code/guns/pepperball_gun.dm
similarity index 100%
rename from modular_skyrat/modules/sec_haul/code/junior_officer/pepperball_gun.dm
rename to modular_skyrat/modules/sec_haul/code/guns/pepperball_gun.dm
diff --git a/modular_skyrat/modules/sec_haul/code/junior_officer/junior_officer.dm b/modular_skyrat/modules/sec_haul/code/junior_officer/junior_officer.dm
deleted file mode 100644
index cd64bdc340e..00000000000
--- a/modular_skyrat/modules/sec_haul/code/junior_officer/junior_officer.dm
+++ /dev/null
@@ -1,3 +0,0 @@
-/obj/effect/landmark/start/junior_officer
-	name = "Civil Disputes Officer"
-	icon_state = "Security Officer"
diff --git a/modular_skyrat/modules/sec_haul/code/junior_officer/junior_officer_clothes.dm b/modular_skyrat/modules/sec_haul/code/junior_officer/junior_officer_clothes.dm
deleted file mode 100644
index 39c9c4ead07..00000000000
--- a/modular_skyrat/modules/sec_haul/code/junior_officer/junior_officer_clothes.dm
+++ /dev/null
@@ -1,30 +0,0 @@
-/obj/item/clothing/head/soft/black/junior_officer
-	name = "peacekeeper junior officer cap"
-	desc = "A junior officers cap, wearing this increases your robustness, apparently."
-	icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
-	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
-	icon_state = "juniorsoft"
-	soft_type = "junior"
-	mutant_variants = NONE
-
-/obj/item/clothing/under/rank/security/peacekeeper/junior
-	name = "peacekeeper junior officer poloshirt"
-	desc = "A sleek peackeeper poloshirt and pants, this one is special. It's for junior officers."
-	icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi'
-	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi'
-	worn_icon_digi = 'modular_skyrat/master_files/icons/mob/clothing/uniform_digi.dmi'
-	icon_state = "junior_officer"
-
-/obj/item/clothing/suit/toggle/labcoat/junior_officer
-	name = "junior officer coat"
-	desc = "An Armadyne coat that offers very minimal protection."
-	icon = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi'
-	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suit.dmi'
-	icon_state = "juniorjacket"
-	inhand_icon_state = "jacket"
-	blood_overlay_type = "coat"
-	body_parts_covered = CHEST|ARMS
-	allowed = list(/obj/item/gun/ballistic/automatic/pistol/pepperball, /obj/item/melee/baton)
-	armor = list(MELEE = 15, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 50, FIRE = 50, ACID = 50)
-	toggle_noun = "zipper"
-	mutant_variants = NONE
diff --git a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm
index bd6c2a11efa..9eb438317f7 100644
--- a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm
+++ b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm
@@ -24,6 +24,23 @@
 	icon_state = "beret"
 	greyscale_colors = "#EAEAEA"
 
+/obj/item/clothing/head/soft/black/junior_officer
+	name = "peacekeeper junior officer cap"
+	desc = "A junior officers cap, wearing this increases your robustness, apparently."
+	icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
+	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
+	icon_state = "juniorsoft"
+	soft_type = "junior"
+	mutant_variants = NONE
+
+/obj/item/clothing/head/sec/peacekeeper/sergeant
+	name = "peacekeeper sergeant hat"
+	desc = "A drill sergeants cap, wearing this increases your loudness. So they say."
+	icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
+	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
+	icon_state = "peacekeeper_sergeant_cap"
+	mutant_variants = NONE
+
 /obj/item/clothing/head/hos/beret/peacekeeper
 	name = "head of security's peacekeeper beret"
 	desc = "A special beret with the Head of Security's insignia emblazoned on it. A symbol of excellence, a badge of courage, a mark of distinction."
@@ -64,6 +81,19 @@
 	name = "blue peacekeeper uniform"
 	icon_state = "bsecurity"
 
+/obj/item/clothing/under/rank/security/peacekeeper/junior
+	name = "peacekeeper junior officer poloshirt"
+	desc = "A sleek peackeeper poloshirt and pants, this one is special. It's for junior officers."
+	icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi'
+	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi'
+	worn_icon_digi = 'modular_skyrat/master_files/icons/mob/clothing/uniform_digi.dmi'
+	icon_state = "junior_officer"
+
+/obj/item/clothing/under/rank/security/peacekeeper/sergeant
+	name = "peacekeeper sergeant uniform"
+	desc = "A sleek peackeeper uniform, signifying the rank of Sergeant."
+	icon_state = "peacekeeper_sergeant"
+
 /obj/item/clothing/under/rank/security/warden/peacekeeper
 	name = "peacekeeper wardens suit"
 	desc = "A formal security suit for officers complete with Armadyne belt buckle."
@@ -98,6 +128,20 @@
 	icon_state = "peacekeeper_black"
 	worn_icon_state = "peacekeeper_black"
 
+/obj/item/clothing/suit/toggle/labcoat/junior_officer
+	name = "junior officer coat"
+	desc = "An Armadyne coat that offers very minimal protection."
+	icon = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi'
+	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suit.dmi'
+	icon_state = "juniorjacket"
+	inhand_icon_state = "jacket"
+	blood_overlay_type = "coat"
+	body_parts_covered = CHEST|ARMS
+	allowed = list(/obj/item/gun/ballistic/automatic/pistol/pepperball, /obj/item/melee/baton)
+	armor = list(MELEE = 15, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 50, FIRE = 50, ACID = 50)
+	toggle_noun = "zipper"
+	mutant_variants = NONE
+
 /obj/item/clothing/suit/armor/hos/trenchcoat/peacekeeper
 	name = "armored peacekeeper trenchcoat"
 	desc = "A trenchcoat enhanced with a special lightweight kevlar. The epitome of tactical plainclothes."
diff --git a/modular_skyrat/modules/sec_haul/code/security_sergeant/secseg_clothes.dm b/modular_skyrat/modules/sec_haul/code/security_sergeant/secseg_clothes.dm
deleted file mode 100644
index 5ad5be83946..00000000000
--- a/modular_skyrat/modules/sec_haul/code/security_sergeant/secseg_clothes.dm
+++ /dev/null
@@ -1,13 +0,0 @@
-/obj/item/clothing/head/sec/peacekeeper/sergeant
-	name = "peacekeeper sergeant hat"
-	desc = "A drill sergeants cap, wearing this increases your loudness. So they say."
-	icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
-	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
-	icon_state = "peacekeeper_sergeant_cap"
-	mutant_variants = NONE
-
-/obj/item/clothing/under/rank/security/peacekeeper/sergeant
-	name = "peacekeeper sergeant uniform"
-	desc = "A sleek peackeeper uniform, this one is special. It's for sergeants."
-	icon_state = "peacekeeper_sergeant"
-
diff --git a/tgstation.dme b/tgstation.dme
index d0dc664b493..de895f540fb 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -4362,7 +4362,7 @@
 #include "modular_skyrat\master_files\code\datums\ert.dm"
 #include "modular_skyrat\master_files\code\datums\components\fullauto.dm"
 #include "modular_skyrat\master_files\code\datums\id_trim\jobs.dm"
-#include "modular_skyrat\master_files\code\datums\id_trim\solgov.dm"
+#include "modular_skyrat\master_files\code\datums\id_trim\solfed.dm"
 #include "modular_skyrat\master_files\code\datums\id_trim\syndicate.dm"
 #include "modular_skyrat\master_files\code\datums\martial\cqcplus.dm"
 #include "modular_skyrat\master_files\code\datums\mutations\chameleon.dm"
@@ -5314,11 +5314,9 @@
 #include "modular_skyrat\modules\sec_haul\code\guns\bullets.dm"
 #include "modular_skyrat\modules\sec_haul\code\guns\gun_spawns.dm"
 #include "modular_skyrat\modules\sec_haul\code\guns\guns.dm"
+#include "modular_skyrat\modules\sec_haul\code\guns\pepperball_gun.dm"
 #include "modular_skyrat\modules\sec_haul\code\guns\token_system\gunsets.dm"
 #include "modular_skyrat\modules\sec_haul\code\guns\token_system\token_system.dm"
-#include "modular_skyrat\modules\sec_haul\code\junior_officer\junior_officer.dm"
-#include "modular_skyrat\modules\sec_haul\code\junior_officer\junior_officer_clothes.dm"
-#include "modular_skyrat\modules\sec_haul\code\junior_officer\pepperball_gun.dm"
 #include "modular_skyrat\modules\sec_haul\code\misc\ai_module.dm"
 #include "modular_skyrat\modules\sec_haul\code\misc\bullet_drive.dm"
 #include "modular_skyrat\modules\sec_haul\code\misc\decals.dm"
@@ -5332,7 +5330,6 @@
 #include "modular_skyrat\modules\sec_haul\code\peacekeeper\peacekeeper_lockers.dm"
 #include "modular_skyrat\modules\sec_haul\code\security_medic\secmed_clothes.dm"
 #include "modular_skyrat\modules\sec_haul\code\security_medic\security_medic.dm"
-#include "modular_skyrat\modules\sec_haul\code\security_sergeant\secseg_clothes.dm"
 #include "modular_skyrat\modules\self_actualization_device\code\self_actualization_device.dm"
 #include "modular_skyrat\modules\server_overflow\code\chat_link.dm"
 #include "modular_skyrat\modules\server_overflow\code\client_procs.dm"