Clothes Addition, Captain alt title, custom loadout tweakes.

code/game/jobs/job/captain.dm

@@ -11,6 +11,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
 	spawn_positions = 1
 	supervisors = "company officials and Corporate Regulations"
 	selection_color = "#ccccff"
+	alt_titles = list("Station Administrator")
 	idtype = /obj/item/weapon/card/id/gold
 	req_admin_notify = 1
 	access = list() 			//See get_access()

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -268,6 +268,8 @@
 		new /obj/item/clothing/under/det(src)
 		new /obj/item/clothing/under/det/grey(src)
 		new /obj/item/clothing/under/det/black(src)
+		new /obj/item/clothing/under/det/waistcoat(src)
+		new /obj/item/clothing/under/det/grey/waistcoat(src)
 		new /obj/item/clothing/suit/storage/det_trench(src)
 		new /obj/item/clothing/suit/storage/det_trench/grey(src)
 		new /obj/item/clothing/suit/storage/forensics/blue(src)

code/modules/client/preferences_gear.dm

@@ -453,84 +453,98 @@ var/global/list/gear_datums = list()
 	path = /obj/item/clothing/under/rank/chief_engineer/skirt
 	slot = slot_w_uniform
 	cost = 1
+	allowed_roles = list("Chief Engineer")
 
 /datum/gear/skirt_atmos
 	display_name = "skirt, atmos"
 	path = /obj/item/clothing/under/rank/atmospheric_technician/skirt
 	slot = slot_w_uniform
 	cost = 1
+	allowed_roles = list("Chief Engineer","Atmospheric Technician")
 
 /datum/gear/skirt_eng
 	display_name = "skirt, engineer"
 	path = /obj/item/clothing/under/rank/engineer/skirt
 	slot = slot_w_uniform
 	cost = 1
+	allowed_roles = list("Chief Engineer","Station Engineer")
 
 /datum/gear/skirt_cmo
 	display_name = "skirt, cmo"
 	path = /obj/item/clothing/under/rank/chief_medical_officer
 	slot = slot_w_uniform
 	cost = 1
+	allowed_roles = list("Chief Medical Officer")
 
 /datum/gear/skirt_chem
 	display_name = "skirt, chemist"
 	path = /obj/item/clothing/under/rank/chemist/skirt
 	slot = slot_w_uniform
 	cost = 1
+	allowed_roles = list("Chief Medical Officer","Chemist")
 
 /datum/gear/skirt_viro
 	display_name = "skirt, virologist"
 	path = /obj/item/clothing/under/rank/virologist/skirt
 	slot = slot_w_uniform
 	cost = 1
+	allowed_roles = list("Chief Medical Officer","Medical Doctor")
 
 /datum/gear/skirt_med
 	display_name = "skirt, medical"
 	path = /obj/item/clothing/under/rank/medical/skirt
 	slot = slot_w_uniform
 	cost = 1
+	allowed_roles = list("Chief Medical Officer","Medical Doctor","Paramedic")
 
 /datum/gear/skirt_sci
 	display_name = "skirt, scientist"
 	path = /obj/item/clothing/under/rank/scientist/skirt
 	slot = slot_w_uniform
 	cost = 1
+	allowed_roles = list("Research Director","Scientist")
 
 /datum/gear/skirt_qm
 	display_name = "skirt, QM"
 	path = /obj/item/clothing/under/rank/cargo/skirt
 	slot = slot_w_uniform
 	cost = 1
+	allowed_roles = list("Quartermaster")
 
 /datum/gear/jeans_qm
 	display_name = "jeans, QM"
 	path = /obj/item/clothing/under/rank/cargo/jeans
 	slot = slot_w_uniform
 	cost = 1
+	allowed_roles = list("Quartermaster")
 
 /datum/gear/jeans_qmf
 	display_name = "female jeans, QM"
 	path = /obj/item/clothing/under/rank/cargo/jeans/female
 	slot = slot_w_uniform
 	cost = 1
+	allowed_roles = list("Quartermaster")
 
 /datum/gear/skirt_cargo
 	display_name = "skirt, cargo"
 	path = /obj/item/clothing/under/rank/cargotech/skirt
 	slot = slot_w_uniform
 	cost = 1
+	allowed_roles = list("Quartermaster","Cargo Technician")
 
 /datum/gear/jeans_cargo
 	display_name = "jeans, cargo"
 	path = /obj/item/clothing/under/rank/cargotech/jeans
 	slot = slot_w_uniform
 	cost = 1
+	allowed_roles = list("Quartermaster","Cargo Technician")
 
 /datum/gear/jeans_cargof
 	display_name = "female jeans, cargo"
 	path = /obj/item/clothing/under/rank/cargotech/jeans/female
 	slot = slot_w_uniform
 	cost = 1
+	allowed_roles = list("Quartermaster","Cargo Technician")
 
 /datum/gear/classicjeans
 	display_name = "pants, classic jeans"
@@ -1240,6 +1254,20 @@ var/global/list/gear_datums = list()
 	slot = slot_wear_suit
 	whitelisted = "Tajara" // You do have a monopoly on a fur suit tho
 
+/datum/gear/forensics/red
+	display_name = "forensics, red"
+	path = /obj/item/clothing/suit/storage/forensics/red/long
+	cost = 2
+	slot = slot_wear_suit
+	allowed_roles = list("Detective")
+
+/datum/gear/forensics/blue
+	display_name = "forensics, blue"
+	path = /obj/item/clothing/suit/storage/forensics/blue/long
+	cost = 2
+	slot = slot_wear_suit
+	allowed_roles = list("Detective")
+
 // Gloves
 
 /datum/gear/black_gloves
