Adds more clothing from Polaris and various sources

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

@@ -204,6 +204,14 @@
 		sweaters[initial(sweater_type.name)] = sweater_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(sweaters))
 
+/datum/gear/accessory/virginkiller
+	display_name = "virgin killer sweater (colorable)"
+	path = /obj/item/clothing/accessory/sweater/virgin
+
+/datum/gear/accessory/virginkiller/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice
+
 /datum/gear/accessory/bracelet/material
 	display_name = "bracelet selection"
 	description = "Choose from a number of bracelets."

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

@@ -127,7 +127,7 @@
 	gear_tweaks += gear_tweak_free_color_choice
 
 /datum/gear/head/cap/mbill
-	display_name = "cap, bill"
+	display_name = "cap, major bill's"
 	path = /obj/item/clothing/head/soft/mbill
 
 /datum/gear/head/cap/sol

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

@@ -35,9 +35,13 @@
 	path = /obj/item/clothing/suit/storage/toggle/bomber
 
 /datum/gear/suit/bomber_alt
-	display_name = "bomber jacket 2"
+	display_name = "bomber jacket, alt"
 	path = /obj/item/clothing/suit/storage/bomber/alt
 
+/datum/gear/suit/bomber_retro
+	display_name = "bomber jacket, retro"
+	path = /obj/item/clothing/suit/storage/toggle/bomber/retro
+
 /datum/gear/suit/leather_jacket
 	display_name = "leather jacket, black"
 	path = /obj/item/clothing/suit/storage/toggle/leather_jacket
@@ -101,7 +105,7 @@
 	path = /obj/item/clothing/suit/storage/trench/grey
 
 /datum/gear/suit/duster
-	display_name = "cowboy duster"
+	display_name = "cowboy duster, colorable"
 	path = /obj/item/clothing/suit/storage/duster
 
 /datum/gear/suit/duster/New()
@@ -533,14 +537,6 @@
 	display_name = "denim vest, corporate"
 	path = /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen/sleeveless
 
-/datum/gear/suit/miscellaneous/kimono
-	display_name = "kimono"
-	path = /obj/item/clothing/suit/kimono
-
-/datum/gear/suit/miscellaneous/kimono/New()
-	..()
-	gear_tweaks += gear_tweak_free_color_choice
-
 /datum/gear/suit/miscellaneous/dep_jacket
 	display_name = "department jacket selection"
 	path = /obj/item/clothing/suit/storage/toggle/sec_dep_jacket
@@ -569,17 +565,13 @@
 	gear_tweaks += new/datum/gear_tweak/path(jacket)
 
 /datum/gear/suit/miscellaneous/peacoat
-	display_name = "peacoat"
+	display_name = "peacoat, colorable"
 	path = /obj/item/clothing/suit/storage/toggle/peacoat
 
 /datum/gear/suit/miscellaneous/peacoat/New()
 	..()
 	gear_tweaks += gear_tweak_free_color_choice
 
-/datum/gear/suit/miscellaneous/kamishimo
-	display_name = "kamishimo"
-	path = /obj/item/clothing/suit/kamishimo
-
 /datum/gear/suit/snowsuit
 	display_name = "snowsuit"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit
@@ -615,7 +607,7 @@
 	allowed_roles = list("Quartermaster","Shaft Miner","Cargo Technician","Head of Personnel")
 
 /datum/gear/suit/miscellaneous/cardigan
-	display_name = "cardigan"
+	display_name = "cardigan, colorable"
 	path = /obj/item/clothing/suit/storage/toggle/cardigan
 
 /datum/gear/suit/miscellaneous/cardigan/New()
@@ -625,4 +617,45 @@
 /datum/gear/suit/cmddressjacket
 	display_name = "command dress jacket"
 	path = /obj/item/clothing/suit/storage/cmddressjacket
