Loadout Overhaul

code/modules/client/preference_setup/loadout/loadout_gloves.dm

@@ -6,25 +6,27 @@
 	slot = slot_gloves
 	sort_category = "Gloves and Handwear"
 
-/datum/gear/gloves/blue
+/datum/gear/gloves/selector
-	display_name = "gloves, blue"
+	display_name = "coloured gloves selector"
-	path = /obj/item/clothing/gloves/blue
+	description = "Pick from a range of plain coloured gloves."
+	path = /obj/item/clothing/gloves/black
 
-/datum/gear/gloves/brown
+/datum/gear/gloves/selector/New()
-	display_name = "gloves, brown"
+	..()
-	path = /obj/item/clothing/gloves/brown
+	var/list/selector_uniforms = list(
-
+		"black"=/obj/item/clothing/gloves/black,
-/datum/gear/gloves/light_brown
+		"blue"=/obj/item/clothing/gloves/blue,
-	display_name = "gloves, light-brown"
+		"brown"=/obj/item/clothing/gloves/brown,
-	path = /obj/item/clothing/gloves/light_brown
+		"light brown"=/obj/item/clothing/gloves/light_brown,
-
+		"green"=/obj/item/clothing/gloves/green,
-/datum/gear/gloves/green
+		"grey"=/obj/item/clothing/gloves/grey,
-	display_name = "gloves, green"
+		"orange"=/obj/item/clothing/gloves/orange,
-	path = /obj/item/clothing/gloves/green
+		"purple"=/obj/item/clothing/gloves/purple,
-
+		"rainbow"=/obj/item/clothing/gloves/rainbow,
-/datum/gear/gloves/grey
+		"red"=/obj/item/clothing/gloves/red,
-	display_name = "gloves, grey"
+		"white"=/obj/item/clothing/gloves/white
-	path = /obj/item/clothing/gloves/grey
+	)
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
 
 /datum/gear/gloves/latex
 	display_name = "gloves, latex"
@@ -36,26 +38,6 @@
 	path = /obj/item/clothing/gloves/sterile/nitrile
 	cost = 2
 
-/datum/gear/gloves/orange
-	display_name = "gloves, orange"
-	path = /obj/item/clothing/gloves/orange
-
-/datum/gear/gloves/purple
-	display_name = "gloves, purple"
-	path = /obj/item/clothing/gloves/purple
-
-/datum/gear/gloves/rainbow
-	display_name = "gloves, rainbow"
-	path = /obj/item/clothing/gloves/rainbow
-
-/datum/gear/gloves/red
-	display_name = "gloves, red"
-	path = /obj/item/clothing/gloves/red
-
-/datum/gear/gloves/white
-	display_name = "gloves, white"
-	path = /obj/item/clothing/gloves/white
-
 /datum/gear/gloves/evening
 	display_name = "evening gloves"
 	path = /obj/item/clothing/gloves/evening

code/modules/client/preference_setup/loadout/loadout_head.dm

@@ -16,11 +16,14 @@
 	display_name = "beret, red"
 	path = /obj/item/clothing/head/beret
 
+<<<<<<< HEAD
 /datum/gear/head/beret/bsec
 	display_name = "beret, navy (officer)"
 	path = /obj/item/clothing/head/beret/sec/navy/officer
 	allowed_roles = list("Security Officer","Head of Security","Warden","Blueshield Guard","Security Pilot") //YW ADDITIONS
 
+=======
+>>>>>>> ec9eb3a615... Merge pull request #15017 from KillianKirilenko/kk-loadouts
 /datum/gear/head/beret/bsec_warden
 	display_name = "beret, navy (warden)"
 	path = /obj/item/clothing/head/beret/sec/navy/warden
@@ -31,11 +34,14 @@
 	path = /obj/item/clothing/head/beret/sec/navy/hos
 	allowed_roles = list("Head of Security")
 
