From c62cfc7c29d02b37842376e050d25bfd6f5dd2c3 Mon Sep 17 00:00:00 2001 From: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com> Date: Fri, 15 Mar 2024 11:40:47 -0600 Subject: [PATCH] Donator Item Stuff (#26884) * stuff * loadout * 1 line * ops * moves code * Update donator_clothing.dm * Update donator_clothing.dm * Update donator_clothing.dm --- .../icons/donator/mob/clothing/ears.dmi | Bin 0 -> 1039 bytes .../icons/donator/mob/clothing/hands.dmi | Bin 2132 -> 1053 bytes .../icons/donator/obj/clothing/ears.dmi | Bin 0 -> 757 bytes .../icons/donator/obj/clothing/gloves.dmi | Bin 2625 -> 1336 bytes .../master_files/icons/obj/ring.dmi | Bin 910 -> 812 bytes .../clothing/~donator/donator_clothing.dm | 17 ++++++++++++++++- .../donator/personal/donator_personal.dm | 5 +++++ 7 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 modular_skyrat/master_files/icons/donator/mob/clothing/ears.dmi create mode 100644 modular_skyrat/master_files/icons/donator/obj/clothing/ears.dmi diff --git a/modular_skyrat/master_files/icons/donator/mob/clothing/ears.dmi b/modular_skyrat/master_files/icons/donator/mob/clothing/ears.dmi new file mode 100644 index 0000000000000000000000000000000000000000..339d5bc9ffe8eddfc03015855dbca0da6d28a206 GIT binary patch literal 1039 zcmV+q1n~QbP)od8WuOV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5DLXSSyC5S!FSR&6DJL;GJ3c>8iHkEOv#1zk1Q%yoQDSZ?h;0rO zP0dNH1Tu|ukRU#z($cV-Wyqzh;OgfBb}#@Gt~I>Rkk^3#00Rq2L_t(|ob8)EZ`&{s zhL4Vijuc?;1w7PakOH0Up}RBm7j)>}p>xowKRdc3C6Z_H!)D?l$@@%x2%hx;2zZZ_ zh;E6sW$$41^?}HIf6RGPeZgr*cb|ziHs^HrD=qkQzfhlZL!U<5^N&Sm{_1ny$KvPb zd~Nx9R`)p{tW?a$8~DOjPm#O%Ij1e9f2jR%pl`qBz_Sy5`5C#JpL2h`a*|7K9#6D; zkOR+7JQCc^&p7js2cGht%K1pO{x;~Rs`Aub{uCaIuAjOKp2Df(RQ8Q6dpD-y00000 zs9;RlyV?A(MQ@>)|BVVf+6B)4@uhM8pL|TyN#57a5iRK-tm+^5e>ne7mnQ$a4}LhL zd0#tGrGHpY`Tsb(%m2>Dw4B6w?To7*q7km2e2m$W|EDx6v3tz_A)Ts*;>>;ju#OJE z{X^tC)w8J)m-jU%lT?aYVbUw#WHjR^Kn!KN#ox zyuV#^UTu$;=H2T1nEwNQ{$Q7!=f@3&c0uxg66nVKulogeX-i(-KVT&PCxLDp(fxwE zv?XucKS%=II5N3W^R;*LaiVL!3ux;Ps!JC6TiJG#t4kL7TiJG#o0crPxVDP~0002q z554_E=lesIdI{N*|7~!|uXdV{=6&U%-l%#Xj5uVwD1DsW<^SU}AzjW_9_n3Q3ia!` zKk)hgG`q|HE`84%5wzjqaA8w|py1T#6ijAHL2n`Gj5)~IA1_lWb5gH*NA}=m6 z85kPN&C%Z8-leIwba8?)F*r?4Rv#cH6crlo?(Q5M9KgW9Uw_nIeE!v0=BE>@0-?w2n6u*f15k8qhCgbVCq=j?8$@V$luLvqOeh zxc27R?!tz;$TbLi`}bz5iYov9oIaT{Zv!0;owuK~#90?b^|HqA(DEVWr#B ztyK`#t`J>njHO%yirKLy=?q81aGmkld=43a`7RAF(h4kS^EYFRW=I3(0bPlkz4(Q~+ z)};e@IDZ>HkC#g$THg2ow=lmD0RR91007{z1-9M4V|Tt6)^`7n&3R4ex?fRt2SV39 zxNMcAMwBM2iTO^lN~K|2x=Q?8TX<6jw>RHfud~zQX|`TZ%v(j`>GZH~ZpUiEdw6>D zS(ay~AkVUid0n*b#(&96cf)OoIJaXr;XUNu{C_G*@*&6*;VpDIuZz-6_bRX44R1Ve zzh2m%QE@cSeL+~hv)POe)#Nj>bDTa<+w0@X$n z^X=Nkb*&&QZ;f9%fM>2MR5b*ZGIkr5|Jo<8m6CecGuPUawcD_KySTaP)?H&P?-qG@ z=6_b^Jr(vhmInX;00000fQMC-eb>~}I_-1H?ajA#e|Gf{)NM2|uZ!ya;dL*s-{)$1 zZbub;58G+J>$F*Orry=3W%sqQ+pxSY>c_>T9zNEHDi!hs#NM{GCu_H1d0iCp1mwAT zivfLiPtD%EFTxsQ`M$_AKD7n_000000Dt&bD7$0p^gpZ83QMUy7yNbFTYT@fEX)%W zMR}I5td3|U_D8F-30bNUPk*hlF&A%|^8+Yr)vA;_)XKhyM|*8g_xmc!+H%>rUw^ls zkhq5;~V-6rL P00000NkvXXu0mjfom2Cq literal 2132 zcmb_eYgE$N9{t-xTe=**IYy=V>S3m4*JnN{d+8KoI+myzO{QjwWF;sdR8*FZT4|=~ zfL2hgvhhJWJPfs3R=C27d&`Uy?jS5AZgB1xd0!mYk_Gvw!EZdW?+(6At+Rg$@g}s!c@F^S#Ru-) z9hzDq6GBd#$C!62Z0`jmCjMX__^jjN{)ZrfB6}5AIlRv}x;VeD)b+?T)G>A1ie=3u z95xPG3D1Js8}?p4U_=HH5M;F7w$(pu3{_pL(RCRRzXIT{0v`SY2-pbR-2W|56$85X zl8zHLZ`I&t*tZIL#IHmodtlAnv|!*Z&r>o;yri*laRji$GS^YYEElznnLZUIy12OHjh|bSn6c-+dool9HeHo2 z9>3B+!)aSbO!`2j6D0`)El# zKR46gh*VlTga4#zv@#5GJPh!D$6EMueP9Rc9rgL<6K>&fYw96R;)dj0-@3k5O_#wP zkmoCNvp6xF_!=>$&g+=iel+i@`{xR~giekJt_nN4;CK_kQQFKa3997ugvil}mpP_) zJbVna9C6cYrdD@+6e}P4?(QjWMDT}niM#sUFi*k$Yg zp)tOFnE&XQKLr|iK%yDm3!Su>!?qv^oD0ay>$54uu%P4^Iq6Y_jq*@r3tKW!i;dy& z`JjIBjXaQZ6i zTnyiS?-s~?pFGRclf%R~aQd5H!6+|*$Q#LAJEv4O_4kXXc;i1M4T*$qe36$XvEj_< zHV|ikmJm0E?h=8kD&+W`(l?}~c8K{G6k+%+B>L@h($(7ybamwe@fMG>d|?xjiULN6 zvMgF9olv_qFriacBO9hNEY<$Vo)@{w*tlTd?ZlzVufDTBcv3Gq_;w$i6z-@9e17*2 zqC#b`NaYWhu=+%Si>5Rbc88-f*7nAbF^NDARs~Vwe^mq#h!V$k%glJXGVn1FH>PAiQNsESL zRl9rULQRe_$MGRrWSep!n*l{ra}q0oOd}mQ#Ai@i8g`Qmxs(-L{anD#1pu}OHCJ;GuD1XH0qRLaK~z|U z?N_mG!Y~j$BPw-F@DC*F4}kguEYOY&M2Ia5s3SwWGt?+_?k{xcU)IIvgq&^85$)3E z4Uk9f9AoaiCjkBjMAwEv61}upTOv)^#?k$GiMX3ME2ic>#X6DWJNDP@2@H$vTyJ(@ zc$OIsSTRUWy!rAu%wAT{B}lVdF&P_fA)(F1c(|H^nm2pnI2@M%w?*l4;lB@Rs$bp~ zF2|pM-oJUR^a@qsa_PMf>-X&*)be2$$zfg0OHgXIi{x-Dbo1e3vy0^V1KoW1+?0_V zR54q?;iwiIx3f_#ANNo_)dfM0v!ze$bZiP3F2?XnNFC*%mg@N>D$X)eZ?#m5x2!6@2YEn^1SJ&;h(^7nAQTXdZp>U;6^8?& zUceMwP_cjaXDW_F*M#WNqdRCmu%Q0WK7jf^2gm<8Q2*!P_&*27|JerW{~R3u=NriX n0}eC~SkOFR@pJy)1BYyT8w-sk*hbwG|g33=9(E zn$ zAivNQS=$W-%yxm_w~@r7^fr@yJK4Q>$BMwO3REOIFn7{Ene}o@U<`{g>BR2TH?++VXcT1UJAg1pV-QI-$h`|k5Fx|j>KcxQe z1Q|Tx2{V7|ssz*c#3Mr}cJ^*Z22a3Y&Ne*>REdoDmc8ON! zwwy1@=qiqXk3(nF8yL_c^#QScyr`0XcLH8U{Avq6t;P(j&!&J#WWY;(;5eSJ9WShm zrGU7BTk<=G<5zR8`>&>eNSH~&U?2?+vKGHms39nPV=*bbGJu~#)59wR_*ZDEpE6%5 zu#D(ESB6TElzd!yQXSRZFZsCgtU4-xtbh4=#DfJnZx=w&x`K)?)6ziDx`K)yUmJ#; z6gfPWl}Ax-!H`#c^g}5y=0tgLr1|KFQee!P^5Cd3hCI&|nhff#IRLF-CX*8`K$Zj0 z3T84n;{tkHF3-E4=nkcN;h-sW#N|{4P=~I1;h-sW#N}kB{WcJ85O+V}fuoG(et+f$ zarZMGILa{Y=P?C0hoK4Xcb#pZo5Roy_q+aP{!IpM5mn|<*Q{ByrkPZ}dTe`_kB6S+ z48Y%R%Lx>JIRX8#;sVB=Y~Km>pPxD}GF^l(FL)-wgYzr?{azHsbbfldsRyf94Z1%b zk9+Z)D!@ZI8(#8%h<|@Rry6(z+<)ZY_lk=D`1yGh$V7vlF#3}nxpLR6w z=hQrhCrT(LFVeO_?Pn61y7YWb-viy~9lhLbj|~!Yc(v_jht}-vGX5`#Hz||qIWH!# m^mqE@1eQ!*-}%<8sqzo%$#r3!wIvn+00008uWdAOPKfD{bYM}kh^ZL z>e<)B)ozsQylw3%in8~djyL>19<;RDZMR;Tdz6E~bOqt6+y7=q81J5uw_i#6>1)}wEt5q z{d9PcRR6Ov25jqitk-ThYqHTupOe@Uk!FMf0J!b37~`v91JvT>1W4Bv%z|52}Fd4{9YVXsaqx-@T& z^NY4qzt|16+~INIn-7292`OGRVivW8&QE+X{7H%o%*$KX+MZzQF{3`TAf7$+@%3Gk z-fHgN;%xpB1af#I;VR)p@hAZ1oPZUdOBYt2q%Xhb|CX2J)FVNqkl7T7Zw?Wk zjusp59L259)#G~0>cKx)thKoyGc&U#Q4PHAcu2S0g@CHBMmv3-RBmCp#Y&?{m&Z3* ztd)@Ey_ym}rENf>QN-Q`{wv)y;h^(&SApL8!IVh0Z`9lmVmLT_GCCH8qfU1;v0jw$ zy?f*g6}qHFQR{g6^fzT<9SyxYR0_mIGRLjigy2U{&)bKYzKaKK;!$bbW&<%ewc=Oc z*+sff2|dLcqJ#13Cyq9ZyxekW3a#Gv#e+8WzYdi9TfJYhkV%$ghoj;G2!zzL30ggA zGE&sP0HtCMMv>04EOGP6!?x_&bKERx)WOU1vpHHs%-r%*=exUs*_RQL zQlU)mj8T9JiULF;k;X@P2(M2%QZY6Xsl_y;s<)xl`}d~?a-X+xCtDBI-e@VqEiCO^ z02klh#E;GNSpU{}Mf4R{ykc3z%8>r>t$0s;lVX)2@sgBU_Eo5Xh3SFvkCDA_C(nw* zo+l%o`+I9K!S7%rB%>Eg3l*8w$EL5>FvT-ZT^3ENnkK@OygR`{YT}SHY7uL*zQJv7 zuR+0)wD<|Al`E0H!~9URF502{IoA++jo(7B&kgSgdqs)=6&e<7{h5S~JKHFW`PSy~ zBw-QeZh)ig08C77B>VCxm#dqCsnhB=uS(6I33@FO9XH^q1Ky=)oN2!yAu`E z4sFxjIOYATCh3@4)&MPzJO-!Dl82=j=$Vo%djvXN8*;fBYICrX%fiMAbmy;()tcL> zUL>Sn0BIw`@`CT13k|%2^D!Jdg8W?B{w(qviIm+)g+HyV%pO(E>8R=gclT(L_#BOJ zS&EYEB&Xo=$B052i96g>6Gqr)A&6rMe(p*9_{(P)Dc2O8XDu=yl9+@z*ZP4?gWvu1 z`5UzrT@FW|LHOQ)3lTB_W>x&lvC)vWID~{aWkl||??8%D`y%<9x)0QIuRGJHb)nyS z&y6U|lavFi?@`Gt!CBsFy{j;NL@p!zUiue7@_X1jK>t-X9ZT_y&u<)R(C z_~@b?NPXV&^~c+vKgdNS9xs^M8n*px_jB(}ZTCEi(U+UH?$}20*J?iMiR-s8>6Aqa zs5BILU3wzW5b0>hHa!qFYpi6@;=f_x(UoCzd6#qhXz6|4g=YgKc1CTvI6Y2zcsR6N z4Y$BzZ8Q>7j&CZ21DsZxgJuldaPp=HeYxt)2=)={N9WOG0(8x2SmKtmwT6>#R z1!Rs5RIaeEK8C{0g?KjOrB9H@{OuHB6UMjoz#ZpGNEp;#;O_5>FNVnU;8cgX-h^;f z#}=VoLB`kHsMmTEsX!ZYB4~A5oSv)69koSpqW_YVFJ93qgasbAh|SMu0X5{4xOd}n z7e8_=SqsuFM(zo~giJsdtGp7O2G2dkdko4#L!7xjm``QWUPbF%BFp4Mx|JJ38OUgM z|EwK-ZR2F?QK2yB@i;0Fw%WpfU`G4@|03s)}Rid+akoSIBc|lU>O!KYKG_AA8RBIoTV8} zdLe0ndmG%@MZYZ3WUjZOyi;Xif)eW)>BiUd(NlTqrgp+$PLqai6J3=e%p3CTEqo3P zA2#2IS4wKr6LUM|E|~0i?OIKmiuQU&&+jBj7DFOTVq2o`u>j>6B)?0~$TSD%b+>x6 z^03?vF@w6*qRkd4im}yYdi6e7Jga^t4m+A#Ip2GahSkU~;q})~yVRGEI!EXn^^(rr z1>438ejro%;H^0J-N*)NeSwtoclX`SKdI<#3I}**9U$4R(>@-2y14=#$l#T zm1nz27J|Rl=yr~dD0@5c;MXA(PKp*5SeSnJJ)gpya){CX;D2}w+?V2!kmTp~&Df-uUHAJa2-mu)n#Ak>!q@*gGH)kJ z)qU36#hC-B^YfwqA-+~;xB7Kn^yguho;pmz9KC(L;t25e>W(Pbe-XOr@Z@Q}tQ1BZn>i-L}v3qi%O5@kwzY~LUovO^Y))+-Rv6M7)P0VC9& z@5`n$+nsOX0>uSBa2$ma7Su6__2!Vv`7xj@%BgQ=R6hPp#~XQMAizYC&H2r4@>8t~ zdxz^e=)9_|kEn_7PZpenRBCP@`$Q0@yPE4xw&8Ssmc9Uv`@(1cK_4vlgLC6F3cZZe zu>GinP4snCu_X&KS4$pdKR9;e!M&pN**!mp(l~5jEkLtV)@aL+Pmp=b)p2BOSJ@t! z;)DA>V-|497dCucK7IklkuC~Uj*PT9&YkxaF$|sGyjB0Jw|kuC@z24Wk7}<;oQ%Bw SE&b#t1YpfBV`@xXWBvoBncA5E diff --git a/modular_skyrat/master_files/icons/obj/ring.dmi b/modular_skyrat/master_files/icons/obj/ring.dmi index e13cc7cd23fe88dd8de313f6dd575ca1fefabd40..e24f1fab4c93fdee3bb6bb11d998453809dde4f1 100644 GIT binary patch delta 695 zcmV;o0!aOi2doB=BmsMoB}Pu5prDG1in+PDs;a7NY;3NsuEN5?*Vosw|NqSY|FyNX zYhg0az=BsOp zqSN}PI(@LsF3V|4bJ7RfoU~uyf0C31*P1LFL;lek`my``)i;m(%%cGFHXQ%}0i{Vq zK~#90?Uze)f-n??YQ!1yTCU30OFi&b~Dij5a(?FF|$vUr#}G*B%cES00000e*l2=ujSA6 zIbEK5GdeuC*F&QG4Fvv4l&8M~5J*3W000000002wuiaV3IbRbX-v5OZ!aKzOPrUg^ zC8bz9gRnjyU#!=kFY;47m$_1s^P(tX28YmpTrGH&pMpUo7kQrh>asXT1xWY*Ov=#D z%5zkJ_6}r1^3wP7@R>$HfAFue^fw@p0ONvJRaF$xe(FKQ{RpUv)j>oI=j(G200000 z0DyPka?x6^dhy=2Ype>@-B~s!|D!eO$L{m1-%S(P?xk7E2><{A^GQTORCt{2mrZkm zFcd|jZ8aoT!8#xYBKSpV>;M0IeJOUw!x@}RT->w3#TD7DjHe? zcYI#lIbOft$(MYtR$415<2dFFX0CrRSa2_2Is+z;R;v|NC-IsU@Ou8AE9Lq{vStPR z?ty=Kq+~+<(p|#{MDim^Xa@um5HgaR%_ff7e&2&g(g@hZgM-L3QV!2S00000005qW zG|jSXAm48DJRit+J7dfv{Y6ovS;@uP>iwP^*!!!xs>oq{|AG3`vSbYOQ6Eov&aXkO zYcd$W25E6P6q%#nz-q0n`#kp>)EBL5W14@a8EN4D0NMa0C-AodPT;d&pt@WxRNXdT z;{0$EzPW_AI#`>xmKwm08ZwP~r}xa&B9G@~7u-VvZ3 zzzJ05r)_Bmj1(XPav-?JFyH6a+Vi=;UkFo~>-E|+WBWzvmLTIELK2`6(46@}WN0k} vT$@J*QCYGxpfebl0e=SOu{j6;03Zmz))On+Pe38O00000NkvXXu0mjfaL!+` diff --git a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm index 010e8707232..e8688a96b1a 100644 --- a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm +++ b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm @@ -1454,10 +1454,25 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/korpstech, 32) /obj/item/clothing/gloves/ring/hypno/nuke name = "suspiciously glossy ring" desc = "This ring oozes with an assertive edge as sharp light bends along the smooth, black bronze. Like the finger that wears it, an exceptional amount of polish repels nearly all the light that glances along its surface. If you look closer, a slight golden hue indicates the precious metals inside the alloy." - icon = 'modular_skyrat/master_files/icons/obj/ring.dmi' + icon = 'modular_skyrat/master_files/icons/donator/obj/clothing/gloves.dmi' + worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/hands.dmi' icon_state = "ringblack" + worn_icon_state = "ringblack" + lefthand_file = null + righthand_file = null spans = list("glossy") +/obj/item/clothing/ears/kinky_headphones/nuke + name = "suspiciously glossy headphones" + desc = "Black metalic headphones with a glossy finish. The soft rubber cushions are comftorable and form fitting" + icon_state = "kinkphones_black_off" + base_icon_state = "kinkphones" + icon = 'modular_skyrat/master_files/icons/donator/obj/clothing/ears.dmi' + worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/ears.dmi' + inhand_icon_state = null + current_kinkphones_color = "black" + color_changed = TRUE + //reward for SomeRandomOwl /obj/item/clothing/head/costume/strigihat name = "starry witch hat" diff --git a/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm b/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm index 5dfd42bca8f..5a44e21b830 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm @@ -649,6 +649,11 @@ item_path = /obj/item/clothing/gloves/ring/hypno/nuke ckeywhitelist = list("sonicgotnuked") +/datum/loadout_item/ears/kinkphone_nuke + name = "Suspiciously Glossy Headphones" + item_path = /obj/item/clothing/ears/kinky_headphones/nuke + ckeywhitelist = list("sonicgotnuked") + /datum/loadout_item/head/somerandomowl name = "Starry Witch Hat" item_path = /obj/item/clothing/head/costume/strigihat