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

Fixes loadout dress shirt rolled sleeves not being able to be unrolled (#22833)

Browse Source 
Title
This commit is contained in:
Wowzewow (Wezzy)
2026-07-14 10:38:56 +00:00
committed by GitHub
parent b05677de1b
commit 8c2d57e534
4 changed files with 97 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/items/shirts.dm
+4 -3
View File
@@ -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
code/modules/clothing/under/shirts/shirts.dm
+34 -39
View File
@@ -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