+<<<<<<< HEAD
 /datum/gear/head/beret/csec
 	display_name = "beret, corporate (officer)"
 	path = /obj/item/clothing/head/beret/sec/corporate/officer
 	allowed_roles = list("Security Officer","Head of Security","Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
 
+=======
+>>>>>>> ec9eb3a615... Merge pull request #15017 from KillianKirilenko/kk-loadouts
 /datum/gear/head/beret/csec_warden
 	display_name = "beret, corporate (warden)"
 	path = /obj/item/clothing/head/beret/sec/corporate/warden
@@ -54,23 +60,43 @@
 	display_name = "beret, purple"
 	path = /obj/item/clothing/head/beret/purple
 
+<<<<<<< HEAD
 /datum/gear/head/beret/sec
 	display_name = "beret, red (security)"
 	path = /obj/item/clothing/head/beret/sec
 	allowed_roles = list("Security Officer","Head of Security","Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
 
+=======
+>>>>>>> ec9eb3a615... Merge pull request #15017 from KillianKirilenko/kk-loadouts
 /datum/gear/head/cap
-	display_name = "cap, black"
+	display_name = "cap, brown-flat"
+	path = /obj/item/clothing/head/flatcap
+
+/datum/gear/head/cap/selector
+	display_name = "cap selector (plain)"
+	description = "Pick from a range of plain, coloured softcaps. Includes black, blue, green, and more!"
 	path = /obj/item/clothing/head/soft/black
 
-/datum/gear/head/cap/blue
+/datum/gear/head/cap/selector/New()
-	display_name = "cap, blue"
+	..()
-	path = /obj/item/clothing/head/soft/blue
+	var/list/selector_uniforms = list(
+		"black"=/obj/item/clothing/head/soft/black,
+		"blue"=/obj/item/clothing/head/soft/blue,
+		"green"=/obj/item/clothing/head/soft/green,
+		"grey"=/obj/item/clothing/head/soft/grey,
+		"orange"=/obj/item/clothing/head/soft/orange,
+		"purple"=/obj/item/clothing/head/soft/purple,
+		"rainbow"=/obj/item/clothing/head/soft/rainbow,
+		"red"=/obj/item/clothing/head/soft/red,
+		"yellow"=/obj/item/clothing/head/soft/yellow
+	)
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
 
 /datum/gear/head/cap/mailman
 	display_name = "cap, blue station"
 	path = /obj/item/clothing/head/mailman
 
+<<<<<<< HEAD
 /datum/gear/head/cap/flat
 	display_name = "cap, brown-flat"
 	path = /obj/item/clothing/head/flatcap
@@ -118,6 +144,8 @@
 	display_name = "cap, yellow"
 	path = /obj/item/clothing/head/soft/yellow
 
+=======
+>>>>>>> ec9eb3a615... Merge pull request #15017 from KillianKirilenko/kk-loadouts
 /datum/gear/head/cap/white
 	display_name = "cap (colorable)"
 	path = /obj/item/clothing/head/soft/mime
@@ -134,69 +162,45 @@
 	..()
 	gear_tweaks += gear_tweak_free_color_choice
 
-/datum/gear/head/cap/mbill
-	display_name = "cap, major bill's"
-	path = /obj/item/clothing/head/soft/mbill
-
 /datum/gear/head/cap/sol
 	display_name = "cap, sol"
 	path = /obj/item/clothing/head/soft/solgov
 
 /datum/gear/head/cowboy
-	display_name = "cowboy"
+	display_name = "cowboy hat selector"
+	description = "Pick from a range of styles of classic cowboy hat. Giddyup!"
 	path = /obj/item/clothing/head/cowboy
 
-/datum/gear/head/cowboy/rattan
+/datum/gear/head/cowboy/New()
-	display_name = "cowboy, rattan"
+	..()
-	path = /obj/item/clothing/head/cowboy/rattan
+	var/list/selector_uniforms = list(
-
+		"Classic"=/obj/item/clothing/head/cowboy,
-/datum/gear/head/cowboy/dark
+		"Rattan"=/obj/item/clothing/head/cowboy/rattan,
-	display_name = "cowboy, dark"
+		"Dark"=/obj/item/clothing/head/cowboy/dark,
-	path = /obj/item/clothing/head/cowboy/dark
+		"Ranger"=/obj/item/clothing/head/cowboy/ranger,
-
+		"Black"=/obj/item/clothing/head/cowboy/black,
-/datum/gear/head/cowboy/ranger
+		"Fancy"=/obj/item/clothing/head/cowboy/fancy,
-	display_name = "cowboy, ranger"
+		"Rustler's"=/obj/item/clothing/head/cowboy/rustler,
-	path = /obj/item/clothing/head/cowboy/ranger
+		"Bandit's"=/obj/item/clothing/head/cowboy/bandit,
-
+		"Wide"=/obj/item/clothing/head/cowboy/wide
-/datum/gear/head/cowboy/black
+	)
-	display_name = "cowboy, black"
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
-	path = /obj/item/clothing/head/cowboy/black
-
-/datum/gear/head/cowboy/fancy
-	display_name = "cowboy, fancy"
-	path = /obj/item/clothing/head/cowboy/fancy
-
-/datum/gear/head/cowboy/rustler
-	display_name = "cowboy, rustler"
-	path = /obj/item/clothing/head/cowboy/rustler
-
-/datum/gear/head/cowboy/black
-	display_name = "cowboy, bandit"
-	path = /obj/item/clothing/head/cowboy/bandit
-
-/datum/gear/head/cowboy/wide
-	display_name = "cowboy, wide"
-	path = /obj/item/clothing/head/cowboy/wide
 
 /datum/gear/head/fedora/grey
-	display_name = "fedora, grey"
+	display_name = "fedora selector"
+	description = "Pick from a range of fedoras. Available in grey, white, brown, beige, and panama style."
 	path = /obj/item/clothing/head/fedora
 
-/datum/gear/head/fedora/brown
+/datum/gear/head/fedora/grey/New()
-	display_name = "fedora, brown"
+	..()
-	path = /obj/item/clothing/head/fedora/brown
+	var/list/selector_uniforms = list(
-
+		"Brown"=/obj/item/clothing/head/fedora/brown,
-/datum/gear/head/fedora/white
+		"White"=/obj/item/clothing/head/fedora/white,
-	display_name = "fedora, white"
+		"Beige"=/obj/item/clothing/head/fedora/beige,
-	path = /obj/item/clothing/head/fedora/white
+		"Panama"=/obj/item/clothing/head/fedora/panama,
-
+		"Grey"=/obj/item/clothing/head/fedora
-/datum/gear/head/fedora/beige
+	)
-	display_name = "fedora, beige"
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
-	path = /obj/item/clothing/head/fedora/beige
-
-/datum/gear/head/fedora/panama
-	display_name = "fedora, panama"
-	path = /obj/item/clothing/head/fedora/panama
 
 /datum/gear/head/hairflower
 	display_name = "hair flower pin (colorable)"
@@ -353,27 +357,23 @@
 	..()
 	gear_tweaks += gear_tweak_free_color_choice
 
-/datum/gear/head/welding/
+/datum/gear/head/welding
-	display_name = "welding, normal (engineering/robotics)"
+	display_name = "welding mask selection"
+	description = "Select from a range of welding masks (engineering crew/roboticists only)"
 	path = /obj/item/clothing/head/welding
 	cost = 2
 	allowed_roles = list("Chief Engineer","Engineer","Atmospheric Technician","Research Director","Roboticist")
 
-/datum/gear/head/welding/demon
+/datum/gear/head/welding/New()
-	display_name = "welding, demon (engineering/robotics)"
+	..()
-	path = /obj/item/clothing/head/welding/demon
+	var/list/selector_uniforms = list(
-
+		"plain"=/obj/item/clothing/head/welding,
-/datum/gear/head/welding/knight
+		"engineering"=/obj/item/clothing/head/welding/engie,
-	display_name = "welding, knight (engineering/robotics)"
+		"fancy"=/obj/item/clothing/head/welding/fancy,
-	path = /obj/item/clothing/head/welding/knight
+		"demonic"=/obj/item/clothing/head/welding/demon,
-
+		"knightly"=/obj/item/clothing/head/welding/knight
-/datum/gear/head/welding/fancy
+	)
-	display_name = "welding, fancy (engineering/robotics)"
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
-	path = /obj/item/clothing/head/welding/fancy
-
-/datum/gear/head/welding/engie
-	display_name = "welding, engie (engineering/robotics)"
-	path = /obj/item/clothing/head/welding/engie
 
 /datum/gear/head/beret/solgov
 	display_name = "beret government, selection"
@@ -445,3 +445,38 @@
 /datum/gear/head/wheat
 	display_name = "straw hat"
 	path = /obj/item/clothing/head/wheat
+
+/datum/gear/head/sec_hat_selector
+	display_name = "Security - Basic Headwear"
+	description = "Select from a range of hats available to all Security personnel."
+	allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
+	path = /obj/item/clothing/head/soft/sec/corp
+
+/datum/gear/head/sec_hat_selector/New()
+	..()
+	var/list/selector_uniforms = list(
+		"Navy Security Beret"=/obj/item/clothing/head/beret/sec/navy/officer,
+		"CorpSec Beret"=/obj/item/clothing/head/beret/sec/corporate/officer,
+		"Security Beret"=/obj/item/clothing/head/beret/sec,
+		"CorpSec Softcap"=/obj/item/clothing/head/soft/sec/corp,
+		"Security Softcap"=/obj/item/clothing/head/soft/sec,
+		"Proxima Centauri Contractor Beret"=/obj/item/clothing/head/beret/corp/pcrc
+	)
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
+
+/datum/gear/head/med_hat_selector
+	display_name = "Medical - Basic Headwear"
+	description = "Select from a range of hats available to all Medical personnel."
+	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic")
+	path = /obj/item/clothing/head/soft/med
+
+/datum/gear/head/med_hat_selector/New()
+	..()
+	var/list/selector_uniforms = list(
+		"medical softcap"=/obj/item/clothing/head/soft/med,
+		"paramedic softcap"=/obj/item/clothing/head/soft/paramed,
+		"medical beret"=/obj/item/clothing/head/beret/medical,
+		"chemist's beret"=/obj/item/clothing/head/beret/medical/chem,
+		"virologist's beret"=/obj/item/clothing/head/beret/medical/viro
+	)
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))

