Ports and Tweaks CMSS13's New Colored Jumpsuit Sprites (#14174)

* Organizes the color pathing and code. Removes Psych and Rainbow jumpsuits.

* Sprites in. Adjusted Bulwark Jumpsuits. Changelog

* Gem's Review Addressed (forgotten punctuations and removing the adjectives from them as well)

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

@@ -18,26 +18,26 @@
 /datum/gear/uniform/jumpsuit/New()
 	..()
 	var/list/jumpsuit = list()
-	jumpsuit["grey jumpsuit"] = /obj/item/clothing/under/color/grey
 	jumpsuit["black jumpsuit"] = /obj/item/clothing/under/color/black
-	jumpsuit["blue jumpsuit"] = /obj/item/clothing/under/color/blue
-	jumpsuit["green jumpsuit"] = /obj/item/clothing/under/color/green
-	jumpsuit["orange jumpsuit"] = /obj/item/clothing/under/color/orange
-	jumpsuit["pink jumpsuit"] = /obj/item/clothing/under/color/pink
-	jumpsuit["red jumpsuit"] = /obj/item/clothing/under/color/red
+	jumpsuit["grey jumpsuit"] = /obj/item/clothing/under/color/grey
 	jumpsuit["white jumpsuit"] = /obj/item/clothing/under/color/white
+	jumpsuit["dark red jumpsuit"] = /obj/item/clothing/under/color/darkred
+	jumpsuit["red jumpsuit"] = /obj/item/clothing/under/color/red
+	jumpsuit["light red jumpsuit"] = /obj/item/clothing/under/color/lightred
+	jumpsuit["light brown jumpsuit"] = /obj/item/clothing/under/color/lightbrown
+	jumpsuit["brown jumpsuit"] = /obj/item/clothing/under/color/brown
 	jumpsuit["yellow jumpsuit"] = /obj/item/clothing/under/color/yellow
-	jumpsuit["light blue jumpsuit"] = /obj/item/clothing/under/lightblue
-	jumpsuit["aqua jumpsuit"] = /obj/item/clothing/under/aqua
-	jumpsuit["purple jumpsuit"] = /obj/item/clothing/under/purple
-	jumpsuit["light purple jumpsuit"] = /obj/item/clothing/under/lightpurple
-	jumpsuit["light green jumpsuit"] = /obj/item/clothing/under/lightgreen
-	jumpsuit["brown jumpsuit"] = /obj/item/clothing/under/brown
-	jumpsuit["light brown jumpsuit"] = /obj/item/clothing/under/lightbrown
-	jumpsuit["yellow green jumpsuit"] = /obj/item/clothing/under/yellowgreen
-	jumpsuit["light red jumpsuit"] = /obj/item/clothing/under/lightred
-	jumpsuit["dark red jumpsuit"] = /obj/item/clothing/under/darkred
-	jumpsuit["rainbow jumpsuit"] = /obj/item/clothing/under/rainbow
+	jumpsuit["yellow green jumpsuit"] = /obj/item/clothing/under/color/yellowgreen
+	jumpsuit["light green jumpsuit"] = /obj/item/clothing/under/color/lightgreen
+	jumpsuit["green jumpsuit"] = /obj/item/clothing/under/color/green
+	jumpsuit["aqua jumpsuit"] = /obj/item/clothing/under/color/aqua
+	jumpsuit["light blue jumpsuit"] = /obj/item/clothing/under/color/lightblue
+	jumpsuit["blue jumpsuit"] = /obj/item/clothing/under/color/blue
+	jumpsuit["dark blue jumpsuit"] = /obj/item/clothing/under/color/darkblue
+	jumpsuit["purple jumpsuit"] = /obj/item/clothing/under/color/purple
+	jumpsuit["light purple jumpsuit"] = /obj/item/clothing/under/color/lightpurple
+	jumpsuit["pink jumpsuit"] = /obj/item/clothing/under/color/pink
+	jumpsuit["orange jumpsuit"] = /obj/item/clothing/under/color/orange
 	gear_tweaks += new /datum/gear_tweak/path(jumpsuit)
 
 /datum/gear/uniform/colorjumpsuit

code/modules/clothing/under/color.dm

