Merge pull request #8706 from Cerebulon/jumpsuitsCM

A Jillion Jumpsuits

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

@@ -61,6 +61,14 @@
 		jumpclothes[initial(jumps.name)] = jumps
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(jumpclothes))
 
+/datum/gear/uniform/colorable_jumpsuit
+	display_name = "jumpsuit, colorable"
+	path = /obj/item/clothing/under/colorable
+
+/datum/gear/uniform/colorable_jumpsuit/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice
+
 /datum/gear/uniform/qipao
 	display_name = "qipao"
 	path = /obj/item/clothing/under/qipao
@@ -381,6 +389,11 @@
 		utils[initial(util_type.name)] = util_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(utils))
 
+/datum/gear/uniform/utility/medical
+	display_name = "utility, medical"
+	path = /obj/item/clothing/under/rank/medical/utility
+	allowed_roles = list("Chief Medical Officer", "Paramedic", "Medical Doctor", "Psychiatrist", "Search and Rescue", "Chemist")
+
 /datum/gear/uniform/sweater
 	display_name = "sweater, grey"
 	path = /obj/item/clothing/under/rank/psych/turtleneck/sweater
@@ -405,6 +418,9 @@
 	display_name = "outfit, frontier"
 	path = 	/obj/item/clothing/under/frontier
 
+/datum/gear/uniform/retro_outdoors
+	display_name = "outfit, retro outdoors"
+	path = /obj/item/clothing/under/retro_outdoors
 /datum/gear/uniform/yogapants
 	display_name = "pants, yoga (colorable)"
 	path = /obj/item/clothing/under/pants/yogapants
@@ -557,6 +573,10 @@
 	display_name = "outfit, cyberpunk strapped harness"
 	path = /obj/item/clothing/under/cyberpunkharness
 
+/datum/gear/uniform/cyberpunkpants
+	display_name = "cyberpunk split-side ensemble"
+	path = /obj/item/clothing/under/cyberpunkpants
+
 /datum/gear/uniform/whitegown
 	display_name = "white gown"
 	path = /obj/item/clothing/under/wedding/whitegown
@@ -608,3 +628,8 @@
 /datum/gear/uniform/vampire
 	display_name = "pants, high-waisted trousers"
 	path = /obj/item/clothing/under/hightrousers
+
+/datum/gear/uniform/chaplain_stripe
+	display_name = "jumpsuit, chaplain striped"
+	path = /obj/item/clothing/under/rank/chaplain/alt
+	allowed_roles = list("Chaplain")

code/modules/clothing/under/color.dm

@@ -1,39 +1,47 @@
+/obj/item/clothing/under/color
+	name = "purple jumpsuit"
+	desc = "The latest in utilitarian fashion."
+	icon_state = "purple"
+	rolled_sleeves = 0
+	rolled_down = 0
+
 /obj/item/clothing/under/color/black
 	name = "black jumpsuit"
 	icon_state = "black"
-	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/blackf
-	name = "feminine black jumpsuit"
+	name = "short black jumpsuit"
 	desc = "It's very smart and in a ladies size!"
-	icon_state = "black"
+	icon_state = "blackf"
 	worn_state = "blackf"
+	rolled_sleeves = -1
+	rolled_down = -1
+	index = 1
 
 /obj/item/clothing/under/color/blackjumpskirt
 	name = "black jumpskirt"
 	desc = "A slimming black jumpskirt."
 	icon_state = "blackjumpskirt"
 	item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black")
+	rolled_sleeves = -1
+	rolled_down = -1
+	index = 1
 
 /obj/item/clothing/under/color/blue
 	name = "blue jumpsuit"
 	icon_state = "blue"
-	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/green
 	name = "green jumpsuit"
 	icon_state = "green"
-	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/grey
 	name = "grey jumpsuit"
 	icon_state = "grey"
-	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/orange
 	name = "orange jumpsuit"
 	icon_state = "orange"
-	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/prison
 	name = "prison jumpsuit"
@@ -45,22 +53,18 @@
 /obj/item/clothing/under/color/pink
 	name = "pink jumpsuit"
 	icon_state = "pink"
