Skip to content

Commit

Permalink
Fashion on The Frontier: Dresses (#3565)
Browse files Browse the repository at this point in the history
## About The Pull Request

(PR'ing the right branch this time)
Resprites many dresses, and adds many more.
Specifically:
Resprites all the colored skirts, black tango, red evening gown, sailors
dress (reflavored to be Solarian), sundress, striped dress, white dress,
and some suitskirts.
Adds an extra colored skirt, a pinafore with five other variants, a one
shoulder dress, and a Kalixcian dress.

![image](https://github.com/user-attachments/assets/a8672878-603c-4c22-89db-b7cca40a0e4b)

## Why It's Good For The Game

Your branch: Crusty, crufty, ugly

![image](https://github.com/user-attachments/assets/3ed162bd-2cea-49ee-9b9d-2a0ae7ce0368)

My branch: Cute, pretty, full of beauty

![image](https://github.com/user-attachments/assets/82d6922f-97dc-4f81-93b4-64495a4e2014)

## Changelog

:cl:
imageadd: Resprites colored skirts, black tango, red evening gown,
sailors dress, sundress, white dress, and some suitskirts.
add: Six pinafore variants, white colored skirt, one shoulder dress, and
iko-ikssoal dress.
/:cl:
  • Loading branch information
MemeSnorfer authored Oct 16, 2024
1 parent 7c4bd99 commit 192bcec
Show file tree
Hide file tree
Showing 17 changed files with 162 additions and 39 deletions.
4 changes: 2 additions & 2 deletions _maps/RandomRuins/JungleRuins/jungle_interceptor.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/generic/CentCom.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_tranquility.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/effects/spawners/bundle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
89 changes: 69 additions & 20 deletions code/modules/client/loadout/loadout_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -181,41 +181,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"
Expand All @@ -224,7 +277,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
81 changes: 73 additions & 8 deletions code/modules/clothing/under/skirt_dress.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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."
Expand Down Expand Up @@ -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"
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/vending/autodrobe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
17 changes: 13 additions & 4 deletions code/modules/vending/clothesmate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
Binary file modified icons/mob/clothing/suit.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/under/command.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/under/dress.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/under/suits.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/suits.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/under/command.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/under/dress.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/under/suits.dmi
Binary file not shown.

0 comments on commit 192bcec

Please sign in to comment.