From 0d315b994c741200a12242d54fa03cff25780aa3 Mon Sep 17 00:00:00 2001 From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com> Date: Thu, 26 Nov 2020 18:31:00 +0800 Subject: [PATCH] Striped shirts should be appropriately labeled now (#10648) --- .../loadout/loadout_accessories.dm | 6 +-- .../clothing/under/accessories/shirts.dm | 8 ++-- html/changelogs/wezzy_longsleevefix.yml | 41 +++++++++++++++++++ 3 files changed, 48 insertions(+), 7 deletions(-) create mode 100644 html/changelogs/wezzy_longsleevefix.yml diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 3bb5bd4ac8d..8ec690723a1 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -185,8 +185,8 @@ shirt["dress shirt, cropped"] = /obj/item/clothing/accessory/dressshirt_crop shirt["cropped dress shirt, rolled up"] = /obj/item/clothing/accessory/dressshirt_crop_r shirt["long-sleeved shirt"] = /obj/item/clothing/accessory/longsleeve - shirt["long-sleeved shirt, blue striped"] = /obj/item/clothing/accessory/longsleeve_s - shirt["long-sleeved shirt, black striped"] = /obj/item/clothing/accessory/longsleeve_sb + shirt["long-sleeved shirt, black striped"] = /obj/item/clothing/accessory/longsleeve_s + shirt["long-sleeved shirt, blue striped"] = /obj/item/clothing/accessory/longsleeve_sb shirt["t-shirt"] = /obj/item/clothing/accessory/tshirt shirt["t-shirt, cropped"] = /obj/item/clothing/accessory/tshirt_crop shirt["blouse"] = /obj/item/clothing/accessory/blouse @@ -287,4 +287,4 @@ gadpathur["cadre brassard"] = /obj/item/clothing/accessory/armband/gadpathur gadpathur["industrial cadre brassard"] = /obj/item/clothing/accessory/armband/gadpathur/ind gadpathur["medical cadre brassard"] = /obj/item/clothing/accessory/armband/gadpathur/med - gear_tweaks += new/datum/gear_tweak/path(gadpathur) \ No newline at end of file + gear_tweaks += new/datum/gear_tweak/path(gadpathur) diff --git a/code/modules/clothing/under/accessories/shirts.dm b/code/modules/clothing/under/accessories/shirts.dm index fdf326ffefe..31086c0f6cb 100644 --- a/code/modules/clothing/under/accessories/shirts.dm +++ b/code/modules/clothing/under/accessories/shirts.dm @@ -105,14 +105,14 @@ item_state = "longshirt" /obj/item/clothing/accessory/longsleeve_s - name = "long-sleeved shirt" - desc = "A long-sleeved shirt made of light fabric. This one is striped." + name = "black striped long-sleeved shirt" + desc = "A long-sleeved shirt made of light fabric. This one is striped in black." icon_state = "longshirt_s" item_state = "longshirt_s" /obj/item/clothing/accessory/longsleeve_sb - name = "long-sleeved shirt" - desc = "A long-sleeved shirt made of light fabric. This one is striped." + name = "blue striped long-sleeved shirt" + desc = "A long-sleeved shirt made of light fabric. This one is striped in blue." icon_state = "longshirt_sb" item_state = "longshirt_sb" diff --git a/html/changelogs/wezzy_longsleevefix.yml b/html/changelogs/wezzy_longsleevefix.yml new file mode 100644 index 00000000000..e8e675e833e --- /dev/null +++ b/html/changelogs/wezzy_longsleevefix.yml @@ -0,0 +1,41 @@ +################################ +# 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: + - bugfix: "Striped shirts should now be named appropriately in the loadout."