-	allowed_roles = list("Site Manager", "Head of Personnel", "Command Secretary")
+<<<<<<< HEAD
+	allowed_roles = list("Site Manager", "Head of Personnel", "Command Secretary")
+||||||| parent of 0085a5bd10... Adds more clothing from Polaris and various sources (#11546)
+	allowed_roles = list("Site Manager", "Head of Personnel", "Command Secretary")
+=======
+	allowed_roles = list("Site Manager", "Head of Personnel", "Command Secretary")
+
+/datum/gear/suit/miscellaneous/kimono
+	display_name = "traditional kimono, colorable"
+	path = /obj/item/clothing/suit/kimono
+
+/datum/gear/suit/miscellaneous/kimono/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice
+
+/datum/gear/suit/miscellaneous/kamishimo
+	display_name = "traditional kamishimo, colorable"
+	path = /obj/item/clothing/suit/kamishimo
+
+/datum/gear/suit/miscellaneous/kamishimo/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice
+
+/datum/gear/suit/miscellaneous/kimono
+	display_name = "kimono selection"
+	path = /obj/item/clothing/suit/kimono/red
+
+/datum/gear/suit/miscellaneous/kimono/New()
+	..()
+	var/list/kimonos = list(
+	"Red kimono" = /obj/item/clothing/suit/kimono/red,
+	"Orange kimono" = /obj/item/clothing/suit/kimono/orange,
+	"Yellow kimono" = /obj/item/clothing/suit/kimono/yellow,
+	"Green kimono" = /obj/item/clothing/suit/kimono/green,
+	"Blue kimono" = /obj/item/clothing/suit/kimono/blue,
+	"Purple kimono" = /obj/item/clothing/suit/kimono/purple,
+	"Violet kimono" = /obj/item/clothing/suit/kimono/violet,
+	"Pink kimono" = /obj/item/clothing/suit/kimono/pink,
+	"Earth kimono" = /obj/item/clothing/suit/kimono/earth
+	)
+	gear_tweaks += new/datum/gear_tweak/path(kimonos)
+>>>>>>> 0085a5bd10... Adds more clothing from Polaris and various sources (#11546)

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

@@ -425,6 +425,7 @@
 	display_name = "sweater, grey"
 	path = /obj/item/clothing/under/rank/psych/turtleneck/sweater
 
+<<<<<<< HEAD
 /datum/gear/uniform/brandsuit/aether
 	display_name = "jumpsuit, aether"
 	path = /obj/item/clothing/under/aether
@@ -450,14 +451,38 @@
 	display_name = "jumpsuit, ward-takahashi"
 	path = /obj/item/clothing/under/wardt
 
+||||||| parent of 0085a5bd10... Adds more clothing from Polaris and various sources (#11546)
+/datum/gear/uniform/brandsuit/aether
+	display_name = "jumpsuit, aether"
+	path = /obj/item/clothing/under/aether
+
+/datum/gear/uniform/brandsuit/focal
+	display_name = "jumpsuit, focal"
+	path = /obj/item/clothing/under/focal
+
+/datum/gear/uniform/mbill
+	display_name = "outfit, major bill's"
+	path = /obj/item/clothing/under/mbill
+
+/datum/gear/uniform/pcrc
+	display_name = "uniform, PCRC (Security)"
+	path = /obj/item/clothing/under/pcrc
+	allowed_roles = list("Security Officer","Head of Security","Warden")
+
+/datum/gear/uniform/brandsuit/grayson
+	display_name = "outfit, grayson"
+	path = /obj/item/clothing/under/grayson
+
+/datum/gear/uniform/brandsuit/wardt
+	display_name = "jumpsuit, ward-takahashi"
+	path = /obj/item/clothing/under/wardt
+
+=======
+>>>>>>> 0085a5bd10... Adds more clothing from Polaris and various sources (#11546)
 /datum/gear/uniform/frontier
 	display_name = "outfit, frontier"
 	path = 	/obj/item/clothing/under/frontier
 
-/datum/gear/uniform/brandsuit/hephaestus
-	display_name = "jumpsuit, hephaestus"
-	path = 	/obj/item/clothing/under/hephaestus
-
 /datum/gear/uniform/yogapants
 	display_name = "yoga pants"
 	path = /obj/item/clothing/under/pants/yogapants
@@ -668,7 +693,7 @@
 
 /datum/gear/uniform/verglasdress
 	display_name = "verglas dress"
-	path = /obj/item/clothing/under/verglasdress
+	path = /obj/item/clothing/under/dress/verglasdress
 
 /datum/gear/uniform/fashionminiskirt
 	display_name = "fashionable miniskirt"
@@ -718,4 +743,84 @@
 	"Brown Cowboy Outfit" = /obj/item/clothing/under/cowboy/brown,
 	"Grey Cowboy Outfit" = /obj/item/clothing/under/cowboy/grey
 	)
-	gear_tweaks += new/datum/gear_tweak/path(cowboy_outfits)
+	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
+
+/*
+ * 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")