Security and Central command uniforms sprite overhaul (#6560)

2026-08-25 05:51:56 +01:00 · 2019-06-18 00:28:53 +02:00
parent 76f55d8aed
commit 77c262e9a2
49 changed files with 419 additions and 255 deletions
@@ -54,7 +54,7 @@ var/datum/controller/subsystem/traumas/SStraumas
 					   "security"  = typecacheof(list(/obj/item/clothing/under/rank/security, /obj/item/clothing/under/rank/warden, /obj/item/clothing/head/beret/sec,
 											 	 /obj/item/clothing/under/rank/head_of_security, /obj/item/clothing/under/det, /obj/item/clothing/glasses/hud/security,
 												 /obj/item/weapon/melee/baton, /obj/item/weapon/gun/energy/taser, /obj/item/weapon/handcuffs, /obj/item/clothing/glasses/sunglasses/sechud,
-												 /obj/machinery/door/airlock/security, /obj/item/clothing/under/rank/security2, /obj/structure/sign/directions/security,
+												 /obj/machinery/door/airlock/security, /obj/item/clothing/under/rank/cadet, /obj/structure/sign/directions/security,
 												 /obj/item/clothing/head/bio_hood/security, /obj/item/clothing/head/bomb_hood/security, /obj/item/clothing/head/helmet/space/void/security,
 												 /obj/item/clothing/head/soft/sec, /obj/item/clothing/suit/armor/vest/security, /obj/item/clothing/suit/bio_suit/security,
 												 /obj/item/clothing/suit/bomb_suit/security, /obj/item/clothing/suit/security/navyofficer, /obj/item/clothing/suit/space/void/security,
@@ -151,13 +151,15 @@
 	uniform = /obj/item/clothing/under/ccpolice
 	suit = /obj/item/clothing/suit/storage/vest/heavy/ert/peacekeeper
 	shoes = /obj/item/clothing/shoes/swat
-	gloves = /obj/item/clothing/gloves/swat
+	gloves = /obj/item/clothing/gloves/swat/tactical
 	l_ear = /obj/item/device/radio/headset/ert
 	glasses = /obj/item/clothing/glasses/sunglasses/sechud
-	head = /obj/item/clothing/head/beret/centcom/officer
+	head = /obj/item/clothing/head/beret/centcom/officer/civilprotection
+	suit_store = /obj/item/weapon/gun/energy/gun
+	belt = /obj/item/weapon/storage/belt/security

 	backpack_contents = list(
-		/obj/item/weapon/gun/energy/gun = 1,
+		/obj/item/weapon/storage/box/engineer = 1,
 		/obj/item/clothing/head/helmet/swat/peacekeeper = 1,
 		/obj/item/clothing/accessory/holster/hip = 1,
 		/obj/item/weapon/gun/energy/pistol = 1
@@ -167,6 +169,26 @@
 		/obj/item/weapon/implant/loyalty
 	)

+/datum/outfit/admin/nt/protection_detail/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+
+	if(H && H.belt)
+
+		var/obj/item/weapon/reagent_containers/spray/pepper/pepperspray = new(H)
+		var/obj/item/weapon/melee/baton/loaded/baton = new(H)
+		var/obj/item/weapon/shield/riot/tact/shield = new(H)
+		var/obj/item/weapon/grenade/flashbang/flashbang = new(H)
+		var/obj/item/weapon/handcuffs/cuffs = new(H)
+		var/obj/item/device/flash/flash = new(H)
+		var/obj/item/device/flashlight/flare/flare = new(H)
+
+		H.belt.contents += flare
+		H.belt.contents += flashbang
+		H.belt.contents += cuffs
+		H.belt.contents += pepperspray
+		H.belt.contents += flash
+		H.belt.contents += baton
+		H.belt.contents += shield
+

 /datum/outfit/admin/nt/ert_commander
 	name = "ERT Commander"
@@ -196,26 +218,49 @@
 	uniform = /obj/item/clothing/under/ccpolice
 	suit = /obj/item/clothing/suit/storage/vest/heavy/ert/peacekeeper
 	shoes = /obj/item/clothing/shoes/swat
-	gloves = /obj/item/clothing/gloves/swat
+	gloves = /obj/item/clothing/gloves/swat/tactical
 	l_ear = /obj/item/device/radio/headset/ert
 	glasses = /obj/item/clothing/glasses/sunglasses/sechud/tactical
 	mask = /obj/item/clothing/mask/gas/tactical
 	head = /obj/item/clothing/head/helmet/swat/peacekeeper
+	back = null
 	r_pocket = /obj/item/weapon/handcuffs/ziptie
-	l_pocket = /obj/item/weapon/grenade/chem_grenade/gas
 	l_hand = /obj/item/weapon/shield/riot/tact
+	suit_store = /obj/item/weapon/gun/energy/gun
+	belt = /obj/item/weapon/storage/belt/security

-	backpack_contents = list(
-		/obj/item/weapon/gun/projectile/automatic/x9 = 1,
-		/obj/item/ammo_magazine/c45x = 2,
-		/obj/item/clothing/accessory/holster/hip = 1,
-		/obj/item/weapon/gun/energy/gun = 1
-	)
+	backpack_contents = null

 	implants = list(
 		/obj/item/weapon/implant/loyalty
 	)

+/datum/outfit/admin/nt/odinsec/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+
+	if(H && H.w_uniform)
+
+		var/obj/item/clothing/accessory/holster/hip/holster = new(H)
+		var/obj/item/weapon/gun/projectile/automatic/x9/weapon = new(H)
+		holster.contents += weapon
+		holster.holstered = weapon
+		var/obj/item/clothing/under/rank/U = H.w_uniform
+		U.attach_accessory(null, holster)
+
+	if(H && H.belt)
+
+		var/obj/item/weapon/reagent_containers/spray/pepper/pepperspray = new(H)
+		var/obj/item/weapon/melee/baton/loaded/baton = new(H)
+		var/obj/item/weapon/grenade/chem_grenade/gas/gasgrenade = new(H)
+		var/obj/item/device/flash/flash = new(H)
+		var/obj/item/ammo_magazine/c45x/mag1 = new(H)
+		var/obj/item/ammo_magazine/c45x/mag2 = new(H)
+
+		H.belt.contents += mag1
+		H.belt.contents += mag2
+		H.belt.contents += gasgrenade
+		H.belt.contents += pepperspray
+		H.belt.contents += flash
+		H.belt.contents += baton

 /datum/outfit/admin/nt/specops
 	name = "Special Operations Officer"
@@ -264,7 +309,7 @@

 	uniform = /obj/item/clothing/under/soviet
 	shoes = /obj/item/clothing/shoes/black
-	head = /obj/item/clothing/head/ushanka
+	head = /obj/item/clothing/head/ushanka/grey


 /datum/outfit/admin/sovietsoldier
@@ -152,5 +152,5 @@
 		/obj/item/clothing/mask/gas/tactical                      = TRADER_THIS_TYPE,
 		/obj/item/weapon/shield/riot/tact                         = TRADER_THIS_TYPE,
 		/obj/item/weapon/storage/belt/security/tactical           = TRADER_THIS_TYPE,
-		/obj/item/weapon/storage/belt/bandolier                   = TRADER_THIS_TYPE
+		/obj/item/clothing/accessory/storage/bandolier            = TRADER_THIS_TYPE
 	)
@@ -164,8 +164,7 @@
 	name = "Forensic Technician"
 	jobtype = /datum/job/forensics

-	uniform = /obj/item/clothing/under/det/slob
-	suit = /obj/item/clothing/suit/storage/vest/csi
+	uniform = /obj/item/clothing/under/det/forensics
 	shoes = /obj/item/clothing/shoes/laceup
 	l_ear = /obj/item/device/radio/headset/headset_sec
 	pda = /obj/item/device/pda/detective
@@ -252,8 +251,9 @@
 	name = "Security Cadet"
 	jobtype = /datum/job/intern_sec

-	uniform = /obj/item/clothing/under/rank/security2
-	head = /obj/item/clothing/head/beret/sec
+	uniform = /obj/item/clothing/under/rank/cadet
+	suit = /obj/item/clothing/suit/storage/vest/cadet
+	head = /obj/item/clothing/head/beret/sec/cadet
 	shoes = /obj/item/clothing/shoes/jackboots
 	l_ear = /obj/item/device/radio/headset/headset_sec

@@ -210,7 +210,7 @@

 /obj/effect/landmark/costume/commie/New()
 	new /obj/item/clothing/under/soviet(src.loc)
-	new /obj/item/clothing/head/ushanka(src.loc)
+	new /obj/item/clothing/head/ushanka/grey(src.loc)
 	delete_me = 1

 /obj/effect/landmark/costume/imperium_monk/New()
@@ -355,14 +355,6 @@
 	new /obj/item/weapon/reagent_containers/spray/plantbgone(src)
 	new /obj/item/weapon/wirecutters/clippers(src)

-/obj/item/weapon/storage/belt/bandolier
-	name = "bandolier"
-	desc = "A pocketed belt designated to hold shotgun shells."
-	icon_state = "bandolier"
-	item_state = "bandolier"
-	can_hold = list(/obj/item/ammo_casing/shotgun)
-	storage_slots = 16
-
 /obj/item/weapon/storage/belt/fannypack
 	name = "leather fannypack"
 	desc = "A dorky fannypack for keeping small items in."
@@ -56,11 +56,11 @@
 	icon_opened = "syndicate1open"

 /obj/structure/closet/gimmick/russian/fill()
-	new /obj/item/clothing/head/ushanka(src)
-	new /obj/item/clothing/head/ushanka(src)
-	new /obj/item/clothing/head/ushanka(src)
-	new /obj/item/clothing/head/ushanka(src)
-	new /obj/item/clothing/head/ushanka(src)
+	new /obj/item/clothing/head/ushanka/grey(src)
+	new /obj/item/clothing/head/ushanka/grey(src)
+	new /obj/item/clothing/head/ushanka/grey(src)
+	new /obj/item/clothing/head/ushanka/grey(src)
+	new /obj/item/clothing/head/ushanka/grey(src)
 	new /obj/item/clothing/under/soviet(src)
 	new /obj/item/clothing/under/soviet(src)
 	new /obj/item/clothing/under/soviet(src)
@@ -127,7 +127,7 @@
 		//Appearance
 		new /obj/item/weapon/storage/backpack/security(src)
 		new /obj/item/weapon/storage/backpack/satchel_sec(src)
-		new /obj/item/clothing/under/rank/head_of_security/jensen(src)
+		new /obj/item/clothing/under/rank/head_of_security(src)
 		new /obj/item/clothing/under/rank/head_of_security/corp(src)
 		new /obj/item/clothing/suit/storage/toggle/armor/hos/jensen(src)
 		new /obj/item/clothing/suit/armor/hos(src)
@@ -135,6 +135,8 @@
 		new /obj/item/clothing/head/helmet/HoS(src)
 		new /obj/item/clothing/head/beret/sec/hos(src)
 		new /obj/item/clothing/accessory/badge/hos(src)
+		new /obj/item/clothing/shoes/black_boots(src)
+		new /obj/item/clothing/gloves/black_leather(src)
 		//Tools
 		new /obj/item/weapon/cartridge/hos(src)
 		new /obj/item/device/radio/headset/heads/hos(src)
@@ -169,7 +171,7 @@
 		//Appearance
 		new /obj/item/weapon/storage/backpack/security(src)
 		new /obj/item/weapon/storage/backpack/satchel_sec(src)
-		new /obj/item/clothing/under/rank/head_of_security/jensen(src)
+		new /obj/item/clothing/under/rank/head_of_security(src)
 		new /obj/item/clothing/under/rank/head_of_security/corp(src)
 		new /obj/item/clothing/suit/storage/vest/hos(src)
 		new /obj/item/clothing/head/beret/sec/hos(src)
@@ -179,6 +181,7 @@
 		new /obj/item/device/radio/headset/heads/hos(src)
 		//Belts
 		new /obj/item/weapon/storage/belt/security(src)
+
 		new /obj/item/clothing/accessory/holster/waist(src)

 		new /obj/item/device/breath_analyzer(src)
@@ -215,6 +218,8 @@
 		new /obj/item/clothing/head/helmet/warden/commissar(src)
 		new /obj/item/clothing/head/helmet(src)
 		new /obj/item/clothing/accessory/badge/warden(src)
+		new /obj/item/clothing/shoes/black_boots(src)
+		new /obj/item/clothing/gloves/black_leather(src)
 		//Tools
 		new /obj/item/weapon/cartridge/security(src)
 		new /obj/item/device/radio/headset/headset_sec(src)
@@ -225,8 +230,11 @@
 		new /obj/item/weapon/melee/baton/loaded(src)
 		new /obj/item/weapon/gun/energy/pistol(src)
 		//Belts
+		if (prob(50))
+			new /obj/item/clothing/accessory/storage/black_vest(src)
+		else
+			new /obj/item/clothing/accessory/storage/black_pouches(src)
 		new /obj/item/weapon/storage/belt/security(src)
-		new /obj/item/clothing/accessory/storage/black_vest(src)


 /obj/structure/closet/secure_closet/security_cadet
@@ -245,8 +253,9 @@
 			new /obj/item/weapon/storage/backpack/security(src)
 		else
 			new /obj/item/weapon/storage/backpack/satchel_sec(src)
-		new /obj/item/clothing/head/beret/sec(src)
-		new /obj/item/clothing/under/rank/security2(src)
+		new /obj/item/clothing/head/beret/sec/cadet(src)
+		new /obj/item/clothing/suit/storage/vest/cadet(src)
+		new /obj/item/clothing/under/rank/cadet(src)
 		//Tools
 		new /obj/item/device/radio/headset/headset_sec(src)
 		new /obj/item/device/flash(src)
@@ -256,7 +265,10 @@
 		new /obj/item/device/holowarrant(src)
 		new /obj/item/device/flashlight/flare(src)
 		//Belts
-		new /obj/item/clothing/accessory/storage/black_vest(src)
+		if (prob(50))
+			new /obj/item/clothing/accessory/storage/black_vest(src)
+		else
+			new /obj/item/clothing/accessory/storage/black_pouches(src)
 		new /obj/item/weapon/storage/belt/security(src)

 /obj/structure/closet/secure_closet/security
@@ -295,10 +307,13 @@
 		new /obj/item/device/flashlight/flare(src)
 		new /obj/item/weapon/handcuffs(src)
 		//Belts
-		new /obj/item/clothing/accessory/storage/black_vest(src)
+		if (prob(50))
+			new /obj/item/clothing/accessory/storage/black_vest(src)
+		else
+			new /obj/item/clothing/accessory/storage/black_pouches(src)
+		new /obj/item/clothing/accessory/holster/hip(src)
 		new /obj/item/weapon/storage/belt/security(src)

-
 /obj/structure/closet/secure_closet/security/cargo

 	fill()
@@ -343,7 +358,7 @@
 		new /obj/item/clothing/suit/storage/toggle/det_jacket(src)
 		new /obj/item/clothing/under/det(src)
 		new /obj/item/clothing/under/det/black(src)
-		new /obj/item/clothing/under/det/slob(src)
+		new /obj/item/clothing/under/det/classic(src)
 		new /obj/item/clothing/gloves/black(src)
 		new /obj/item/clothing/shoes/brown(src)
 		//Tools
@@ -395,11 +410,10 @@
 		new /obj/item/clothing/suit/storage/forensics/blue(src)
 		new /obj/item/clothing/suit/storage/forensics/red(src)
 		new /obj/item/clothing/suit/storage/vest/csi(src)
-		new /obj/item/clothing/under/det(src)
-		new /obj/item/clothing/under/det/black(src)
-		new /obj/item/clothing/under/det/slob(src)
 		new /obj/item/clothing/under/det/forensics(src)
-		new /obj/item/clothing/shoes/brown(src)
+		new /obj/item/clothing/under/det/black(src)
+		new /obj/item/clothing/under/det/classic(src)
+		new /obj/item/clothing/shoes/laceup(src)
 		//Tools
 		new /obj/item/device/radio/headset/headset_sec(src)
 		new /obj/item/weapon/storage/box/evidence(src)
@@ -14,12 +14,15 @@
 	new /obj/item/clothing/under/rank/security(src)
 	new /obj/item/clothing/under/rank/security(src)
 	new /obj/item/clothing/under/rank/security(src)
-	new /obj/item/clothing/under/rank/security2(src)
-	new /obj/item/clothing/under/rank/security2(src)
-	new /obj/item/clothing/under/rank/security2(src)
-	new /obj/item/clothing/shoes/jackboots(src)
-	new /obj/item/clothing/shoes/jackboots(src)
-	new /obj/item/clothing/shoes/jackboots(src)
+	new /obj/item/clothing/under/rank/cadet(src)
+	new /obj/item/clothing/under/rank/cadet(src)
+	new /obj/item/clothing/under/rank/cadet(src)
+	new /obj/item/clothing/shoes/black_boots(src)
+	new /obj/item/clothing/shoes/black_boots(src)
+	new /obj/item/clothing/shoes/black_boots(src)
+	new /obj/item/clothing/gloves/black_leather(src)
+	new /obj/item/clothing/gloves/black_leather(src)
+	new /obj/item/clothing/gloves/black_leather(src)
 	new /obj/item/clothing/head/soft/sec(src)
 	new /obj/item/clothing/head/soft/sec(src)
 	new /obj/item/clothing/head/soft/sec(src)
@@ -23,6 +23,7 @@
 	gloves["green gloves"] = /obj/item/clothing/gloves/green
 	gloves["grey gloves"] = /obj/item/clothing/gloves/grey
 	gloves["rainbow gloves"] = /obj/item/clothing/gloves/rainbow
+	gloves["black leather gloves"] = /obj/item/clothing/gloves/black_leather
 	gear_tweaks += new/datum/gear_tweak/path(gloves)

 /datum/gear/gloves/evening
@@ -128,6 +128,7 @@
 	hats["hat, feather trilby"] = /obj/item/clothing/head/feathertrilby
 	hats["hat, black fedora"] = /obj/item/clothing/head/fedora
 	hats["hat, brown fedora"] = /obj/item/clothing/head/fedora/brown
+	hats["hat, dark brown fedora"] = /obj/item/clothing/head/fedora/brown/dark
 	hats["hat, grey fedora"] = /obj/item/clothing/head/fedora/grey
 	hats["hat, beaver"] = /obj/item/clothing/head/beaverhat
 	hats["hat, cowboy"] = /obj/item/clothing/head/cowboy
@@ -103,4 +103,8 @@
 	shoes["high-tops, green"] = /obj/item/clothing/shoes/hitops/green
 	shoes["high-tops, purple"] = /obj/item/clothing/shoes/hitops/purple
 	shoes["high-tops, yellow"] = /obj/item/clothing/shoes/hitops/yellow
-	gear_tweaks += new/datum/gear_tweak/path(shoes)
+	gear_tweaks += new/datum/gear_tweak/path(shoes)
+
+/datum/gear/shoes/black_boots
+	display_name = "black boots"
+	path = /obj/item/clothing/shoes/black_boots
@@ -77,6 +77,7 @@

 /datum/gear/suit/iacvest
 	display_name = "IAC vest"
+	description = "It's a lightweight vest. Made of a dark, navy mesh with highly-reflective white material, designed to be worn by the Interstellar Aid Corps."
 	path = /obj/item/clothing/suit/iacvest
 	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Pharmacist", "Paramedic", "Medical Resident")

@@ -108,31 +109,37 @@
 	..()
 	gear_tweaks = list(gear_tweak_free_color_choice)

-/datum/gear/suit/trenchcoat
-	display_name = "trenchcoat, brown"
+
+
+/datum/gear/suit/trenchcoats
+	display_name = "trenchcoat selection"
+	description = "A selection of trenchcoats."
 	path = /obj/item/clothing/suit/storage/toggle/trench

-/datum/gear/suit/trenchcoatgrey
-	display_name = "trenchcoat, grey"
-	path = /obj/item/clothing/suit/storage/toggle/trench/grey
+/datum/gear/suit/trenchcoats/New()
+	..()
+	var/coat = list()
+	coat["trenchcoat, brown"] = /obj/item/clothing/suit/storage/toggle/trench
+	coat["trenchcoat, grey"] = /obj/item/clothing/suit/storage/toggle/trench/grey
+	coat["trenchcoat, dark brown"] = /obj/item/clothing/suit/storage/toggle/trench/alt
+	coat["trenchcoat, grey alternate"] = /obj/item/clothing/suit/storage/toggle/trench/grey_alt
+	gear_tweaks += new/datum/gear_tweak/path(coat)

-/datum/gear/suit/det_trenchcoat_brown
-	display_name = "brown trenchcoat (Detective)"
-	description = "A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. The coat is externally impact resistant - perfect for your next act of autodefenestration!"
+
+/datum/gear/suit/det_trenchcoat
+	display_name = "detective trenchcoat selection"
+	description = "A selection of detective trenchcoats."
 	path = /obj/item/clothing/suit/storage/toggle/det_trench
-	allowed_roles = list("Detective", "Head of Security")
+	allowed_roles = list("Detective")

-/datum/gear/suit/det_trenchcoat_black
-	display_name = "black trenchcoat (Detective)"
-	description = "A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. The coat is externally impact resistant - perfect for your next act of autodefenestration!"
-	path = /obj/item/clothing/suit/storage/toggle/det_trench/black
-	allowed_roles = list("Detective", "Head of Security")
+/datum/gear/suit/det_trenchcoat/New()
+	..()
+	var/coat = list()
+	coat["brown trenchcoat (Detective)"] = /obj/item/clothing/suit/storage/toggle/det_trench
+	coat["black trenchcoat (Detective)"] = /obj/item/clothing/suit/storage/toggle/det_trench/black
+	coat["technicolor trenchcoat (Detective)"] = /obj/item/clothing/suit/storage/toggle/det_trench/technicolor
+	gear_tweaks += new/datum/gear_tweak/path(coat)

-/datum/gear/suit/det_trenchcoat_techni
-	display_name = "technicolor trenchcoat (Detective)"
-	description = "A 23rd-century multi-purpose trenchcoat. It's fibres are hyper-absorbent. Can be painted into any color."
-	path = /obj/item/clothing/suit/storage/toggle/det_trench/technicolor
-	allowed_roles = list("Detective", "Head of Security")

 /datum/gear/suit/ian
 	display_name = "worn shirt"
@@ -235,25 +242,21 @@
 	display_name = "Tau Ceti Foreign Legion jacket"
 	path = /obj/item/clothing/suit/storage/legion

-/datum/gear/suit/miscellaneous/engi_dep_jacket
-	display_name = "department jacket, engineering"
+/datum/gear/suit/dep_jacket
+	display_name = "department jackets selection"
+	description = "A selection of department jackets."
 	path = /obj/item/clothing/suit/storage/toggle/engi_dep_jacket

-/datum/gear/suit/miscellaneous/supply_dep_jacket
-	display_name = "department jacket, supply"
-	path = /obj/item/clothing/suit/storage/toggle/supply_dep_jacket
+/datum/gear/suit/dep_jacket/New()
+	..()
+	var/jacket = list()
+	jacket["department jacket, engineering"] = /obj/item/clothing/suit/storage/toggle/engi_dep_jacket
+	jacket["department jacket, supply"] = /obj/item/clothing/suit/storage/toggle/supply_dep_jacket
+	jacket["department jacket, science"] = /obj/item/clothing/suit/storage/toggle/sci_dep_jacket
+	jacket["department jacket, medical"] = /obj/item/clothing/suit/storage/toggle/med_dep_jacket
+	jacket["department jacket, security"] = /obj/item/clothing/suit/storage/toggle/sec_dep_jacket
+	gear_tweaks += new/datum/gear_tweak/path(jacket)

-/datum/gear/suit/miscellaneous/sci_dep_jacket
-	display_name = "department jacket, science"
-	path = /obj/item/clothing/suit/storage/toggle/sci_dep_jacket
-
-/datum/gear/suit/miscellaneous/med_dep_jacket
-	display_name = "department jacket, medical"
-	path = /obj/item/clothing/suit/storage/toggle/med_dep_jacket
-
-/datum/gear/suit/miscellaneous/sec_dep_jacket
-	display_name = "department jacket, security"
-	path = /obj/item/clothing/suit/storage/toggle/sec_dep_jacket

 /datum/gear/suit/miscellaneous/peacoat
 	display_name = "peacoat"
@@ -143,11 +143,6 @@
 	..()
 	gear_tweaks = list(gear_tweak_free_color_choice)

-/datum/gear/uniform/corpsecsuit
-	display_name = "uniform, corporate (Security)"
-	path = /obj/item/clothing/under/rank/security/corp
-	allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet")
-
 /datum/gear/uniform/uniform_hop
 	display_name = "uniform, HoP dress"
 	path = /obj/item/clothing/under/dress/dress_hop
@@ -158,21 +153,6 @@
 	path = /obj/item/clothing/under/dress/dress_hr
 	allowed_roles = list("Head of Personnel")

-/datum/gear/uniform/navysecsuit
-	display_name = "uniform, navyblue (Security Officer)"
-	path = /obj/item/clothing/under/rank/security/navyblue
-	allowed_roles = list("Security Officer", "Head of Security", "Warden")
-
-/datum/gear/uniform/navysecsuit_warden
-	display_name = "uniform, navyblue (Warden)"
-	path = /obj/item/clothing/under/rank/warden/navyblue
-	allowed_roles = list("Head of Security", "Warden")
-
-/datum/gear/uniform/navysecsuit_hos
-	display_name = "uniform, navyblue (Head of Security)"
-	path = /obj/item/clothing/under/rank/head_of_security/navyblue
-	allowed_roles = list("Head of Security")
-
 /datum/gear/uniform/security_contractors
 	display_name = "security contractor uniform selection"
 	description = "A selection of security contractor uniforms."
@@ -276,4 +256,39 @@
 	uniform["Idris Incorporated uniform"] = /obj/item/clothing/under/rank/idris
 	uniform["Einstein Engines uniform"] = /obj/item/clothing/under/rank/einstein_engines
 	uniform["Zeng-Hu Pharmaceuticals uniform"] = /obj/item/clothing/under/rank/zeng
-	gear_tweaks += new/datum/gear_tweak/path(uniform)
+	gear_tweaks += new/datum/gear_tweak/path(uniform)
+
+/datum/gear/uniform/officer
+	display_name = "uniforms, (Security Officer)"
+	description = "A selection of officer uniforms."
+	path = /obj/item/clothing/under/rank/security
+	allowed_roles = list("Security Officer")
+
+/datum/gear/uniform/officer/New()
+	..()
+	var/uniform = list()
+	uniform["officer uniform, standard"] = /obj/item/clothing/under/rank/security
+	uniform["officer uniform, corporate"] = /obj/item/clothing/under/rank/security/corp
+	uniform["officer uniform, blue"] = /obj/item/clothing/under/rank/security/blue
+	gear_tweaks += new/datum/gear_tweak/path(uniform)
+
+
+/datum/gear/uniform/warden
+	display_name = "uniforms, (Warden)"
+	description = "A selection of Warden uniforms."
+	path = /obj/item/clothing/under/rank/warden
+	allowed_roles = list("Warden")
+
+/datum/gear/uniform/warden/New()
+	..()
+	var/uniform = list()
+	uniform["warden uniform, standard"] = /obj/item/clothing/under/rank/warden
+	uniform["warden uniform, corporate"] = /obj/item/clothing/under/rank/warden/corp
+	uniform["warden uniform, dark blue"] = /obj/item/clothing/under/rank/warden/dark_blue
+	gear_tweaks += new/datum/gear_tweak/path(uniform)
+
+
+/datum/gear/uniform/hos
+	display_name = "uniform, corporate (Head of Security)"
+	path = /obj/item/clothing/under/rank/head_of_security/corp
+	allowed_roles = list("Head of Security")
@@ -25,7 +25,7 @@
 	armor = list(melee = 25, bullet = 25, laser = 80, energy = 10, bomb = 0, bio = 0, rad = 0)

 /obj/item/clothing/gloves/arm_guard/bulletproof
-	name = "bulletproof arm guards"
+	name = "ballistic arm guards"
 	desc = "These arm guards will protect your hands and arms from ballistic weapons."
 	icon_state = "arm_guards_bullet"
 	armor = list(melee = 25, bullet = 80, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
@@ -198,6 +198,12 @@
 	desc = "A pair of gloves that reach past the elbow."
 	icon_state = "evening_gloves"

+/obj/item/clothing/gloves/black_leather
+	name = "black leather gloves"
+	desc = "A pair of tight-fitting synthleather gloves."
+	icon_state = "black_leather"
+	item_state = "black_leather_gloves"
+
 /obj/item/clothing/gloves/fingerless
 	desc = "A pair of gloves that don't actually cover the fingers."
 	name = "fingerless gloves"
@@ -24,6 +24,11 @@
 	heat_protection = HANDS
 	max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE

+/obj/item/clothing/gloves/swat/tactical
+	name = "\improper tactical gloves"
+	icon_state = "black_leather"
+	item_state = "black_leather_gloves"
+
 /obj/item/clothing/gloves/combat //Combined effect of SWAT gloves and insulated gloves
 	desc = "These tactical gloves are somewhat fire and impact resistant."
 	name = "combat gloves"
@@ -36,6 +41,7 @@
 	heat_protection = HANDS
 	max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE

+
 /obj/item/clothing/gloves/latex
 	name = "latex gloves"
 	desc = "Sterile latex gloves."
@@ -118,8 +118,8 @@
 /obj/item/clothing/head/helmet/swat/peacekeeper
 	name = "\improper ERT civil protection helmet"
 	desc = "A full helmet made of highly advanced ceramic materials, complete with a jetblack visor. Shines with a mirror sheen."
-	icon_state = "erthelmet_peacekeeper"
-	item_state = "erthelmet_peacekeeper"
+	icon_state = "civilprotection_helmet"
+	item_state = "civilprotection_helmet"
 	body_parts_covered = HEAD|FACE|EYES //face shield
 	flags_inv = HIDEEARS
 	action_button_name = "Toggle Visor"
@@ -62,6 +62,11 @@
 	desc = "A navy blue beret with an officer's rank emblem. For officers that are more inclined towards style than safety."
 	icon_state = "officerberet"

+/obj/item/clothing/head/beret/sec/cadet
+	name = "cadet beret"
+	desc = "A beret with the security insignia emblazoned on it. This one is for in training security personnel."
+	icon_state = "cadetberet"
+
 /obj/item/clothing/head/beret/sec/hos
 	name = "commander beret"
 	desc = "A navy blue beret with a commander's rank emblem. For officers that are more inclined towards style than safety."
@@ -87,6 +92,12 @@
 	desc = "A black beret adorned with the shield - a silver kite shield with an engraved sword - of the NanoTrasen security forces."
 	icon_state = "centcomofficerberet"

+/obj/item/clothing/head/beret/centcom/officer/civilprotection
+	name = "civil protection beret"
+	desc = "A black beret adorned with the shield - a gold kite shield with an engraved sword - of the NanoTrasen security forces."
+	icon_state = "civilprotection_beret"
+	item_state = "civilprotection_beret"
+
 /obj/item/clothing/head/beret/centcom/captain
 	name = "captains beret"
 	desc = "A white beret adorned with the shield - a silver kite shield with an engraved sword - of the NanoTrasen security forces."
@@ -125,7 +136,7 @@
 /obj/item/clothing/head/det
 	name = "fedora"
 	desc = "A brown fedora - either the cornerstone of a detective's style or a poor attempt at looking cool, depending on the person wearing it."
-	icon_state = "detective"
+	icon_state = "brown_fedora"
 	item_state_slots = list(
 		slot_l_hand_str = "det_hat",
 		slot_r_hand_str = "det_hat"
@@ -135,7 +146,7 @@
 	siemens_coefficient = 0.7

 /obj/item/clothing/head/det/grey
-	icon_state = "detective2"
+	icon_state = "grey_fedora"
 	desc = "A grey fedora - either the cornerstone of a detective's style or a poor attempt at looking cool, depending on the person wearing it."

 /obj/item/clothing/head/det/technicolor
@@ -432,15 +432,18 @@
 /obj/item/clothing/head/fedora/brown
 	name = "fedora"
 	desc = "A brown fedora - either the cornerstone of a detective's style or a poor attempt at looking cool, depending on the person wearing it."
-	icon_state = "detective"
+	icon_state = "brown_fedora"
 	item_state_slots = list(
 		slot_l_hand_str = "det_hat",
 		slot_r_hand_str = "det_hat"
 		)
 	siemens_coefficient = 0.7

+/obj/item/clothing/head/fedora/brown/dark
+	icon_state = "darkbrown_fedora"
+
 /obj/item/clothing/head/fedora/grey
-	icon_state = "detective2"
+	icon_state = "grey_fedora"
 	desc = "A grey fedora - either the cornerstone of a detective's style or a poor attempt at looking cool, depending on the person wearing it."

 /obj/item/clothing/head/beanie
@@ -25,7 +25,7 @@
 	armor = list(melee = 25, bullet = 25, laser = 80, energy = 10, bomb = 0, bio = 0, rad = 0)

 /obj/item/clothing/shoes/leg_guard/bulletproof
-	name = "bulletproof leg guards"
+	name = "ballistic leg guards"
 	desc = "These will protect your legs and feet from ballistic weapons."
 	icon_state = "leg_guards_bullet"
 	armor = list(melee = 25, bullet = 80, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
@@ -189,6 +189,14 @@
 	siemens_coefficient = 0.9
 	can_hold_knife = 1

+/obj/item/clothing/shoes/black_boots
+	name = "black boots"
+	desc = "A pair of tough looking black boots."
+	icon_state = "blackboots"
+	item_state = "blackboots"
+	armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
+	can_hold_knife = 1
+
 /obj/item/clothing/shoes/caligae
 	name = "caligae"
 	desc = "The standard Unathi marching footwear. Made of leather and rubber, with heavy hob-nailed soles, their unique design allows for improved traction and protection, leading to them catching on with other species."
@@ -113,20 +113,20 @@
 	pockets.max_storage_space = 8

 /obj/item/clothing/suit/armor/riot
-	name = "riot suit"
-	desc = "A suit of armor with heavy padding to protect against melee attacks. Looks like it might impair movement."
-	icon_state = "riot"
-	item_state = "swat_suit"
+	name = "riot vest"
+	desc = "A vest of armor with heavy padding to protect against melee attacks. Looks like it might impair movement."
+	icon_state = "riot_vest"
+	item_state = "riot_vest"
 	slowdown = 1
 	armor = list(melee = 80, bullet = 20, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.5
-	pocket_slots = 4//Fullbody suit, so more slots
+	pocket_slots = 4

 /obj/item/clothing/suit/armor/bulletproof
-	name = "bulletproof vest"
+	name = "ballistic vest"
 	desc = "A vest that excels in protecting the wearer against high-velocity solid projectiles."
-	icon_state = "bulletproof"
-	item_state = "armor"
+	icon_state = "bulletproof_armor"
+	item_state = "bulletproof_armor"
 	blood_overlay_type = "armor"
 	armor = list(melee = 25, bullet = 80, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
 	pocket_slots = 4
@@ -400,6 +400,13 @@
 	icon_badge = "csivest_badge"
 	icon_nobadge = "csivest_nobadge"

+/obj/item/clothing/suit/storage/vest/cadet
+	name = "cadet hazard vest"
+	desc = "A sturdy high-visibility vest intended for in training security personnel."
+	icon_state = "hazard_cadet"
+	item_state = "hazard_cadet"
+	armor = list(melee = 10, bullet = 0, laser = 10, energy = 10, bomb = 10, bio = 0, rad = 0)
+
 /obj/item/clothing/suit/storage/vest/heavy
 	name = "heavy armor vest"
 	desc = "A heavy kevlar plate carrier with webbing attached."
@@ -487,8 +494,10 @@
 /obj/item/clothing/suit/storage/vest/heavy/ert/peacekeeper
 	name = "ERT civil protection plate carrier"
 	desc = "A plate carrier worn by troopers serving civil protection details. Commonly seen on high-profile escorts and Nanotrasen administration centers."
-	icon_state = "ert_peacekeeper"
-	item_state = "ert_peacekeeper"
+	icon_state = "civilprotection_nobadge"
+	item_state = "civilprotection_nobadge"
+	icon_badge = "civilprotection_badge"
+	icon_nobadge = "civilprotection_nobadge"

 //unathi armor

@@ -345,6 +345,22 @@
 	icon_closed = "trench2"
 	blood_overlay_type = "coat"

+/obj/item/clothing/suit/storage/toggle/trench/alt
+	name = "brown trenchcoat"
+	desc = "A sleek canvas trenchcoat"
+	icon_state = "trenchcoat_brown"
+	item_state = "trenchcoat_brown"
+	icon_open = "trenchcoat_brown_open"
+	icon_closed = "trenchcoat_brown"
+
+/obj/item/clothing/suit/storage/toggle/trench/grey_alt
+	name = "grey trenchcoat"
+	desc = "A sleek canvas trenchcoat"
+	icon_state = "trenchcoat_grey"
+	item_state = "trenchcoat_grey"
+	icon_open = "trenchcoat_grey_open"
+	icon_closed = "trenchcoat_grey"
+
 /obj/item/clothing/suit/storage/dominia
 	name = "dominia cape"
 	desc = "This is a cape in the style of Dominia nobility. It's the latest fashion across Dominian space."
@@ -124,4 +124,18 @@
 		/obj/item/weapon/material/knife/bayonet
 	)

-	new /obj/item/weapon/material/knife/bayonet(hold)
+	new /obj/item/weapon/material/knife/bayonet(hold)
+
+/obj/item/clothing/accessory/storage/bandolier
+	name = "bandolier"
+	desc = "A pocketed belt designated to hold shotgun shells."
+	icon_state = "bandolier"
+	item_state = "bandolier"
+	slots = 16
+
+/obj/item/clothing/accessory/storage/bandolier/Initialize()
+	. = ..()
+	hold.max_storage_space = 16
+	hold.can_hold = list(
+		/obj/item/ammo_casing/shotgun
+	)
@@ -8,62 +8,93 @@
 /*
 * Security
 */
-/obj/item/clothing/under/rank/warden
-	desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection. It has the word \"Warden\" written on the shoulders."
-	name = "warden's jumpsuit"
-	icon_state = "warden"
-//	item_state = "r_suit"
-	worn_state = "warden"
-	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	siemens_coefficient = 0.7

 /obj/item/clothing/under/rank/security
-	name = "security officer's jumpsuit"
+	name = "security officer's uniform"
 	desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
-	icon_state = "security"
-//	item_state = "r_suit"
-	worn_state = "secred"
-	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	siemens_coefficient = 0.7
-
-/obj/item/clothing/under/rank/dispatch
-	name = "dispatcher's uniform"
-	desc = "A dress shirt and khakis with a security patch sewn on."
-	icon_state = "dispatch"
-	//item_state = "dispatch"
-	worn_state = "dispatch"
-	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
-	siemens_coefficient = 0.7
-
-/obj/item/clothing/under/rank/security2
-	name = "security cadet's uniform"
-	desc = "It's made of a slightly sturdier material, to allow for robust protection."
-	icon_state = "redshirt2"
-	item_state = "r_suit"
-	worn_state = "redshirt2"
+	icon_state = "officer_standard"
+	worn_state = "officer_standard"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.7

 /obj/item/clothing/under/rank/security/corp
-	icon_state = "sec_corporate"
-	//item_state = "sec_corporate"
-	worn_state = "sec_corporate"
+	icon_state = "officer_corporate"
+	worn_state = "officer_corporate"
+
+/obj/item/clothing/under/rank/security/blue
+	icon_state = "officer_blue"
+	worn_state = "officer_blue"
+
+/obj/item/clothing/under/rank/cadet
+	name = "security cadet's uniform"
+	desc = "It's made of a slightly sturdier material, to allow for robust protection."
+	icon_state = "cadet_standard"
+	worn_state = "cadet_standard"
+	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	siemens_coefficient = 0.7
+
+/obj/item/clothing/under/rank/warden
+	desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection. It has the word \"Warden\" written on the shoulders."
+	name = "warden's uniform"
+	icon_state = "warden_standard"
+	worn_state = "warden_standard"
+	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	siemens_coefficient = 0.7

 /obj/item/clothing/under/rank/warden/corp
 	icon_state = "warden_corporate"
-	//item_state = "warden_corporate"
 	worn_state = "warden_corporate"

-/obj/item/clothing/under/tactical
-	name = "tactical jumpsuit"
-	desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
-	icon_state = "swatunder"
-	//item_state = "swatunder"
-	worn_state = "swatunder"
-	armor = list(melee = 10, bullet = 5, laser = 5,energy = 0, bomb = 0, bio = 0, rad = 0)
+/obj/item/clothing/under/rank/warden/dark_blue
+	icon_state = "warden_darkblue"
+	worn_state = "warden_darkblue"
+
+/*
+ * Detective / Forensics
+ */
+
+/obj/item/clothing/under/det
+	name = "detective's uniform"
+	desc = "Someone who wears this means business."
+	icon_state = "detective_standard"
+	worn_state = "detective_standard"
+	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.7

+/obj/item/clothing/under/det/black
+	name = "hard-worn suit"
+	icon_state = "detective_black"
+	worn_state = "detective_black"
+
+/obj/item/clothing/under/det/classic
+	name = "hard-worn suit"
+	icon_state = "detective_classic"
+	worn_state = "detective_classic"
+
+/obj/item/clothing/under/det/forensics
+	name = "forensics technician's uniform"
+	icon_state = "forensic_standard"
+	worn_state = "forensic_standard"
+
+/*
+ * Head of Security
+ */
+/obj/item/clothing/under/rank/head_of_security
+	desc = "It's a jumpsuit worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer."
+	name = "head of security's uniform"
+	icon_state = "hos_standard"
+	worn_state = "hos_standard"
+	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	siemens_coefficient = 0.7
+
+/obj/item/clothing/under/rank/head_of_security/corp
+	icon_state = "hos_corporate"
+	worn_state = "hos_corporate"
+
+/*
+ * Contractors
+ */
+
 /obj/item/clothing/under/rank/security/necropolis
 	name = "Necropolis Industries security uniform"
 	desc = "A uniform worn by Necropolis Industries security forces."
@@ -88,83 +119,4 @@

 /obj/item/clothing/under/rank/security/eridani/alt
 	icon_state = "erisec_alt"
-	worn_state = "erisec_alt"
-
-/*
- * Detective
- */
-
-/obj/item/clothing/under/det
-	name = "hard-worn suit"
-	desc = "Someone who wears this means business."
-	icon_state = "detective"
-	item_state = "det"
-	worn_state = "detective"
-	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	siemens_coefficient = 0.7
-
-/obj/item/clothing/under/det/black
-	icon_state = "detective2"
-	worn_state = "detective2"
-	item_state = "sl_suit"
-
-/obj/item/clothing/under/det/slob
-	icon_state = "polsuit"
-	worn_state = "polsuit"
-
-/obj/item/clothing/under/det/forensics
-	name = "forensics technician's uniform"
-	desc = "A tan service uniform worn by a forensics officer."
-	icon_state = "officertanclothes"
-	item_state = "det"
-	worn_state = "officertanclothes"
-
-/*
- * Head of Security
- */
-/obj/item/clothing/under/rank/head_of_security
-	desc = "It's a jumpsuit worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer."
-	name = "head of security's jumpsuit"
-	icon_state = "hos"
-//	item_state = "r_suit"
-	worn_state = "hosred"
-	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	siemens_coefficient = 0.7
-
-/obj/item/clothing/under/rank/head_of_security/corp
-	icon_state = "hos_corporate"
-	//item_state = "hos_corporate"
-	worn_state = "hos_corporate"
-
-//Jensen cosplay gear
-/obj/item/clothing/under/rank/head_of_security/jensen
-	desc = "You never asked for anything that stylish."
-	name = "head of security's jumpsuit"
-	icon_state = "jensen"
-	item_state = "jensen"
-	worn_state = "jensen"
-
-/*
- * Navy uniforms
- */
-
-/obj/item/clothing/under/rank/security/navyblue
-	name = "security officer's uniform"
-	desc = "The latest in fashionable security outfits."
-	icon_state = "officerblueclothes"
-	item_state = "ba_suit"
-	worn_state = "officerblueclothes"
-
-/obj/item/clothing/under/rank/head_of_security/navyblue
-	desc = "The insignia on this uniform tells you that this uniform belongs to the Head of Security."
-	name = "head of security's uniform"
-	icon_state = "hosblueclothes"
-	item_state = "ba_suit"
-	worn_state = "hosblueclothes"
-
-/obj/item/clothing/under/rank/warden/navyblue
-	desc = "The insignia on this uniform tells you that this uniform belongs to the Warden."
-	name = "warden's uniform"
-	icon_state = "wardenblueclothes"
-	item_state = "ba_suit"
-	worn_state = "wardenblueclothes"
+	worn_state = "erisec_alt"
@@ -110,9 +110,8 @@
 /obj/item/clothing/under/ccpolice
 	name = "ERT civil protection uniform"
 	desc = "A sturdy navy uniform, carefully ironed and folded. Worn by specialist troopers on civil protection duties."
-	icon_state = "officerdnavyclothes"
-	item_state = "scratch"
-	worn_state = "officerdnavyclothes"
+	icon_state = "civilprotection"
+	worn_state = "civilprotection"

 /obj/item/clothing/under/rank/centcom_commander
 	desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Commander.\ It has a patch denoting a Pheonix on the sleeves."
@@ -709,4 +708,22 @@
 	name = "\improper CR suit"
 	desc = "A very tight form-fitting padded suit that looks extremely comfortable to wear."
 	icon_state = "crsuit"
-	worn_state = "crsuit"
+	worn_state = "crsuit"
+
+/obj/item/clothing/under/tactical
+	name = "tactical jumpsuit"
+	desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
+	icon_state = "swatunder"
+	//item_state = "swatunder"
+	worn_state = "swatunder"
+	armor = list(melee = 10, bullet = 5, laser = 5,energy = 0, bomb = 0, bio = 0, rad = 0)
+	siemens_coefficient = 0.7
+
+/obj/item/clothing/under/rank/dispatch
+	name = "dispatcher's uniform"
+	desc = "A dress shirt and khakis with a security patch sewn on."
+	icon_state = "dispatch"
+	worn_state = "dispatch"
+	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
+	siemens_coefficient = 0.7
@@ -108,7 +108,7 @@
 			new/obj/item/weapon/gun/projectile/shotgun/pump/rifle(src)
 			new/obj/item/ammo_magazine/boltaction(src)
 			new/obj/item/clothing/under/soviet(src)
-			new/obj/item/clothing/head/ushanka(src)
+			new/obj/item/clothing/head/ushanka/grey(src)
 		if(89)
 			new/obj/item/organ/xenos/plasmavessel(src)
 		if(90)
@@ -154,4 +154,4 @@
 	corpsehelmet = /obj/item/clothing/head/bearpelt

 /obj/effect/landmark/mobcorpse/russian/ranged
-	corpsehelmet = /obj/item/clothing/head/ushanka
+	corpsehelmet = /obj/item/clothing/head/ushanka/grey
@@ -0,0 +1,44 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: AmoryBlaine, Ferner
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - imageadd: "Overhauled the sprites of security's uniforms and equipment. (Spritework by AmoryBlaine.)"
+  - imageadd: "Changed the uniforms of civilprotection. (Spritework by AmoryBlaine.)"
+  - rscadd: "Compacted, changed and added a few of loadout options."
+  - tweak: "Changed the bandolier from a belt to an accessory."