Adds Colourable Shorts (Aurorastation#17691)

* Adds Recolourable Shorts and Short Shorts

* Fixes

* Fix

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

@@ -166,11 +166,12 @@
 /datum/gear/uniform/pants/New()
 	..()
 	var/list/pants = list()
+
+	// Pants
 	pants["jeans"] = /obj/item/clothing/under/pants/jeans
 	pants["classic jeans"] = /obj/item/clothing/under/pants/classic
-	pants["must hang jeans"] = /obj/item/clothing/under/pants/mustang
+	pants["mustang jeans"] = /obj/item/clothing/under/pants/mustang
 	pants["black jeans"] = /obj/item/clothing/under/pants/jeansblack
-	pants["young folks jeans"] = /obj/item/clothing/under/pants/youngfolksjeans
 	pants["white pants"] = /obj/item/clothing/under/pants/white
 	pants["black pants"] = /obj/item/clothing/under/pants/black
 	pants["red pants"] = /obj/item/clothing/under/pants/red
@@ -187,13 +188,6 @@
 	pants["ripped jeans"] = /obj/item/clothing/under/pants/ripped
 	pants["black ripped jeans"] = /obj/item/clothing/under/pants/blackripped
 
-	// Athletic Shorts
-	pants["black athletic shorts"] = /obj/item/clothing/under/shorts/athletic/black
-	pants["red athletic shorts"] = /obj/item/clothing/under/shorts/athletic/red
-	pants["green athletic shorts"] = /obj/item/clothing/under/shorts/athletic/green
-	pants["grey athletic shorts"] = /obj/item/clothing/under/shorts/athletic/grey
-	pants["SCC-branded athletic shorts"] = /obj/item/clothing/under/shorts/athletic/scc
-
 	// Shorts
 	pants["black shorts"] = /obj/item/clothing/under/shorts/black
 	pants["black short shorts"] = /obj/item/clothing/under/shorts/black/short
@@ -207,30 +201,43 @@
 	pants["classic jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/classic/short
 	pants["mustang jeans shorts"] = /obj/item/clothing/under/shorts/jeans/mustang
 	pants["mustang jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/mustang/short
-	pants["young folks jeans shorts"] = /obj/item/clothing/under/shorts/jeans/youngfolks
-	pants["young folks jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/youngfolks/short
 	pants["black jeans shorts"] = /obj/item/clothing/under/shorts/jeans/black
 	pants["black jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/black/short
 	pants["grey jeans shorts"] = /obj/item/clothing/under/shorts/jeans/grey
 	pants["grey jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/grey/short
+
+	// Athletic Shorts
+	pants["black athletic shorts"] = /obj/item/clothing/under/shorts/athletic/black
+	pants["red athletic shorts"] = /obj/item/clothing/under/shorts/athletic/red
+	pants["green athletic shorts"] = /obj/item/clothing/under/shorts/athletic/green
+	pants["grey athletic shorts"] = /obj/item/clothing/under/shorts/athletic/grey
+	pants["SCC-branded athletic shorts"] = /obj/item/clothing/under/shorts/athletic/scc
+
 	gear_tweaks += new /datum/gear_tweak/path(pants)
 
 /datum/gear/uniform/colorpants
-	display_name = "pants and shorts selection (recolourable)"
-	description = "A selection of recolourable pants and shorts."
+	display_name = "pants and shorts selection (colourable)"
+	description = "A selection of colourable pants and shorts."
 	path = /obj/item/clothing/under/pants/dress
 	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
 
 /datum/gear/uniform/colorpants/New()
 	..()
 	var/list/colorpants = list()
+
+	// Pants
 	colorpants["dress pants"] = /obj/item/clothing/under/pants/dress
 	colorpants["dress pants, with belt"] = /obj/item/clothing/under/pants/dress/belt
 	colorpants["striped pants"] = /obj/item/clothing/under/pants/striped
-	colorpants["tailored jeans"] = /obj/item/clothing/under/pants/tailoredjeans
+	colorpants["flared pants"] = /obj/item/clothing/under/pants/flared
 	colorpants["mustang jeans"] = /obj/item/clothing/under/pants/mustang/colourable
+	colorpants["tailored jeans"] = /obj/item/clothing/under/pants/tailoredjeans
+
+	// Shorts
+	colorpants["shorts"] = /obj/item/clothing/under/shorts/colourable
+	colorpants["short shorts"] = /obj/item/clothing/under/shorts/colourable/short
 	colorpants["athletic shorts"] = /obj/item/clothing/under/shorts/athletic/colourable
-	colorpants["flared pants"] = /obj/item/clothing/under/pants/flared
+
 	gear_tweaks += new /datum/gear_tweak/path(colorpants)
 
 /datum/gear/uniform/turtleneck

code/modules/clothing/under/pants.dm

@@ -114,12 +114,6 @@
 	icon_state = "jeansblack"
 	item_state = "jeansblack"
 
-/obj/item/clothing/under/pants/youngfolksjeans
-	name = "young folks jeans"
-	desc = "For those tired of boring old jeans."
-	icon_state = "jeansyoungfolks"
-	item_state = "jeansyoungfolks"
-
 /obj/item/clothing/under/pants/designer
 	name = "designer jeans"
 	desc = "Dark denim jeans carefully distressed to perfection. They're not as rugged as they look."
@@ -177,4 +171,4 @@
 	name = "red track pants"
 	icon_state = "trackpantsred"
 	item_state = "trackpantsred"
-/********** Track Pants End **********/
+/********** Track Pants End **********/

code/modules/clothing/under/shorts.dm

@@ -12,6 +12,16 @@
 
 /********** Shorts Start **********/
 // Shorts
+/obj/item/clothing/under/shorts/colourable
+	name = "shorts"
+	desc = "A pair of cotton shorts."
+	icon_state = "shorts_recolourable"
+	item_state = "shorts_recolourable"
+
+/obj/item/clothing/under/shorts/colourable/short
+	name = "short shorts"
+	desc = "A pair of cotton short shorts."
+
 /obj/item/clothing/under/shorts/black
 	name = "black shorts"
 	desc = "For that island getaway. It's five o'clock somewhere, right?"
@@ -68,16 +78,6 @@
 	icon_state = "shorts_s_jeans_mustang"
 	item_state = "shorts_s_jeans_mustang"
 
-/obj/item/clothing/under/shorts/jeans/youngfolks
-	name = "young folks jeans shorts"
-	icon_state = "shorts_jeans_youngfolk"
-	item_state = "shorts_jeans_youngfolk"
-
-/obj/item/clothing/under/shorts/jeans/youngfolks/short
-	name = "young folks jeans short shorts"
-	icon_state = "shorts_s_jeans_youngfolk"
-	item_state = "shorts_s_jeans_youngfolk"
-
 /obj/item/clothing/under/shorts/jeans/black
 	name = "black jeans shorts"
 	icon_state = "shorts_jeans_black"
@@ -147,4 +147,4 @@
 	desc_extended = "The Stellar Corporate Conglomerate, also known as the Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals, and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur."
 	icon_state = "shorts_athletic_scc"
 	item_state = "shorts_athletic_scc"
-/********** Athletic Shorts End **********/
+/********** Athletic Shorts End **********/

html/changelogs/SleepyGemmy-recolourable_shorts.yml

@@ -0,0 +1,7 @@
+author: SleepyGemmy
+
+delete-after: True
+
+changes:
+  - rscadd: "Added a pair of colourable shorts and short shorts."
+  - rscdel: "Removed the young folks jeans and jeans shorts, as they had the same sprite as the classic jeans and jeans shorts."

maps/away/ships/freebooter/freebooter_ship.dmm

@@ -8912,7 +8912,6 @@
 /obj/item/clothing/head/dominia/fleet,
 /obj/item/clothing/head/dominia/fleet/armsman,
 /obj/item/clothing/under/pants/jeans,
-/obj/item/clothing/under/pants/youngfolksjeans,
 /obj/item/clothing/under/pants/jeansblack,
 /obj/item/clothing/head/beanie/random,
 /obj/item/clothing/head/beanie/random,