Sorts the modular skirts_dresses.dm file, properly subtypes the new M…

…edium/Long skirts and fixes their broken toggleability (#24680) (#369) * moves the dresses to the dress section, skirts to the skirt section * Repaths the new skirts to actually be skirt subtypes (and removes their chest coverage) Co-authored-by: OrionTheFox <[email protected]>
Fluffy-Frontier · Nov 1, 2023 · 1e5fb7c · 1e5fb7c
1 parent 184201f
commit 1e5fb7c
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 53 deletions.
diff --git a/modular_skyrat/master_files/code/modules/clothing/under/skirts_dresses.dm b/modular_skyrat/master_files/code/modules/clothing/under/skirts_dresses.dm
@@ -37,15 +37,29 @@
 	icon_state = "skirt_swept"
 	body_parts_covered = GROIN
 
-/obj/item/clothing/under/dress/skirt/skyrat/lone_skirt
-	name = "skirt"
-	desc = "Just a skirt! Hope you have a tanktop to wear with this."
-	icon_state = "lone_skirt"
-	body_parts_covered = GROIN
-	greyscale_config = /datum/greyscale_config/lone_skirt
-	greyscale_config_worn = /datum/greyscale_config/lone_skirt/worn
-	greyscale_colors = "#5f534a"
-	flags_1 = IS_PLAYER_COLORABLE_1
+/obj/item/clothing/under/dress/skirt/skyrat/striped_skirt
+	name = "Striped Skirt"
+	desc = "A red side-slit skirt with stripes! Comes with a matching two-tone bra."
+	icon_state = "striped_skirt"
+	body_parts_covered = CHEST|GROIN|LEGS
+	can_adjust = TRUE
+	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/dress/skirt/skyrat/red_skirt
+	name = "Red Skirt"
+	desc = "An eye-catching knee-length red skirt, with a golden-yellow trim. Comes with a matching two-tone bra."
+	icon_state = "red_skirt"
+	body_parts_covered = CHEST|GROIN|LEGS
+	can_adjust = TRUE
+	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/dress/skirt/skyrat/black_skirt
+	name = "Black Skirt"
+	desc = "A black side-slit skirt with a golden-yellow trim. Screams 'affluent goth'. Comes with a funky-looking matching bra."
+	icon_state = "black_skirt"
+	body_parts_covered = CHEST|GROIN|LEGS
+	can_adjust = TRUE
+	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
 
 /obj/item/clothing/under/dress/skirt/skyrat/turtleskirt_knit //Essentially the same as the Turtleneck Skirt but with a different texture
 	name = "cableknit skirt"
@@ -71,34 +85,32 @@
 	greyscale_colors = "#787878#723E0E#4D7EAC"
 	flags_1 = IS_PLAYER_COLORABLE_1
 
-/obj/item/clothing/under/dress/skyrat/short_dress
-	name = "short dress"
-	desc = "An extremely short dress with a lovely sash and flower - only for those with good self-confidence."
-	icon_state = "short_dress"
-	greyscale_config = /datum/greyscale_config/short_dress
-	greyscale_config_worn = /datum/greyscale_config/short_dress/worn
-	greyscale_colors = "#ff3636#363030"
+/obj/item/clothing/under/dress/skirt/skyrat/lone_skirt
+	name = "skirt"
+	desc = "Just a skirt! Hope you have a tanktop to wear with this."
+	icon_state = "lone_skirt"
+	body_parts_covered = GROIN
+	greyscale_config = /datum/greyscale_config/lone_skirt
+	greyscale_config_worn = /datum/greyscale_config/lone_skirt/worn
+	greyscale_colors = "#5f534a"
 	flags_1 = IS_PLAYER_COLORABLE_1
 
-/obj/item/clothing/under/dress/skyrat/pinktutu
-	name = "pink tutu"
-	desc = "A fluffy pink tutu."
-	icon_state = "pinktutu"
-
-/obj/item/clothing/under/skyrat/medium_skirt
+/obj/item/clothing/under/dress/skirt/skyrat/medium
 	name = "medium skirt"
-	desc = "Appealing medium-length skirt."
+	desc = "An appealing medium-length skirt. Top not included."
 	icon_state = "medium_skirt"
+	body_parts_covered = GROIN
 	greyscale_config = /datum/greyscale_config/medium_skirt
 	greyscale_config_worn = /datum/greyscale_config/medium_skirt/worn
 	greyscale_colors = "#3a3c45"
 	female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY|FEMALE_UNIFORM_NO_BREASTS
 	flags_1 = IS_PLAYER_COLORABLE_1
 
-/obj/item/clothing/under/skyrat/long_skirt
+/obj/item/clothing/under/dress/skirt/skyrat/long
 	name = "long skirt"
-	desc = "Appealing long skirt."
+	desc = "An appealing long skirt. At this point does it qualify as a dress?"
 	icon_state = "long_skirt"
+	body_parts_covered = GROIN|LEGS
 	greyscale_config = /datum/greyscale_config/long_skirt
 	greyscale_config_worn = /datum/greyscale_config/long_skirt/worn
 	greyscale_colors = "#3a3c45"
@@ -110,6 +122,20 @@
 *	Dresses
 */
 
+/obj/item/clothing/under/dress/skyrat/short_dress
+	name = "short dress"
+	desc = "An extremely short dress with a lovely sash and flower - only for those with good self-confidence."
+	icon_state = "short_dress"
+	greyscale_config = /datum/greyscale_config/short_dress
+	greyscale_config_worn = /datum/greyscale_config/short_dress/worn
+	greyscale_colors = "#ff3636#363030"
+	flags_1 = IS_PLAYER_COLORABLE_1
+
+/obj/item/clothing/under/dress/skyrat/pinktutu
+	name = "pink tutu"
+	desc = "A fluffy pink tutu."
+	icon_state = "pinktutu"
+
 /obj/item/clothing/under/dress/skyrat/flower
 	name = "flower dress"
 	desc = "Lovely dress. Colored like the autumn leaves."
@@ -157,27 +183,3 @@
 	body_parts_covered = CHEST|GROIN|LEGS
 	can_adjust = TRUE
 	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
-
-/obj/item/clothing/under/dress/skirt/skyrat/striped_skirt
-	name = "Striped Skirt"
-	desc = "A red side-slit skirt with stripes! Comes with a matching two-tone bra."
-	icon_state = "striped_skirt"
-	body_parts_covered = CHEST|GROIN|LEGS
-	can_adjust = TRUE
-	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
-
-/obj/item/clothing/under/dress/skirt/skyrat/red_skirt
-	name = "Red Skirt"
-	desc = "An eye-catching knee-length red skirt, with a golden-yellow trim, comes with a two-tone bra."
-	icon_state = "red_skirt"
-	body_parts_covered = CHEST|GROIN|LEGS
-	can_adjust = TRUE
-	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
-
-/obj/item/clothing/under/dress/skirt/skyrat/black_skirt
-	name = "Black Skirt"
-	desc = "A black side-slit skirt with a golden-yellow trim. Screams 'affluent goth'. Comes with a funky-looking matching bra."
-	icon_state = "black_skirt"
-	body_parts_covered = CHEST|GROIN|LEGS
-	can_adjust = TRUE
-	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
diff --git a/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm b/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm
@@ -396,11 +396,11 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/
 
 /datum/loadout_item/under/miscellaneous/medium_skirt
 	name = "Medium Colourable Skirt"
-	item_path = /obj/item/clothing/under/skyrat/medium_skirt
+	item_path = /obj/item/clothing/under/dress/skirt/skyrat/medium
 
 /datum/loadout_item/under/miscellaneous/long_skirt
 	name = "Long Colourable Skirt"
-	item_path = /obj/item/clothing/under/skyrat/long_skirt
+	item_path = /obj/item/clothing/under/dress/skirt/skyrat/long
 
 /datum/loadout_item/under/miscellaneous/denim_skirt
 	name = "Jean Skirt"

diff --git a/modular_skyrat/modules/modular_vending/code/clothesmate.dm b/modular_skyrat/modules/modular_vending/code/clothesmate.dm
@@ -82,8 +82,8 @@
 				/obj/item/clothing/under/suit/skyrat/inferno/skirt = 3,
 				/obj/item/clothing/under/suit/skyrat/helltaker = 3,
 				/obj/item/clothing/under/suit/skyrat/helltaker/skirt = 3,
-				/obj/item/clothing/under/skyrat/medium_skirt = 5,
-				/obj/item/clothing/under/skyrat/long_skirt = 5,
+				/obj/item/clothing/under/dress/skirt/skyrat/medium = 5,
+				/obj/item/clothing/under/dress/skirt/skyrat/long = 5,
 			),
 		),