diff --git a/code/modules/client/preference_setup/loadout/items/shirts.dm b/code/modules/client/preference_setup/loadout/items/shirts.dm index 8e2603c9acc..593f654a966 100644 --- a/code/modules/client/preference_setup/loadout/items/shirts.dm +++ b/code/modules/client/preference_setup/loadout/items/shirts.dm @@ -36,6 +36,8 @@ ABSTRACT_TYPE(/datum/gear/shirts) shirt["dress shirt, v-neck alt rolled up"] = /obj/item/clothing/under/dressshirt/alt/vneck/rolled 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, plaid"] = /obj/item/clothing/under/dressshirt/plaid + shirt["dress shirt, plaid rolled up"] = /obj/item/clothing/under/dressshirt/plaid/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 diff --git a/code/modules/clothing/under/shirts/shirts.dm b/code/modules/clothing/under/shirts/shirts.dm index b2134c8c3e2..e6eb6a8bdd4 100644 --- a/code/modules/clothing/under/shirts/shirts.dm +++ b/code/modules/clothing/under/shirts/shirts.dm @@ -79,6 +79,12 @@ icon_state = "dressshirt_asymmetric" item_state = "dressshirt_asymmetric" +/obj/item/clothing/under/dressshirt/plaid + name = "plaid dress shirt" + desc = "A dress shirt with a plaid pattern." + icon_state = "plaidshirt" + item_state = "plaidshirt" + // So people can see how these appear in the loadout /obj/item/clothing/under/dressshirt/rolled rolled = TRUE @@ -95,6 +101,9 @@ /obj/item/clothing/under/dressshirt/crop/rolled rolled = TRUE +/obj/item/clothing/under/dressshirt/plaid/rolled + rolled = TRUE + /obj/item/clothing/under/dressshirt/asymmetric/rolled rolled = TRUE diff --git a/html/changelogs/stryker-plaidshirt.yml b/html/changelogs/stryker-plaidshirt.yml new file mode 100644 index 00000000000..070e16c5ec7 --- /dev/null +++ b/html/changelogs/stryker-plaidshirt.yml @@ -0,0 +1,58 @@ +################################ +# 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: The Stryker + +# 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: + - rscadd: "Adds a plaid shirt to the loadout as an alternate to the dress shirt." diff --git a/icons/obj/item/clothing/under/shirt/shirts.dmi b/icons/obj/item/clothing/under/shirt/shirts.dmi index bb2ddd40fa1..9e4ce2e9103 100644 Binary files a/icons/obj/item/clothing/under/shirt/shirts.dmi and b/icons/obj/item/clothing/under/shirt/shirts.dmi differ