code/modules/client/preference_setup/loadout/loadout_head_vr.dm

@@ -1,8 +1,11 @@
+<<<<<<< HEAD
 /datum/gear/head/cap/med
 	display_name = "cap, medical (Medical)"
 	path = /obj/item/clothing/head/soft/med
 	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic","Field Medic") //CHOMP keep explo
 
+=======
+>>>>>>> ec9eb3a615... Merge pull request #15017 from KillianKirilenko/kk-loadouts
 /*/datum/gear/head/cap/sol
 	display_name = "cap, sol"
 	path = /obj/item/clothing/head/soft/sol*/
@@ -33,28 +36,21 @@
 	allowed_roles = list("Head of Security", "Detective")
 
 /datum/gear/head/bearpelt
-	display_name = "brown bear pelt"
+	display_name = "animal pelt selection"
+	description = "Select from a range of (probably, hopefully) synthetic/artificial animal pelts."
 	path = /obj/item/clothing/head/pelt
 
-/datum/gear/head/wolfpelt
+/datum/gear/head/bearpelt/New()
-	display_name = "brown wolf pelt"
+	..()
-	path = /obj/item/clothing/head/pelt/wolfpelt
+	var/list/selector_uniforms = list(
-
+		"bear, brown"=/obj/item/clothing/head/pelt,
-/datum/gear/head/wolfpeltblack
+		"wolf, brown"=/obj/item/clothing/head/pelt/wolfpelt,
-	display_name = "black wolf pelt"
+		"wolf, black"=/obj/item/clothing/head/pelt/wolfpeltblack,
-	path = /obj/item/clothing/head/pelt/wolfpeltblack
+		"tiger, plain"=/obj/item/clothing/head/pelt/tigerpelt,
-
+		"tiger, white"=/obj/item/clothing/head/pelt/tigerpeltsnow,
-/datum/gear/head/tigerpelt
+		"tiger, pink"=/obj/item/clothing/head/pelt/tigerpeltpink
-	display_name = "shiny tiger pelt"
+	)
-	path = /obj/item/clothing/head/pelt/tigerpelt
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
-
-/datum/gear/head/tigerpeltsnow
-	display_name = "snow tiger pelt"
-	path = /obj/item/clothing/head/pelt/tigerpeltsnow
-
-/datum/gear/head/tigerpeltpink
-	display_name = "pink tiger pelt"
-	path = /obj/item/clothing/head/pelt/tigerpeltpink
 
 /datum/gear/head/magic_hat
 	display_name = "wizard hat, colorable"

code/modules/client/preference_setup/loadout/loadout_smoking.dm

@@ -48,6 +48,6 @@
 /datum/gear/cigarettes/New()
 	..()
 	var/list/cigarettes = list()
-	for(var/obj/item/weapon/storage/fancy/cigarettes/cigarette_brand as anything in (typesof(/obj/item/weapon/storage/fancy/cigarettes) - typesof(/obj/item/weapon/storage/fancy/cigarettes/killthroat)))
+	for(var/obj/item/weapon/storage/fancy/cigarettes/cigarette_brand as anything in (typesof(/obj/item/weapon/storage/fancy/cigarettes)))
 		cigarettes[initial(cigarette_brand.name)] = cigarette_brand
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cigarettes))

code/modules/client/preference_setup/loadout/loadout_suit.dm

@@ -31,52 +31,38 @@
 	path = /obj/item/clothing/suit/jacket/puffer/vest
 
 /datum/gear/suit/bomber
-	display_name = "bomber jacket"
+	display_name = "bomber jacket selection"
+	description = "Pick from a small selection of bomber jackets."
 	path = /obj/item/clothing/suit/storage/toggle/bomber
 
-/datum/gear/suit/bomber_alt
+/datum/gear/suit/bomber/New()
-	display_name = "bomber jacket, alt"
+	..()
-	path = /obj/item/clothing/suit/storage/bomber/alt
+	var/list/selector_uniforms = list(
-
+		"classic"=/obj/item/clothing/suit/storage/toggle/bomber,
-/datum/gear/suit/bomber_retro
+		"classic alternative"=/obj/item/clothing/suit/storage/bomber/alt,
-	display_name = "bomber jacket, retro"
+		"retro"=/obj/item/clothing/suit/storage/toggle/bomber/retro
-	path = /obj/item/clothing/suit/storage/toggle/bomber/retro
+	)
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
 
 /datum/gear/suit/leather_jacket
-	display_name = "leather jacket, black"
+	display_name = "leather jacket and vest selection"
+	description = "Pick from a wide variety of leather vests and jackets."
 	path = /obj/item/clothing/suit/storage/toggle/leather_jacket
 