@@ -1419,6 +1447,49 @@ var/global/list/gear_datums = list()
 	cost = 1
 	slot = slot_shoes
 
+/datum/gear/flats_black
+	display_name = "flats, black"
+	path = /obj/item/clothing/shoes/flats
+	cost = 1
+	slot = slot_shoes
+
+/datum/gear/flats_blue
+	display_name = "flats, blue"
+	path = /obj/item/clothing/shoes/flats/blue
+	cost = 1
+	slot = slot_shoes
+
+/datum/gear/flats_brown
+	display_name = "flats, brown"
+	path = /obj/item/clothing/shoes/flats/brown
+	cost = 1
+	slot = slot_shoes
+
+/datum/gear/flats_orange
+	display_name = "flats, orange"
+	path = /obj/item/clothing/shoes/flats/orange
+	cost = 1
+	slot = slot_shoes
+
+/datum/gear/flats_purple
+	display_name = "flats, purple"
+	path = /obj/item/clothing/shoes/flats/purple
+	cost = 1
+	slot = slot_shoes
+
+/datum/gear/flats_red
+	display_name = "flats, red"
+	path = /obj/item/clothing/shoes/flats/red
+	cost = 1
+	slot = slot_shoes
+
+/datum/gear/flats_white
+	display_name = "flats, white"
+	path = /obj/item/clothing/shoes/flats/white
+	cost = 1
+	slot = slot_shoes
+
+
 // "Useful" items - I'm guessing things that might be used at work?
 
 /datum/gear/briefcase

code/modules/clothing/shoes/colour.dm

@@ -8,6 +8,7 @@
 	heat_protection = FEET
 	max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE
 
+
 /obj/item/clothing/shoes/brown
 	name = "brown shoes"
 	desc = "A pair of brown shoes."
@@ -53,6 +54,41 @@
 	desc = "Very gay shoes."
 	icon_state = "rain_bow"
 
+/obj/item/clothing/shoes/flats
+	name = "black flats"
+	desc = "Sleek black flats."
+	icon_state = "flatsblack"
+
+/obj/item/clothing/shoes/flats/white
+	name = "white flats"
+	desc = "Shiny white flats."
+	icon_state = "flatswhite"
+
+/obj/item/clothing/shoes/flats/red
+	name = "red flats"
+	desc = "Ruby red flats."
+	icon_state = "flatsred"
+
+/obj/item/clothing/shoes/flats/purple
+	name = "purple flats"
+	desc = "Royal purple flats."
+	icon_state = "flatspurple"
+
+/obj/item/clothing/shoes/flats/blue
+	name = "blue flats"
+	desc = "Sleek blue flats."
+	icon_state = "flatsblue"
+
+/obj/item/clothing/shoes/flats/brown
+	name = "brown flats"
+	desc = "Sleek brown flats."
+	icon_state = "flatsbrown"
+
+/obj/item/clothing/shoes/flats/orange
+	name = "orange flats"
+	desc = "Radiant orange flats."
+	icon_state = "flatsorange"
+
 /obj/item/clothing/shoes/orange
 	name = "orange shoes"
 	icon_state = "orange"

code/modules/clothing/suits/jobs.dm

@@ -117,11 +117,21 @@
 	desc = "A red forensics technician jacket."
 	icon_state = "forensics_red"
 
+/obj/item/clothing/suit/storage/forensics/red/long
+	name = "long red jacket"
+	desc = "A long red forensics technician jacket."
+	icon_state = "forensics_red_long"
+
 /obj/item/clothing/suit/storage/forensics/blue
 	name = "blue jacket"
 	desc = "A blue forensics technician jacket."
 	icon_state = "forensics_blue"
 
+/obj/item/clothing/suit/storage/forensics/blue/long
+	name = "long blue jacket"
+	desc = "A long blue forensics technician jacket."
+	icon_state = "forensics_blue_long"
+
 //Engineering
 /obj/item/clothing/suit/storage/hazardvest
 	name = "hazard vest"

code/modules/clothing/under/jobs/security.dm

@@ -110,6 +110,16 @@
 	worn_state = "det_corporate"
 	desc = "A more modern uniform for corporate investigators."
 
+/obj/item/clothing/under/det/waistcoat
+	icon_state = "detective_waistcoat"
+	worn_state = "detective_waistcoat"
+	desc = "A rumpled white dress shirt paired with well-worn grey slacks, complete with a blue striped tie, faux-gold tie clip, and waistcoat."
+
+/obj/item/clothing/under/det/grey/waistcoat
+	icon_state = "detective2_waistcoat"
+	worn_state = "detective2_waistcoat"
+	desc = "A serious-looking tan dress shirt paired with freshly-pressed black slacks, complete with a red striped tie and waistcoat."
+
 /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."

code/modules/mob/new_player/sprite_accessories.dm

@@ -406,6 +406,22 @@
 		name = "Volaju"
 		icon_state = "hair_volaju"
 
+	eighties
+		name = "80's"
+		icon_state = "hair_80s"
+
+	nia
+		name = "Nia"
+		icon_state = "hair_nia"
+
+	unkept
+		name = "Unkept"
+		icon_state = "hair_unkept"
+
+	modern
+		name = "Modern"
+		icon_state = "hair_modern"
+
 	bald
 		name = "Bald"
 		icon_state = "bald"