From a65e0bca7eda1c17d028246cb440b69e2d953b56 Mon Sep 17 00:00:00 2001 From: TheFlagbearer Date: Wed, 27 May 2015 16:51:00 -0400 Subject: [PATCH] Real merge fix Merge conflicts aren't my strong suit. --- icons/obj/clothing/uniforms.dmi | Bin 70212 -> 70214 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index b9dea0a7c28231980f2775aeda77e8e6e7f00802..3380328db36a61feb7ecd3493ab606f7123eac18 100644 GIT binary patch delta 3069 zcmV)WST*lird zPKq?w1ZM;;>{l3YB+iJt`Z6WW-sI_1%-T*0ga5@fcffBXlH!-Bdwc%tN{)6-3S59jCe?;lQ2fn^Q-_@i~|e11N^nd9JpH>W2r+Ro4C_ot^t zDe>|9cc`|VQnfM3R}(5qd9}CPImU7`u{n~n_q+w^_Li&iZbHf)S%|YqIjWt+=4R4F zHs-mr>$2H;UMNd1Y6}>6F`>j>97TJvRBWb1$rF=CTL~AaM#OwAPHjlHtx`hH_W5V} zN9-fhad<}S`&)dfz{y4ta`iI!Ma8>F6!y)oxi zvVAH_l4qclxQIkSA{9H6#UZPmCTiPV_=y64o}N5M+Rx8_=l8$-@8>^mB+3rU)RQD&y|M`dmL}I_DaGD(j^wWGDhi%-3q?DU~T@cMw(f zAPJmI1_D-3%Urs+_5mjCj+vwbJKuBvl-bU&-wFx@Hz%Asy7axUp!ggIL&+cyZ5Vl# z2*fzQ?r4>fh&25hlB*iO?pTOBrS1aa;I5FZuOnScXJEyXaRMZN*f{_VQFA)x2DPdO ziuJz-3wG;2Y(6b)pQ^H->VBa_SZ0UeP}&>^yI6W)2=|$`{QEw= zLfyZ4K(NF49+B(#;vun)Pacq}jqH^hP?Sr=e5?i0ZkI>Noi$UWWg$^O(5_M|>tv^- z@91iyH%Z`B;Ep1H0e_P;f$@Hmgyq?GlLU<;dB^ zt0>qgmI91(RXk7FMA}QMP)C-BHsI2#o)w5dM=_3sHBKdedZbYeL%Efq$kqC&Vz!i= zyDN73-^%MdM{Q7i_x=&sE*G`!*r24;TaeVyW^i&vYr$^$>>i*)X%EnqloES!z_k+b zfyCnN(OIHJ>^XCyMQCGSu##vI!osZ$#+U4X#!IAHp^2N$0QO^~1GWbn^rW?6H&i`jH2zd)gXVmZG+xtwb+4UfT|of!cN#`p^!@ z`|Yxb_)+DY_nQDE<`_;Yt;iM1ZWb;~xw%NK0jG6g$}Nr7Dceo+%gF0e z;uW~>1nFEUW1~V0oFlm_hIY#6ngbLwNt8~yg90djEbD~{c(=L+y4nq+qf{O+=F};# zb~#e^6K|X)uhWW*?ixufI$;;s)>SHdkj}L2SXbr(yDP&lDHqC;NbFAc+f-{>iYDL@ z@!rpXbSMo)T_AM@ebkwUt|NQUc%8tPDr!wyr`%Dg%MEyURaq9`{~BDN3cQhOpU@f; zz?MHHmpSr;4|6K36a}B(My}(h%D+8-{PJ>s`TXhhFA8Ad1mGfR#Dg>imox-G1VsXY;D^l>BLDyb0|U9Y*W1)xw-JE) zrsrVSUAK{Yd%aCyV4&gWke!_^XJ=>2xw*NmHnq+Gvzqf)QJwy-UAtV$j1&QvzzYE% zf51qx+jyo!Tjc_QKp=2Wrv<>oi4)ts(O#_nQpn26l7|l;-ds>$$+&Uj0F-@wrB*e3 z_;ACb0J*uj^46_e2@MTp?%cWj^rt`7wz+fX5*ixH)~#E0cfzXkcXswF6DLk&=+L16 z?Ao=<5D{?Cq^IP=CEMu@e7J7`tA{M%f5UwX7-%-j&d0rh!zJ4divn!eut7e0-A|eI zk8^UM*(|?gHp_u#vpnk`=j5Z;{ge$GHV6?Q5C{Yvq*DSwb?(nS_ng}sty*q`2mp9z zZ#?gO9RTMx6BroCxN+l@UjMnxyz_Mc@9d2?!mL~J^YiJKy^?-=Qs|exlKlL9f5UAS z6co4>0l)wK@7c9$7X<|chS~n0X#+(Bj32Uu4}kGa&c9_Fz1gr~gS>k6Y8vbn0F?au zIGbddl7Aluput|j>eZ`-2oMMaf(~*?Nq|p2`K08|$#34g*=@OA^lA8ChF?FNcaGi) zSg5M1QUpNMt=!ws!tUMwi}Da*fBnhL&6VfQoy+<2=Q(iT0Gl>#LVo`xq`PJ#zyA^| zR;=K_fdc@{ojaEmD^|#QCgpA3yt&P~#fum7*T4StqU|o1)kBuBy2UXlB0yzklNd0X zDf8yAZs|&<%$q~v@F^a#DG&$*R}+_<1F(7XW~senJ$d7eH>BOWcLVUwe}Q!F?Pmd? zyu2KMd;3{<=Ri6DyLaz4bSA+0^XCCrzI-`pX=y}!zK*oCG?p)4?ozKe$BrFyTYl=) zDSrR^-(R%d;CIDx@-$roa2=1GmMR4K> z&VIiQfSEIAiYS0UAP{tre@+R2l#~51ml8}05JG?g1Y z4X|Yo+sDVJ-FiJ3Hf)%bnVH$<=UTjYvGzJMGgC5RI^eREqombCmN33)b4D#&J!FYt z(*XDF+vjq8;qb?7S+hvGaQNeP+X(~$fxtbT9s&ps4yLNAN)rKqf6MEtswzz=7(%0? zbLBcQY}hbq#fla33opEYudgqDettmnOa%4#g%@7X+8cE)r%s)sPoF;8v2z5#NM`O^ zz@1I6okf6i4ggqmw>x?AWXWo^GI{c3CQnvN?*m}VnnjZHvD!``5C{bA(`f-^$eSy@@KQBi;HgYkbJMX+x4h; zdxDnp{f(Ue-xB8@e_OAO;?6tolv7eth>VQHX0vHqWMm{MDSs*4dFP!X`(Gds2s(&l zu~@qL96HQ>_uVH)MMbq)UshJe#*G^dRRA9@m?nn@`VbT7!>ZE(e3x`HgHCMc(cU$b zRM%szu4nv`w+uOloSYoZ!8s2-s8NXe`g*2JnPS-I@5l;&MvwnTMn+OzUhXp9-&T1? zFq_S~pQk_|5Pw_=Tv1O0G}^g$gtd7!`1<++wLldy=W;0X_2ro|rQYFiFy0{BMkM!j zhOU0n-?cUy%Rl%)YPs%zTjc_QKp<$FD=Gr;Lt)aSNo_isO`A4#xkwRo91#H!2n5}g zD=Gr;LqRxsfj}S-T;k9BB3Un9?%VSpAOHOH<^1yb z(`jREQu6uv{M*mJoStstdpJLzfBkTJ3M^~r#~-az=kxRV%^U}Rzd1d5(RO}5zdt=K zN{Nr(zeBa{l&XzMzM4=`%Bwx)&M}soiOrFmJ?AY*x2If{cN0?f$UvM;%2DkkHaC+d zvN6w{U6;*X=Y_KLqPBs77ZXbC#Zj~eOT}hNlsqwMv=`w5)rf3gi&GoY?OiD$XZ!p! z{U!F1X}Q^!MY`>OtP|$KcNlTM@8bfI9c2w2Gnc*&vQxm&3Y=b)HS|YVEToRrAnQKT z3pT1Jz2cjRoRBBIB3vkSD$(Y8d6nF-WQhjs%9*=3dsG)VN$YCI&L&!7S#6MdD)z*j zSIPFNC`q1yQsN>K1&LJbOcsZ%cABVdci}%4@cZe>bEN%${Cs}@)4zWH;YOnDuuLwz z9NWbDtio^Be^Svb|$b4)Dp$nPE|HmiqT$pFGHo-^R_*E zaRjs}RTROR3#G(W)DHC|2^g#~$$&pJnP*LD>JPr8Mo9Z7P7L3CB-jI%q4 zDtnLwP9_6U0jp&$U0nMBlXk~U(t(-pxqr%R=htrq1%jIs&K({4URY3kj)S3OkcT#m zyh;ROoL_ge%1A_-{td}hjbC>x#GO)i0da6w$X>4_T}x+R#FK9VB!8GW01Z)dI_3to zst1bozXuC;>p%8tAhmx%dT3!>dFkCHoUrbx>|qJW`YrB>F- zPD$U<)kbfUKvm$5B7XsYlQe;lzNfLLhYg(e65N8$7*rE;;R1^;wO=Bva zp{04{)+R^xZXM(zYEOTlpgf`68oCJw3<{O1yA;X z@sm{)Y!piYc1En@4;i58)a0bwQ4B7}uo8;lRxffX;2YK0UxodN8Jqyx4G8}y{LVRGws zsLa?_ZlE~3!GDUx<^s^`%>+!E*agafUqA97bx&I(%Tm-fw3X-u$7|bxGEm#@LLb@z zd%s;45kIP&^L`Vc#2n(J(u!Q6>}KJ@l$(px8gN<{rrgqKowD6zUzjqu`U_KTdl`9M zO1uL1ogkenWlSo>z&Vn;VrZv~jyXUxlSJvHJ7|EywtrrjfOo5FpsU?5I!fh%&73;r z)h8_E)q7!z3ZC$0Z2kA`Pj&)@&u)8w+l5(LeiNx-7zo}Z&QZxaN zi1&U5q(f;a>H?`N=%da&bRF4)o7V|^siM}Tb;=#Jy4-+wSCwS}{;$CWs=ynm_6e;q z0c`nmnIt1msF+hnt^)|0QCX$v|C;dj{PD}n`Q`Jc)8FNc;sia4_~C;y1(!1g0b>D} zx0eM0S_OaHC1>R!?wRzIysTt90Le}ZIvs0TDn|XKBvsd+ZAP@)ydU3@>0J5^O zT01Rysz zR~|WXq*mrE2Cg>lne>zl;18@Gvc#os^^hg_w`fl%5C{Z<_PJsN06<`1Aouoqo4V^Z z0#M)d9PGO5Hga#Tw+RdkH2fU0v$N&w>})wVH@DTM))`<{bN(u-)8DmgmrI$^A|Shs zXDYN+t|ynZ3jrU0Kp+qZ1Q(~%0$}3AiS6F#FIImkWMyT^!-o%VE~u|$+_-T7%D%o* zs~SFhxM5L%+}vDw>(;G=hK4eC?p%KQ)1PYF+_`fJ4Gm@M)~&ibVb%FNJA0Lh6DKls z=uiN5?b>Ci2-vV;gM9S5pEBzo=j1@MS$@fEmIKXZdDcIF&dEow`zaeXY%s*`J(Hf2 z50`AGH}K)U1*{&jgb(*EV4&G7J0JH34wq~fQ2>EJAm{*{5&)`mf9|>G+}>c-aw9|l zz&m^6dFSf@IJcR=z(B^08>jU8&u!+NuLF2zZ@dv^-IAZ5PrvMy^xKm{zwDLd=jR)4 zv!I~BtqAyk{qKLzu3ft*C@3(@_J$1`7K z2>76B14RUkAF_lGfbmVvzhxVNKp+sb&m|=RKKbO6k~=5AdGlts<$BSl;eQ!^{czqn zdMjX|s;Wv608zJcZ$AsWcmFTSLxlAwH#b+FJ9jRB=g*(#z<~p7+O!Gz{g;sLnvMMa zORQM2f&&K*05Es%Tvn`DA?ulxw|VpCHtQBIUd&(r`qzuL(~~Ll=CE$*N~X-4L*no$ z9oGd9&2sv7Wr~#v9V^-MayJ=Ri95_Ok#` zUS1A=z`gw}ymKHOfZe-y8#)u<{Q2_$EMLByw6ruLK3_*#S{lojFL$Zen`6h0xh+3+ z>J-2K{qHZ@?s8Cj|1)RK1mNuV+Xzk^!F{u{2u>Wq+3&XjFmvWiL!tohZhBT)-8A<9 zVbkV}S~hdv0x=UnAP@*TNT&oqN=ga<)22;-lcCw^tNUrwrpeCJ^Ylb>>Wy~y4Vuc0 zo(9;mhwbCz({8;U3>!8~%FN7c^K&g;yjXjknVBgWF&%Kvn>J_EveiSD2HaS!3Q50X7`>+PszzGasX7E#lW#iPst(*AP@)y7w3|a0M#gfyVdxNiU3qyS65S0 zQ$u{vJM7uhTwYRA0zf=_s0A7u8+Etc9%=-@6Qri50K$N^|cWMm}1zP{LO zHsa#qa5x;;Y&OH~s@eZ4$IkwX`PON>n#6Fp#*oIJ~^P zFquqvd3g~R7e`=VAOi;u)Y=)1-L51Zsu2M7*b}sz?{DP%e`oHz^G-P>C56byNNhHn zwnaupl9H0bop;`8_yT`C&OQFNUJC>Qf#Bju7K^2;&!NNIci(+-R8&-(^<`ycY}~lf zPzCVef@yMipbs&DKCC(&z;{VEGw8&29_?L2Np(He>Uzd6dCQP<$jQmk9IW%ugBpdX zudipylqrUe|3^kfQeIx}GTz@-x!!bSg}=^@|C`O`OFkcgKp=m(lDVRu257W%?+9!2 zYVh^-1!{pRV$S7I=IhHdWlFun;b6Q$wv9~g>j>A{Y%Kra1F7Y@|814)jY#ej2m}KC zxS}EeKNKcSn$)JF+q7wua8g$gA_5=~2)Zj*R0QCMf^hNzfj}U*(z&7@2P_Z>1OkCT sAA|r92m}Iwpc|8j>=Tnv>>L*P|2a9FuRy=s`Tzg`07*qoM6N<$f|>@~y8r+H