Loadout stuff, but done right! (#4094)

* Loadout and accessory path tweaks.

* updated: armbands

* except it's better now

* no ian shirt and psych medHUD, travis fixed?

* OKAY ROUND THREE

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

@@ -14,7 +14,8 @@ var/list/gear_datums = list()
 	//create a list of gear datums to sort
 	for(var/geartype in typesof(/datum/gear)-/datum/gear)
 		var/datum/gear/G = geartype
-
+		if(initial(G.type_category) == geartype)
+			continue
 		var/use_name = initial(G.display_name)
 		var/use_category = initial(G.sort_category)
 
@@ -205,6 +206,7 @@ var/list/gear_datums = list()
 	var/sort_category = "General"
 	var/list/gear_tweaks = list() //List of datums which will alter the item after it has been spawned.
 	var/exploitable = 0		//Does it go on the exploitable information list?
+	var/type_category = null
 
 /datum/gear/New()
 	..()

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

@@ -1,42 +1,28 @@
 /datum/gear/accessory
-	display_name = "armband, red"
-	path = /obj/item/clothing/accessory/armband
+	display_name = "accessory"
 	slot = slot_tie
 	sort_category = "Accessories"
+	type_category = /datum/gear/accessory
+	path = /obj/item/clothing/accessory
+	cost = 1
 
-/datum/gear/accessory/cargo
-	display_name = "armband, cargo"
-	path = /obj/item/clothing/accessory/armband/cargo
+/datum/gear/accessory/armband
+	display_name = "armband selection"
+	path = /obj/item/clothing/accessory/armband
 
-/datum/gear/accessory/emt
-	display_name = "armband, EMT"
-	path = /obj/item/clothing/accessory/armband/medblue
+/datum/gear/accessory/armband/New()
+	..()
+	var/list/armbands = list()
+	for(var/armband in (typesof(/obj/item/clothing/accessory/armband) - typesof(/obj/item/clothing/accessory/armband/med/color)))
+		var/obj/item/clothing/accessory/armband_type = armband
+		armbands[initial(armband_type.name)] = armband_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(armbands))
 
-/datum/gear/accessory/engineering
-	display_name = "armband, engineering"
-	path = /obj/item/clothing/accessory/armband/engine
-
-/datum/gear/accessory/hydroponics
-	display_name = "armband, hydroponics"
-	path = /obj/item/clothing/accessory/armband/hydro
-
-/datum/gear/accessory/medical
-	display_name = "armband, medical"
-	path = /obj/item/clothing/accessory/armband/med
-
-/datum/gear/accessory/medical/cross
-	display_name = "armband, medic"
-	path = /obj/item/clothing/accessory/armband/med/cross
-
-/datum/gear/accessory/science
-	display_name = "armband, science"
-	path = /obj/item/clothing/accessory/armband/science
-
-/datum/gear/accessory/colored
+/datum/gear/accessory/armband/colored
 	display_name = "armband"
 	path = /obj/item/clothing/accessory/armband/med/color
 
-/datum/gear/accessory/colored/New()
+/datum/gear/accessory/armband/colored/New()
 	..()
 	gear_tweaks = list(gear_tweak_free_color_choice)
 
@@ -74,215 +60,109 @@
 	..()
 	gear_tweaks = list(gear_tweak_free_color_choice)
 
-
 /datum/gear/accessory/wcoat
-	display_name = "waistcoat"
+	display_name = "waistcoat selection"
 	path = /obj/item/clothing/accessory/wcoat
 	cost = 1
 
-/datum/gear/accessory/wcoat/red
-	display_name = "waistcoat, red"
-	path = /obj/item/clothing/accessory/wcoat/red
-
-/datum/gear/accessory/wcoat/grey
-	display_name = "waistcoat, grey"
-	path = /obj/item/clothing/accessory/wcoat/grey
-
-/datum/gear/accessory/wcoat/brown
-	display_name = "waistcoat, brown"
-	path = /obj/item/clothing/accessory/wcoat/brown
-
-/datum/gear/accessory/swvest
-	display_name = "sweatervest, black"
-	path = /obj/item/clothing/accessory/wcoat/swvest
-	cost = 1
-
-/datum/gear/accessory/swvest/blue
-	display_name = "sweatervest, blue"
-	path = /obj/item/clothing/accessory/wcoat/swvest/blue
-
-/datum/gear/accessory/swvest/red
-	display_name = "sweatervest, red"
-	path = /obj/item/clothing/accessory/wcoat/swvest/red
+/datum/gear/accessory/wcoat/New()
+	..()
+	var/list/wcoats = list()
+	for(var/wcoat in typesof(/obj/item/clothing/accessory/wcoat))
+		var/obj/item/clothing/accessory/wcoat_type = wcoat
+		wcoats[initial(wcoat_type.name)] = wcoat_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(wcoats))
 
 /datum/gear/accessory/holster
