Fashion on The Frontier: Dresses

_maps/RandomRuins/JungleRuins/jungle_interceptor.dmm

@@ -1090,7 +1090,7 @@
 /obj/item/radio,
 /obj/item/radio,
 /obj/item/clothing/under/color/jumpskirt/darkblue,
-/obj/item/clothing/under/dress/skirt/blue,
+/obj/item/clothing/under/dress/skirt/color/blue,
 /obj/effect/turf_decal/corner/opaque/black{
 	icon_state = "siding_line";
 	dir = 10
@@ -1516,7 +1516,7 @@
 	},
 /obj/item/radio,
 /obj/item/radio,
-/obj/item/clothing/under/dress/skirt/blue,
+/obj/item/clothing/under/dress/skirt/color/blue,
 /obj/item/clothing/under/color/darkblue,
 /obj/effect/turf_decal/corner/opaque/black{
 	icon_state = "siding_line";

_maps/map_files/generic/CentCom.dmm

@@ -4840,7 +4840,7 @@
 "aRr" = (
 /obj/structure/closet/secure_closet/personal/cabinet,
 /obj/item/clothing/under/rank/civilian/curator/treasure_hunter,
-/obj/item/clothing/under/dress/skirt,
+/obj/item/clothing/under/dress/skirt/color,
 /obj/item/clothing/under/shorts/black,
 /obj/item/clothing/under/pants/track,
 /obj/item/clothing/accessory/armband/deputy,

_maps/shuttles/independent/independent_tranquility.dmm

@@ -1326,7 +1326,7 @@
 /obj/item/clothing/head/beret,
 /obj/item/clothing/under/color/jumpskirt/random,
 /obj/item/clothing/under/color/random,
-/obj/item/clothing/under/dress/skirt/red,
+/obj/item/clothing/under/dress/skirt/color/red,
 /obj/item/clothing/suit/longcoat,
 /obj/item/clothing/suit/jacket/letterman_red,
 /obj/item/clothing/head/soft/mime,

code/game/objects/effects/spawners/bundle.dm

@@ -43,7 +43,7 @@
 /obj/effect/spawner/bundle/costume/maid
 	name = "maid costume spawner"
 	items = list(
-		/obj/item/clothing/under/dress/skirt,
+		/obj/item/clothing/under/dress/skirt/color,
 		/obj/effect/spawner/lootdrop/minor/beret_or_rabbitears,
 		/obj/item/clothing/glasses/blindfold)
 

code/modules/client/loadout/loadout_uniform.dm

@@ -185,41 +185,94 @@
 	subtype_path = /datum/gear/uniform/dress
 
 /datum/gear/uniform/dress/sailor
-	display_name = "sailor dress"
+	display_name = "dress, sailor"
 	path = /obj/item/clothing/under/dress/sailor
 
 /datum/gear/uniform/dress/striped
-	display_name = "striped dress"
+	display_name = "dress, striped"
 	path = /obj/item/clothing/under/dress/striped
 
 /datum/gear/uniform/dress/redeveninggown
-	display_name = "red evening gown"
+	display_name = "dress, red evening gown"
 	path = /obj/item/clothing/under/dress/redeveninggown
 
 /datum/gear/uniform/dress/blacktango
-	display_name = "black tango dress"
+	display_name = "dress, black tango"
 	path = /obj/item/clothing/under/dress/blacktango
 
+/datum/gear/uniform/dress/one_shoulder_dress
+
+	display_name = "dress, one shoulder"
+	path = /obj/item/clothing/under/dress/one_shoulder
+
+/datum/gear/uniform/dress/iko_ikssoal
+
+	display_name = "dress, iko-ikssoal"
+	path = /obj/item/clothing/under/dress/iko_ikssoal
+
+/datum/gear/uniform/dress/whitedress
+
+	display_name = "dress, white"
+	path = /obj/item/clothing/under/dress/white_dress
+
+/datum/gear/uniform/dress/sundress
+	display_name = "dress, sundress"
+	path = /obj/item/clothing/under/dress/sundress
+
+/datum/gear/uniform/dress/rilena
+	display_name = "dress, Ri cosplay"
+	path = /obj/item/clothing/under/dress/rilena
+
 /datum/gear/uniform/dress/purpleskirt
-	display_name = "purple skirt"
-	path = /obj/item/clothing/under/dress/skirt/purple
+	display_name = "skirt, purple"
+	path = /obj/item/clothing/under/dress/skirt/color/purple
 
 /datum/gear/uniform/dress/blueskirt
-	display_name = "blue skirt"
-	path = /obj/item/clothing/under/dress/skirt/blue
+	display_name = "skirt, blue"
+	path = /obj/item/clothing/under/dress/skirt/color/blue
 
 /datum/gear/uniform/dress/redskirt
-	display_name = "red skirt"
-	path = /obj/item/clothing/under/dress/skirt/red
+	display_name = "skirt, red"
+	path = /obj/item/clothing/under/dress/skirt/color/red
+
+/datum/gear/uniform/dress/whiteskirt
+
+	display_name = "skirt, white"
+	path = /obj/item/clothing/under/dress/skirt/color/white
 
 /datum/gear/uniform/dress/blackskirt
-	display_name = "black skirt"
-	path = /obj/item/clothing/under/dress/skirt
-	description = "Actually, it's a black blouse with a salmon skirt. But it's not called that."
+	display_name = "skirt, black"
+	path = /obj/item/clothing/under/dress/skirt/color
 
-/datum/gear/uniform/dress/sundress
-	display_name = "sundress"
-	path = /obj/item/clothing/under/dress/sundress
+/datum/gear/uniform/dress/black_pinafore
+
+	display_name = "pinafore, black"
+	path = /obj/item/clothing/under/dress/skirt/pinafore
+
+/datum/gear/uniform/dress/maroon_pinafore
+
+	display_name = "pinafore, maroon"
+	path = /obj/item/clothing/under/dress/skirt/pinafore/maroon
+
+/datum/gear/uniform/dress/cerulean_pinafore
+
+	display_name = "pinafore, cerulean"
+	path = /obj/item/clothing/under/dress/skirt/pinafore/cerulean
+
+/datum/gear/uniform/dress/red_plaid_pinafore
+
+	display_name = "pinafore, red plaid"
+	path = /obj/item/clothing/under/dress/skirt/pinafore/plaid
+
+/datum/gear/uniform/dress/green_plaid_pinafore
+
+	display_name = "pinafore, green plaid"
+	path = /obj/item/clothing/under/dress/skirt/pinafore/plaid/green
+
+/datum/gear/uniform/dress/brown_plaid_pinafore
+
+	display_name = "pinafore, brown plaid"
+	path = /obj/item/clothing/under/dress/skirt/pinafore/plaid/brown
 
 /datum/gear/uniform/suit/dress_suit
 	display_name = "dress-suit, navy"
@@ -228,7 +281,3 @@
 /datum/gear/uniform/suit/dress_suit/skirt
 	display_name = "dress-suitskirt, navy"
 	path = /obj/item/clothing/under/suit/dresssuit/skirt
-
-/datum/gear/uniform/dress/rilena
-	display_name = "red dress, Ri cosplay"
-	path = /obj/item/clothing/under/dress/rilena

code/modules/clothing/under/skirt_dress.dm

@@ -13,19 +13,19 @@
 
 /obj/item/clothing/under/dress/blacktango
 	name = "black tango dress"
-	desc = "Filled with Latin fire."
+	desc = "A silky black satin dress, traditionally made for dancing. It's light and easy to move in."
 	icon_state = "black_tango"
 	item_state = "wcoat"
 
 /obj/item/clothing/under/dress/striped
 	name = "striped dress"
-	desc = "Fashion in space."
+	desc = "A simple blue striped dress."
 	icon_state = "striped_dress"
 	item_state = "striped_dress"
 
 /obj/item/clothing/under/dress/sailor
 	name = "sailor dress"
-	desc = "Formal wear for a leading lady."
+	desc = "A traditional dress with roots in Far Eastern Cantonal culture, later popularized by the Solarian Confederacy's Naval Forces. However, due to its roots as a formal uniform, it would later be used by civilians in occasions outside of its naval context. The crisp cloth evokes feelings of order and discipline."
 	icon_state = "sailor_dress"
 	item_state = "sailor_dress"
 
@@ -35,32 +35,91 @@
 	icon_state = "red_evening_gown"
 	item_state = "red_evening_gown"
 
-/obj/item/clothing/under/dress/skirt
+/obj/item/clothing/under/dress/one_shoulder
+
+	name = "one shoulder dress"
+	desc = "A modern black dress with only one shoulder strap. Comes with a matching pair of arm warmers."
+	icon_state = "one_shoulder_dress"
+	can_adjust = TRUE
+
+/obj/item/clothing/under/dress/iko_ikssoal
+
+	name = "iko_ikssoal"
+	desc = "The “iko-ikssoal”, translating to “long-dress”, is a traditional Kalixcian garment for formal gatherings."
+	icon_state = "iko_ikssoal"
+
+/obj/item/clothing/under/dress/skirt/color
 	name = "black skirt"
-	desc = "A black skirt, very fancy!"
+	desc = "A black, casual skirt."
 	icon_state = "blackskirt"
+	can_adjust = TRUE
 
-/obj/item/clothing/under/dress/skirt/blue
+/obj/item/clothing/under/dress/skirt/color/blue
 	name = "blue skirt"
 	desc = "A blue, casual skirt."
 	icon_state = "blueskirt"
 	item_state = "b_suit"
 	custom_price = 60
 
-/obj/item/clothing/under/dress/skirt/red
+/obj/item/clothing/under/dress/skirt/color/red
 	name = "red skirt"
 	desc = "A red, casual skirt."
 	icon_state = "redskirt"
 	item_state = "r_suit"
 	custom_price = 60
 
-/obj/item/clothing/under/dress/skirt/purple
+/obj/item/clothing/under/dress/skirt/color/purple
 	name = "purple skirt"
 	desc = "A purple, casual skirt."
 	icon_state = "purpleskirt"
 	item_state = "p_suit"
 	custom_price = 60
 
+/obj/item/clothing/under/dress/skirt/color/white
+
+	name = "white skirt"
+	desc = "A white, casual skirt."
+	icon_state = "whiteskirt"
+	custom_price = 60
+
+/obj/item/clothing/under/dress/skirt/pinafore
+
+	name = "black pinafore"
+	desc = "It's really just an apron that one wears over a shirt or dress. This one is black."
+	icon_state = "black_pinafore"
+	can_adjust = TRUE
+	alt_covers_chest = TRUE
+
+/obj/item/clothing/under/dress/skirt/pinafore/maroon
+
+	name = "maroon pinafore"
+	desc = "It's really just an apron that one wears over a shirt or dress. This one is maroon."
+	icon_state = "maroon_pinafore"
+
+/obj/item/clothing/under/dress/skirt/pinafore/cerulean
+
+	name = "cerulean pinafore"
+	desc = "It's really just an apron that one wears over a shirt or dress. This one is cerulean."
+	icon_state = "cerulean_pinafore"
+
+/obj/item/clothing/under/dress/skirt/pinafore/plaid
+
+	name = "red plaid pinafore"
+	desc = "It's really just an apron that one wears over a shirt or dress. This one is in red plaid."
+	icon_state = "red_plaid_pinafore"
+
+/obj/item/clothing/under/dress/skirt/pinafore/plaid/green
+
+	name = "green plaid pinafore"
+	desc = "It's really just an apron that one wears over a shirt or dress. This one is in green plaid."
+	icon_state = "green_plaid_pinafore"
+
+/obj/item/clothing/under/dress/skirt/pinafore/plaid/brown
+
+	name = "brown plaid pinafore"
+	desc = "It's really just an apron that one wears over a shirt or dress. This one is in brown plaid."
+	icon_state = "brown_plaid_pinafore"
+
 /obj/item/clothing/under/dress/skirt/plaid
 	name = "red plaid skirt"
 	desc = "A preppy red skirt with a white blouse."
@@ -94,3 +153,9 @@
 	icon_state = "rilena_dress"
 	item_state = "rilena_dress"
 	//supports_variations = KEPORI_VARIATION
+
+/obj/item/clothing/under/dress/white_dress
+	name = "white dress"
+	desc = "A breezy white dress."
+	icon_state = "white_dress"
+	item_state = "white_dress"

code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm

@@ -17,7 +17,7 @@
 		/obj/item/clothing/under/suit/black = 1,
 		/obj/item/clothing/under/dress/sailor = 1,
 		/obj/item/clothing/under/dress/striped = 1,
-		/obj/item/clothing/under/dress/skirt/blue = 1,
+		/obj/item/clothing/under/dress/skirt/color/blue = 1,
 		/obj/item/clothing/under/syndicate/tacticool = 1,
 		)
 	)

