Updates a lot of security clothing, unifies a lot of the security blu…

…e colors that were all over the place, some other things (#23455)

* get real

* uhhh everything?

* some other stuff

* awawawa

* that can got too then

* reinstates the sprite changes

* man in suit gif

* Update packs.dm

---------

Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>

_maps/shuttles/skyrat/pirate_nri_raider.dmm

@@ -385,10 +385,6 @@
 	},
 /obj/item/clothing/under/costume/nri/engineer,
 /obj/item/clothing/mask/balaclavaadjust,
-/obj/item/clothing/suit/armor/vest/warden/peacekeeper{
-	name = "advanced imperial jacket";
-	desc = "A dark blue jacket with blue rank pips and body armor strapped on top."
-	},
 /obj/item/clothing/under/syndicate/rus_army/cin_surplus/marine,
 /obj/item/clothing/glasses/meson/engine,
 /obj/item/storage/belt/military/cin_surplus/marine,
@@ -824,10 +820,6 @@
 /obj/item/clothing/under/costume/nri/medic,
 /obj/item/clothing/glasses/hud/security/sunglasses/peacekeeper,
 /obj/item/clothing/mask/balaclavaadjust,
-/obj/item/clothing/suit/armor/vest/warden/peacekeeper{
-	name = "advanced imperial jacket";
-	desc = "A dark blue jacket with blue rank pips and body armor strapped on top."
-	},
 /obj/item/clothing/under/syndicate/rus_army/cin_surplus/marine,
 /obj/item/storage/belt/military/cin_surplus/marine,
 /obj/item/clothing/suit/armor/vest/cin_surplus_vest,
@@ -954,10 +946,6 @@
 /obj/item/clothing/under/costume/nri/captain,
 /obj/item/clothing/glasses/hud/security/sunglasses/peacekeeper,
 /obj/item/clothing/mask/balaclavaadjust,
-/obj/item/clothing/suit/armor/vest/warden/peacekeeper{
-	name = "advanced imperial jacket";
-	desc = "A dark blue jacket with blue rank pips and body armor strapped on top."
-	},
 /obj/item/clothing/under/syndicate/rus_army/cin_surplus/marine,
 /obj/item/storage/belt/military/cin_surplus/marine,
 /obj/item/clothing/suit/armor/vest/cin_surplus_vest,

modular_skyrat/modules/cargo/code/packs.dm

@@ -163,7 +163,7 @@
 	name = "Helmets Crate"
 	desc = "Contains three standard-issue brain buckets."
 	cost = CARGO_CRATE_VALUE * 2
-	contains = list(/obj/item/clothing/head/helmet/sec/sol = 3)
+	contains = list(/obj/item/clothing/head/helmet/sec = 3)
 	crate_name = "helmet crate"
 
 /datum/supply_pack/security/deployablebarricades

modular_skyrat/modules/command_vendor/code/vending.dm