-	display_name = "holster, armpit"
-	path = /obj/item/clothing/accessory/holster/armpit
+	display_name = "holster selection (Security, CD, HoP)"
+	path = /obj/item/clothing/accessory/holster
 	allowed_roles = list("Colony Director", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective")
 
-/datum/gear/accessory/holster/hip
-	display_name = "holster, hip"
-	path = /obj/item/clothing/accessory/holster/hip
-
-/datum/gear/accessory/holster/leg
-	display_name = "holster, leg"
-	path = /obj/item/clothing/accessory/holster/leg
-
-/datum/gear/accessory/holster/waist
-	display_name = "holster, waist"
-	path = /obj/item/clothing/accessory/holster/waist
+/datum/gear/accessory/holster/New()
+	..()
+	var/list/holsters = list()
+	for(var/holster in typesof(/obj/item/clothing/accessory/holster))
+		var/obj/item/clothing/accessory/holster_type = holster
+		holsters[initial(holster_type.name)] = holster_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(holsters))
 
 /datum/gear/accessory/tie
-	display_name = "tie, black"
-	path = /obj/item/clothing/accessory/black
+	display_name = "tie selection"
+	path = /obj/item/clothing/accessory/tie
+	cost = 1
 
-/datum/gear/accessory/tie/blue
-	display_name = "tie, blue"
-	path = /obj/item/clothing/accessory/blue
-
-/datum/gear/accessory/tie/blue_clip
-	display_name = "tie, blue with clip"
-	path = /obj/item/clothing/accessory/blue_clip
-
-/datum/gear/accessory/tie/blue_long
-	display_name = "tie, blue long"
-	path = /obj/item/clothing/accessory/blue_long
-
-/datum/gear/accessory/tie/red
-	display_name = "tie, red"
-	path = /obj/item/clothing/accessory/red
-
-/datum/gear/accessory/tie/red_clip
-	display_name = "tie, red with clip"
-	path = /obj/item/clothing/accessory/red_clip
-
-/datum/gear/accessory/tie/red_long
-	display_name = "tie, red long"
-	path = /obj/item/clothing/accessory/red_long
-
-/datum/gear/accessory/tie/yellow
-	display_name = "tie, yellow"
-	path = /obj/item/clothing/accessory/yellow
-
-/datum/gear/accessory/tie/navy
-	display_name = "tie, navy blue"
-	path = /obj/item/clothing/accessory/navy
-
-/datum/gear/accessory/tie/white
-	display_name = "tie, white"
-	path = /obj/item/clothing/accessory/white
-
-/datum/gear/accessory/tie/horrible
-	display_name = "tie, socially disgraceful"
-	path = /obj/item/clothing/accessory/horrible
+/datum/gear/accessory/tie/New()
+	..()
+	var/list/ties = list()
+	for(var/tie in typesof(/obj/item/clothing/accessory/tie))
+		var/obj/item/clothing/accessory/tie_type = tie
+		ties[initial(tie_type.name)] = tie_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(ties))
 
 /datum/gear/accessory/scarf
-	display_name = "scarf"
+	display_name = "scarf selection"
 	path = /obj/item/clothing/accessory/scarf
+	cost = 1
 
-/datum/gear/accessory/scarf/red
-	display_name = "scarf, red"
-	path = /obj/item/clothing/accessory/scarf/red
+/datum/gear/accessory/scarf/New()
+	..()
+	var/list/scarfs = list()
+	for(var/scarf in typesof(/obj/item/clothing/accessory/scarf))
+		var/obj/item/clothing/accessory/scarf_type = scarf
+		scarfs[initial(scarf_type.name)] = scarf_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(scarfs))
 
-/datum/gear/accessory/scarf/green
-	display_name = "scarf, green"
-	path = /obj/item/clothing/accessory/scarf/green
+/datum/gear/accessory/jacket
+	display_name = "suit jacket selection"
+	path = /obj/item/clothing/accessory/jacket
+	cost = 1
 