-	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/red
 	name = "red jumpsuit"
 	icon_state = "red"
-	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/white
 	name = "white jumpsuit"
 	icon_state = "white"
-	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/yellow
 	name = "yellow jumpsuit"
 	icon_state = "yellow"
-	rolled_sleeves = 0
 
 /obj/item/clothing/under/psyche
 	name = "psychedelic jumpsuit"
@@ -69,75 +73,48 @@
 
 /obj/item/clothing/under/color/lightblue
 	name = "lightblue jumpsuit"
-	desc = "A light blue jumpsuit."
 	icon_state = "lightblue"
-	item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue")
-	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/aqua
 	name = "aqua jumpsuit"
 	desc = "An aqua jumpsuit."
 	icon_state = "aqua"
-	item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue")
-	rolled_sleeves = 0
-
-/obj/item/clothing/under/color
-	name = "purple jumpsuit"
-	desc = "The latest in space fashion."
-	icon_state = "purple"
-	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/lightpurple
 	name = "lightpurple jumpsuit"
-	desc = "A light purple jumpsuit."
 	icon_state = "lightpurple"
-	item_state_slots = list(slot_r_hand_str = "purple", slot_l_hand_str = "purple")
-	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/lightgreen
 	name = "lightgreen jumpsuit"
-	desc = "A light green jumpsuit."
 	icon_state = "lightgreen"
-	item_state_slots = list(slot_r_hand_str = "green", slot_l_hand_str = "green")
-	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/lightbrown
 	name = "lightbrown jumpsuit"
-	desc = "A light brown jumpsuit."
 	icon_state = "lightbrown"
-	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/brown
 	name = "brown jumpsuit"
-	desc = "A brown jumpsuit."
 	icon_state = "brown"
-	item_state_slots = list(slot_r_hand_str = "lightbrown", slot_l_hand_str = "lightbrown")
-	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/yellowgreen
 	name = "yellowgreen jumpsuit"
-	desc = "A... yellow green jumpsuit?"
 	icon_state = "yellowgreen"
-	item_state_slots = list(slot_r_hand_str = "yellow", slot_l_hand_str = "yellow")
-	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/darkblue
 	name = "darkblue jumpsuit"
-	desc = "A dark blue jumpsuit."
 	icon_state = "darkblue"
-	item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue")
-	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/lightred
 	name = "lightred jumpsuit"
-	desc = "A light red jumpsuit."
 	icon_state = "lightred"
-	item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red")
-	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/darkred
 	name = "darkred jumpsuit"
-	desc = "A dark red jumpsuit."
 	icon_state = "darkred"
-	item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red")
+
+/obj/item/clothing/under/colorable
+	name = "plain jumpsuit"
+	desc = "The latest in utilitarian fashion."
+	icon_state = "colorable"
 	rolled_sleeves = 0
+	rolled_down = 0

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

@@ -56,12 +56,18 @@
 	icon_state = "cargojf"
 
 /obj/item/clothing/under/rank/chaplain
-	desc = "It's a black jumpsuit, often worn by religious folk."
+	desc = "It's a black jumpsuit, often worn by guidance staff."
 	name = "chaplain's jumpsuit"
 	icon_state = "chaplain"
 	item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black")
 	rolled_sleeves = 0
 
+/obj/item/clothing/under/rank/chaplain/alt
+	name = "chaplain's striped jumpsuit"
+	icon_state = "chaplain_alt"
+	rolled_sleeves = -1
+	index = 1
+
 /obj/item/clothing/under/rank/chef
 	desc = "It's an apron which is given only to the most <b>hardcore</b> chefs in space."
 	name = "chef's uniform"
@@ -116,15 +122,18 @@
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/lawyer
+	name = "baby blue suit"
 	desc = "Slick threads."
-	name = "lawyer suit"
+	icon_state = "ress_suit"
+	item_state_slots = list(slot_r_hand_str = "lightblue", slot_l_hand_str = "lightblue")
 
 /obj/item/clothing/under/lawyer/black
