From 03e873478cb773e4668c6eb92312f7ba296b1afc Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Mon, 20 Apr 2020 23:11:58 +0200 Subject: [PATCH] Fixing CE jump suit/skirt and accessory overlays. --- code/modules/clothing/under/_under.dm | 5 +++-- icons/mob/clothing/uniform_digi.dmi | Bin 262426 -> 262431 bytes icons/obj/clothing/uniforms.dmi | Bin 115556 -> 115557 bytes 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm index fe3aaf4bda..0d08b59be9 100644 --- a/code/modules/clothing/under/_under.dm +++ b/code/modules/clothing/under/_under.dm @@ -26,6 +26,8 @@ . += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform") if(blood_DNA) . += mutable_appearance('icons/effects/blood.dmi', "uniformblood", color = blood_DNA_to_color()) + if(accessory_overlay) + . += accessory_overlay /obj/item/clothing/under/attackby(obj/item/I, mob/user, params) if((has_sensor == BROKEN_SENSORS) && istype(I, /obj/item/stack/cable_coil)) @@ -99,8 +101,7 @@ if((flags_inv & HIDEACCESSORY) || (A.flags_inv & HIDEACCESSORY)) return TRUE - var/accessory_color = attached_accessory.icon_state - accessory_overlay = mutable_appearance('icons/mob/clothing/accessories.dmi', "[accessory_color]") + accessory_overlay = mutable_appearance('icons/mob/clothing/accessories.dmi', "attached_accessory.icon_state") accessory_overlay.alpha = attached_accessory.alpha accessory_overlay.color = attached_accessory.color diff --git a/icons/mob/clothing/uniform_digi.dmi b/icons/mob/clothing/uniform_digi.dmi index 7fe37547e96404036937fe4530ce097e3465e7a1..7a638ef54ca7dffd71c91926ee977e07ddb76c04 100644 GIT binary patch delta 1202 zcmV;j1Wo&zf)JmA5RfDRnXx4p0e^hhObW2kuzJ&3vpDcfF|#rD7+9G=OB^D(2}AYB zMlrT`RLNC2sJ0#BEJn3$GD%V!DtZ)d@4|7ePTQKHhl4oas>_Ixkwhe>9K`{b&rd6)C8r>jF@1MrV>@m;vVT!~I7G~g z&21eZ$%CE%e?T#={SF&0&X%D-acVw^P0f`g_cIxJ zAUQ2XN~K);gIWSI?V#l>yMIpv=;8|=(M1=?oT9Nc({Tl(@M7bVJxII2ZelzcATYfM z+ICG_AprQht4=`d7J>luS~&phj|L75_}OTIK|fjHzF+{**AxR_N8{B4Y0#MiBz{i- zbgqN}(j_EX{{7bj8dxtbrA=<>I{;EmidvBR>Lmk3 zL~c18GA=5pnvMyFhuVPyTzmeT7MxCsR3wVT7Z1IZSfrC5NCC2=dGj3;ea%C z+qQCUaNy|<97(ou)*&z07Jn^_<7T?buO`r#`VSuI<69@ziI2s(-tLXMU>tmY(^k?phP) z`flgp?Art9eG5A3x=a31*L_EH)OFW_eEGC*0$)Du+JP^hb}gu;xvxf&xt(HN2XKy3 zKx3(C?h6~#$gIXw|4+LNCYyprq%H1@staw8yci)5AxDW3d461r06E|QQH3M|OFIPt z+VEQk7^|cq2!CycfQ?b02SPSME!+zTwqUSUEMT<^M5fA6y8ufPwl_5Fa>5|Fxb zj6k=3!;rkpD39&i*f1oe1zxa?Jyh?TD)O{rs>sRBlG|o6OGd0B$`~s61o47JY{QWE ztikkz>^aI9Dkkz7MXb&UeFVDp6P>1k+5^D!KP@Q%Nq?>*V`qTDl!+r(K;PJEzhpV6 zA!W}C8n{#$`#G#Yd*DJMYEMRqJ4sdl!y#b=uYlJsiXVZn&)3i^Fz-xOLM(E21|ik_yOs z2JZgD?2-GQB(|Z#Pb=oD6G=p3$x$3|`TVp(T5<|f8Pj)1Hn!unBOA4cLx01(*xc3u zl04`M@COv*+V8O8;%pfT6rVP9G-e>)J6ndbIprNLr$2Dp5Qn&MKd+CJ2nseZ8?+2@ zVHdRqhVV)mrO)nT&jjZo+a$<<6Pf3{XNqmaj%|z@UtZCxE`;0!+SFW0azB%i2a?iK zq*ThaKd2=j!wy=`vin4UE`Pq@5nXhF%qbdMGaXkj3NJP;*@LtT>?X#O0Rq#Dpl#Q* z6##(0yXpkQZXpOjuN4Ep{%GL9fS-*P81$1B?h6J0eN8a{b~Ii+kOrMOK;riVK<5e= zAYDSD<==ljpn>(`QrhHJ2?HS2q{uY}MXv8$lp?jcc9958zR5(?mMIq( zsT6S#oR(54kC zTxC*h)}V!eYH!03y?-n07Ly8S{e?uN2B2kW0rKUx#c`BFoYkqFuZ|{%1JcB8+se7I zfu}i;4=6~FVUAQ1A;r9-q*zIb-5R0*@P&aI0Lz1Qeuv5riwRH%@zWgDfUDb@zH$J{ z2;-@DniA#qGOO{_a~=z~V@EZf`ozAtwg;=mQ=j>%?h>B)sekTUdgiCPYfYT%yPb!# zZx5XJE$FE0F8N1Y_Z`tu*If(p<tRKkf3DYzi8YcDOUDF0?)JVuU<=93@8Nxp6H5M1O(a2iXL*ZZ9C%dcj(-fYmY(nJPnV0xU_`-p;U-!z5lwK`k1a+5bM?Q?m#By0r5 z3Rg@oSfro(zeyf7dyUi%D~nML#sr9DvObVy=*$McK;Ny*8qsfSRvoFwn^Qd~_K_*~ zCi4vFvw!C-sV|cl@)|~Sdv<3!SKxi?YNGEv8IroGdSlYg^1wOrwr%aN7%FRp&)w4+q;a0rs*`NbGi=unt~Uf$`T3 zV)*&sF!;Jl41abE@9y@%@AtqTUW4CupT9kH4-H?x-2My48!I^(i~#s!DQ1p$Y~ L1p>Fm1p`_8noT?F diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index a485deb9add676a1cd29b5b5be973a922372d8b6..cea11f8a49cbe0cd35bd74752983ae945d46a6fa 100644 GIT binary patch delta 1590 zcmV-62Fdy4h6m+_2aqHIJCP+(0+B4Sc;o?p)F)jcC0pNll(XbQp>#u34^#wG%*WcD zCtz#8;*qVrpNoixn~Bs!Gy@8B*}w#B(QyeDq|L-;W;nYm1m=rVtVhLBd9y%5q_!+t zfNynX3fVZySqujIB^L@K24e-?nJMHgE@2#^n*slwq;R5ur7;-TJ2Eqd778G!@S10T zCZP75Cz=I_2R=5ubXO>h^_pMVc6{L=VeCdEW62~gYKH~RTvQTUkoF|?+W$;JAW$=# zMWxgut?nmBotuC%eTtcY6frpx3pG1-5=v`!6iijJnPPOKX#J>oK@o*tXf(mP@=+;_ zbI8_n$x-%%Bo~H!#Eiag6^uo;J?w0tul0)x zki_tFa#7JQILQE&88mvi}KuYXnX>Pws+vr zrqI8tm?fR3=zx;+Xg5HvGqU7~kiw0Mnd(lnC{$lw#6jKhEhA3dL)3oS)}s!81si>L zUVMU*(sdG`mp3Zc{Ta&zE$Iv$VOUR}fzW`(HcL8V=Z8 zGEN0;VknXbIvJ;ep|>t`XQJ<^zCZV4`TM$s7Vqm@G#gSj3Vgggv*QBT+$x#H5s=in z*h49X)j^s6i$=iv~zq%?#Wjy+#dyR`)<+$Dj@m*;UzTVn@qxkKb7Z*S+ ze)RBQ3nq~C;!$h7y72}jj!_hlem&07Dzcz2@#;3IO+wkCCf#RdK>B(q3F6oJBM^V` zs2WG_7smH%1{DAQdpTInHsKR|V!Yf@qHFJ+1(3dtT%de>mVoMho&13hum*>^W!(*@ zBZ@XGdoAc1@FV)RL~6``<0Ld$Z_o44SV0;is>z<|f$*L}w)k1Y#%^&jtT;$yI02(G zw;>yJ;ahFkGH-)B?%NxA)ZBY=jc)EmsZ7dLFGuX6)M%HUGWX0FBqNXOVB za4RYrWcEt2~mRvOS=T9{aYFEEpU~ZbZJte zkEKNKkiPy~98~6&0P4l!sSt2=`G$r!`;~9h2H0)?{`KqMfBN{#f9e%}9I3-RdT?=N zbgFJ}L`yXzB8Q$_aQcji~^mz$R)2CV`(MQT_WrNumhaXlIctRWoq}Mpt$W_>tknF^u(; z)Ki!x)JKzYQAvrls~h`<0^>R=mO)eQEH>_b$HN{D*<$+tbI-A5I@WJ>LHh3VsPpuua{2gJ%f0X9xlPy6FNPSpWb4 delta 1589 zcmV-52Fm&6h6m(^2aqHII*}z&0r%$&P*Y1aS7uP-3<8eB!v?NERDgy-jSIxv`_#+h1WcP zGXZzcd7@c>c;I8hOLv9BSikct+m0_BB#hmNWGtD)MeVS_nTtwd3(}sXe)m695D3)F zW>G2iNUQtFQRgP$nm)x$K#G_giG_+CI|-#VI|`;M*-SCIQM7(kyr77}FEpB9UHPaK z#=7RC$}j+BDn?>dhA$G(bx_%2V4lc-#?=WBbCaX&2}v#t`G^^P-zpf3Y=j5WIUvQEEIN6owF7R{dIEQJ!J zcjv_?C@Ebh0cv@pa^0V?T+ouv&=H2!^ce^ZSZuSTGe&Og98fa{&oJa5^`tQZpC{9iOu_N0Y_1s2YKY`~0U6%Y364iu@ht>VEnBd_A&)Kid@xAAc!bg=K zRpqFwp|p+>WN#w?uu*ux(Y@;o^MbGK(HGqBwx~6Zwl0Y8eO(Z~cI#1p{MO#Z1yD;L zwL92?2_(IE)Ecik-JrxVf&$X7$2eL=7W5@vb&=X6lr3t~eO3mfugyphzs?)J~ zIBLEyzPA@p{QvuLu$*neC-|gz=}n?*?-d1*zKvR-e0-LG>VBR0fe)?*hq`6k4W}ZC zHY|I+$Ti?c^lgdMn8!(fXtLg(-=VRBG)7dDJ;MXxJ#}pHvxbe`;$qmPAd%q&jLh7I zYtV&ncfyuA8{Bc$nLcLwU!DE$NJY`P~`DMXtyk6tK;R83WzYEl#piAx+s95;* z%Rhhr>E~a*eEN8Q`tkQKpFf;_`}y(L)7LMLpMR@+N^~1K#JuH2%6IQ@v|bCop+7(< zG{|`cK}~0Iu%=jwdnHj*&7w^jfW|^+hHogU?+$|s?=YtEdGYnRt1AdAgzyFgYilB{l7HOrLi6bzwvSYxH3nz|Ytf!=& z!YrXal9Y=|N~~So*f$gy(^0VunsR5cF&7of9XKnp!|?EiScbl5ep;v$*0_`bxkD~F z$KEY$2>31W%-a+l=amVWen_O`*@{7HzgPY{C*#zA!dp_{=y`*q62b6K7zkK>HDsgObal=dxeqUc7uCYPr+~SsKAKM n%gTQj7)ZW7ef<34^x@Ov{r>>KOa=eElrAHKXb87x2m$@N`7#