diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 3421cccb3b1..ad5f36ffaba 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -386,9 +386,6 @@ new /obj/item/clothing/under/color/green(src) new /obj/item/clothing/under/color/orange(src) new /obj/item/clothing/under/color/pink(src) - new /obj/item/clothing/under/skirt/plaid_blue(src) - new /obj/item/clothing/under/skirt/plaid_red(src) - new /obj/item/clothing/under/skirt/plaid_purple(src) new /obj/item/clothing/shoes/blue(src) new /obj/item/clothing/shoes/yellow(src) new /obj/item/clothing/shoes/green(src) diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index bc414482f18..162e5668f27 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -66,10 +66,11 @@ ..() var/skirts = list() skirts["casual skirt"] = /obj/item/clothing/under/skirt/casual - skirts["casual skirt, alt"] = /obj/item/clothing/under/skirt/casual/alt + skirts["puffy skirt"] = /obj/item/clothing/under/skirt/puffy skirts["long skirt"] = /obj/item/clothing/under/skirt/long skirts["pencil skirt"] = /obj/item/clothing/under/skirt/pencil skirts["swept skirt"] = /obj/item/clothing/under/skirt/swept + skirts["plaid skirt"] = /obj/item/clothing/under/skirt/plaid gear_tweaks += new/datum/gear_tweak/path(skirts) /datum/gear/uniform/suit @@ -325,4 +326,4 @@ var/pyjamas = list() pyjamas["blue pyjamas"] = /obj/item/clothing/under/pj/blue pyjamas["red pyjamas"] = /obj/item/clothing/under/pj/red - gear_tweaks += new/datum/gear_tweak/path(pyjamas) \ No newline at end of file + gear_tweaks += new/datum/gear_tweak/path(pyjamas) diff --git a/code/modules/clothing/under/skirts.dm b/code/modules/clothing/under/skirts.dm index 3a507d77d75..2e4e2334f5a 100644 --- a/code/modules/clothing/under/skirts.dm +++ b/code/modules/clothing/under/skirts.dm @@ -1,102 +1,65 @@ //skirts /obj/item/clothing/under/skirt - name = "black skirt" - desc = "A black skirt, very fancy!" - icon_state = "blackskirt" - item_state = "bl_suit" - worn_state = "blackskirt" - body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + name = "skirt" + icon = 'icons/obj/clothing/skirts.dmi' + desc = "A skirt, very fancy!" + body_parts_covered = LOWER_TORSO rolled_sleeves = -1 - -/obj/item/clothing/under/skirt/khaki - name = "khaki skirt" - desc = "A skirt that is a khaki color." - icon_state = "skirt_khaki" - worn_state = "skirt_khaki" + contained_sprite = TRUE /obj/item/clothing/under/skirt/casual name = "casual skirt" desc = "A short, colorful skirt." + desc_info = "Not to be mistaken with the similarly named cut of steak." icon_state = "skirt_casual" + item_state = "skirt_casual" worn_state = "skirt_casual" -/obj/item/clothing/under/skirt/casual/alt - icon_state = "skirt_casual_alt" - worn_state = "skirt_casual_alt" +/obj/item/clothing/under/skirt/puffy + name = "puffy skirt" + desc = "A short, puffy skirt." + desc_info = "When you've got too much air in your head and need to put it somewhere else." + icon_state = "skirt_puffy" + item_state = "skirt_puffy" + worn_state = "skirt_puffy" /obj/item/clothing/under/skirt/long name = "long skirt" desc = "A long, modest skirt." + desc_info = "Long enough to do a curtsy, if you're into that sort of thing." icon_state = "skirt_long" + item_state = "skirt_long" worn_state = "skirt_long" /obj/item/clothing/under/skirt/pencil name = "pencil skirt" desc = "A professional-looking pencil skirt." + desc_info = "Revel in how professional you are. Realize that you'll never pick up anything from the floor without compromising yourself." icon_state = "skirt_pencil" + item_state = "skirt_pencil" worn_state = "skirt_pencil" -/obj/item/clothing/under/skirt/short_black - name = "short black skirt" - desc = "A skirt that is a shiny black." - icon_state = "skirt_short_black" - worn_state = "skirt_short_black" - -/obj/item/clothing/under/skirt/blue - name = "short blue skirt" - desc = "A skirt that is a shiny blue." - icon_state = "skirt_short_blue" - worn_state = "skirt_short_blue" - -/obj/item/clothing/under/skirt/red - name = "short red skirt" - desc = "A skirt that is a shiny red." - icon_state = "skirt_short_red" - worn_state = "skirt_short_red" - /obj/item/clothing/under/skirt/swept name = "swept skirt" desc = "A skirt that is swept to one side." + desc_info = "When you want a little more skirt, but not too much." icon_state = "skirt_swept" + item_state = "skirt_swept" worn_state = "skirt_swept" -/obj/item/clothing/under/skirt/plaid_blue - name = "blue plaid skirt" - desc = "A preppy blue skirt with a white blouse." - icon_state = "plaid_blue" - worn_state = "plaid_blue" - -/obj/item/clothing/under/skirt/plaid_red - name = "red plaid skirt" - desc = "A preppy red skirt with a white blouse." - icon_state = "plaid_red" - item_state = "kilt" - worn_state = "plaid_red" - -/obj/item/clothing/under/skirt/plaid_purple - name = "blue purple skirt" - desc = "A preppy purple skirt with a white blouse." - icon_state = "plaid_purple" - item_state = "kilt" - worn_state = "plaid_purple" - -/obj/item/clothing/under/skirt/blackjumpskirt - name = "black jumpskirt" - desc = "A black jumpskirt, Sol size 0." - icon_state = "blackjumpskirt" - item_state = "bl_suit" - worn_state = "blackjumpskirt" - -/obj/item/clothing/under/skirt/loincloth - name = "loincloth" - desc = "A piece of cloth wrapped around the waist." - icon_state = "loincloth" - item_state = "loincloth" - worn_state = "loincloth" +/obj/item/clothing/under/skirt/plaid + name = "plaid skirt" + desc = "A preppy plaid skirt." + desc_info = "Stick it to gender stereotypes and be the lumberjack you've always been! Avoid doing physical labor anyway on account of the skirt being several lengths too short!" + icon_state = "skirt_plaid" + item_state = "skirt_plaid" + worn_state = "skirt_plaid" /obj/item/clothing/under/skirt/offworlder name = "\improper CR skirt" desc = "A very tight form-fitting padded suit that looks extremely comfortable to wear. This variant seems to have a poofy skirt and longer sleeves than normal." icon_state = "crskirt" - worn_state = "crskirt" \ No newline at end of file + item_state = "crskirt" + worn_state = "crskirt" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS diff --git a/html/changelogs/wezzy_skirts.yml b/html/changelogs/wezzy_skirts.yml new file mode 100644 index 00000000000..a50341ea89a --- /dev/null +++ b/html/changelogs/wezzy_skirts.yml @@ -0,0 +1,43 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Renames the alt casual skirt to puffy skirt. Adds a new plaid skirt to the loadout." + - imageadd: "Improves the sprites of the skirts in the loadout." + - rscdel: "Kills off the superfluous plaid skirt/shirt combo that spawns in closets." diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 5553e761594..1dfd7fafc98 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/skirts.dmi b/icons/obj/clothing/skirts.dmi new file mode 100644 index 00000000000..a07480aa198 Binary files /dev/null and b/icons/obj/clothing/skirts.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 8e1899d13e2..b3df5c7118e 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