-	name = "black lawyer suit"
+	name = "tacky black lawyer suit"
 	icon_state = "lawyer_black"
+	item_state_slots = list(slot_r_hand_str = "lawyer_black", slot_l_hand_str = "lawyer_black")
 
 /obj/item/clothing/under/lawyer/black/skirt
-	name = "black lawyer skirt"
+	name = "tacky black lawyer skirt"
 	icon_state = "lawyer_black_skirt"
 	item_state_slots = list(slot_r_hand_str = "lawyer_black", slot_l_hand_str = "lawyer_black")
 
@@ -137,32 +146,36 @@
 	name = "black modern suit"
 	icon_state = "modern_suit_m"
 	index = 1
+	item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black")
 
 /obj/item/clothing/under/lawyer/modern/skirt
 	name = "black modern skirt"
 	icon_state = "modern_suit_f"
 	index = 1
+	item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black")
 
 /obj/item/clothing/under/lawyer/trimskirt
 	name = "blue-trim skirt"
 	icon_state = "trim_skirtsuit"
 	index = 1
-
+	item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black")
 /obj/item/clothing/under/lawyer/red
-	name = "red lawyer suit"
+	name = "tacky red suit"
 	icon_state = "lawyer_red"
+	item_state_slots = list(slot_r_hand_str = "lawyer_red", slot_l_hand_str = "lawyer_red")
 
 /obj/item/clothing/under/lawyer/red/skirt
-	name = "red lawyer skirt"
+	name = "tacky red skirt"
 	icon_state = "lawyer_red_skirt"
 	item_state_slots = list(slot_r_hand_str = "lawyer_red", slot_l_hand_str = "lawyer_red")
 
 /obj/item/clothing/under/lawyer/blue
-	name = "blue lawyer suit"
+	name = "tacky blue suit"
 	icon_state = "lawyer_blue"
+	item_state_slots = list(slot_r_hand_str = "lawyer_blue", slot_l_hand_str = "lawyer_blue")
 
 /obj/item/clothing/under/lawyer/blue/skirt
-	name = "blue lawyer skirt"
+	name = "tacky blue skirt"
 	icon_state = "lawyer_blue_skirt"
 	item_state_slots = list(slot_r_hand_str = "lawyer_blue", slot_l_hand_str = "lawyer_blue")
 
@@ -170,12 +183,13 @@
 	name = "blue suit"
 	desc = "A classy suit."
 	icon_state = "bluesuit"
-	item_state_slots = list(slot_r_hand_str = "lawyer_blue", slot_l_hand_str = "lawyer_blue")
+	item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue")
 	starting_accessories = list(/obj/item/clothing/accessory/tie/red)
 
 /obj/item/clothing/under/lawyer/bluesuit/skirt
 	name = "blue skirt suit"
 	icon_state = "bluesuit_skirt"
+	item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue")
 
 /obj/item/clothing/under/lawyer/purpsuit
 	name = "purple suit"
@@ -185,6 +199,7 @@
 /obj/item/clothing/under/lawyer/purpsuit/skirt
 	name = "purple skirt suit"
 	icon_state = "lawyer_purp_skirt"
+	item_state_slots = list(slot_r_hand_str = "purple", slot_l_hand_str = "purple")
 
 /obj/item/clothing/under/lawyer/oldman
 	name = "Old Man's Suit"
@@ -192,18 +207,64 @@
 	icon_state = "oldman"
 	item_state_slots = list(slot_r_hand_str = "johnny", slot_l_hand_str = "johnny")
 