-/datum/gear/suit/leather_jacket_sleeveless
+/datum/gear/suit/leather_jacket/New()
-	display_name = "leather vest, black"
+	..()
-	path = /obj/item/clothing/suit/storage/toggle/leather_jacket/sleeveless
+	var/list/selector_uniforms = list(
-
+		"black jacket"=/obj/item/clothing/suit/storage/toggle/leather_jacket,
-/datum/gear/suit/leather_jacket_alt
+		"black vest"=/obj/item/clothing/suit/storage/toggle/leather_jacket/sleeveless,
-	display_name = "leather jacket 2, black"
+		"black jacket, alternative"=/obj/item/clothing/suit/storage/leather_jacket_alt,
-	path = /obj/item/clothing/suit/storage/leather_jacket_alt
+		"black jacket, corporate"=/obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen,
-
+		"black vest, corporate"=/obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen/sleeveless,
-/datum/gear/suit/leather_jacket_nt
+		"brown jacket"=/obj/item/clothing/suit/storage/toggle/brown_jacket,
-	display_name = "leather jacket, corporate, black"
+		"brown vest"=/obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless,
-	path = /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen
+		"brown jacket, corporate"=/obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen,
-
+		"brown vest, corporate"=/obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen/sleeveless
-/datum/gear/suit/leather_jacket_nt/sleeveless
+	)
-	display_name = "leather vest, corporate, black"
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
-	path = /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen/sleeveless
-
-/datum/gear/suit/brown_jacket
-	display_name = "leather jacket, brown"
-	path = /obj/item/clothing/suit/storage/toggle/brown_jacket
-
-/datum/gear/suit/brown_jacket_sleeveless
-	display_name = "leather vest, brown"
-	path = /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless
-
-/datum/gear/suit/brown_jacket_nt
-	display_name = "leather jacket, corporate, brown"
-	path = /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen
-
-/datum/gear/suit/brown_jacket_nt/sleeveless
-	display_name = "leather vest, corporate, brown"
-	path = /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen/sleeveless
 
 //YW EDIT BEGINS
 /datum/gear/suit/mil
@@ -204,17 +190,19 @@
 	path = /obj/item/clothing/suit/cyberpunk
 	cost = 2
 
-/datum/gear/suit/puffycoat/blue
+/datum/gear/suit/puffycoat
-	display_name = "puffy coat, blue"
+	display_name = "puffy coat selection"
+	description = "Pick from a few different colours of puffy coat."
 	path = /obj/item/clothing/suit/storage/puffyblue
 
-/datum/gear/suit/puffycoat/red
+/datum/gear/suit/puffycoat/New()
-	display_name = "puffy coat, red"
+	..()
-	path = /obj/item/clothing/suit/storage/puffyred
+	var/list/selector_uniforms = list(
-
+		"blue"=/obj/item/clothing/suit/storage/puffyblue,
-/datum/gear/suit/puffycoat/purple
+		"red"=/obj/item/clothing/suit/storage/puffyred,
-	display_name = "puffy coat, purple"
+		"purple"=/obj/item/clothing/suit/storage/puffypurple
-	path = /obj/item/clothing/suit/storage/puffypurple
+	)
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
 
 /datum/gear/suit/poncho
 	display_name = "poncho selection"
@@ -558,20 +546,19 @@
 	gear_tweaks += new/datum/gear_tweak/path(flannel)
 
 /datum/gear/suit/denim_jacket
-	display_name = "denim jacket"
+	display_name = "denim jacket and vest selection"
+	description = "Select from a small range of denim jackets and vests."
 	path = /obj/item/clothing/suit/storage/toggle/denim_jacket
 
-/datum/gear/suit/denim_jacket/corporate
+/datum/gear/suit/denim_jacket/New()
-	display_name = "denim jacket, corporate"
+	..()
-	path = /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen
+	var/list/selector_uniforms = list(
-
+		"denim jacket"=/obj/item/clothing/suit/storage/toggle/denim_jacket,
-/datum/gear/suit/denim_vest
+		"denim jacket, corporate"=/obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen,
-	display_name = "denim vest"
+		"denim vest"=/obj/item/clothing/suit/storage/toggle/denim_jacket/sleeveless,
-	path = /obj/item/clothing/suit/storage/toggle/denim_jacket/sleeveless
+		"denim vest, corporate"=/obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen/sleeveless
-
+	)
-/datum/gear/suit/denim_vest/corporate
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
-	display_name = "denim vest, corporate"
-	path = /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen/sleeveless
 
 /datum/gear/suit/miscellaneous/dep_jacket
 	display_name = "department jacket selection"

code/modules/client/preference_setup/loadout/loadout_suit_vr.dm

@@ -23,7 +23,6 @@
 	path = /obj/item/clothing/suit/storage/toggle/labcoat/old/tox
 	cost = 2
 
