From 64bc2abec38c8207a45891124ee4676e05d7720e Mon Sep 17 00:00:00 2001 From: paprka Date: Thu, 7 Aug 2014 14:52:40 -0700 Subject: [PATCH] sprite and fix --- code/modules/projectiles/guns/energy/stun.dm | 1 - icons/obj/gun.dmi | Bin 45947 -> 46398 bytes 2 files changed, 1 deletion(-) diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index b90afcaa925..c4b396afeab 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -102,7 +102,6 @@ name = "energy crossbow" desc = "A weapon favored by syndicate carp hunters." icon_state = "crossbowlarge" - item_state = "crossbowlarge" w_class = 3.0 force = 10 m_amt = 200000 diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index 2aeea5c45a7be00802d8128ba6762ab0967207aa..c76b374a7cb1e866287198be24fb6a28415842db 100644 GIT binary patch delta 6305 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 delta 5851 zcmZWtc{r4B)Sj_Mvdi8KvJ{fRkZo*PvP+aDM3P;yGw+Zh+lWGTQDhB~-9*_Mku2Gl zGP09(#u(r0_kI6;^T%B8`(Dp-&VA0gpZh#*D^y1Ws^p8%-_@eEG)g$sN=g0t=S>NY z^KS6SuIUcr_nsLw5_Xr0{7FDV2sa)-E7~SD3$%(=p=PZB2xdu8SEOlrtCoe9F#{-+ z*iogdw`4%(9iKO{=HvCHH1D35l(1@CkT>*OdY8=Y{L=Yehh}o@n|l)Ov>uz@-y*J^ z{S!T6!8WDS;kS65rj;`^#%O=Pg#9wZXAR!8bX-@9CzDuKGTx;_^+0dw^{!E93h&Ug zX(}b6)IzQ5cs=*=33`^IW{Mi9r*#9|*>@&W+mw!*#RUbQtq8@%dai(TSA(c| zZ{F_L)dU)-iaD0;`1FK;nut*wMb8|EVE;}!q-iNT>Lyw}GFRbR-%jmR=sbnoC z5!oJfll5cKH{$TF{WjP;wO`gy5PW4xG9>@)XhR=MH$p^HZ{iQqW>331invV-*UHSs z%*g`5i`{rH@Qdut)ZGf8aI^Qj>+}2fEsO(^+U?sJ)>f_)`?13(Zr|jWQKj%JEO=kT zw-Q|MP*vqdTHcXYk4LRO(L^4xNO0wkb8%T1KB}3Ybb3ENR~Q)-Mff|-U?Z_SXngjIXwF#fI z+Jb3&n7loxIY|?42o2#3m7puNQAD=>&%&>tUq#VqvIZ`eQQ`(nCntI!Z1;M4dK?3h zr=O!6!(V0N@$%{d2o3O+M)Mc5;WVu-_`pizMCXDz69qpL^+C`D!$ipbc_;tw#EZ(h zD?*=c#Q{TgjDfR26g;+or;e`Ya+h=9^{@0x+25l;?_fM{g6EZ%|G01ZzuZO@?mpAbi9U7+_sL)wLU0=# z8NM~MZyV;XU`(|caEqu||1ren6*V-3S0L0Pz1~ENoRRzjlbjF#(mOFZNnJR}F{%l0 zQx}>1!=#XH-94Vr$uD%;9-xp@7&kADF~ufj`6@HR*bkL&4J7{bz|QL zw$;81Z0HP8EbKo$&l21V9TCH1!7Hm2PfZ9@mvnKDs3Rh596Z84?)G1GnAbN<9dA9z z^ocsNQ+Dj9h zRsoWhk*?pfFNO2tJ8o=uGe(=p{Mkd;Vn6s?f4oj3m`NVEmLnxk^iKffQ7yzv*=^=@ zQbWgz-yr{R{%aX8E>m-IbF;Y9Q90VsYDKFnDu8~8njZ~(DrjiPc$z6Ax7+z5O|14? zdcPtHMD|`{f4`fjH`34|^|joCn(g1+XXP|iDY1ieU%FsFZhLuO*W$N7m#j=|-9><+kji_J<0)hLQt zzp1U|m_;8|EI&7uq+~q*dnl4ZCWj*fRxA;yPtYblc)-6+H=r3aJ@AU|mUe_Gb?=L z-|RuZlEcS_;()`E0b@lJhySBrpgnI23ZNjJLNLk_wH{*`F41ka8!oQ|7aQW-oe1Lc zl#Hjh7O)b)znz^s4i2!;u&{Ywr5^I_Y^7G~9@Dn(`!?YulCx&-Y)`7}F!^!)*n;)R z5&y^G(R+a>5AY2NGv&uipPHK=FwtaGrlBOi!6tkQkCg>h>0RX%Nh^kuTNl@5UR|Nm z4^=&^lk>1Q+Kd)Rq=2PY6CbsksP$1jCM)lmVIB>T1jx-3mSSLN+^ThDJ~OVR2Jy3A z+Y60sgt57zhqt?>%FhFMF%&9~7_Pp%zu&RC2LhXl$A0}0fUq<0D{Q zWMp$i(ZOCh>x0|AgU`C#9%vo$5;$&(tm?lQ_r8n%!zUtiO%V8q$4*xG?0HN!i5DV6 z+Gh^(BE9Bjt=nCLBBq(lih3O)=+kmv@zhb=6j1_o442z8segPf9^dRXhZJwLsr)?_ zR0-rE0q}@w5~dE1^N`I2J+_6 zTJpfeS2AScs7ice_6pCbZ}56E$nE~Lrq3(x>nkeWwN+T2r6akZ z!F>Ko&WIrMJE5PIq8se4q~(^VqLt)$#g8~tmrBK<)_`fCkQ$rj=K9GWrHui7(c`OA zHBk15f8+ME?w@0J*Wa2FV(?h|-`HG2jN*xJ#~uKE>E6{AH1oMVZ;dMdA~{lY>znmx zL8(}9$t$^Z8!9aS$v^8Mmie@<|6ArexXjnpRHD$1^Vp%YWo^2$d6{3M9e(jqwL@DC zzi z4D8>YiMUYd!_>X_NcQd};_l&C5lpl*iAI|Ar?$DRX|09uqYt+l%Hqny`~#FW>krZ2 zH^)VwF6eSjV9gVa=UdWCY=YsBdEZCUR8_uI5=e3?6Dfk_3Y|;-n>w&TviYp%!F;ul zH7DG_p&UTlWa4Xph`wFdDo}!!AOFURB2c68C|BWshe66Yo-4!eJMdV(fLd15!*B+j z*3eaO>0PVXhSXno$kS&6&l4CMDJ$(+_ zO&!xIG)#_W@6Enb1iR)Wso~ncaDiE6RV4>eR^n@@riS2`>&oV+YG_a@*%|+-hoyqB z8#AgG$ylK{<*;hfs^jBKJiksd*F0Uj);2tlJRy9U^+z5_m8jEbU@- ze+bq}axZs8vw!O=QkLlImfE4#$e1_R-qyo!n-aRwG}CkghE?Q0az`tj8zdZVWGqA0 zRgwiqjg3WfgGM@hBtq$cN>V>Ut$>rWJbl#jb|)UG%?WVo2%Lb)WsnSYe}7BYR^A^O zFa*ObzZ|c2#+1z6w6nt>-ujg$ZEMs@bunU_1c6VGZ_~29g2$m2l1}2{7$0s-H74M( zt!H@ht5Q;5mr#&JDBnfe9-}X}8k7%XF{f(yUcsRVd| zxhH_;!1_KvsFQCCf@7|@+`lgik&ux|x2m-3?MmdQ$7QeRIeLGT$F=H*JJ11-U~TFV z%3I_Dde}t{9Z*}#$`^OQW8HfC`tB_*E?Q`5QCU^kd@nL8& z;hM7AVexjJJ}=^P4%ch7=r~*IkNE&{Z-m69OD|5Bb&S&SJPQhTS)Nh|n@Cg^45F{E zuVH5=z$~ByhvGV(Jw4Q?#6mILcR3r*GL>OyE~5@E6P9vc`rY2$Ie43U;q~5LujlrH zk)>se0T&O51{LHMCYCKFIT@m{yip1Tnc z?%x*cN`O+fVlD@(cA0KvG>0g7NO*qv7*srmt9-%^DWzfqQDQ}Ce2I<4V(IgF3NkVx zJ0D7Qz2T~8UGMqpq2%r>%$|*tRr* zy0_YUT6v$mGav^*O43)LkeoJ?kG1>x1AMm_8pZDmh$TGl-2Q#b&4b$FW~59Tgt9B{ zICN3NG7tX0R-9d-*7>VzWW)q&2yrNm{vUmLPTdnCkMbZC(va}&cAY!dPH5}jjSZxy zO6A)VLD#(;JqMUCMRjnBNlD-atRTMPN_`L9zJdVAfG~Arn$gDcu&L*RM2dMQUvL~9SU*Qnt3{&qdg+c-m^7wPsNaanXtGh zJ0o?y|K@3lz)KiBiT@VYdR~ZhioF{gkalQOm3XLAlcYatNFuDvGJ;u|Lb3|>jyjxn zynq$o8lRf78yy>?hac_}ZSM&K7;`X6(6uF9kgPEMYM#Ky;Kg8>A{XuxrNY%E4QhS>na zOm`-Z_?Ze)j8Po;-tn?XM?NqlnK-19xq2>~qJJ{?{0vfKdwV-JG4bix>ep{F?Fpl! zRz*ccIv=MfK2>iDKCoRoIlh>tPEk@;QISQH5A#Kro*r^j9Y?z%EWtp_>IY2+a2wvZ zK?O0&xC)h(l?6`Mx@fREWSdPfo%8p_Jfrpq{VVg1fQ zKD@n1-lYi%2`Q2>b71*yUFC?%<-qo>+-)HZwBa7}geSl?9$x<4e>XG(rf`a9uk$93 zm}Wv=tBcUCv{sjp+nr4&%=}IJ$YcgG#YUcrB2elTeDL#N@WUszpQEOl^Ks|2(ff71 zCp4-mu%C#mL9=Q7oVN^7a2j~y^ad`~O_J?ru_?>Z1yh{0IR1KQx8jqTu^W9Lo1a)o zNJ+V*iWztOl>F{A6D88gC(zn&YB!D?9o*op`6tI&KzGK>d&$SkE74s|n(__MaeAHS#FsBlS*^mFUQxqey1RcTscf9G-onDm zjYnY04sP>9LPJBZI(5)kT3bsVV@SryB;?^zZdei&_p92u`q4N-Ks}VRqM`z1(gLxo zV4yW=c;Olb9XmHMUEZSCHhNNdO;hgNxg#Yj%XR_#z)V=OFKyg{{)1aF5H`4q(-6)b z0%Wt1CI%e^48QtF+OjsgB5yx@NdDU0U07D;kxZ0*Qu+yrP{XstWWg0$E`Kp*&ENG} z5R1(ktfvUQ>*R%-n47cxrgK~Rp2H4Fh6)FcF^U7B5bu4Dsh z@3!+#pFWjBBCQ&T@4Z(54Z{aAh=AJ<3=E!gPSCu+#T5q@#=U#OrKP2G5vZUY_ok=0 z@G}cY&GZ-fBfWb%FYsDrthhOysmIRwmo-VBuoScYySjzm`=#D1JoTOaAERfk6?^l= zCnjF^^prBmRec^EP1E1J#=NF1u~_NQ&$o{h4mx(%Ez~?c7}EhwV@KSaD-VTaW^6_d zd-(e$Ma;%P$)daz)_b7)1g)f#33HtDuBzX-YoFQrOxp{?&cVS3)(2>xPz+DcbU9D{ zpzGBNf(#}T2i`L26kKE9{f_u#ISz8MB44IABySAsS@@sdEdyAI9S-aIL}P;+U%;}+ z_F5AFC}%}` z*?f995;*P^?csJ2%NwlH4l2@dM}zhPv6D|q#I?D+)OA)TpW6SsQhyQ6Fr=9Nrlv{p zYEQu({S>^IY1()p)-_7{+LOH2decWTj|>l)aZwbu9BDlH+|CQW)bsV5pgN%uI&Z&0 zC87&U_v7V`;EoKQE2}^d8v92~jc-xn;>+fInI8WQ1ZRgUpCt;uZdBw`>F)+AlKE1f zz513$n+vum;2qrs^F65WTBleD2Q_9nBdLF*Un{e%(hgebK#!37njx^)pz#9#$M@fqyhY&q|IU;6V)%^3=wEi3lEVf&c%3j4CyM`6KuZb0!M} O{25#~(W%sOjQSsm;#|Q1