@@ -1,33 +1,25 @@
-/obj/item/clothing/under/color/black
-	name = "black jumpsuit"
-	icon_state = "black"
-	item_state = "bl_suit"
-	worn_state = "black"
-
-/obj/item/clothing/under/color/blue
-	name = "blue jumpsuit"
-	icon_state = "blue"
-	item_state = "b_suit"
-	worn_state = "blue"
-
-/obj/item/clothing/under/color/green
-	name = "green jumpsuit"
-	icon_state = "green"
-	item_state = "g_suit"
-	worn_state = "green"
-
-/obj/item/clothing/under/color/grey
+/obj/item/clothing/under/color
 	name = "grey jumpsuit"
+	desc = "A basic jumpsuit."
+	desc_info = "Jumpsuits can have their sleeves rolled up/down via the Roll Up/Down Sleeves verb, and also have their upper body part be up/down via the \
+	the Rolled Up/Down verb."
+	icon = 'icons/clothing/under/uniforms/jumpsuits.dmi'
 	icon_state = "grey"
-	item_state = "gy_suit"
-	worn_state = "grey"
+	item_state = "grey"
+	item_icons = null
+	contained_sprite = TRUE
+
+/obj/item/clothing/under/color/colorable
+	name = "colorable jumpsuit"
+	desc = "A colorable non-descript jumpsuit."
+	icon_state = "colorable"
+	item_state = "colorable"
 
 /obj/item/clothing/under/color/orange
 	name = "orange jumpsuit"
 	desc = "It's standardised prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
 	icon_state = "orange"
-	item_state = "o_suit"
-	worn_state = "orange"
+	item_state = "orange"
 	has_sensor = 2
 	sensor_mode = 3
 	var/id
@@ -48,124 +40,117 @@
 	desc = "It's standardised SCC prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position.\nThis one has \"Cell 4\" marked on it."
 	id = "Cell 4"
 
-/obj/item/clothing/under/color/pink
-	name = "pink jumpsuit"
-	icon_state = "pink"
-	item_state = "p_suit"
-	worn_state = "pink"
+/obj/item/clothing/under/color/black
+	name = "black jumpsuit"
+	desc = "A black jumpsuit."
+	icon_state = "black"
+	item_state = "black"
 
-/obj/item/clothing/under/color/red
-	name = "red jumpsuit"
-	icon_state = "red"
-	item_state = "r_suit"
-	worn_state = "red"
+/obj/item/clothing/under/color/grey
+	name = "grey jumpsuit"
+	desc = "A grey jumpsuit."
+	icon_state = "grey"
+	item_state = "grey"
 
 /obj/item/clothing/under/color/white
 	name = "white jumpsuit"
+	desc = "A white jumpsuit."
 	icon_state = "white"
-	item_state = "w_suit"
-	worn_state = "white"
+	item_state = "white"
+
+/obj/item/clothing/under/color/darkred
+	name = "darkred jumpsuit"
+	desc = "A dark red jumpsuit."
+	icon_state = "darkred"
+	item_state = "darkred"
+
+/obj/item/clothing/under/color/red
+	name = "red jumpsuit"
+	desc = "A red jumpsuit."
+	icon_state = "red"
+	item_state = "red"
+
+/obj/item/clothing/under/color/lightred
+	name = "lightred jumpsuit"
+	desc = "A light red jumpsuit."
+	icon_state = "lightred"
+	item_state = "lightred"
+
+/obj/item/clothing/under/color/lightbrown
+	name = "lightbrown jumpsuit"
+	desc = "A light brown jumpsuit."
+	icon_state = "lightbrown"
+	item_state = "lightbrown"
+
+/obj/item/clothing/under/color/brown
+	name = "brown jumpsuit"
+	desc = "A brown jumpsuit."
+	icon_state = "brown"
+	item_state = "brown"
 
 /obj/item/clothing/under/color/yellow
 	name = "yellow jumpsuit"
+	desc = "A yellow jumpsuit."
 	icon_state = "yellow"
-	item_state = "y_suit"
-	worn_state = "yellow"
+	item_state = "yellow"
 