-
 /datum/gear/suit/roles/labcoat_old/New()
 	..()
 	var/list/labcoats = list(
@@ -92,7 +91,6 @@
 	display_name = "chiton"
 	path = /obj/item/clothing/suit/chiton
 
-
 //oversized t-shirt
 /datum/gear/suit/oversize
 	display_name = "oversized t-shirt (colorable)"
@@ -109,7 +107,6 @@ Talon winter coat
 	display_name = "winter coat, Talon"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/talon
 
-
 /datum/gear/suit/armor/combat/crusader_explo
 	display_name = "knight, explo"
 	path = /obj/item/clothing/suit/armor/combat/crusader_explo
@@ -118,20 +115,14 @@ Talon winter coat
 /datum/gear/suit/armor/combat/crusader_explo/FM
 	display_name = "knight, Field Medic"
 	path = /obj/item/clothing/suit/armor/combat/crusader_explo/FM
-	allowed_roles = list ("Field Medic")
+	allowed_roles = list ("Paramedic")
 
 //Atmos-coloured hazard vest
 	display_name = "hazard vest, atmospherics"
 	path = /obj/item/clothing/suit/storage/hazardvest/atmos
 	allowed_roles = list("Chief Engineer","Atmospheric Technician", "Engineer")
 
-//Long fur coat
-/datum/gear/suit/russofurcoat
-	display_name = "long fur coat"
-	path = /obj/item/clothing/suit/storage/vest/hoscoat/russofurcoat
-
 //Colorable Hoodie
-
 /datum/gear/suit/hoodie_vr
 	display_name = "hoodie with hood (colorable)"
 	path = /obj/item/clothing/suit/storage/hooded/hoodie

code/modules/client/preference_setup/loadout/loadout_uni_selector.dm

@@ -7,7 +7,7 @@
 	allowed_roles = list("")
 	path =
 	slot = slot_w_uniform
-	sort_category = "Uniform Selectors"
+	sort_category = "Uniforms"
 	cost = 2
 
 /datum/gear/uniform/BLANK_selector/New()
@@ -24,8 +24,8 @@
 	description = "Select from a range of outfits available to all Site Managers."
 	allowed_roles = list("Site Manager")
 	path = /obj/item/clothing/under/rank/neo_captain
-	sort_category = "Uniform Selectors"
+	sort_category = "Uniforms"
-	cost = 2
+	cost = 1
 
 /datum/gear/uniform/site_manager_selector/New()
 	..()
@@ -53,8 +53,8 @@
 	description = "Select from a range of outfits available to all Heads of Personnel."
 	allowed_roles = list("Head of Personnel")
 	path = /obj/item/clothing/under/rank/neo_hop
-	sort_category = "Uniform Selectors"
+	sort_category = "Uniforms"
-	cost = 2
+	cost = 1
 
 /datum/gear/uniform/head_of_personnel_selector/New()
 	..()
@@ -84,7 +84,7 @@
 	description = "Select from a range of outfits available to all Pilots."
 	allowed_roles = list("Pilot")
 	path = /obj/item/clothing/under/rank/neo_pilot
-	sort_category = "Uniform Selectors"
+	sort_category = "Uniforms"
 	cost = 1
 
 /datum/gear/uniform/pilot_uniform_selector/New()
@@ -102,7 +102,7 @@
 	description = "Select from a range of outfits available to all Janitorial personnel."
 	allowed_roles = list("Janitor")
 	path = /obj/item/clothing/under/rank/neo_janitor
-	sort_category = "Uniform Selectors"
+	sort_category = "Uniforms"
 	cost = 1
 
 /datum/gear/uniform/janitor_uniform_selector/New()
@@ -117,7 +117,7 @@
 	display_name = "Civilian - Basic Uniforms"
 	description = "Select from a range of uniforms available to all personnel. Includes miscellaneous corporate contractor uniforms."
 	path = /obj/item/clothing/under/utility/grey
-	sort_category = "Uniform Selectors"
+	sort_category = "Uniforms"
 	cost = 1
 
 /datum/gear/uniform/civvie_uniform_selector/New()
@@ -138,6 +138,7 @@
 		"Corporate, Focal Point Energistics uniform"=/obj/item/clothing/under/corp/focal,
 		"Corporate, Grayson Manufactories uniform"=/obj/item/clothing/under/corp/grayson,
 		"Corporate, Grayson Manufactories jumpsuit"=/obj/item/clothing/under/corp/grayson_jump,
+		"Corporate, Kaleidoscope"=/obj/item/clothing/under/corp/kaleidoscope,
 		"Corporate, Ward-Takahashi uniform"=/obj/item/clothing/under/corp/wardt,
 		"Corporate, Hephaestus Arms uniform"=/obj/item/clothing/under/corp/hephaestus,
 		"Corporate, Centauri Provisions uniform"=/obj/item/clothing/under/corp/centauri,
@@ -163,8 +164,8 @@
 	description = "Select from a range of outfits available to all Security personnel."
 	allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
 	path = /obj/item/clothing/under/rank/security/corp
-	sort_category = "Uniform Selectors"
+	sort_category = "Uniforms"
-	cost = 2
+	cost = 1
 
 /datum/gear/uniform/security_selector/New()
 	..()
@@ -208,8 +209,8 @@
 	description = "Select from a range of outfits available to Wardens."
 	allowed_roles = list("Head of Security","Warden")
 	path = /obj/item/clothing/under/rank/warden/corp
-	sort_category = "Uniform Selectors"
+	sort_category = "Uniforms"
-	cost = 2
+	cost = 1
 
 /datum/gear/uniform/security_warden_selector/New()
 	..()
@@ -229,8 +230,8 @@
 	description = "Select from a range of outfits available to all Detectives."
 	allowed_roles = list("Head of Security","Detective")
 	path = /obj/item/clothing/under/det/corporate
-	sort_category = "Uniform Selectors"
+	sort_category = "Uniforms"
-	cost = 2
+	cost = 1
 
 /datum/gear/uniform/security_detective_selector/New()
 	..()
@@ -245,8 +246,8 @@
 	description = "Select from a range of outfits available to all Heads of Security."
 	allowed_roles = list("Head of Security")
 	path = /obj/item/clothing/under/rank/head_of_security/corp
-	sort_category = "Uniform Selectors"
+	sort_category = "Uniforms"
-	cost = 2
+	cost = 1
 
 /datum/gear/uniform/security_head_selector/New()
 	..()
@@ -284,8 +285,8 @@
 	description = "Select from a range of outfits available to all Quartermasters."
 	allowed_roles = list("Quartermaster")
 	path = /obj/item/clothing/under/rank/cargo/jeans
-	sort_category = "Uniform Selectors"
+	sort_category = "Uniforms"
-	cost = 2
+	cost = 1
 
 /datum/gear/uniform/quartermaster_selector/New()
 	..()
@@ -315,8 +316,8 @@
 	description = "Select from a range of outfits available to all Cargo personnel."
 	allowed_roles = list("Cargo Technician","Shaft Miner","Quartermaster")
 	path = /obj/item/clothing/under/rank/cargotech/jeans
-	sort_category = "Uniform Selectors"
+	sort_category = "Uniforms"
-	cost = 2
+	cost = 1
 
 /datum/gear/uniform/cargo_general_selector/New()
 	..()
@@ -343,8 +344,8 @@
 	description = "Select from a range of outfits available to all Mining personnel."
 	allowed_roles = list("Shaft Miner","Quartermaster")
 	path = /obj/item/clothing/under/rank/neo_miner
-	sort_category = "Uniform Selectors"
+	sort_category = "Uniforms"
-	cost = 2
+	cost = 1
 
 /datum/gear/uniform/cargo_miner_selector/New()
 	..()
@@ -361,8 +362,8 @@
 	description = "Select from a range of outfits available to all Chief Engineers."
 	allowed_roles = list("Chief Engineer")
 	path = /obj/item/clothing/under/rank/neo_chiefengi
-	sort_category = "Uniform Selectors"
+	sort_category = "Uniforms"
-	cost = 2
+	cost = 1
 
 /datum/gear/uniform/engineering_chief_selector/New()
 	..()
@@ -385,8 +386,8 @@
 	description = "Select from a range of outfits available to all Engineering personnel."
 	allowed_roles = list("Chief Engineer","Engineer","Atmospheric Technician")
 	path = /obj/item/clothing/under/rank/neo_engi
-	sort_category = "Uniform Selectors"
+	sort_category = "Uniforms"
-	cost = 2
+	cost = 1
 
 /datum/gear/uniform/engineer_selector/New()
 	..()
@@ -402,7 +403,8 @@
 		"voidsuit underlayer"=/obj/item/clothing/under/undersuit/hazard,
 		"TG&C jumpsuit"=/obj/item/clothing/under/rank/neo_engi,
 		"TG&C jumpskirt"=/obj/item/clothing/under/rank/neo_engi_skirt,
-		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_engi_gorka
+		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_engi_gorka,
+		"hazard jumpsuit"=/obj/item/clothing/under/hazard
 	)
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
 