code/modules/vending/autodrobe.dm

@@ -19,7 +19,7 @@
 		/obj/item/clothing/under/costume/schoolgirl/green = 1,
 		/obj/item/clothing/under/costume/schoolgirl/orange = 1,
 		/obj/item/clothing/head/kitty = 1,
-		/obj/item/clothing/under/dress/skirt = 1,
+		/obj/item/clothing/under/dress/skirt/color = 1,
 		/obj/item/clothing/head/beret = 1,
 		/obj/item/clothing/head/cowboy = 1, //WS - Yee Haw
 		/obj/item/clothing/accessory/waistcoat = 1,

code/modules/vending/clothesmate.dm

@@ -55,10 +55,17 @@
 		/obj/item/clothing/under/dress/skirt/plaid/blue = 2,
 		/obj/item/clothing/under/dress/skirt/plaid/green = 2,
 		/obj/item/clothing/under/dress/skirt/plaid/purple = 2,
-		/obj/item/clothing/under/dress/skirt = 2,
-		/obj/item/clothing/under/dress/skirt/blue = 2,
-		/obj/item/clothing/under/dress/skirt/red = 2,
-		/obj/item/clothing/under/dress/skirt/purple = 2,
+		/obj/item/clothing/under/dress/skirt/color = 2,
+		/obj/item/clothing/under/dress/skirt/color/blue = 2,
+		/obj/item/clothing/under/dress/skirt/color/red = 2,
+		/obj/item/clothing/under/dress/skirt/color/purple = 2,
+		/obj/item/clothing/under/dress/skirt/color/white = 2,
+		/obj/item/clothing/under/dress/skirt/pinafore = 2,
+		/obj/item/clothing/under/dress/skirt/pinafore/maroon = 2,
+		/obj/item/clothing/under/dress/skirt/pinafore/cerulean = 2,
+		/obj/item/clothing/under/dress/skirt/pinafore/plaid = 2,
+		/obj/item/clothing/under/dress/skirt/pinafore/plaid/green = 2,
+		/obj/item/clothing/under/dress/skirt/pinafore/plaid/brown = 2,
 		/obj/item/clothing/under/suit/white/skirt = 2,
 		/obj/item/clothing/under/rank/command/captain/suit/skirt = 2,
 		/obj/item/clothing/under/rank/command/head_of_personnel/suit/skirt = 2,
@@ -87,6 +94,8 @@
 		/obj/item/clothing/under/dress/sailor = 1,
 		/obj/item/clothing/under/dress/redeveninggown = 1,
 		/obj/item/clothing/under/dress/blacktango = 1,
+		/obj/item/clothing/under/dress/one_shoulder = 1,
+		/obj/item/clothing/under/dress/white_dress = 1,
 		/obj/item/clothing/suit/ianshirt = 1,
 		/obj/item/clothing/shoes/laceup = 2,
 		/obj/item/clothing/shoes/sandal = 2,