-/obj/item/clothing/under/psyche
-	name = "psychedelic jumpsuit"
-	desc = "Groovy!"
-	icon_state = "psyche"
-	item_state = "psyche"
-	worn_state = "psyche"
-
-/obj/item/clothing/under/rainbow
-	name = "rainbow"
-	desc = "rainbow"
-	icon_state = "rainbow"
-	item_state = "rainbow"
-	worn_state = "rainbow"
-
-/obj/item/clothing/under/lightblue
-	name = "lightblue jumpsuit"
-	desc = "lightblue"
-	icon_state = "lightblue"
-	item_state = "b_suit"
-	worn_state = "lightblue"
-
-/obj/item/clothing/under/aqua
-	name = "aqua jumpsuit"
-	desc = "aqua"
-	icon_state = "aqua"
-	item_state = "b_suit"
-	worn_state = "aqua"
-
-/obj/item/clothing/under/purple
-	name = "purple jumpsuit"
-	desc = "purple"
-	icon_state = "purple"
-	item_state = "p_suit"
-	worn_state = "purple"
-
-/obj/item/clothing/under/lightpurple
-	name = "lightpurple jumpsuit"
-	desc = "lightpurple"
-	icon_state = "lightpurple"
-	item_state = "p_suit"
-	worn_state = "lightpurple"
-
-/obj/item/clothing/under/lightgreen
-	name = "lightgreen jumpsuit"
-	desc = "lightgreen"
-	icon_state = "lightgreen"
-	item_state = "g_suit"
-	worn_state = "lightgreen"
-
-/obj/item/clothing/under/lightbrown
-	name = "lightbrown jumpsuit"
-	desc = "lightbrown"
-	icon_state = "lightbrown"
-	item_state = "lb_suit"
-	worn_state = "lightbrown"
-
-/obj/item/clothing/under/brown
-	name = "brown jumpsuit"
-	desc = "brown"
-	icon_state = "brown"
-	item_state = "lb_suit"
-	worn_state = "brown"
-
-/obj/item/clothing/under/yellowgreen
+/obj/item/clothing/under/color/yellowgreen
 	name = "yellowgreen jumpsuit"
-	desc = "yellowgreen"
+	desc = "A yellow green jumpsuit."
 	icon_state = "yellowgreen"
-	item_state = "y_suit"
-	worn_state = "yellowgreen"
+	item_state = "yellowgreen"
 
-/obj/item/clothing/under/darkblue
+/obj/item/clothing/under/color/lightgreen
+	name = "lightgreen jumpsuit"
+	desc = "A light green jumpsuit."
+	icon_state = "lightgreen"
+	item_state = "lightgreen"
+
+/obj/item/clothing/under/color/green
+	name = "green jumpsuit"
+	desc = "A green jumpsuit."
+	icon_state = "green"
+	item_state = "green"
+
+/obj/item/clothing/under/color/aqua
+	name = "aqua jumpsuit"
+	desc = "An aqua jumpsuit."
+	icon_state = "aqua"
+	item_state = "aqua"
+
+/obj/item/clothing/under/color/lightblue
+	name = "lightblue jumpsuit"
+	desc = "A light blue jumpsuit."
+	icon_state = "lightblue"
+	item_state = "lightblue"
+
+/obj/item/clothing/under/color/blue
+	name = "blue jumpsuit"
+	desc = "A blue jumpsuit."
+	icon_state = "blue"
+	item_state = "blue"
+
+/obj/item/clothing/under/color/darkblue
 	name = "darkblue jumpsuit"
-	desc = "darkblue"
+	desc = "A dark blue jumpsuit."
 	icon_state = "darkblue"
-	item_state = "b_suit"
-	worn_state = "darkblue"
+	item_state = "darkblue"
 
-/obj/item/clothing/under/lightred
-	name = "lightred jumpsuit"
-	desc = "lightred"
-	icon_state = "lightred"
-	item_state = "r_suit"
-	worn_state = "lightred"
+/obj/item/clothing/under/color/purple
+	name = "purple jumpsuit"
+	desc = "A purple jumpsuit."
+	icon_state = "purple"
+	item_state = "purple"
 
-/obj/item/clothing/under/darkred
-	name = "darkred jumpsuit"
-	desc = "darkred"
-	icon_state = "darkred"
-	item_state = "r_suit"
-	worn_state = "darkred"
+/obj/item/clothing/under/color/lightpurple
+	name = "lightpurple jumpsuit"
+	desc = "A light purple jumpsuit."
+	icon_state = "lightpurple"
+	item_state = "lightpurple"
+
+/obj/item/clothing/under/color/pink
+	name = "pink jumpsuit"
+	desc = "A pink jumpsuit."
+	icon_state = "pink"
+	item_state = "pink"
 
-/obj/item/clothing/under/color/colorable
-	name = "colorable jumpsuit"
-	desc = "A non-descript jumpsuit in 167,777,216 designer colors."
-	icon_state = "white"
-	item_state = "w_suit"
-	worn_state = "colorable"