-/datum/gear/accessory/scarf/darkblue
-	display_name = "scarf, dark blue"
-	path = /obj/item/clothing/accessory/scarf/darkblue
-
-/datum/gear/accessory/scarf/purple
-	display_name = "scarf, purple"
-	path = /obj/item/clothing/accessory/scarf/purple
-
-/datum/gear/accessory/scarf/yellow
-	display_name = "scarf, yellow"
-	path = /obj/item/clothing/accessory/scarf/yellow
-
-/datum/gear/accessory/scarf/orange
-	display_name = "scarf, orange"
-	path = /obj/item/clothing/accessory/scarf/orange
-
-/datum/gear/accessory/scarf/lightblue
-	display_name = "scarf, light blue"
-	path = /obj/item/clothing/accessory/scarf/lightblue
-
-/datum/gear/accessory/scarf/white
-	display_name = "scarf, white"
-	path = /obj/item/clothing/accessory/scarf/white
-
-/datum/gear/accessory/scarf/black
-	display_name = "scarf, black"
-	path = /obj/item/clothing/accessory/scarf/black
-
-/datum/gear/accessory/scarf/zebra
-	display_name = "scarf, zebra"
-	path = /obj/item/clothing/accessory/scarf/zebra
-
-/datum/gear/accessory/scarf/christmas
-	display_name = "scarf, christmas"
-	path = /obj/item/clothing/accessory/scarf/christmas
-
-/datum/gear/accessory/scarf/stripedred
-	display_name = "scarf, striped red"
-	path = /obj/item/clothing/accessory/stripedredscarf
-
-/datum/gear/accessory/scarf/stripedgreen
-	display_name = "scarf, striped green"
-	path = /obj/item/clothing/accessory/stripedgreenscarf
-
-/datum/gear/accessory/scarf/stripedblue
-	display_name = "scarf, striped blue"
-	path = /obj/item/clothing/accessory/stripedbluescarf
-
-/datum/gear/accessory/suitjacket
-	display_name = "suit jacket, tan"
-	path = /obj/item/clothing/accessory/tan_jacket
-
-/datum/gear/accessory/suitjacket/charcoal
-	display_name = "suit jacket, charcoal"
-	path = /obj/item/clothing/accessory/charcoal_jacket
-
-/datum/gear/accessory/suitjacket/navy
-	display_name = "suit jacket, navy blue"
-	path = /obj/item/clothing/accessory/navy_jacket
-
-/datum/gear/accessory/suitjacket/burgundy
-	display_name = "suit jacket, burgundy"
-	path = /obj/item/clothing/accessory/burgundy_jacket
-
-/datum/gear/accessory/suitjacket/checkered
-	display_name = "suit jacket, checkered"
-	path = /obj/item/clothing/accessory/checkered_jacket
+/datum/gear/accessory/jacket/New()
+	..()
+	var/list/jackets = list()
+	for(var/jacket in typesof(/obj/item/clothing/accessory/jacket))
+		var/obj/item/clothing/accessory/jacket_type = jacket
+		jackets[initial(jacket_type.name)] = jacket_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(jackets))
 
 /datum/gear/accessory/suitvest
 	display_name = "suit vest"
 	path = /obj/item/clothing/accessory/vest
 
 /datum/gear/accessory/brown_vest
-	display_name = "webbing, engineering"
+	display_name = "webbing, brown"
 	path = /obj/item/clothing/accessory/storage/brown_vest
 	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor")
 
 /datum/gear/accessory/black_vest
-	display_name = "webbing, security"
+	display_name = "webbing, black"
 	path = /obj/item/clothing/accessory/storage/black_vest
 	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor")
 
 /datum/gear/accessory/white_vest
-	display_name = "webbing, medical"
+	display_name = "webbing, white"
 	path = /obj/item/clothing/accessory/storage/white_vest
 	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor")
 
 /datum/gear/accessory/brown_drop_pouches
-	display_name = "drop pouches, engineering"
+	display_name = "drop pouches, brown"
 	path = /obj/item/clothing/accessory/storage/brown_drop_pouches
 	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor")
 
 /datum/gear/accessory/black_drop_pouches
-	display_name = "drop pouches, security"
+	display_name = "drop pouches, black"
 	path = /obj/item/clothing/accessory/storage/black_drop_pouches
 	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor")
 
 /datum/gear/accessory/white_drop_pouches
-	display_name = "drop pouches, medical"
+	display_name = "drop pouches, white"
 	path = /obj/item/clothing/accessory/storage/white_drop_pouches
 	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor")
 
 /datum/gear/accessory/fannypack
 	display_name = "fannypack selection"
 	cost = 2
+	path = /obj/item/weapon/storage/belt/fannypack
 
 /datum/gear/accessory/fannypack/New()
 	..()

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

