diff --git a/code/modules/client/preference_setup/loadout/items/shirts.dm b/code/modules/client/preference_setup/loadout/items/shirts.dm index 68ea6ca44b6..8e2603c9acc 100644 --- a/code/modules/client/preference_setup/loadout/items/shirts.dm +++ b/code/modules/client/preference_setup/loadout/items/shirts.dm @@ -29,7 +29,7 @@ ABSTRACT_TYPE(/datum/gear/shirts) shirt["dress shirt"] = /obj/item/clothing/under/dressshirt shirt["dress shirt, rolled up"] = /obj/item/clothing/under/dressshirt/rolled shirt["dress shirt, cropped"] = /obj/item/clothing/under/dressshirt/crop - shirt["cropped dress shirt, rolled up"] = /obj/item/clothing/under/dressshirt/crop/rolled + shirt["dress shirt, cropped rolled up"] = /obj/item/clothing/under/dressshirt/crop/rolled shirt["dress shirt, alt"] = /obj/item/clothing/under/dressshirt/alt shirt["dress shirt, alt rolled up"] = /obj/item/clothing/under/dressshirt/alt/rolled shirt["dress shirt, v-neck alt"] = /obj/item/clothing/under/dressshirt/alt/vneck @@ -37,12 +37,13 @@ ABSTRACT_TYPE(/datum/gear/shirts) shirt["dress shirt, deep v-neck"] = /obj/item/clothing/under/dressshirt/deepv shirt["dress shirt, deep v-neck rolled up"] = /obj/item/clothing/under/dressshirt/deepv/rolled shirt["dress shirt, asymmetric"] = /obj/item/clothing/under/dressshirt/asymmetric + shirt["dress shirt, asymmetric rolled up"] = /obj/item/clothing/under/dressshirt/asymmetric/rolled shirt["long-sleeved shirt"] = /obj/item/clothing/under/dressshirt/longsleeve shirt["t-shirt"] = /obj/item/clothing/under/dressshirt/tshirt shirt["t-shirt, cropped"] = /obj/item/clothing/under/dressshirt/tshirt_crop shirt["blouse"] = /obj/item/clothing/under/dressshirt/blouse - shirt["long-sleeved blouse"] = /obj/item/clothing/under/dressshirt/longblouse - shirt["puffy blouse"] = /obj/item/clothing/under/dressshirt/puffyblouse + shirt["blouse, long-sleeved"] = /obj/item/clothing/under/dressshirt/longblouse + shirt["blouse, puffy"] = /obj/item/clothing/under/dressshirt/puffyblouse shirt["halter top"] = /obj/item/clothing/under/dressshirt/haltertop shirt["tank top"] = /obj/item/clothing/under/dressshirt/tanktop shirt["tank top, feminine"] = /obj/item/clothing/under/dressshirt/tanktop/feminine diff --git a/code/modules/clothing/under/shirts/shirts.dm b/code/modules/clothing/under/shirts/shirts.dm index e26756aba28..b2134c8c3e2 100644 --- a/code/modules/clothing/under/shirts/shirts.dm +++ b/code/modules/clothing/under/shirts/shirts.dm @@ -17,9 +17,21 @@ if(ismob(loc)) M.update_inv_wear_suit() +/obj/item/clothing/under/dressshirt/Initialize() + . = ..() + update_icon() + +/obj/item/clothing/under/dressshirt/update_icon() + . = ..() + var/initial_state = initial(icon_state) + var/new_state = "[initial_state]_r" + icon_state = rolled ? new_state : initial_state + item_state = rolled ? new_state : initial_state + overlay_state = rolled ? new_state : initial_state + update_clothing_icon() + /obj/item/clothing/under/dressshirt/verb/roll_up_shirt_sleeves() - set name = "Roll Up Sleeves" - set desc = "Roll up your shirt sleeves. Doesn't work with some shirts." + set name = "Roll Up/Down Sleeves" set category = "Object.Equipped" set src in usr @@ -34,12 +46,8 @@ return rolled = !rolled - to_chat(usr, SPAN_NOTICE("You roll your shirt sleeves [rolled ? "up" : "down"].")) - icon_state = rolled ? new_state : initial_state - item_state = rolled ? new_state : initial_state - overlay_state = rolled ? new_state : initial_state update_icon() - update_clothing_icon() + to_chat(usr, SPAN_NOTICE("You roll your shirt sleeves [rolled ? "up" : "down"].")) /obj/item/clothing/under/dressshirt/alt name = "dress shirt" @@ -65,44 +73,31 @@ icon_state = "dressshirt_crop" item_state = "dressshirt_crop" -// So people can see how these appear in the loadout -/obj/item/clothing/under/dressshirt/rolled - name = "dress shirt" - desc = "A casual dress shirt. This one has its sleeves rolled up." - icon_state = "dressshirt_r" - item_state = "dressshirt_r" - -/obj/item/clothing/under/dressshirt/alt/rolled - name = "dress shirt" - desc = "A casual dress shirt. This one has its sleeves rolled up." - icon_state = "dressshirt_alt_r" - item_state = "dressshirt_alt_r" - -/obj/item/clothing/under/dressshirt/alt/vneck/rolled - name = "v-neck dress shirt" - desc = "A casual dress shirt. This one has its sleeves rolled up." - icon_state = "dressshirtvneck_alt_r" - item_state = "dressshirtvneck_alt_r" - -/obj/item/clothing/under/dressshirt/deepv/rolled - name = "deep v-neck dress shirt" - desc = "A casual dress shirt with a deep neckline. This one has its sleeves rolled up." - icon_state = "dressshirt_deepv_r" - item_state = "dressshirt_deepv_r" - -/obj/item/clothing/under/dressshirt/crop/rolled - name = "cropped dress shirt" - desc = "A casual cropped dress shirt. This one has its sleeves rolled up" - icon_state = "dressshirt_crop_r" - item_state = "dressshirt_crop_r" - - /obj/item/clothing/under/dressshirt/asymmetric name = "asymmetric dress shirt" desc = "A casual dress shirt that opens diagonally down the front." icon_state = "dressshirt_asymmetric" item_state = "dressshirt_asymmetric" +// So people can see how these appear in the loadout +/obj/item/clothing/under/dressshirt/rolled + rolled = TRUE + +/obj/item/clothing/under/dressshirt/alt/rolled + rolled = TRUE + +/obj/item/clothing/under/dressshirt/alt/vneck/rolled + rolled = TRUE + +/obj/item/clothing/under/dressshirt/deepv/rolled + rolled = TRUE + +/obj/item/clothing/under/dressshirt/crop/rolled + rolled = TRUE + +/obj/item/clothing/under/dressshirt/asymmetric/rolled + rolled = TRUE + // Long Sleeve /obj/item/clothing/under/dressshirt/longsleeve diff --git a/html/changelogs/wezzy-rolled-fix.yml b/html/changelogs/wezzy-rolled-fix.yml new file mode 100644 index 00000000000..6ae1fbd93fa --- /dev/null +++ b/html/changelogs/wezzy-rolled-fix.yml @@ -0,0 +1,59 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixes loadout rolled sleeved shirts not being able to be unrolled." + - bugfix: "Fixes asymmetric dress shirts not being able to be rolled up." diff --git a/icons/obj/item/clothing/under/shirt/shirts.dmi b/icons/obj/item/clothing/under/shirt/shirts.dmi index e227bf858c3..bb2ddd40fa1 100644 Binary files a/icons/obj/item/clothing/under/shirt/shirts.dmi and b/icons/obj/item/clothing/under/shirt/shirts.dmi differ