diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index b26c66ac753..86a6b71fd06 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -193,6 +193,17 @@ ..() gear_tweaks += gear_tweak_free_color_choice +/datum/gear/accessory/silversun + display_name = "silversun floral shirt selection" + path = /obj/item/clothing/accessory/silversun + +/datum/gear/accessory/silversun/New() + ..() + var/shirts = list() + shirts["cyan silversun shirt"] = /obj/item/clothing/accessory/silversun + shirts["red silversun shirt"] = /obj/item/clothing/accessory/silversun/red + gear_tweaks += new/datum/gear_tweak/path(shirts) + /datum/gear/accessory/scarf display_name = "scarf selection" path = /obj/item/clothing/accessory/scarf diff --git a/code/modules/clothing/under/accessories/shirts.dm b/code/modules/clothing/under/accessories/shirts.dm index d7c984d2bcd..a3bfff69517 100644 --- a/code/modules/clothing/under/accessories/shirts.dm +++ b/code/modules/clothing/under/accessories/shirts.dm @@ -52,4 +52,40 @@ name = "t-shirt" desc = "A simple, cheap t-shirt." icon_state = "tshirt" - item_state = "tshirt" \ No newline at end of file + item_state = "tshirt" + +/obj/item/clothing/accessory/silversun + name = "silversun floral shirt" + desc = "A stylish Solarian shirt of Silversun design. It bears a floral design. This one is cyan." + icon = 'icons/clothing/under/shirts/hawaiian.dmi' + icon_state = "hawaii" + item_state = "hawaii" + contained_sprite = TRUE + var/open = FALSE + +/obj/item/clothing/accessory/silversun/verb/unbutton() + set name = "Unbutton Shirt" + set category = "Object" + set src in usr + + if(!istype(usr, /mob/living)) + return + if(use_check_and_message(usr)) + return + + var/mob/user = usr + attack_self(user) + +/obj/item/clothing/accessory/silversun/attack_self(mob/user) + open = !open + icon_state = "[initial(icon_state)][open ? "_open" : ""]" + item_state = icon_state + to_chat(user, span("notice", "You [open ? "open" : "close"] \the [src].")) + // the below forces the shirt to hard reset its image so it resets later its fucking weird ok + inv_overlay = null + mob_overlay = null + +/obj/item/clothing/accessory/silversun/red + desc = "A stylish Solarian shirt of Silversun design. It bears a floral design. This one is crimson." + icon_state = "hawaii_red" + item_state = "hawaii_red" \ No newline at end of file diff --git a/html/changelogs/geeves-hawaii.yml b/html/changelogs/geeves-hawaii.yml new file mode 100644 index 00000000000..682f64c4b77 --- /dev/null +++ b/html/changelogs/geeves-hawaii.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "Added a new shirt accessory. A Silversun shirt." \ No newline at end of file diff --git a/icons/clothing/under/shirts/hawaiian.dmi b/icons/clothing/under/shirts/hawaiian.dmi new file mode 100644 index 00000000000..2e005c9f2d0 Binary files /dev/null and b/icons/clothing/under/shirts/hawaiian.dmi differ