@@ -119,10 +119,8 @@
 	access_lists["[ACCESS_HOS]"] = list(
 		/obj/item/clothing/head/hats/hos/cap = 1,
 		/obj/item/clothing/head/hats/hos/beret/navyhos = 1,
-		/obj/item/clothing/head/hats/hos/cap/peacekeeper/sol = 1,
 		/obj/item/clothing/head/hats/imperial/hos = 1,
 		/obj/item/clothing/under/rank/security/head_of_security/peacekeeper = 1,
-		/obj/item/clothing/under/rank/security/head_of_security/peacekeeper/sol = 1,
 		/obj/item/clothing/under/rank/security/head_of_security/alt = 1,
 		/obj/item/clothing/under/rank/security/head_of_security/alt/skirt = 1,
 		/obj/item/clothing/under/rank/security/head_of_security/skyrat/imperial = 1,

modular_skyrat/modules/customization/modules/clothing/head/head.dm

@@ -55,51 +55,6 @@
 	acid = 50
 	wound = 6
 
-/obj/item/clothing/head/hats/sec/peacekeeper/sol
-	name = "sol police cap"
-	desc = "Be a proper boy in blue with this cap, comes with a black visor to block out inconvenient truths."
-	icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
-	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
-	icon_state = "policeofficercap"
-	supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
-	armor_type = /datum/armor/head_helmet
-
-/obj/item/clothing/head/hats/sec/cap/peacekeeper/sol/dark
-	name = "police patrol cap"
-	desc = "A dark colored hat with a silver badge, for the officer interested in style."
-	icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
-	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
-	icon_state = "policeofficerpatrolcap"
-	supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
-	armor_type = /datum/armor/head_helmet
-
-/obj/item/clothing/head/hats/hos/cap/peacekeeper/sol
-	name = "sol police chief cap"
-	desc = "A blue hat adorned with gold, rumoured to be used to distract Agents with its swag."
-	icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
-	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
-	icon_state = "policechiefcap"
-	supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
-
-/obj/item/clothing/head/hats/sec/peacekeeper/sol/traffic
-	name = "sol traffic cop cap"
-	desc = "You think that's Shitcurrity? That's just Civil Shitsputes, I'll show you REAL Shitcurrity."
-	icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
-	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
-	icon_state = "policetrafficcap"
-	supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
-	armor_type = /datum/armor/head_helmet
-/obj/item/clothing/head/helmet/sec/sol
-	name = "sol police helmet"
-	desc = "A helmet to protect any officer from bludgeoning attacks, or the occasional bullet."
-	icon = 'modular_skyrat/master_files/icons/obj/clothing/head/helmet.dmi'
-	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head/helmet.dmi'
-	icon_state = "security_helmet_novisor"
-	base_icon_state = "security_helmet_novisor"
-	actions_types = NONE
-	supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
-	armor_type = /datum/armor/head_helmet
-
 /obj/item/clothing/head/colourable_flatcap
 	name = "colourable flat cap"
 	desc = "You in the computers son? You work the computers?"

modular_skyrat/modules/customization/modules/clothing/under/security.dm

@@ -44,37 +44,6 @@
 	supports_variations_flags = NONE
 	can_adjust = FALSE
 
-// Police Uniforms
-///OFFICERS
-/obj/item/clothing/under/rank/security/peacekeeper/sol/cadet
-	name = "sol police cadet uniform"
-	desc = "A light blue shirt with navy pants, and no other markings. This is essentially no more than a fancy blue suit."
-	icon_state = "policecadetalt"
-
-/obj/item/clothing/under/rank/security/peacekeeper/sol
-	name = "sol police uniform"
-	desc = "A light blue shirt with navy pants, and a golden insignia on the shoulder. Perfect for standing around idly during emergencies."
-	icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi'
-	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi'
-	icon_state = "policealt"
-	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION | CLOTHING_MONKEY_VARIATION
-
-///WARDEN
-/obj/item/clothing/under/rank/security/warden/peacekeeper/sol
-	name = "sol warden uniform"
-	desc = "A light blue shirt with navy pants. This one bears the insignia of a Warden, as well as the stretch marks."
-	icon_state = "policewardenalt"
-
-///HEAD OF SECURITY
-/obj/item/clothing/under/rank/security/head_of_security/peacekeeper/sol
-	name = "sol chief of police uniform"
-	desc = "A white satin shirt with golden pauldrons and a leather belt, which has a large \"NT\" for a buckle. Nice to see where the budget went."
-	icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi'
-	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi'
-	icon_state = "policechiefalt"
-
-// End Police Uniforms
-
 /// PRISONER
 /obj/item/clothing/under/rank/prisoner/protcust
 	name = "protective custody prisoner jumpsuit"

modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm

@@ -461,10 +461,6 @@
 			RESKIN_ICON_STATE = "vest_white",
 			RESKIN_WORN_ICON_STATE = "vest_white"
 		),
-		"Peacekeeper Variant" = list(
-			RESKIN_ICON_STATE = "peacekeeper_white",
-			RESKIN_WORN_ICON_STATE = "peacekeeper_white"
-		)
 	)
 
 /obj/item/clothing/suit/armor/hos
@@ -497,10 +493,6 @@
 //Standard Bulletproof Vest
 /obj/item/clothing/suit/armor/bulletproof
 	desc = "A Type-III-AD-P heavy bulletproof vest that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent."
-	icon = 'modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi'
-	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi'
-	icon_state = "vest_bulletproof"
-	body_parts_covered = CHEST|GROIN|ARMS //Our sprite has groin and arm protections, so we get it too.
 	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
 
 //Riot Armor

modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm

@@ -496,16 +496,6 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea
 	item_path = /obj/item/clothing/head/beret/sec/navyofficer
 	restricted_roles = list(JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_WARDEN)
 