@@ -411,8 +413,8 @@
 	description = "Select from a range of outfits available to all Atmospherics Technicians."
 	allowed_roles = list("Chief Engineer","Atmospheric Technician")
 	path = /obj/item/clothing/under/rank/atmospheric_technician/skirt
-	sort_category = "Uniform Selectors"
+	sort_category = "Uniforms"
-	cost = 2
+	cost = 1
 
 /datum/gear/uniform/engi_atmos_selector/New()
 	..()
@@ -430,8 +432,8 @@
 	description = "Select from a range of outfits available to all Medical personnel."
 	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic")
 	path = /obj/item/clothing/under/rank/neo_med
-	sort_category = "Uniform Selectors"
+	sort_category = "Uniforms"
-	cost = 2
+	cost = 1
 
 /datum/gear/uniform/medical_selector/New()
 	..()
@@ -452,7 +454,8 @@
 		"TG&C virology jumpskirt"=/obj/item/clothing/under/rank/neo_viro_skirt,
 		"TG&C dark jumpsuit"=/obj/item/clothing/under/rank/neo_med_dark,
 		"TG&C dark jumpskirt"=/obj/item/clothing/under/rank/neo_med_dark_skirt,
-		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_med_gorka
+		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_med_gorka,
+		"sterile jumpsuit"=/obj/item/clothing/under/sterile
 	)
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
 
@@ -461,8 +464,8 @@
 	description = "Select from a range of outfits available to all Chemists."
 	allowed_roles = list("Chief Medical Officer","Chemist")
 	path = /obj/item/clothing/under/rank/neo_chem
-	sort_category = "Uniform Selectors"
+	sort_category = "Uniforms"
-	cost = 2
+	cost = 1
 
 /datum/gear/uniform/chemist_selector/New()
 	..()
@@ -480,8 +483,8 @@
 	description = "Select from a range of outfits available to all Paramedics."
 	allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic")
 	path = /obj/item/clothing/under/rank/paramedunidark
-	sort_category = "Uniform Selectors"
+	sort_category = "Uniforms"
-	cost = 2
+	cost = 1
 
 /datum/gear/uniform/paramedic_selector/New()
 	..()
@@ -502,7 +505,7 @@
 	description = "Select from a range of outfits available to all Chief Medical Officers."
 	allowed_roles = list("Chief Medical Officer")
 	path = /obj/item/clothing/under/rank/neo_cmo
-	sort_category = "Uniform Selectors"
+	sort_category = "Uniforms"
 	cost = 2
 
 /datum/gear/uniform/chief_medical_selector/New()
@@ -530,8 +533,8 @@
 	description = "Select from a range of outfits available to all Research Directors."
 	allowed_roles = list("Research Director")
 	path = /obj/item/clothing/under/rank/neo_rd_suit
-	sort_category = "Uniform Selectors"
+	sort_category = "Uniforms"
-	cost = 2
+	cost = 1
 
 /datum/gear/uniform/research_director_selector/New()
 	..()
@@ -555,8 +558,8 @@
 	description = "Select from a range of outfits available to all Science personnel."
 	allowed_roles = list("Scientist","Research Director","Roboticist","Xenobiologist","Xenobotanist")
 	path = /obj/item/clothing/under/rank/neo_science
-	sort_category = "Uniform Selectors"
+	sort_category = "Uniforms"
-	cost = 2
+	cost = 1
 
 /datum/gear/uniform/science_dept_selector/New()
 	..()
@@ -579,8 +582,8 @@
 	description = "Select from a range of outfits available to all Roboticists."
 	allowed_roles = list("Research Director","Roboticist")
 	path = /obj/item/clothing/under/rank/neo_robo
-	sort_category = "Uniform Selectors"
+	sort_category = "Uniforms"
-	cost = 2
+	cost = 1
 
 /datum/gear/uniform/science_robotics_selector/New()
 	..()

code/modules/client/preference_setup/loadout/loadout_uniform.dm

@@ -3,7 +3,7 @@
 	display_name = "blazer, blue"
 	path = /obj/item/clothing/under/blazer
 	slot = slot_w_uniform
-	sort_category = "Uniforms and Casual Dress"
+	sort_category = "Casual Dress"
 
 /datum/gear/uniform/blazerskirt
 	display_name = "blazer, blue with skirt"
@@ -106,6 +106,7 @@
 		shorts[initial(short_type.name)] = short_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(shorts))
 
+<<<<<<< HEAD
 /datum/gear/uniform/job_skirt/ce
 	display_name = "skirt, ce"
 	path = /obj/item/clothing/under/rank/chief_engineer/skirt
@@ -216,6 +217,8 @@
 	path = /obj/item/clothing/under/rank/cargotech/jeans/female
 	allowed_roles = list("Quartermaster","Cargo Technician")
 
+=======
+>>>>>>> ec9eb3a615... Merge pull request #15017 from KillianKirilenko/kk-loadouts
 /datum/gear/uniform/suit/lawyer
 	display_name = "suit, one-piece selection"
 	path = /obj/item/clothing/under/lawyer
@@ -302,6 +305,7 @@
 	display_name = "flame dress"
 	path = /obj/item/clothing/under/dress/dress_fire
 
