From 339a8c7ba8a7d7ac1a5aeb58200dac2aa16447b4 Mon Sep 17 00:00:00 2001 From: Qlonever <42286723+Qlonever@users.noreply.github.com> Date: Wed, 18 Oct 2023 08:50:09 +0300 Subject: [PATCH 1/2] [MIRROR] Fix decals on open closets --- .../closets/_closet_appearance_definitions.dm | 27 +++++++++++++----- code/unit_tests/closets.dm | 2 +- icons/obj/closets/bases/closet.dmi | Bin 1803 -> 1754 bytes icons/obj/closets/decals/closet.dmi | Bin 3222 -> 3507 bytes icons/obj/closets/decals/crate.dmi | Bin 1868 -> 1806 bytes icons/obj/closets/decals/wall.dmi | Bin 838 -> 1158 bytes 6 files changed, 21 insertions(+), 8 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/_closet_appearance_definitions.dm b/code/game/objects/structures/crates_lockers/closets/_closet_appearance_definitions.dm index f1c172c761ceb..7703057772adf 100644 --- a/code/game/objects/structures/crates_lockers/closets/_closet_appearance_definitions.dm +++ b/code/game/objects/structures/crates_lockers/closets/_closet_appearance_definitions.dm @@ -25,6 +25,9 @@ if(isnull(decals[thing])) decals[thing] = color + // Create a list of valid icon states for decals + var/list/icon_states = icon_states(decal_icon) + // Declare storage vars for icons. var/icon/open_icon var/icon/closed_emagged_icon @@ -39,12 +42,17 @@ open_icon = icon(base_icon, "base") open_icon.Blend(icon(base_icon, "open"), ICON_OVERLAY) open_icon.Blend(color, BLEND_ADD) - open_icon.Blend(icon(base_icon, "interior"), ICON_OVERLAY) if(decal_icon) for(var/thing in decals) - var/icon/this_decal_icon = icon(decal_icon, "[thing]_open") - this_decal_icon.Blend(decals[thing], BLEND_ADD) - open_icon.Blend(this_decal_icon, ICON_OVERLAY) + var/icon/this_decal_icon + if (icon_states.Find("[thing]_open")) + this_decal_icon = icon(decal_icon, "[thing]_open") + else if (icon_states.Find(thing)) + this_decal_icon = icon(decal_icon, thing) + if(this_decal_icon) + this_decal_icon.Blend(decals[thing], BLEND_ADD) + open_icon.Blend(this_decal_icon, ICON_OVERLAY) + open_icon.Blend(icon(base_icon, "interior"), ICON_OVERLAY) // Generate basic closed icons. closed_emagged_icon = icon(base_icon, "base") @@ -53,9 +61,14 @@ closed_emagged_icon.Blend(color, BLEND_ADD) if(decal_icon) for(var/thing in decals) - var/icon/this_decal_icon = icon(decal_icon, thing) - this_decal_icon.Blend(decals[thing], BLEND_ADD) - closed_emagged_icon.Blend(this_decal_icon, ICON_OVERLAY) + var/icon/this_decal_icon + if (icon_states.Find("[thing]_closed")) + this_decal_icon = icon(decal_icon, "[thing]_closed") + else if (icon_states.Find(thing)) + this_decal_icon = icon(decal_icon, thing) + if(this_decal_icon) + this_decal_icon.Blend(decals[thing], BLEND_ADD) + closed_emagged_icon.Blend(this_decal_icon, ICON_OVERLAY) closed_locked_icon = icon(closed_emagged_icon) closed_unlocked_icon = icon(closed_emagged_icon) diff --git a/code/unit_tests/closets.dm b/code/unit_tests/closets.dm index 84daec10bd521..7a3831af5e211 100644 --- a/code/unit_tests/closets.dm +++ b/code/unit_tests/closets.dm @@ -38,7 +38,7 @@ for(var/thing in closet.decals) if(isnull(closet.decals[thing])) LAZYADD(bad_decal_colour, "[check_appearance] - [thing]") - if(!(thing in decal_states)) + if(!(thing in decal_states) && !("[thing]_open" in decal_states) && !("[thing]_closed" in decal_states)) LAZYADD(bad_decal_state, "[check_appearance] - [thing] - [closet.decal_icon]") if( \ diff --git a/icons/obj/closets/bases/closet.dmi b/icons/obj/closets/bases/closet.dmi index 551435629e4353606dcf8193bcf34128c6d6a405..562d49494d15bbb6c5a0547153a2535db98ba131 100644 GIT binary patch delta 1557 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 diff --git a/icons/obj/closets/decals/closet.dmi b/icons/obj/closets/decals/closet.dmi index 7adcad37d554d80ff212c5c1a705b86a7ab438a6..d0cfcfe618c833a7985902c230430c11e0224615 100644 GIT binary patch literal 3507 zcmb`KXH-+^*2kX^0!T|3WQaIIP%a=M#X(0zLkD35;s60ObdlZyLp4POK}A4E0cqkO zO?pwp7!o?tL_wqmq=gcSsI(Ar<6Ud!ecyX$-cR?#S?BC^)_I<@_kZu-|D2l`OH(mn z8DRi`nAusQUjTscE+IfjfOo>-3orA6wkR9>P$Q2Jcf5B{sCQrh01=saDczPV4bj*S zeFgD1&P)dC?AH?N=5u;{?BGx4nCCMq*KYy@Kcw_3{xOj~q zg6048_UR*y1*sZ-6o+!#WBRRKWuss}+3d_Uy49Yx)-ntjp zuk=HWI?6mb{o~C>H>_7eXO^V+Fq~cE_vSV|vPp5TWR%p}tk>Nf+YI???HSdUvMj~+ z*;o1dtJelfUiqH;R9Tv5YUx$R2x-<5n8l7x2PbNYR+~el&((14ndbB=f}%zkrihj=^xa>t9C=+EknF3$^a=Se-P9#wY9$3{qBP-)er zxLro~MssX*1mopWUl|(;)+h6rbQlc)kpeR#eVd5Pr7>#Y{@453KE>(#%=+oEo(p}{ z(wb=G(t9mjq|9&G)EyLrnx#Ln{!I&=S>Aqpx$I{!`R;|;Egk7oICpVeXDlfCF3ru+ zj7)IgLNXe0?xlm1^Nguuz~GVth04VjBO6tQ4uH7dp29)W*0L=LSo48#J&8Y z`1U8=8D-ewE7e;`SJsDCrWw@ed->kQ8_+O$AY)&O-7-}nW1-J+kS?ZfAcsg-_)0E1|tjA5%YsY%F9yGsr!azFfF6SdS=VC8WtD{y zZC-w0WI}pAU`tz6Na}L+LmUprx-wRJvDW0LP2-mriI)6)qPcu}hkEKpqjl@HBTA}N zJKeFUzWLB&S(evn>Jaj9nRvts=gA`C#fuloDkF4}BG=7X|moA{E)Yc%vWHPne z8sd(2Rymd1rgdNb#a%sORUb*=lxdw3rUwU6GDB7bh>?;L3tauU{5XiVWKYiTUEE&H z`N_fRSPsPfotI=zaq&l4^c7{CSb<^XnDglra;jmjt_|>df?L0h+4gNggZ@S|Ie1@x z5j|4`{>2vq0Xfc@!lFnM0B%SCvMWDuK|;Xag}E=3CLS!l%dHu2BYX<`s;|)FiD3Ka z4F@uIy;R6+Vk&O&V_~e$ptxRQ7uw68qy<4lBbsG_Ce%xLsZHGV&Qg*haI*uIE#f(Y zHDy=bYaKo1=+U(hc3N+(kf0W_1D*DAVH6PqfJwe3Ov9|N2002$T(sB#^qc}vD3DdejGY_aW^{iF-a*JnKBF31@ahFH<{&)!q8>eE{AZcSmkL=MFb z#3A}&?%hUQdkG@G%$;Yc zrTwucrdBdYDBAhxM#EYayc8~9SPa6(?#81NsvWmiUHz4sZKVNV42$oU55E$G0OjdS zc1C>s#%{SkqoC(#0}yRLLj+K02!x zm!KFs$o&r4ZBS#Q12RJ*N8FRZjmPI<6VyitJ~HtRA6+}u`WoN%@iJf#&acPy5d_!e zknmqkdAa1Ofg2T{@1k8)`(c0_^uLDJS{h_@D~3s*`!fN`;X+Y&lkfkh7%JrVK2j8s z{6FfYg$01`ydBSI;{G2P0F4q`aFR)se0u1Dm}_>-;F4i^D`X;*a_AuU)&ag5Ia0}0 z7w>F-CXP7OdWSv3Y@w}j!-wiamJOG}8SBTF##gH0^2f8JCldV%lu~NtSJ^?1KK+m8 zd?)O~e^yI5b9pl>Gn3WkMe!oBhvd9}AXgqQ1w{FSG^x9~@$HflThU#Jc&b3+5K-c^ zCUmYROUG1mSZz3o%7?h?)j5tWCIAMT6tSXvR5ot@m#O+f+KG$5;p<3veATyuyZv=> zh3!MLA4ydqJ3V-MhqI*nK*j>TOy$;wESt^Kvaft;IdFuurAZX3{6Oa|J+Ns^Y56Q` zm}5Vca-^KFLU4wBDdYTZ!Ngfv#Ife@0!%+T(S=)4+iJFxdti#X!iybPW}N zfqa|%B`LroIZnj&VuG*yw_fgn{#PniVFE$mWuD~wxB1XU1&3=t5a+xn(re_ZmWFwa z+ezJ!Tp`p@KC}kV<_r_UI-Q9Lavu@HNu05^S?Z&hZI*2SUo(y^S_H>Ba9M^oaykIA zQ3i#T>sV@?Gi0s1KfieP-gJ`Y2;2eEpDj}|8o@etauzOs`LIkhXb#ZLpWM(*c|*Rb zj~PMmAzd}Jm3`bNlHxiD05qch#&Z8d@xS!v-a)rY4MI3Wb0Wp1<0NzWcKh4)`Q7yu z3X{QJVb8U>Rkm-euQzL_Iy*Ua3=Qq8-D4dutoJDQU9+-j3t2sT<1K`VbCO*ZB~pdR z63Syw2_)ui=(7)|I&-oa;1EW1x4whhI5Xq%sQWRLpNwYbIk=EWtgSsw@iqeIKnWZuhOiIlKiio6*GBZA{WC`Eo4>9H6TKOcE%ya zc6-dCz}l8}`zur1^J6urT=Rhyn;K+5-fRBeK&$VU+HRm*p^3>yW)Di$32#!RJGM4BI^nHe(y+ zm9GelE>-!u_)-o?A~Mo}^1!ZfB+d5`*jR#wSxbV0EAWNIf%Oz|C_c`uMzbS}j7>yp zY`#rN7j{8EvSYN?hVG?nZ^UlwhCp4D)xQ@RI(}v_?1IMKTh{IlKXnMx`Iw{9BXMvs zQDUf(1q|Z}=ME+b_z7|iB_gM(+|yyCsAEHALlVj9!YH$QmQKa@pEV>U78Zd8WHd~# zE(xOoqffOZeQs(ptP3FGSE%Eo!=TcyxmFf*W?+R|w zPAa0e=$)dTW?`Qe_4(dfe01JqMaEk>PPy@P>cO?9=fV*ir+vzM+m*xl!iuhRan{z3 zg@s2ksa#8=`j8%uIirk2T4ivx@wL6l=}qK=-x2&N_Nok>kFzY6A0p!)gc0%Gz*;NX z7&^}2x3z5c)y}+aBKcH#tSk1!MO_nX7(jjdrafl?`iE@J*Em3p@_17E6+4WVL7)C2 z$s5D{9-v|mu*sb@%J~{~v~%W|x-6*+Uw26o6rSyi1bRUOcHifY@&ima7YwUB>_1X1 S`ib{52F#2tjmivMuKg2{;U38V literal 3222 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 Hu0mjf+*^5_ diff --git a/icons/obj/closets/decals/wall.dmi b/icons/obj/closets/decals/wall.dmi index eb8a4885dffd48e583359112df8c589e10cb2f51..c3a78f5a1329cf80539d913e42b788cfde133904 100644 GIT binary patch literal 1158 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGo3#vjQN?cNllZ!G7N;32F7#J$% zOg(4Ib=ZK1^}$WMR*!F&_Fwfb)R3E`%_6*dqvF=)rOU3rPk3>|YBtOL>OEq4ckl8n zs8%*VBND{Idi`)+x?)WnuMIZsnfoaL}{MeVf0|cX5H|8RQ|lhVQ_M)u`S)1|wcL*72P^vGU;W#`ua zhj^7NLa5Y0E#A?mdwGjpfj!lPP<0%x-^s z@9yqCu{SqzTKcRspR2DK&a#-?yR!KIUB~-1<`QiWODD}ao0b?E_P}N>3q!+W3&Z1u zH!f#*uMFv$xlHoM*Ql!vamNeiT(I`nX0#H$z96HVg;n#Ax3~AiD~-pq0*dpN25Ek{ zVR-jeP!q?CXBr6$@AAF)sw5+}HtT@53m&%;^o-M2R@aO3)+)c9b$C}M7x!IB@g=s_ zKH2m7a&mJk+1c6o=gCV;AO7;CWD66^R%?gd*N%ko9R4t``uN&4YZe^l}>-Ex)jT4xvKI*y76_@9TWcIn-!@84;X~EY;HtJE=8>Tm0Gku_{ zz;vR6!APm0heJV`G-k$4>0gy;&t4}e8Q!j$$o6uM=?srE`~LsPT=(_o=2LPEHkAv-KL32rpf)>M=3Sol$*+gM zbF2!{irX3UE$4Py?rjaR?!cbEDwkGHdGGJ)v+r!}jNmyhyWjHx#ZROdNyy5wGWhuT zxY$k1^H?6V;#$@!@&AtB7Jm8?UBl|*>-+H2C!uY*%nUNe9rdPn7f3zy{B|_Zc5Px! zip15+QkULe@mg^$Z}Z|MkNIZIpZ|Vl@&2iQ9}6!D*4%Nu^ox4?hWeVOr%n&MSN(Z1 z+v3h^t2?uIt@4PkVSQ21eD|)hQdjbcy(<^TXD+gjs^`my{d2UY&UV$C6&J!BHtF|i zf0ucze0WFE`H643wa?~XYta54lbNS|i|dBHonw8`i#Xl@&aG@OoVJSH7451HZkJB1 z6V_$@vvbFdj2bJ}g8!>IralG+$p4%t+GqE6Ph+af&0D9qXg!&u6{1-oD!MQh#w${hi)o zwVPe1Z<{^XEfV{GzUFN$sri5Zuaugtmyn@c!>EuSmVEBm#iI-iOa-1Ujv*Cu-p<~e zbvrbx5|Go7=MfD~0MYqtWuj-I~t1kOHG7W@6lGlU%#HezOJ()XMaQ7diBE(KkR?KHq5)` zzWx%vuTj3sHs9=i{B~;PoFJ}@?YB3ju!w~9Kc72)>K&#jK^xbe-OzobMesqWw$a|1 zCm$Z%=aZin^nZe{lOChjN()Od&4b@-e>}T?utEuF(zE^lPxNh9Z~o|_x9hI)Ws9BD z7J4ohw`DSGO!*}^G3Ii>yXOttZ~Ww3Uwq*D=g;q#8U9e1Cb&Lo;_;tzW#rzRe*DL8 zPnK%14A+Sh2{sdD^WVGjop92ezHqkFB<4>JjFJ^Q_V3^G@8{$DKR<^HF5CD+T-D$V dBIxQFH>=;4IdhOF1DG)wJYD@<);T3K0RU&+ZJGc8 From 97db6201fbc67a8286bee97e919dd63b2d4a7537 Mon Sep 17 00:00:00 2001 From: SuhEugene <32931701+SuhEugene@users.noreply.github.com> Date: Wed, 18 Oct 2023 18:52:53 +0300 Subject: [PATCH 2/2] Update closet base icon --- .../icons/obj/closets/bases/closet.dmi | Bin 1861 -> 1820 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/mods/_master_files/icons/obj/closets/bases/closet.dmi b/mods/_master_files/icons/obj/closets/bases/closet.dmi index 0f7b71d0069771b3fcc439dc3adfefc366d02c0b..7f294b4591118ee61a0ec9341425f8b61a2370f6 100644 GIT binary patch delta 1566 zcmV+(2I2X|4xA2<=6@kcL_t(|ob8=GNMl(P$ItT%ly!`*vk|AT*g}gfrU*=6Q4|&# z1Vv$sog$TujTo?Wv5-waAcA0NF^epST4|N_V+d>$kU$1BU@`2dF%frQG&_(jcFZI( z$-6J!d*8?T|3FA4H}{_L{&Mbl_vJl_0BekBG-`JYLM$yU<$tZTUtC-?RK? zkDKfZL!9O1<^06N1dWf63$@?b*`ej-<^1gIEF>_Y!R`Qny+8owKmg{rq6Q!$nw*@Z z_V#w+wg(3XiX-v{6$RMa+bgNKx3;!uWo5;-f-0Fz()|3q<@W${n&Ry*uA6-VU_nus1w_=n3(;c?H?F1-;|AruNx zxu~_;Zf|cZj>sDniog$-nZged(bdJ@wgpv*qoX4wZMlP^0Omjd=0E`EG!PLb5(&HG z05*XPz#P}?1Ui{`JYKSKc5-q;ZEbBdHa6z?vyq+@V1Hv{L+f~Rb905qp-_kdfdHMJ zo@yI^XlUqrB6?0l@%{aMO9Q)R2}q?B5TJO{%fAJz zb5o@fe!rjA*48Y)2bg0-qtOS~0gR50x^`m&n1A!&>R?PbUvLz_90ZQX!9C=no&%~D5ar;4tDWRxxe|9<+UvU?x_ zB?7d!w$hI;UeMY5_bR#v5|J*z?{D7ZiHI_p47Inm%I+RWMo9)pf4M=^KOSEKg2ANr zLVs8Gm`Vib?(C$lE@#|aN+q$_K*h7DD#egJrm`Y%|Lt2!`NXTp0+q5$@$<)y zjdKAKP?`SC`hINoQ7XXH)D*sJs0qhpfY+~I=g-q=A|l${+{6hX8?cfMqzlmF_mj`( zqwDKy>;y_ibYiV!1L*?%^6HiG!@vOfd_K?b1nNdbt)c8(0MLg>W~kOiX%UDeKs*m3 znW0)6B}+g$o28F8H}uoXmpBS=I7%{r*LMKDgc1SnK7UrxEl_~68sJy_?Os=)M1XKO zjLCNiI2V&a1uuWO3bk5$;4CZ)Q0pqxN|z~@x3L?@Sc(yiM(cW`o!7*J$5H$TBkHaJ ztX`FhPo6U|6~Jub%$5LI*Um#AHJAz@GI6!md|Atc%;g3$eWf6Pm0ybJ{b!tt-Elfe zK;!myRcbL;>uy;n9GyW)5m;+N>M=DI8!+yFD!pblhSh&P1{FBz6RMh;HGrrbkNJhw zx&e||woo-uoU+uT4+F~|mt)6WGmFO!29tReF?c0Q)V&b|+>4ZrARvyDvqeP#WCiTx z|F}+^TvJpOpq|YitNm1aziw${#NlSqU0nmz+E=Ld8ulVQR0GtS$ZD_YntZop1y>8; zWZaTvn(TiLpg0`?{U8G{2Ldn$0x$;xFb4uK2Ldn$0x(B-A7Ex?#?sE#>guX1HbS^# zX(LGV&%tIgnYw}j`oR*w90o0yO}0AOLeLEdl9tT2&kX006Y}AN|ut+>VFr Qu>b%707*qoM6N<$f?5&!@I delta 1615 zcmV-V2C(^@4#f_T=6^~_L_t(|ob8=WNMlzN$ItT%lsZQ1G~z5=bfJqbW+6ixb5NLq2!3%K}7-f_xDRG?wy?-T3cJQte}d=LTT3Vt&AV6NP zSJ{|HM}J3!+r7QLg(6TDpV$4miVj@?{)#wnUwv?JQ0c)SCsg~@sJI0D7Fbao2e62e z43MArZ1!(Uf&uC&5g$lVN(9JHJTd?ugfakdFS;2Zd3mKa zBA}Ft8Q|s1p9{bH=JD5RBdWpP-k#MVxQ>DVSAWTOg^4f!6tK!ol}dQMUfS5$F#H^# zj}{Jx@0|xQHa6zijSZmBy|aTc;e5ftAm%^-=0E`EKmg`I0Om*);N;}Q(1o3VdXNE_ zBSnBe!{OYo1~2OdtU-zZ=}d+?Iy+@_4NOMr67cWGk21RlCLl$C_SRPV{@F7+fBRNO z_kX}dOc&tySFdtJMCo*z+FM)A?jD$olnjvie1WEaT)qVOd~xN4uGwQs5um%Xle)U> zad9b`L?QzfkD|&H!|XAo6@dq@U(4#+mK0AwwMmjWuIQNMqL?ng?d@%03AnwvF}r(P z;`7CGDkr^|NMu0EPipbxR?7(GahfhbCV!iy_?tKM;rf~~SML5mY5A*9R_ZVBxBPxy zg5t>)71DG878VvXZ+AC+_2?1xJb7Yv_qL*Z;$>ukO4+6O{zJ#cu>cd0nf~?qerWcQ zD!}ygG(Kyn2-{?U)z#J9MJh!^MBCfjI3Q#JMzVqF0`z#j)?-LE zFkOJ3UcAu08yFyu$K(2)K-I{oHKZL20O}CQ4At65EdsFws6iw%RBIz;2}or!^x^uN zet7;I?*eR&lnmhZ9Y8lBMS$B+pJa3kBp|H@_yynH>ju&}Uz$#)1i7Lynzktrzw}Wu^Px&iWUxs>w2P<=fs1DQT&Awb=Lq!&q~EB z&z|TCpf_=POMqGD&O;zM=n5b*akbWbvz7@nmmA3Rg@OP^{wbo@pRp@e$7v@4wVRuD zQ;WG;SIa`-Xb(z?z*-YhkExN!fR_KM^naM%7)JLPWMHRPsBCK10HSg{e>7;+E2CTtCq%$IGilHqicX#`wG<_!(N1oYJgf3S?w`Zlkb$Q;AjEtjDJ(I zOq10C6sIGg9%KOKKmg`I0Omjd=0E`EKmg`I0Oknq1I*6O8rs=fUtf2`MhJHdZ3Kya z9c((Ct}7Uz9xMUOfdI^b0L*~^%z*&RfdI@g^fs`e0lv5m;TgTVyA$rzNLyencu6zI z&=Szx+$<{&U=hdw%rTS!8XFsB#asa_0vUig5P&(tOF&CY3ndZ>;kLjT2n%p`cSn7F zeL`)|&(G@)2&lzS5!lhuAuA4G5vT!}0|A(0XbDKAQnKOz005wz{{VGlTcitBFe?B6 N002ovPDHLkV1k~;{$KzA