From 17daf9f2e02d96c7c5b18fb8d8760882577ffbc0 Mon Sep 17 00:00:00 2001 From: atteria <86520558+atteria@users.noreply.github.com> Date: Sun, 17 Mar 2024 14:54:32 -0700 Subject: [PATCH] Colorable Dresses (#18644) * dressed to kill * changelog * Apply suggestions from code review Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> Signed-off-by: atteria <86520558+atteria@users.noreply.github.com> * renamed dmi --------- Signed-off-by: atteria <86520558+atteria@users.noreply.github.com> Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> --- aurorastation.dme | 1 + .../preference_setup/loadout/items/uniform.dm | 18 ++++++++ code/modules/clothing/under/dresses.dm | 41 ++++++++++++++++++ html/changelogs/atteria-dresses.yml | 6 +++ .../under/uniforms/colorable_dresses.dmi | Bin 0 -> 4514 bytes 5 files changed, 66 insertions(+) create mode 100644 code/modules/clothing/under/dresses.dm create mode 100644 html/changelogs/atteria-dresses.yml create mode 100644 icons/clothing/under/uniforms/colorable_dresses.dmi diff --git a/aurorastation.dme b/aurorastation.dme index ca397c1f42b..33f5503702c 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1879,6 +1879,7 @@ #include "code\modules\clothing\suits\xeno\unathi.dm" #include "code\modules\clothing\suits\xeno\vaurca.dm" #include "code\modules\clothing\under\color.dm" +#include "code\modules\clothing\under\dresses.dm" #include "code\modules\clothing\under\miscellaneous.dm" #include "code\modules\clothing\under\pants.dm" #include "code\modules\clothing\under\shorts.dm" diff --git a/code/modules/client/preference_setup/loadout/items/uniform.dm b/code/modules/client/preference_setup/loadout/items/uniform.dm index 89c41d70cbd..2a597e0241d 100644 --- a/code/modules/client/preference_setup/loadout/items/uniform.dm +++ b/code/modules/client/preference_setup/loadout/items/uniform.dm @@ -434,6 +434,24 @@ flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION origin_restriction = list(/singleton/origin_item/origin/galatea) +/datum/gear/uniform/miscellaneous/dress_colorable + display_name = "dress selection (colorable)" + path = /obj/item/clothing/under/dress/colorable + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + +/datum/gear/uniform/miscellaneous/dress_colorable/New() + ..() + var/list/dress_colorable = list() + dress_colorable["strapless midi dress"] = /obj/item/clothing/under/dress/colorable + dress_colorable["sleeveless A-line dress"] = /obj/item/clothing/under/dress/colorable/sleeveless + dress_colorable["longsleeve A-line dress"] = /obj/item/clothing/under/dress/colorable/longsleeve + dress_colorable["evening gown"] = /obj/item/clothing/under/dress/colorable/evening_gown + dress_colorable["tea-length dress"] = /obj/item/clothing/under/dress/colorable/tea_dress + dress_colorable["open-shoulder dress"] = /obj/item/clothing/under/dress/colorable/open_shoulder + dress_colorable["asymmetric dress"] = /obj/item/clothing/under/dress/colorable/asymmetric + + gear_tweaks += new /datum/gear_tweak/path(dress_colorable) + /* Uniform Rolled State Adjustment */ diff --git a/code/modules/clothing/under/dresses.dm b/code/modules/clothing/under/dresses.dm new file mode 100644 index 00000000000..a8803b6f513 --- /dev/null +++ b/code/modules/clothing/under/dresses.dm @@ -0,0 +1,41 @@ +/obj/item/clothing/under/dress/colorable + name = "strapless midi dress" + desc = "A one-piece fashionable garment." + icon = 'icons/clothing/under/uniforms/colorable_dresses.dmi' + icon_state = "dress" + item_state = "dress" + body_parts_covered = UPPER_TORSO | LOWER_TORSO + contained_sprite = TRUE + +/obj/item/clothing/under/dress/colorable/sleeveless + name = "sleeveless A-line dress" + icon_state = "shortsleeve_dress" + item_state = "shortsleeve_dress" + +/obj/item/clothing/under/dress/colorable/longsleeve + name = "longsleeve A-line dress" + icon_state = "longsleeve_dress" + item_state = "longsleeve_dress" + body_parts_covered = UPPER_TORSO | LOWER_TORSO | ARMS + +/obj/item/clothing/under/dress/colorable/evening_gown + name = "evening gown" + icon_state = "evening_gown" + item_state = "evening_gown" + body_parts_covered = UPPER_TORSO | LOWER_TORSO | LEGS + +/obj/item/clothing/under/dress/colorable/tea_dress + name = "tea-length dress" + icon_state = "tea_dress" + item_state = "tea_dress" + body_parts_covered = UPPER_TORSO | LOWER_TORSO | LEGS + +/obj/item/clothing/under/dress/colorable/open_shoulder + name = "open-shoulder dress" + icon_state = "open_shoulder_dress" + item_state = "open_shoulder_dress" + +/obj/item/clothing/under/dress/colorable/asymmetric + name = "asymmetric dress" + icon_state = "asymm_dress" + item_state = "asymm_dress" diff --git a/html/changelogs/atteria-dresses.yml b/html/changelogs/atteria-dresses.yml new file mode 100644 index 00000000000..f18c7e4d93a --- /dev/null +++ b/html/changelogs/atteria-dresses.yml @@ -0,0 +1,6 @@ +author: atteria + +delete-after: True + +changes: + - imageadd: "Added seven colorable dresses to the loadout." diff --git a/icons/clothing/under/uniforms/colorable_dresses.dmi b/icons/clothing/under/uniforms/colorable_dresses.dmi new file mode 100644 index 0000000000000000000000000000000000000000..414c814efed5f6018fe3dd51bde6ab8e9ce57fa5 GIT binary patch literal 4514 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