+<<<<<<< HEAD
 /datum/gear/uniform/uniform_captain
 	display_name = "uniform, site manager's dress"
 	path = /obj/item/clothing/under/dress/dress_cap
@@ -353,6 +357,8 @@
 	path = /obj/item/clothing/under/rank/head_of_security/navyblue
 	allowed_roles = list("Head of Security")
 
+=======
+>>>>>>> ec9eb3a615... Merge pull request #15017 from KillianKirilenko/kk-loadouts
 /datum/gear/uniform/shortplaindress
 	display_name = "plain dress"
 	path = /obj/item/clothing/under/dress/white3
@@ -408,18 +414,6 @@
 		maids[initial(maid_type.name)] = maid_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(maids))
 
-/datum/gear/uniform/utility
-	display_name = "utility, black"
-	path = /obj/item/clothing/under/utility
-
-/datum/gear/uniform/utility/blue
-	display_name = "utility, blue"
-	path = /obj/item/clothing/under/utility/blue
-
-/datum/gear/uniform/utility/grey
-	display_name = "utility, grey"
-	path = /obj/item/clothing/under/utility/grey
-
 /datum/gear/uniform/sweater
 	display_name = "sweater, grey"
 	path = /obj/item/clothing/under/rank/psych/turtleneck/sweater
@@ -648,26 +642,6 @@
 	..()
 	gear_tweaks += gear_tweak_free_color_choice
 
-/datum/gear/uniform/paramedunidark
-	display_name = "paramedic uniform, dark"
-	path = /obj/item/clothing/under/rank/paramedunidark
-	allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic")
-
-/datum/gear/uniform/parameduniskirtdark
-	display_name = "paramedic skirt, dark"
-	path = /obj/item/clothing/under/rank/parameduniskirtdark
-	allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic")
-
-/datum/gear/uniform/paramedunilight
-	display_name = "paramedic uniform, light"
-	path = /obj/item/clothing/under/rank/paramedunilight
-	allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic")
-
-/datum/gear/uniform/parameduniskirtlight
-	display_name = "paramedic skirt, light"
-	path = /obj/item/clothing/under/rank/parameduniskirtlight
-	allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic")
-
 /datum/gear/uniform/tourist_1
 	display_name = "tourist outfit, white"
 	path = /obj/item/clothing/under/tourist_1
@@ -690,14 +664,6 @@
 	)
 	gear_tweaks += new/datum/gear_tweak/path(cowboy_outfits)
 
-/datum/gear/uniform/utility/gsa
-	display_name = "utility, galactic survey"
-	path = /obj/item/clothing/under/gsa
-
-/datum/gear/uniform/utility/gsa_work
-	display_name = "heavy utility, galactic survey"
-	path = /obj/item/clothing/under/gsa_work
-
 /*
  * 80s
  */
@@ -717,75 +683,3 @@
 /datum/gear/uniform/tropical_outfit/blue
 	display_name = "tropical outfit, miami vice"
 	path = /obj/item/clothing/under/tropical/blue
-
-/*
- * Branded Uniforms
- */
-
-/datum/gear/uniform/brandsuit/mbill
-	display_name = "uniform, major bill's"
-	path = /obj/item/clothing/under/mbill
-
-/datum/gear/uniform/brandsuit/mbill_flight
-	display_name = "uniform, major bill's flightsuit (Pilot)"
-	path = /obj/item/clothing/under/mbill_flight
-	allowed_roles = list("Pilot")
-
-/datum/gear/uniform/brandsuit/aether
-	display_name = "jumpsuit, aether"
-	path = /obj/item/clothing/under/corp/aether
-
-/datum/gear/uniform/brandsuit/focal
-	display_name = "jumpsuit, focal"
-	path = /obj/item/clothing/under/corp/focal
-
-/datum/gear/uniform/brandsuit/pcrc
-	display_name = "uniform, PCRC (Security)"
-	path = /obj/item/clothing/under/corp/pcrc
-	allowed_roles = list("Security Officer","Head of Security","Warden")
-
-/datum/gear/uniform/brandsuit/grayson
-	display_name = "outfit, grayson"
-	path = /obj/item/clothing/under/corp/grayson
-
-/datum/gear/uniform/brandsuit/grayson_jump
-	display_name = "jumpsuit, grayson"
-	path = /obj/item/clothing/under/corp/grayson_jump
-
-/datum/gear/uniform/brandsuit/wardt
-	display_name = "jumpsuit, ward-takahashi"
-	path = /obj/item/clothing/under/corp/wardt
-
-/datum/gear/uniform/brandsuit/hephaestus
-	display_name = "jumpsuit, hephaestus"
-	path = 	/obj/item/clothing/under/corp/hephaestus
-
-/datum/gear/uniform/brandsuit/centauri
-	display_name = "jumpsuit, centauri provisions"
-	path = /obj/item/clothing/under/corp/centauri
-
-/datum/gear/uniform/brandsuit/morpheus
-	display_name = "jumpsuit, morpheus"
-	path = /obj/item/clothing/under/corp/morpheus
-
-/datum/gear/uniform/brandsuit/wulf
-	display_name = "jumpsuit, wulf"
-	path = /obj/item/clothing/under/corp/wulf
-
-/datum/gear/uniform/brandsuit/zenghu
-	display_name = "jumpsuit, zeng-hu"
-	path = /obj/item/clothing/under/corp/zenghu
-
-/datum/gear/uniform/brandsuit/xion
-	display_name = "jumpsuit, xion"
-	path = /obj/item/clothing/under/corp/xion
-
-/datum/gear/uniform/brandsuit/vedmed
-	display_name = "jumpsuit, vey-med (Medical)"
-	path = /obj/item/clothing/under/corp/veymed
-	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic")
-
-/datum/gear/uniform/brandsuit/kaleidoscope
-	display_name = "outfit, kaleidoscope (Science)"
-	path = 	/obj/item/clothing/under/corp/kaleidoscope
-	allowed_roles = list("Research Director","Scientist","Xenobiologist")

code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm

@@ -11,6 +11,7 @@
 	display_name = "pt uniform, planetside sec"
 	path = /obj/item/clothing/under/solgov/pt/sifguard
 
+<<<<<<< HEAD
 /datum/gear/uniform/job_skirt/sci
 	allowed_roles = list("Research Director","Scientist", "Xenobiologist", "Xenobotanist")
 
