feat(uniforms): new skirts

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

@@ -75,7 +75,7 @@
 	flags = GEAR_HAS_TYPE_SELECTION
 
 /datum/gear/uniform/skirt_c
-	display_name = "short skirt, colour select"
+	display_name = "skirt selection, colour select"
 	path = /obj/item/clothing/under/skirt_c
 	flags = GEAR_HAS_COLOR_SELECTION
 
@@ -84,6 +84,20 @@
 	path = /obj/item/clothing/under/skirt_c/dress
 	flags = GEAR_HAS_COLOR_SELECTION
 
+/datum/gear/uniform/skirt_c/New()
+	..()
+	var/skirts_colorable = list()
+	skirts_colorable += /obj/item/clothing/under/skirt_c
+	skirts_colorable += /obj/item/clothing/under/skirt_c/pencil
+	skirts_colorable += /obj/item/clothing/under/skirt_c/casual
+	skirts_colorable += /obj/item/clothing/under/skirt_c/high
+	skirts_colorable += /obj/item/clothing/under/skirt_c/long
+	skirts_colorable += /obj/item/clothing/under/skirt_c/swept
+	skirts_colorable += /obj/item/clothing/under/skirt_c/plaid
+	skirts_colorable += /obj/item/clothing/under/skirt_c/skater
+	skirts_colorable += /obj/item/clothing/under/skirt_c/tube
+	gear_tweaks += new /datum/gear_tweak/path/specified_types_list(skirts_colorable)
+
 /datum/gear/uniform/casual_pants
 	display_name = "casual pants selection"
 	path = /obj/item/clothing/under/casual_pants

code/modules/clothing/under/skirts.dm

@@ -29,21 +29,6 @@
 	worn_state = "plaid_purple"
 
 // discreet skirts, dont cover upper/arms etc
-/obj/item/clothing/under/skirt/khaki
-	name = "khaki skirt"
-	desc = "A khaki skirt with a flare at the hem."
-	icon_state = "skirt_khaki"
-	worn_state = "skirt_khaki"
-	body_parts_covered = LOWER_TORSO
-	coverage = 0.7
-
-/obj/item/clothing/under/skirt/swept
-	name = "swept skirt"
-	desc = "A skirt that is swept to one side."
-	icon_state = "skirt_swept"
-	worn_state = "skirt_swept"
-	body_parts_covered = LOWER_TORSO
-	coverage = 0.6
 
 // colour selection, needs to be different for loadout type selection
 
@@ -55,6 +40,61 @@
 	body_parts_covered = LOWER_TORSO
 	coverage = 0.7
 
+/obj/item/clothing/under/skirt_c/casual
+	name = "casual skirt"
+	desc = "A short, colorful skirt."
+	icon_state = "skirt_casual"
+	item_state = "skirt_casual"
+	worn_state = "skirt_casual"
+
+/obj/item/clothing/under/skirt_c/high
+	name = "high skirt"
+	desc = "A modest skirt going up to the waist."
+	icon_state = "skirt_high"
+	item_state = "skirt_high"
+	worn_state = "skirt_high"
+
+/obj/item/clothing/under/skirt_c/long
+	name = "long skirt"
+	desc = "A long, modest skirt."
+	icon_state = "skirt_long"
+	item_state = "skirt_long"
+	worn_state = "skirt_long"
+
+/obj/item/clothing/under/skirt_c/swept
+	name = "swept skirt"
+	desc = "A skirt that is swept to one side."
+	icon_state = "skirt_swept"
+	worn_state = "skirt_swept"
+
+/obj/item/clothing/under/skirt_c/pencil
+	name = "pencil skirt"
+	desc = "A professional-looking pencil skirt."
+	icon_state = "skirt_pencil"
+	item_state = "skirt_pencil"
+	worn_state = "skirt_pencil"
+
+/obj/item/clothing/under/skirt_c/plaid
+	name = "plaid skirt"
+	desc = "A preppy plaid skirt."
+	icon_state = "skirt_plaid"
+	item_state = "skirt_plaid"
+	worn_state = "skirt_plaid"
+
+/obj/item/clothing/under/skirt_c/skater
+	name = "skater skirt"
+	desc = "A plush skater skirt."
+	icon_state = "skirt_skater"
+	item_state = "skirt_skater"
+	worn_state = "skirt_skater"
+
+/obj/item/clothing/under/skirt_c/tube
+	name = "tube skirt"
+	desc = "A long tube skirt."
+	icon_state = "skirt_tube"
+	item_state = "skirt_tube"
+	worn_state = "skirt_tube"
+
 // dresses
 /obj/item/clothing/under/skirt_c/dress
 	name = "short dress"

maps/templates/holodeck_beach.dmm

@@ -20,7 +20,7 @@
 "D" = (/obj/item/clothing/head/collectable/paper,/obj/item/clothing/head/collectable/paper{pixel_y = -8; pixel_x = 10},/obj/item/clothing/head/collectable/paper{pixel_y = -12; pixel_x = -5},/turf/simulated/floor/natural/jungle/water,/area/template_noop)
 "F" = (/obj/item/inflatable_duck,/turf/simulated/floor/natural/jungle/water,/area/template_noop)
 "H" = (/turf/simulated/floor/natural/jungle/water,/area/template_noop)
-"I" = (/obj/item/clothing/under/skirt/khaki,/turf/simulated/floor/natural/jungle/sandgrasscorner1{dir = 8},/area/template_noop)
+"I" = (/turf/simulated/floor/natural/jungle/sandgrasscorner1{dir = 8},/area/template_noop)
 "J" = (/obj/structure/bed/chair/lime{dir = 4},/turf/simulated/floor/natural/jungle/sand,/area/template_noop)
 "K" = (/obj/item/clothing/glasses/sunglasses,/turf/simulated/floor/natural/jungle/sand,/area/template_noop)
 "M" = (/obj/item/beach_ball,/turf/simulated/floor/natural/jungle/sand,/area/template_noop)