From 017119ef2cd0a12f9044a2fb6338be0aaf7bbaa0 Mon Sep 17 00:00:00 2001 From: Geeves Date: Wed, 12 Feb 2020 21:34:11 +0200 Subject: [PATCH] Adds a New Shirt Accessory (#8198) --- .../loadout/loadout_accessories.dm | 11 +++++ .../clothing/under/accessories/shirts.dm | 38 +++++++++++++++++- html/changelogs/geeves-hawaii.yml | 6 +++ icons/clothing/under/shirts/hawaiian.dmi | Bin 0 -> 2419 bytes 4 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/geeves-hawaii.yml create mode 100644 icons/clothing/under/shirts/hawaiian.dmi 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 0000000000000000000000000000000000000000..2e005c9f2d048f25890dd0e5a2e075f4c7c3a1c2 GIT binary patch literal 2419 zcmYjSdpOi-8-Dy|Cgr?^ZTpI8<(M2&B5F+7m~2g0#+l^!Nke3mW-=yG!lKNUkW_=v zl(A!Sm>*V=sHjzqn8DW8mup6n98S2YxkN&w)#6kirIb2Aqh7dliu01eqB_Lqkwj0)D>0djPj? z4i67QK><8zgNHT1V8HJ@*u5M2-oo%-U~dmC&A<>qP7Zibz{?Xtg2B@RL_%n&1KWMB zfRqCEG2qC6Q~_2Uz#kAi02LqxFnNHr2ALGVv;!^&Fe1Q>EdvcOy8)^J8xDvC$glw8 z4TunM4uEv5RLBQ73P>?v_kzq>z=Q(w0&vcNL;}VFKsus6z@-7k1Z08%sRe8WU`YUX z0h@vEpxF$}0d50UI`y*v z_W?TsxSs$-pee9~8~{&1sDPmWLIT7MkR1Rf06ReD2q0azc8*A0A`|0$&;@KpdV-~w z%u}wE7`vbofze^qn6TrK0JJ<8H)?e3?34@j%k(>g1KSKb+B;qD{bKUmY+%T+(@DP- zqSG$%EzF$Fy39!UyrHb-ELXgXz82To)XXLIqM7ys&U!un$AA3hmcza#7jRSmqVZE( z&JMI}djo!F2E~OK?r0*=+j)+Xok(&tV{eIT>i&zn&jWqgiQ8xjNZ4tfuX7CpU{$oE z9nqDRH_l#+TW7yMSyxffzxTT7tZM>&U8De1ItD;t-cJ=mc++DNrWNedm zH=J{`A&2rVxU1fEGh!6=8@}`t^ylvUvQa5NzO!{WFGL`o`1EOHDxkf21@9V293usf zdwAB@Q?xsLoy|FB>Zx`Hm+{Gl-c_NdstKII!E<`&l`nX?JswdU`tE2lxr%Grcx7Px z$~}j`Kvhdr2epp~poMwwxEQooG-Dy=k2h^o!mMpf6$eku&Zcei<8B|DRDZ>q{`Zk> zqSOj+u1GoA(n;vmP)O{;Cr?{}~K zx{V)vtZraDV13u-p>eT%1=q2j_SADQ1$$m@Q^upEE9~+Eyt{`ii}s|cDf}+4%d6Ms zb>t?SH(M}%?1(>e^g~N&O}2`#VCs56puy!gpliXHA6+ZUmsvHx$#+!$x&9F3DU?j7`@ zphgoB{pP!#8Q;+R{)(0_jZ2EG!=Bz)v9_AoS8Fw}oqhN7?TXgj%iuCi zpV#CXJQnn4%vMeNH(*&h(@hGto%{-)5KNB;^Dq@C4$eYRT5!p42)}FN@tz#xz=ZNxhI;#nsJ1r~J!hsbEW%&{tm33k+ZCJuj81v9AONDh_ zm4)_m#4{0jvf?CuL-(resic{MKF@wy(xfi=-qdVfx@FET*8J3W%oa756*Gi`n?})Z zf2)g^3dhwVwD?9TVjFa&jkoFT-(mQ>upEvHjI&#(W*I4y5d!7D#l;8j`)9{yB{DI| zD2kG_Q#Q*gX;@=%gbfRG&^DO#uCA^w+CfpvEKTpvr`#sm!zRN~K{z&%RQfH^>2_f{ z=McGrY7}5|xCR$*w-D8mu3=T-9giHRv9D)V?52O>Xc{`QZSvdG+74ZI`rf3&gznIG zKPxiIHH_YN{6beqH(NgB*Cx3U5Co33hxIc**uI_$F{ zt_ywq(yS$`p0h3u%cfRVi@J1H*YA=2`f3wL<|1#zjLwvYfBcR853C1TZ!ZpLDv6eZ zy80fSnNA{Ser5E9l+!bvvSV`_EPpfRBbn9k_{Z|t9#y^X0vNaZMS6J{ej3xe`TJ75w pu?mX8t@OM)8L@8Ny6oiu3BuxqS{4*~%}9SnaI`;YSFz8Z`5&=TNdW)= literal 0 HcmV?d00001