+/obj/item/clothing/under/lawyer/librarian
+	name = "sensible suit"
+	desc = "It's very... sensible."
+	icon_state = "red_suit"
+	item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red")
+
+/obj/item/clothing/under/lawyer/retro_tan
+	name = "retro tan suit"
+	desc = "Just one more thing."
+	icon_state = "liaison_regular"
+	item_state_slots = list(slot_r_hand_str = "lightbrown", slot_l_hand_str = "lightbrown")
+	index = 1
+
+/obj/item/clothing/under/lawyer/retro_white
+	name = "retro white suit"
+	desc = "Snappy!"
+	icon_state = "liaison_formal"
+	item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white")
+	index = 1
+
+/obj/item/clothing/under/lawyer/retro_waistcoat
+	name = "retro waistcoat"
+	desc = "The spectre of CEOs past."
+	icon_state = "manager_uniform"
+	index = 1
+
+/obj/item/clothing/under/lawyer/retro_suspenders
+	name = "retro suspenders"
+	desc = "The spectre of CEOs past."
+	icon_state = "liaison_suspenders"
+	index = 1
+
+/obj/item/clothing/under/lawyer/retro_clerk
+	name = "retro clerk's suit"
+	desc = "The spectre of toadies past."
+	icon_state = "trainee_uniform"
+	index = 1
+
+/obj/item/clothing/under/lawyer/powersuit_black
+	name = "black and gold powersuit"
+	desc = "Resonates corporate energy."
+	icon_state = "director_uniform"
+	item_state_slots = list(slot_r_hand_str = "lawyer_black", slot_l_hand_str = "lawyer_black")
+	index = 1
+
+/obj/item/clothing/under/lawyer/powersuit_grey
+	name = "grey powersuit"
+	desc = "Resonates corporate energy."
+	icon_state = "stowaway_uniform"
+	item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white")
+	index = 1
+
 /obj/item/clothing/under/oldwoman
 	name = "Old Woman's Attire"
 	desc = "A typical outfit for the older woman, a lovely cardigan and comfortable skirt."
 	icon_state = "oldwoman"
 	item_state_slots = list(slot_r_hand_str = "johnny", slot_l_hand_str = "johnny")
 
-/obj/item/clothing/under/librarian
-	name = "sensible suit"
-	desc = "It's very... sensible."
-	icon_state = "red_suit"
-	item_state_slots = list(slot_r_hand_str = "lawyer_red", slot_l_hand_str = "lawyer_red")
-
 /obj/item/clothing/under/mime
 	name = "mime's outfit"
 	desc = "It's not very colourful."

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

@@ -114,6 +114,10 @@
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	rolled_sleeves = 0
 
+/obj/item/clothing/under/rank/medical/utility
+	name = "medical utility jumpsuit"
+	desc = "A hard-wearing version of the standard medical uniform, made with the same bioresistant lining. Designed for long term medical postings."
+	icon_state = "medical_util"
 /obj/item/clothing/under/rank/medical/turtleneck
 	name = "medical turtleneck"
 	desc = "It's a stylish turtleneck made of bioresistant fiber. Look good, save lives- what more could you want?"

code/modules/clothing/under/miscellaneous.dm

@@ -926,6 +926,12 @@ Uniforms and such
 	icon_state = "cyberhell"
 	index = 1
 
+/obj/item/clothing/under/cyberpunkpants
+	name = "cyberpunk split-side ensemble"
+	desc = "Cyberpunk styled split-side pants and matching top. Just in time for the dystopian future."
+	icon_state = "hart_jumpsuit"
+	index = 1
+
 /obj/item/clothing/under/blackngold
 	name = "black and gold gown"
 	desc = "A black and gold gown. You get the impression this is typically worn for religious purposes."
@@ -1211,6 +1217,12 @@ Uniforms and such
 	icon_state = "retro_sweater"
 	worn_state = "retro_sweater"
 
+/obj/item/clothing/under/retro_outdoors
+	name = "retro outsdoorwear"
+	desc = "A puffer vest over utility pants, for when you're really rustic and want everybody to know it."
+	icon_state = "liaison_outing"
+	index = 1
+
 /obj/item/clothing/under/hightrousers
 	name = "high-waisted trousers"
 	desc = "A waistline this high is just made for ripping bodices, swashing buckles, or - just occasionally - sucking blood."
@@ -1307,4 +1319,4 @@ Uniforms and such
 	unicolor = "orange"
 
 /obj/item/clothing/under/ranger/yellow
-	unicolor = "yellow"
+	unicolor = "yellow"