From 3dc7092972903a320f3eda961ec7a18001aaac62 Mon Sep 17 00:00:00 2001 From: Schnayy Date: Sat, 29 Feb 2020 12:13:57 -0600 Subject: [PATCH 1/2] Merge pull request #6746 from listerla/airlock+meter Pretty airlock_machines and meter sprites taken from CEV Eris --- icons/obj/airlock_machines.dmi | Bin 1212 -> 7666 bytes icons/obj/meter.dmi | Bin 1975 -> 1046 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/airlock_machines.dmi b/icons/obj/airlock_machines.dmi index 0c4643269cdfbb2b50c9aeb20e2aa68a30cdf4fa..1f22e8e19897e6bb165c8cd2fea514767d4c03d2 100644 GIT binary patch literal 7666 zcmcIpc{o&k-#@kpSyGk=nJh`hQg)`YwaAvGY=a1qU3McamaNI1r6fBc2{E=|vdfk% zBimSFY=dFUyl1-a=eeKfdY|{b-+$geT&`=b-#K&6Z$8`i^NZBi)jq~}iV*;SW7n@~ z7yWnft+lE{Yb!#Sl@~T#<|C2GwT4kFnfzCpLrm?fwoYAJJlAHod-SG3Hk<6J@GgDQdT-S;O}(Q( zY~~OgQ6;Iu+)p%C3E_%+_*ON8m9~_!TLFs>XAOLYcMBFi4L8hjvgDsyz6Wuey1D_8 zdwQJ<0Qg$3Yg{q%d%ZfT=g51#k$$~gK)s)D#^O0j?)eAVwyd@ifepR|DT$ZVyw5|u zu0^m^@I0@Uj$lK-U{Kf-JZk$$P+`s{?2N+AJ2QNCFV&e_XVlNK??{DvG&S%15b>vt zewbW)R~&gnIE%roz05@82DJMx!;Jn?Dd9auzyu(82+xRXx$rL8 zbIcn*O5b|MZZOTR{vk7XWsxdeF7rC|gGXVJjuPz5;WNWlkb4k2Qc~JWGR%t9uLT9=FfN4b&mH+R2)*X%gxr&=kX^zIQlr^w;6}$)RUnhQ(Y*(vj>(z-Nq!iJ1u> z@aVvnW4;^#JSsTQXXQxERWzv$yGqRfa2Y7h^pmeED|$`NgS}?Sty5*1r8AE zbDi3+RpglgKeFf1LX@t`6!EH-mwkFBGM}0O*oBr&x4(EZ(??e3+S$)vzQ0QN1xc`0 zc-n$XJ<+mt1T^&6luFSvBJgFBe`65d98W(I1Ubwe1{ZT?(=?tLY z@5=3)dlzUbt+lb1KHqSQhY%9w*!=g$V@cmseFfn30Q>H3XR1At`?Z` zlQyzq_(D39av!Ja&PM`2>H)FR8HZ z9^`RLLh;#6cXI@dMBsnm z+#Mhiedq6~`5%@Q&o{E0$%hEnkEJ34J&b`{nbDdB4u;9kh78LrMdxiu-N+wXrKyO? zL?MurMLR*ZSM5%ow*h%e+xo_@dKCSgfy?k_E#eC?aCkJxcP%jQ_SvEqVj7|vYkrAb zrxp5mR@C#}z1+R62rnF03q7ir9M0x9(5%f-jif@ z`H5ladTR@z4Nb&8_mEGg3nen+U))`KXcpM$qI7%bb?RB=jNY@NZ!4abWTg_Ynq@&6 z4=Ol7a{a!aWT@>NBtW&9KSF2B`$%FgLfo8R5OzE;NV|tcFe>}TTWr152jd{J39KAX z^#|K>polBcZASBm&DZH~9Z*CAm##+g_=-V;1y|EIbVu+#89tuK$-B2lKKaZSn+bTy z%Eqb+#N!S@nQ9o?@re#9R+Kq@`xW^ho{K*YF5Q@qg-6CFa9j8A_gAop$F$iEHXu#GwGkcI37^n1rkt{@^7PGw?5oASmBFYQrIkfH$b%HYPz8c zm*O*g#DDqqx@w({XRFw2^T_hXGVkL7$HdE?QtfMD<_Rf_o$&c<-Fk!-2{qjV^Wp_u z9iU`sPY5by4XsOHjfed#UXIFMcXt($W{*)+b2tV^HR#uA&2(b~2rmX|KJT>>8=RJ7 z`ioq{Xg5vUiWz++el{9%_rl$ELx9jx%d!!x|j^-b>^B=JNpWNy1m(`NA97BZV*{hjAiOITt zmlK5dqs&*Rp|5@g6B-wjIku)b`4fRHH_b8;&2NeqvR&~yObi8MM@2wnMGjuwZ_Zft zt##1L79bq1k+QxK1MBMI<`9HsVdBrBl^+H-D8Du zv%Fb9m;>J>zM6yhojjg^vE=^Vvh2)LYW&E?nu+}A4rf|se^q{;^V%ZleW{a}F4fl= zPW!t0eeF;y(Rv2b_IdYN6dU!|lW9Fe7pH2TfW%dR1#1PEucjhyzejz!#3gY;y|xXF zZE4~Z(I$J(5wb`30ZmASxmR=LKzZksLPqZi43ayNrU^v9UywFQEXe=CX>5Mq2?5p_ z_0I?oxwG8f8I7BW2tV2?mXjmu?}&HNT|eEzX^1sMG>l{4ly> zvsZ!`=r_Ja=%5_I*KPRTs0+SD=ZkDr^5kJdrTV>L!mhUum-d^`dZJ|K~07(y>jaNV6GiU7Xi)Ou922QE+!J_-_O4-%G~t-23m#lJm>kvLo6(ZH1Cs?j4`D zQ+aPqy6>D%wA72*26?+SHi*>@LDnPlU4(Ts?nP#mt$jY+O)0n9>=}w&jRL)Ya&z}0 z^~b(8e&+C4qAsVj@bsUYUZ>EWXNfjV`Au(RA>9J}^j1p#7=`D$I-MoUF{Uz8H8emf zW;tnUghJs)42aiz$j2YrKj~*G( zb?b#wzHMs_FK)bHoo;4>vD7;zTrV*fLPf1-7~;RNV zN}vaRv&^>-dQpjby(PWAiHLXfChrFEc7x=p@W=#tp2P(k$ns-8YuYKta2EnxDe>L# zV-sk(@?{88tRVkMrFt!cXv_&4c#j`wBaYjXcU7o|q-Q+e?pxTE#smi5;~4W6Ip<7k zeX@45LV<{+=*%-3fiY!4U|uu-c*Sh-sf4{V2a|?KYqs2^pSE=L^U;HvY36&?v zAXHNk{uw=J3|{mK@$z;{v%8opL4n0?B2bgm3XW6VMDt4EIQu0UHOE~yeT{)^)nF^x#eW4aBU^c514qR5G~(PrF8Wd?UOyWHMm9doIF@#d{YBJW@eF+^T(~*dPVqs zcXvA(!%Emg1x-Tzel0Ca7L&w#W5D-6F+S=PQfx{P>(3%jkGEEay~Ga0#vquk zsnOPav-GAl*fWm3Ryy7|nqVqBp6xRIG`yJlb3HO;yY)@>Aj8m&g)^x+v;DW_k#o?f zI6uCiz&jElq3Ohw{E-B+U)!3bkr}9Yb+3Kkz1t7QL5(XSq{CkC%luq$s}m3XlOzQW zbbx2M#?g@P>r~ZPp)^D!Tq|^E2Aa6WqOVm}#`@T2YIQ9oLuJ)8L!&R>bJE4lC7^D3 zSZu+~m4x>WE!}bA4mtjgE;2@nn+0`2pd&0g5Qj#jBDOwII*Gl9Qh!%l{5=`|gUbI! zt@!{moj2dM{VMZO86becFye851Kn;e!->Owv+Lv2ZaC`#W`d}CvPpg%=c()Ua%~MK z{CgNl5;WNdwH^IlRwjMDIzU7?rItjuP)@()7DCF>4&C9I`6JfJ{i*B5-=-)D)2uu} zk#Xr?V14Tsct`tcxA}0&&Qk$km=be}Bc$w|A>aQ+&SDY-i2sOfNm?YGF29{^|KWI0 zdZp`;qSf?eBU_62PMOFZBe%UeDFk-MOp*MYaT@GSddyh#jADqtN+7JKc^|Ls99|tp z_w_1m_E(U6YH(aVV3-vTtp7fI59eg1Jqy9w7UHokB+mhI#Va%^09FjPSYZElCYS4V!*0%umg!<}lFKVF#-g${ z-R6eQf3*%qjCsHREL${PL&U)?r~n<2G$dn47pC(jD2UW?yQ@aQM)u&ivZr_HAP`Iu zk}C;zAo#(~4FE56akyQ*!8FqV)hkU=E$W5EQ$(?8PX0y)oqj-Hiyrc=i-tJO7IZZF z5Ho0OUD0x0wJ2w~Klk`BZ>C^W$tCY32#~Wq)u)$zF7VUeoe!A!Wi`wD~p zcEl40`Y2Ibdk?d|I<2?#8*jd8GCafn1n>0zJo$2E&^G;|GT&$eSssEIrCZYOoWoz(Z;$lk{G*&2mTZmFc&@A^)GCt>t#k`2k_!nW?Wn6Q zxS5bZzSNV>My$mNrQImmwN^M$zN0jjO>0dGkU}V$tyMLN%!aS`v=cMpes{h94+FP< zI%guh=b_w!+owmJ7`*9>xx+J0q5DrCuyDxQo+LXAiYzU;1qK3ONnir)?MB+V3~Y5a2~hB#w~WM-NGq$=src4 z!5F3H_Xw!knmKbeZakAmgH%Oo%nI%Y=S-PY1=c*#7Hly%D?%BDcSaJP!_xq2%26*2+MV}Y!l zQ{;*bw=LL2h;RU0m{*umV{{F76IJ1KR#|4y100wQw!M7<550W8{)K(};vaj@HX2U@ zc|L+9bCn{Qy&X0&HYXy*?#Ino7d9=sF+|3etj7v8j^MF}HX_TppVv*Hmp zpYhq^AquoLSlHgqhZ0kh>-aaK)8#}TzOaLHWG%4JE2pN(-dVbls)^m=s11XaZO}4&#xr>h7?444Q;lH@05MsJ3{XBE-#d(zG(Evp96r z&5A}p05kH2JUvF$G4K4oC681@nFbHFj25z~nuzAA2vfRs@Vp_GQe1vhj0ekD?nq`| zFp8;O&}sOk8eJ5FI4d(@)4)EcHpkVBuA?t@ce~re>tR31+zr;1_298Vu6tcX96IEvjeAzio)Jl@%7ldA=#S_DE)77x|X=xO^ua$%Eb&!921fAvlLnr43# zF|1M{(7?9=8a++~ z7Pa7bIoXu&K&A+sa}fXa-|QkX@=aphqswDeZ>7mQotSOv#bq`>iZSr=mah27JZb}X zOjoDz^(}`F`@R)<`>uRO{|glw^Cjsls$u4J{aO0PBMo}vBwD8ZHIw0d-c$}qaE2pc0Wk^Z4@J4 zQ&Em>PDVmc@Q3z;X*0bAVVKPtThd%|esL3MOF-y+A-+<3BhdH=hJR*dynG$MYIJ1&I?Vls+sRE5P14qJi?nxTXm4n5PyC`K48 z`28;fdo~LG*>QI-8Q9Td_&E_ZD%EA){;9}DqGm!hXYep(Io*dJ?fElOmxteIUD}CR z17`{QhXTB0&JWQ6#%^HlfNOR@y9T0EFbo%-{~SRS?fqoyZXBS{i8rax4#s!;F(Cz8 zzM{|9pNOb;T+~_wgZN44)dCe(Y`D7AN~D9d&?yyVeHC_S7bU6>2;`96nM1#2V&;gM zBeL3|Q?-(Rz+8#Bf`1=u`@~#nD^Ez`P4SBZ982caXi*P%r+8-7$z_8_pBaSDm=!Gqk z#9kJ*1%RXd#)I<2!|QAd<>4j7TjaCXx`H{s+Y#9s$L!|%sL|Bd>?8)61d*)&{p9a2 g^#1dJaD_}ohW>1QNd4gsc!&#J*VNT0yJ{WwUj*t;DF6Tf literal 1212 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