@@ -68,9 +68,9 @@
 	path = /obj/item/clothing/glasses/sunglasses/medhud/aviator/prescription
 
 /datum/gear/eyes/meson
-	display_name = "Optical Meson Scanners (Engineering)"
+	display_name = "Optical Meson Scanners (Engineering, Science)"
 	path = /obj/item/clothing/glasses/meson
-	allowed_roles = list("Station Engineer","Chief Engineer","Atmospheric Technician")
+	allowed_roles = list("Station Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director")
 
 /datum/gear/eyes/meson/prescription
 	display_name = "Optical Meson Scanners, prescription (Engineering)"
@@ -115,4 +115,3 @@
 /datum/gear/eyes/sun/prescriptionsun
 	display_name = "sunglasses, presciption (Security/Command)"
 	path = /obj/item/clothing/glasses/sunglasses/prescription
-	cost = 2

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

@@ -68,7 +68,7 @@
 	cost = 3
 
 /datum/gear/gloves/forensic
-	display_name = "gloves, forensic"
+	display_name = "gloves, forensic (Detective)"
 	path = /obj/item/clothing/gloves/forensic
 	allowed_roles = list("Detective")
 

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

@@ -136,7 +136,6 @@
 /datum/gear/head/cowboy
 	display_name = "cowboy, rodeo"
 	path = /obj/item/clothing/head/cowboy_hat
-	cost = 3
 
 /datum/gear/head/cowboy/black
 	display_name = "cowboy, black"
@@ -268,6 +267,11 @@
 	..()
 	gear_tweaks = list(gear_tweak_free_color_choice)
 
+
+/datum/gear/head/kitty
+	display_name = "kitty ears"
+	path = /obj/item/clothing/head/kitty
+
 /datum/gear/head/beanie
 	display_name = "beanie"
 	path = /obj/item/clothing/head/beanie

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

@@ -195,6 +195,10 @@
 	..()
 	gear_tweaks = list(gear_tweak_free_color_choice)
 
+/datum/gear/shoes/slippers
+	display_name = "bunny slippers"
+	path = /obj/item/clothing/shoes/slippers
+
 /datum/gear/shoes/boots/winter
 	display_name = "winter boots"
 	path = /obj/item/clothing/shoes/boots/winter
@@ -227,7 +231,7 @@
 /datum/gear/shoes/boots/winter/medical
 	display_name = "medical winter boots"
 	path = /obj/item/clothing/shoes/boots/winter/medical
-	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist")
+	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist")
 
 /datum/gear/shoes/boots/winter/mining
 	display_name = "mining winter boots"

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

@@ -149,7 +149,7 @@
 /datum/gear/suit/labcoat/emt
 	display_name = "labcoat, EMT (Medical)"
 	path = /obj/item/clothing/suit/storage/toggle/labcoat/emt
-	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist")
+	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist")
 
 /datum/gear/suit/roles/surgical_apron
 	display_name = "surgical apron"
@@ -182,7 +182,7 @@
 /datum/gear/suit/roles/poncho/medical
 	display_name = "poncho, medical"
 	path = /obj/item/clothing/accessory/poncho/roles/medical
-	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist")
+	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist")
 
 /datum/gear/suit/roles/poncho/engineering
 	display_name = "poncho, engineering"
@@ -292,7 +292,7 @@
 /datum/gear/suit/wintercoat/medical
 	display_name = "winter coat, medical"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical
-	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist")
+	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist")
 
 /datum/gear/suit/wintercoat/science
 	display_name = "winter coat, science"
@@ -445,7 +445,7 @@
 /datum/gear/suit/snowsuit/medical
 	display_name = "snowsuit, medical"
 	path = /obj/item/clothing/suit/storage/snowsuit/medical
-	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist")
+	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist")
 
 /datum/gear/suit/snowsuit/science
 	display_name = "snowsuit, science"

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

@@ -243,7 +243,6 @@
 /datum/gear/uniform/scrub
 	display_name = "scrubs selection"
 	path = /obj/item/clothing/under/rank/medical/scrubs
-	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Roboticist")
 
 /datum/gear/uniform/scrub/New()
 	..()
@@ -455,3 +454,7 @@
 /datum/gear/uniform/red_swept_dress
 	display_name = "red swept dress"
 	path = /obj/item/clothing/under/dress/red_swept_dress
+
+/datum/gear/uniform/bathrobe
+	display_name = "bathrobe"
+	path = /obj/item/clothing/under/bathrobe