-/datum/loadout_item/head/solofficercap
-	name = "Security Officer's Sol Cap"
-	item_path = /obj/item/clothing/head/hats/sec/peacekeeper/sol
-	restricted_roles = list(JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_WARDEN)
-
-/datum/loadout_item/head/soltrafficoff
-	name = "Traffic Officer Cap"
-	item_path = /obj/item/clothing/head/hats/sec/peacekeeper/sol/traffic
-	restricted_roles = list(JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_WARDEN)
-
 /datum/loadout_item/head/navybluewardenberet
 	name = "Warden's Navy Blue beret"
 	item_path = /obj/item/clothing/head/beret/sec/navywarden

modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm

@@ -114,21 +114,11 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/
 	item_path = /obj/item/clothing/under/rank/captain/skyrat/imperial/generic/pants
 	restricted_roles = list(JOB_CAPTAIN, JOB_HEAD_OF_PERSONNEL, JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_QUARTERMASTER, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_NT_REP)
 
-/datum/loadout_item/under/jumpsuit/solwarden
-	name = "Sol Warden Uniform"
-	item_path = /obj/item/clothing/under/rank/security/warden/peacekeeper/sol
-	restricted_roles = list(JOB_WARDEN)
-
 /datum/loadout_item/under/jumpsuit/security_trousers
 	name = "Security Trousers"
 	item_path = /obj/item/clothing/under/rank/security/peacekeeper/trousers
 	restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY)
 
-/datum/loadout_item/under/jumpsuit/solofficer
-	name = "Sol Officer Uniform"
-	item_path = /obj/item/clothing/under/rank/security/peacekeeper/sol
-	restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY)
-
 /datum/loadout_item/under/jumpsuit/disco
 	name = "Superstar Cop Uniform"
 	item_path = /obj/item/clothing/under/rank/security/detective/disco

modular_skyrat/modules/sec_haul/code/corrections_officer/corrections_officer.dm

@@ -52,7 +52,7 @@
 	satchel = /obj/item/storage/backpack/satchel/sec
 	duffelbag = /obj/item/storage/backpack/duffelbag/sec
 	messenger = /obj/item/storage/backpack/messenger/sec
-	head = /obj/item/clothing/head/corrections_officer
+	head = /obj/item/clothing/head/security_garrison
 	box = /obj/item/storage/box/survival/security
 	belt = /obj/item/modular_computer/pda/security
 

modular_skyrat/modules/sec_haul/code/corrections_officer/corrections_officer_equipment.dm

@@ -31,14 +31,6 @@
 	icon_state = "sec_headset"
 	keyslot = new /obj/item/encryptionkey/headset_sec
 
-/obj/item/clothing/head/corrections_officer
-	name = "corrections officer's cap"
-	desc = "A black visor cap with a round Nanotrasen logo made out of silver in the center, the most it'll do is protect you from some light rain...Or a prisoner slopping out."
-	icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
-	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
-	icon_state = "corrections_officer"
-	supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
-
 /obj/item/clothing/suit/toggle/jacket/corrections_officer
 	name = "corrections officer's suit jacket"
 	desc = "A pressed and ironed suit jacket, it has light armor against stabbings. There's some rank badges on the right breast."

modular_skyrat/modules/sec_haul/code/misc/vending.dm

@@ -47,19 +47,12 @@
 					/obj/item/storage/backpack/duffelbag/sec = 5,
 					/obj/item/clothing/under/rank/security/officer = 10,
 					/obj/item/clothing/under/rank/security/officer/skirt = 10,
-					/obj/item/clothing/under/rank/security/peacekeeper/tactical = 4,
-					/obj/item/clothing/under/rank/security/peacekeeper/sol/cadet = 3,
-					/obj/item/clothing/under/rank/security/peacekeeper/sol = 3,
 					/obj/item/clothing/under/rank/security/skyrat/utility = 3,
 					/obj/item/clothing/shoes/jackboots/sec = 10,
 					/obj/item/clothing/head/security_garrison = 10,
 					/obj/item/clothing/head/security_cap = 10,
 					/obj/item/clothing/head/beret/sec/peacekeeper = 5,
 					/obj/item/clothing/head/costume/ushanka/sec = 10,
