cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 20:43:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updates shirts to the new palette (#21121)

Browse Source 
Brings the shirt selection and colourable polos to the new palette and
updates most of the shirt sprites too so they work a little better with
the updated colours.
<details>
<summary>Basic shirts:</summary>
<img width="764" height="572" alt="image"
src="https://github.com/user-attachments/assets/53632412-4981-4dba-a72c-d1e12b80a0c8"
/>
</details>

<details>
<summary>Alternative shirts:</summary>
<img width="763" height="572" alt="image"
src="https://github.com/user-attachments/assets/8a7de694-7cf2-467f-ba3a-79dee2a9b6e6"
/>
</details>

<details>
<summary>T-shirts and longsleeves:</summary>
<img width="769" height="568" alt="image"
src="https://github.com/user-attachments/assets/e2ceeb7e-3c0d-4e82-bc15-785b39b257c9"
/>
</details>

<details>
<summary>Blouses:</summary>
<img width="765" height="574" alt="image"
src="https://github.com/user-attachments/assets/2f481d5e-2bd5-410e-92ae-15ef2b2f9e26"
/>
</details>

<details>
<summary>Halter top and striped shirts:</summary>
<img width="1920" height="1080" alt="image"
src="https://github.com/user-attachments/assets/c275c69e-6599-48c0-b6f4-9629b7270a1c"
/>
</details>

<details>
<summary>Tanktops:</summary>
<img width="765" height="376" alt="image"
src="https://github.com/user-attachments/assets/f9b4d92d-50f2-4677-a41f-caaa995b445f"
/>
</details>
This commit is contained in:
CometBlaze
2025-08-10 14:15:15 +00:00
committed by GitHub
parent 32bfb24d70
commit 5879254629
4 changed files with 85 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/items/shirts.dm
+15 -28
View File
@@ -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
code/modules/clothing/under/shirts/shirts.dm
+11 -73
View File
@@ -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