diff --git a/code/modules/client/preference_setup/loadout/items/shirts.dm b/code/modules/client/preference_setup/loadout/items/shirts.dm index 2114f10f3d1..602dc228224 100644 --- a/code/modules/client/preference_setup/loadout/items/shirts.dm +++ b/code/modules/client/preference_setup/loadout/items/shirts.dm @@ -2,36 +2,11 @@ ABSTRACT_TYPE(/datum/gear/shirts) sort_category = "Shirts and Tops" slot = slot_w_uniform -/datum/gear/shirts/polo - display_name = "polo shirts selection" - description = "A selection of polo shirts." - path = /obj/item/clothing/under/dressshirt/polo - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION - -/datum/gear/shirts/polo/New() - ..() - var/list/polo = list() - - polo["blue polo shirt"] = /obj/item/clothing/under/dressshirt/polo/polo_blue - polo["blue polo shirt (waist fitted)"] = /obj/item/clothing/under/dressshirt/polo/polo_blue_fem - polo["red polo shirt"] = /obj/item/clothing/under/dressshirt/polo/polo_red - polo["red polo shirt (waist fitted)"] = /obj/item/clothing/under/dressshirt/polo/polo_red_fem - polo["tan polo shirt"] = /obj/item/clothing/under/dressshirt/polo/polo_grayyellow - polo["tan polo shirt (waist fitted)"] = /obj/item/clothing/under/dressshirt/polo/polo_grayyellow_fem - polo["polo shirt, green strip"] = /obj/item/clothing/under/dressshirt/polo/polo_greenstrip - polo["polo shirt, green strip (waist fitted)"] = /obj/item/clothing/under/dressshirt/polo/polo_greenstrip_fem - polo["polo shirt, blue strip"] = /obj/item/clothing/under/dressshirt/polo/polo_bluestrip - polo["polo shirt, blue strip (waist fitted)"] = /obj/item/clothing/under/dressshirt/polo/polo_bluestrip_fem - polo["polo shirt, red strip"] = /obj/item/clothing/under/dressshirt/polo/polo_redstrip - polo["polo shirt, red strip (waist fitted)"] = /obj/item/clothing/under/dressshirt/polo/polo_redstrip_fem - - gear_tweaks += new /datum/gear_tweak/path(polo) - /datum/gear/shirts/polo_colorable display_name = "polo shirts selection (colorable)" description = "A selection of colorable polo shirts." path = /obj/item/clothing/under/dressshirt/polo - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION /datum/gear/shirts/polo_colorable/New() ..() @@ -63,8 +38,6 @@ ABSTRACT_TYPE(/datum/gear/shirts) 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["long-sleeved shirt"] = /obj/item/clothing/under/dressshirt/longsleeve - shirt["long-sleeved shirt, black striped"] = /obj/item/clothing/under/dressshirt/longsleeve_s - shirt["long-sleeved shirt, blue striped"] = /obj/item/clothing/under/dressshirt/longsleeve_sb 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 @@ -75,6 +48,20 @@ ABSTRACT_TYPE(/datum/gear/shirts) shirt["tank top, feminine"] = /obj/item/clothing/under/dressshirt/tanktop/feminine gear_tweaks += new /datum/gear_tweak/path(shirt) +/datum/gear/shirts/stripes + display_name = "striped shirt selection" + path = /obj/item/clothing/under/dressshirt + description = "A selection of shirts." + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION + +/datum/gear/shirts/stripes/New() + ..() + var/list/shirt = list() + shirt["striped long-sleeved shirt"] = /obj/item/clothing/under/dressshirt/longsleeve_s + shirt["striped t-shirt"] = /obj/item/clothing/under/dressshirt/tshirt_s + gear_tweaks += new /datum/gear_tweak/path(shirt) + + /datum/gear/shirts/silversun display_name = "silversun floral shirt selection" path = /obj/item/clothing/under/dressshirt/silversun diff --git a/code/modules/clothing/under/shirts/shirts.dm b/code/modules/clothing/under/shirts/shirts.dm index 9689ff87bf4..e3c5aa695bb 100644 --- a/code/modules/clothing/under/shirts/shirts.dm +++ b/code/modules/clothing/under/shirts/shirts.dm @@ -112,16 +112,18 @@ item_state = "longshirt" /obj/item/clothing/under/dressshirt/longsleeve_s - name = "black striped long-sleeved shirt" - desc = "A long-sleeved shirt made of light fabric. This one is striped in black." + name = "striped long-sleeved shirt" + desc = "A long-sleeved shirt made of light fabric. This one has some stripes." icon_state = "longshirt_s" item_state = "longshirt_s" + has_accents = TRUE -/obj/item/clothing/under/dressshirt/longsleeve_sb - 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" +/obj/item/clothing/under/dressshirt/tshirt_s + name = "striped t-shirt" + desc = "A t-shirt made of light fabric. This one has some stripes." + icon_state = "tshirt_s" + item_state = "tshirt_s" + has_accents = TRUE // T-shirt @@ -180,77 +182,13 @@ desc = "A stylish polo shirt." icon_state = "polo" item_state = "polo" + has_accents = TRUE /obj/item/clothing/under/dressshirt/polo/polo_fem desc = "A stylish polo shirt with a waist fit." icon_state = "polo_fem" item_state = "polo_fem" - -/obj/item/clothing/under/dressshirt/polo/polo_blue - name = "blue polo shirt" - desc = "A blue, stylish polo shirt." - icon_state = "polo_blue" - item_state = "polo_blue" - -/obj/item/clothing/under/dressshirt/polo/polo_blue_fem - name = "blue polo shirt" - desc = "A blue, stylish polo shirt with a waist fit." - icon_state = "polo_blue_fem" - item_state = "polo_blue_fem" - -/obj/item/clothing/under/dressshirt/polo/polo_red - name = "red polo shirt" - desc = "A red, stylish polo shirt." - icon_state = "polo_red" - item_state = "polo_red" - -/obj/item/clothing/under/dressshirt/polo/polo_red_fem - name = "red polo shirt" - desc = "A red, stylish polo shirt with a waist fit." - icon_state = "polo_red_fem" - item_state = "polo_red_fem" - -/obj/item/clothing/under/dressshirt/polo/polo_grayyellow - name = "tan polo shirt" - desc = "A tan, stylish polo shirt." - icon_state = "polo_grayyellow" - item_state = "polo_grayyellow" - -/obj/item/clothing/under/dressshirt/polo/polo_grayyellow_fem - name = "tan polo shirt" - desc = "A tan, stylish polo shirt with a waist fit." - icon_state = "polo_grayyellow_fem" - item_state = "polo_grayyellow_fem" - -/obj/item/clothing/under/dressshirt/polo/polo_greenstrip - desc = "A stylish polo shirt with a green strip around the collar." - icon_state = "polo_corp" - item_state = "polo_corp" - -/obj/item/clothing/under/dressshirt/polo/polo_greenstrip_fem - desc = "A stylish polo shirt with a green strip around the collar and a waist fit." - icon_state = "polo_corp_fem" - item_state = "polo_corp_fem" - -/obj/item/clothing/under/dressshirt/polo/polo_bluestrip - desc = "A stylish polo shirt with a blue strip around the collar." - icon_state = "polo_dais" - item_state = "polo_dais" - -/obj/item/clothing/under/dressshirt/polo/polo_bluestrip_fem - desc = "A stylish polo shirt with a blue strip around the collar and a waist fit." - icon_state = "polo_dais_fem" - item_state = "polo_dais_fem" - -/obj/item/clothing/under/dressshirt/polo/polo_redstrip - desc = "A stylish polo shirt with a red strip around the collar." - icon_state = "polo_nt" - item_state = "polo_nt" - -/obj/item/clothing/under/dressshirt/polo/polo_redstrip_fem - desc = "A stylish polo shirt with a red strip around the collar and a waist fit." - icon_state = "polo_nt_fem" - item_state = "polo_nt_fem" + has_accents = TRUE // Silversun diff --git a/html/changelogs/cometblaze-PR-21121.yml b/html/changelogs/cometblaze-PR-21121.yml new file mode 100644 index 00000000000..813a6c937c8 --- /dev/null +++ b/html/changelogs/cometblaze-PR-21121.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: CometBlaze + +# 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: "Updated the shirt and polo selection to the new palette and tweaked the sprites a little." + - rscdel: "Removed the generic polo selection as its superseded by the colourable polos." diff --git a/icons/obj/item/clothing/under/shirt/shirts.dmi b/icons/obj/item/clothing/under/shirt/shirts.dmi index 6229e6f5453..5c12e8914e1 100644 Binary files a/icons/obj/item/clothing/under/shirt/shirts.dmi and b/icons/obj/item/clothing/under/shirt/shirts.dmi differ