diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 27f162cd3ed..b1821c2f058 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -63,6 +63,7 @@ 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 + skirts["pleated skirt"] = /obj/item/clothing/under/skirt/pleated gear_tweaks += new/datum/gear_tweak/path(skirts) /datum/gear/uniform/suit diff --git a/code/modules/clothing/under/skirts.dm b/code/modules/clothing/under/skirts.dm index 15f2e132489..c1ec49469fe 100644 --- a/code/modules/clothing/under/skirts.dm +++ b/code/modules/clothing/under/skirts.dm @@ -3,7 +3,7 @@ /obj/item/clothing/under/skirt name = "casual skirt" desc = "A short, colorful skirt." - desc_info = "Not to be mistaken with the similarly named cut of steak." + desc_fluff = "Not to be mistaken with the similarly named cut of steak." icon = 'icons/obj/clothing/skirts.dmi' icon_state = "skirt_casual" item_state = "skirt_casual" @@ -15,7 +15,7 @@ /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." + desc_fluff = "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" @@ -23,7 +23,7 @@ /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." + desc_fluff = "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" @@ -31,7 +31,7 @@ /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." + desc_fluff = "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" @@ -39,7 +39,7 @@ /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." + desc_fluff = "When you want a little more skirt, but not too much." icon_state = "skirt_swept" item_state = "skirt_swept" worn_state = "skirt_swept" @@ -47,11 +47,19 @@ /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!" + desc_fluff = "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/pleated + name = "pleated skirt" + desc = "A sharp-looking knife-pleated skirt." + desc_fluff = "Would go great with a sailor uniform." + icon_state = "skirt_pleated" + item_state = "skirt_pleated" + worn_state = "skirt_pleated" + /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." diff --git a/html/changelogs/wezzy_skirt_outlines.yml b/html/changelogs/wezzy_skirt_outlines.yml new file mode 100644 index 00000000000..abcf73e6ac8 --- /dev/null +++ b/html/changelogs/wezzy_skirt_outlines.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: "Adds pleated skirts to the loadout." + - rscadd: "Adds skirt inhands." + - tweak: "Skirts have more well-defined outlines to stand out more." diff --git a/icons/obj/clothing/skirts.dmi b/icons/obj/clothing/skirts.dmi index a07480aa198..479d50a4d0a 100644 Binary files a/icons/obj/clothing/skirts.dmi and b/icons/obj/clothing/skirts.dmi differ