@@ -57,6 +58,8 @@
 	display_name = "ge uniform, civ" //CHOMPedit: changed to GE suit
 	path = /obj/item/clothing/under/rank/khi/civ
 
+=======
+>>>>>>> ec9eb3a615... Merge pull request #15017 from KillianKirilenko/kk-loadouts
 //Federation jackets
 /datum/gear/suit/job_fed/sec
 	display_name = "fed uniform, sec"
@@ -72,6 +75,7 @@
 	display_name = "fed uniform, eng"
 	path = /obj/item/clothing/suit/storage/fluff/fedcoat/fedeng
 	allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer")
+<<<<<<< HEAD
 
 // Trekie things
 //TOS
@@ -128,6 +132,8 @@
 
 //CHOMPEdit: See loadout_uniform_vr_ch.dm for a security-specific variant that has standard armor values.
 
+=======
+>>>>>>> ec9eb3a615... Merge pull request #15017 from KillianKirilenko/kk-loadouts
 //DS9
 
 /datum/gear/suit/job_trek/ds9_coat
@@ -138,6 +144,7 @@
 						"Scientist","Roboticist","Xenobiologist","Xenobotanist","Atmospheric Technician",
 						"Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic", "Blueshield Guard","Security Pilot") //YW ADDITIONS  //CHOMP keep explo
 
+<<<<<<< HEAD
 
 /datum/gear/uniform/job_trek/cmd/ds9
 	display_name = "DS9 uniform, cmd"
@@ -174,6 +181,8 @@
 
 //CHOMPEdit: See loadout_uniform_vr_ch.dm for a security-specific variant that has standard armor values.
 
+=======
+>>>>>>> ec9eb3a615... Merge pull request #15017 from KillianKirilenko/kk-loadouts
 /*
 Swimsuits
 */
@@ -279,26 +288,6 @@ Talon jumpsuit
 		suits[initial(undersuit_type.name)] = undersuit_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(suits))
 
-/datum/gear/uniform/undersuit_haz
-	display_name = "undersuit, hazard (Engineering)"
-	allowed_roles = list("Chief Engineer", "Atmospheric Technician", "Engineer")
-	path = /obj/item/clothing/under/undersuit/hazard
-
-/datum/gear/uniform/undersuit_sec
-	display_name = "undersuit, security (Security)"
-	allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
-	path = /obj/item/clothing/under/undersuit/sec
-
-/datum/gear/uniform/undersuit_hos
-	display_name = "undersuit, security command (HoS)"
-	allowed_roles = list("Head of Security")
-	path = /obj/item/clothing/under/undersuit/sec/hos
-
-/datum/gear/uniform/undersuit_com
-	display_name = "undersuit, command (SM/HoP)"
-	allowed_roles = list("Site Manager", "Head of Personnel")
-	path = /obj/item/clothing/under/undersuit/command
-
 //Altevian Uniforms
 /datum/gear/uniform/altevian
 	description = "An extremely comfortable set of clothing that's made to help people handle their day to day work around the fleets with little to no discomfort."
@@ -325,12 +314,6 @@ Talon jumpsuit
 		jumpsuits[initial(jumpsuit.name)] = jumpsuit
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(jumpsuits))
 
-//Modernized Sec Jumpsuit
-/datum/gear/uniform/modernsec
-    display_name = "undersuit, security, modernized (Security)"
-    allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
-    path = /obj/item/clothing/under/rank/security/modern
-
 /datum/gear/uniform/singer_blue
 	display_name = "blue singer dress"
 	path = /obj/item/clothing/under/dress/singer

code/modules/clothing/head/soft_caps.dm

@@ -106,3 +106,9 @@
 	desc = "It's a field cap in white, with a blue cross on the front."
 	icon_state = "medsoft"
 	item_state_slots = list(slot_r_hand_str = "mimesoft", slot_l_hand_str = "mimesoft")
+
+/obj/item/clothing/head/soft/paramed
+	name = "paramedic's cap"
+	desc = "It's a field cap in dark blue, with a white cross on the front."
+	icon_state = "emtsoft"
+	item_state_slots = list(slot_r_hand_str = "bluesoft", slot_l_hand_str = "bluesoft")

code/modules/economy/vending_machines.dm

@@ -329,6 +329,8 @@
 					/obj/item/weapon/storage/fancy/cigarettes/luckystars = 10,
 					/obj/item/weapon/storage/fancy/cigarettes/jerichos = 10,
 					/obj/item/weapon/storage/fancy/cigarettes/menthols = 10,
+					/obj/item/weapon/storage/fancy/cigarettes/carcinomas = 10,
+					/obj/item/weapon/storage/fancy/cigarettes/professionals = 10,
 					/obj/item/weapon/storage/rollingpapers = 10,
 					/obj/item/weapon/storage/rollingpapers/blunt = 10,
 					/obj/item/weapon/storage/chewables/tobacco = 5,
@@ -349,15 +351,15 @@
 					/obj/item/weapon/reagent_containers/ecig_cartridge/blanknico = 2,
 					/obj/item/weapon/storage/box/fancy/chewables/tobacco/nico = 5)
 	contraband = list(/obj/item/weapon/flame/lighter/zippo = 4)
-	premium = list(/obj/item/weapon/storage/fancy/cigar = 5,
+	premium = list(/obj/item/weapon/storage/fancy/cigar = 5)
-					/obj/item/weapon/storage/fancy/cigarettes/carcinomas = 5,
-					/obj/item/weapon/storage/fancy/cigarettes/professionals = 5)
 	prices = list(/obj/item/weapon/storage/fancy/cigarettes = 12,
 					/obj/item/weapon/storage/fancy/cigarettes/dromedaryco = 20,
 					/obj/item/weapon/storage/fancy/cigarettes/killthroat = 14,
 					/obj/item/weapon/storage/fancy/cigarettes/luckystars = 17,
 					/obj/item/weapon/storage/fancy/cigarettes/jerichos = 22,
 					/obj/item/weapon/storage/fancy/cigarettes/menthols = 18,
+					/obj/item/weapon/storage/fancy/cigarettes/carcinomas = 24,
+					/obj/item/weapon/storage/fancy/cigarettes/professionals = 27,
 					/obj/item/weapon/storage/rollingpapers = 10,
 					/obj/item/weapon/storage/rollingpapers/blunt = 20,
 					/obj/item/weapon/storage/chewables/tobacco = 10,