-					/obj/item/clothing/head/helmet/sec/sol = 5,
-					/obj/item/clothing/head/hats/sec/peacekeeper/sol = 5,
-					/obj/item/clothing/head/hats/sec/peacekeeper/sol/traffic = 5,
-					/obj/item/clothing/head/hats/sec/cap/peacekeeper/sol/dark = 5,
 					/obj/item/clothing/gloves/color/black/security = 10,
 					)
 	premium = list( /obj/item/clothing/under/rank/security/officer/formal = 3,

modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm

@@ -1,16 +1,3 @@
-
-//PEACEKEEPER HELMET
-/obj/item/clothing/head/helmet/sec/peacekeeper
-	name = "peacekeeper helmet"
-	desc = "A standard issue combat helmet for peacekeeper operators. Has decent tensile strength and armor. Keep your head down."
-	icon = 'modular_skyrat/master_files/icons/obj/clothing/head/helmet.dmi'
-	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head/helmet.dmi'
-	icon_state = "peacekeeper_helmet"
-	base_icon_state = "peacekeeper_helmet"
-	can_toggle = FALSE
-	actions_types = null
-	supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
-
 /obj/item/clothing/head/beret/sec/peacekeeper
 	name = "peacekeeper beret"
 	desc = "A robust beret with the peacekeeper insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection."
@@ -28,15 +15,6 @@
 	icon_state = "beret"
 	greyscale_colors = "#EAEAEA"
 
-/obj/item/clothing/head/hats/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"
-	supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
-	armor_type = /datum/armor/hats_warden
-
 /obj/item/clothing/head/hats/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."
@@ -48,7 +26,7 @@
 	desc = "A special beret with the Warden's insignia emblazoned on it. For wardens with class."
 	greyscale_config = /datum/greyscale_config/beret_badge_fancy
 	greyscale_config_worn = /datum/greyscale_config/beret_badge_fancy/worn
-	greyscale_colors = "#3F3C40#FF0000#00AEEF"
+	greyscale_colors = "#3f6e9e#FF0000#00AEEF"
 	icon_state = "beret_badge_fancy_twist"
 	supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
 	armor_type = /datum/armor/hats_warden
@@ -70,16 +48,6 @@
 	sensor_mode = SENSOR_COORDS
 	random_sensor = FALSE
 
-/obj/item/clothing/under/rank/security/peacekeeper/tactical
-	name = "tactical peacekeeper uniform"
-	desc = "A tactical peacekeeper uniform, woven with a lightweight layer of kevlar to provide minor ballistic and stab protection."
-	icon_state = "peacekeeper_tac"
-
-/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."
@@ -122,14 +90,6 @@
 	. = ..()
 	AddComponent(/datum/component/toggle_icon, "zipper")
 
-/obj/item/clothing/suit/armor/vest/warden/peacekeeper
-	name = "warden's peacekeeper jacket"
-	desc = "A deep blue jacket with some simple body armor strapped over the top."
-	icon = 'modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi'
-	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi'
-	icon_state = "peacekeeper_trench_warden"
-	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
-
 /obj/item/clothing/suit/armor/vest/peacekeeper/spacecoat
 	name = "peacekeeper sleek coat"
 	desc = "An incredibly stylish and heavy black coat made of synthetic kangaroo leather, padded with durathread and lined with kevlar."

tools/UpdatePaths/Scripts_Skyrat/16753_hats_repath.txt

@@ -17,7 +17,6 @@
 /obj/item/clothing/head/whiterussian : /obj/item/clothing/head/costume/whiterussian {@OLD}
 /obj/item/clothing/head/whiterussian/white : /obj/item/clothing/head/costume/whiterussian/white {@OLD}
 /obj/item/clothing/head/whiterussian/black : /obj/item/clothing/head/costume/whiterussian/black {@OLD}
-/obj/item/clothing/head/hos/peacekeeper/sol : /obj/item/clothing/head/hats/hos/peacekeeper/sol {@OLD}
 /obj/item/clothing/head/christmas : /obj/item/clothing/head/costume/christmas {@OLD}
 /obj/item/clothing/head/christmas/green : /obj/item/clothing/head/costume/christmas/green {@OLD}
 /obj/item/clothing/head/cowboyhat/sheriff : /obj/item/clothing/head/costume/cowboyhat/sheriff {@OLD}
@@ -34,4 +33,4 @@
 /obj/item/clothing/head/imperial/cmo : /obj/item/clothing/head/hats/imperial/cmo {@OLD}
 /obj/item/clothing/head/imperial/ce : /obj/item/clothing/head/hats/imperial/ce {@OLD}
 /obj/item/clothing/head/imperial/helmet : /obj/item/clothing/head/hats/imperial/helmet {@OLD}
-/obj/item/clothing/head/rabbitears : /obj/item/clothing/head/costume/rabbitears {@OLD}
+/obj/item/clothing/head/rabbitears : /obj/item/clothing/head/costume/rabbitears {@OLD}