From 2f0b5e31f49428f7c3c0111fcfbc2f252cc77168 Mon Sep 17 00:00:00 2001 From: DJSnapshot Date: Sat, 21 Dec 2013 22:58:24 -0800 Subject: [PATCH] Fix so magazines read correctly on the Colt M1911. Also notice for when the clip falls out. --- code/modules/projectiles/guns/projectile.dm | 1 + .../projectiles/guns/projectile/revolver.dm | 1 + icons/obj/ammo.dmi | Bin 4290 -> 4416 bytes 3 files changed, 2 insertions(+) diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index 685122e05c..ff56a95795 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -93,6 +93,7 @@ AM.loc = get_turf(src) empty_mag = null update_icon() + AM.update_icon() user << "\blue You unload magazine from \the [src]!" else user << "\red Nothing loaded in \the [src]!" diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index b6a305cbf7..a403cc6733 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -89,6 +89,7 @@ if(!loaded.len && empty_mag) empty_mag.loc = get_turf(src.loc) empty_mag = null + user << "The Magazine falls out and clatters on the floor!" return diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index b5a6f7f39df5cb5d8eed97d414bd54f0921d3308..a230140edca0d0028fc5312a0b5fef666b7f1541 100644 GIT binary patch delta 4140 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 HSmJ*GqdM=3 delta 4014 zcmY+Ec|6o>`^Udy86jH{q6TG&tR2~RLS!lHu}w`O$|z*4UrSjFCHpdD%aP?l4Pgw5 zP{=lxV`l7G1~H6nW}eP@&iTDwzklxgx~@O&*L}UO&-KAcbc(0FGN|*jc%4-h7WcgS zt8G}Ba)XE^4g`x_pjb{QcDLR(jX3pL+8wd0ssIB zylHg{&|jMH{1xLu?VJLQ?*$+p-}eu^kMsioRDLzS#V=NgA4(D~WRh$s@mDm;lC{kc zcb;l{oXlyKCT2NJA+I6g{xG62jMUPwLg5Mnx6kRU!+0vZgSDTcJ?m!{MQ2PWJw>1% zZaSC^sT-X|s-WA*K>v$^-3Naz%6_wW@Ak}K=EnF;&+RSUm5$4J(9W{*>CH=JD%TfZ z%gWfRaOAF3$91Q4kJ3!=o}tQJ>R^|Lc15sp`Pu1QZ2Wr0U7h9i<3~%S>r9TXWL(YP z_)8{sW?ba>C&^G}y^&cZwEX9#WA*s0>x<=PwdSDi+oTHASa|w;kv+cYtN?dn@Pg0& z*t^h?4_a#NN-b?{RX6<_GEt9JPpW$nkgjgXT zxEzJp=Pl#Dm+z0^t_gQLli2rjr?ubAG(UmB*Gx&-Z`nyfpz;yiPCj>wrOx=ki@Ku z=EeqgsC;t45n^OqIPPKR)O#U(^1QwaINlBEEK@IiWOfNN4E1)Nlqn%xUlB^H&f@ZB zYZ)4*Z)%y=mtI)O-_#m^dAT_`!k`$I0Z*=pv|?@uv2{?Q?^&3g`z^2GKI?XYJaA!4}R)=mpWPIqval_SyC-)B_K#yE@Iv1ul>RiF1d^6%$4hPq?)uxKO3jhA}Xx(DU%Bk^7HyRWFj~jT%9B;XB(Myq#f2-iq#-?(8-WMOXE=e-9_LohoW(3d(vF zmbdjNa{e}lzp}wL*V1^yzMRwg6D^B^G(U_87<;h02lLXzpX zZ;HbD1l`;y8S723M`Xz32CMhp>ay}jE<3$#`~ikPFw&$$wCH|hAGcEi-Ws04?*D!c zVxJJ6Z8F2JIC)^ez557aTlw7P20XVuL+i&{Nco?sK3g{W_utbQ`RDG)daX#w(?1K$})=vUF3MisJ4Qki7dd4J5_jJ1nQ zf?a(=!MM?5q4$9_X4~%u|n{$RPBkj`#1~ zQ#lfLwwpyOEs8-REWiBJ#fX4G7WO36*Kde3*p7pnya(^l5~p5ck(6x_9M#_NMdewukX9|aE_JYDcdLS92$7B+=M~uFJbo82r50E$vQ6B- z!YqUwL7r%? z4r)V%E~1{B*THrSqAV;dR;^`mImB4W$QWPC7~0(!hn6i-e)t977zbjT1`Gma&xKvy zXP4rR1&%TuVx+NTlw0g-GpU}6}kn~xvS`cJbt+rm;6 z3tl>>I`wgY`k$pAh+~7=Cx$YOczY#QiwqXnZlF1!(Fmm>4Tq8`W&;@%fa_xB> zS*Bwa-c*bbssYu9lpEc!OOd|!d|gblixNOnmoD3=iu;4|9s%v|>)*`8j{%iTBaTfc z#zGHrkE#XaR~57;#EAN$TiL+MqVI-D)bxX>`*XjnoXt$ZBS4YaG8PEnvSCY!wvD1F z`x}AWQzu$yMOEwEup5ysAUA=Vncvq8k3aMb6xZ-36NwVXag;=H&022degA|>@W{wa z(LL`qG6ekn=;5~vN|;xM3*V!%)50^aBJO}vyEH>A5-J=aD`_r=#FXOV(q*6^nfRBP7P!)4vitLe5qn(y9J zbWJ?)M)NLal{Pj(*COXEM8p4{rPBXKDdq!A6a*v3fGs}WS z#eXq6&p!M&6f^&48(>}#+9>9$bL99xD*}wZ%1a?m_Q`ut4*Qpuyw*YLCb!Hl@ly^f zaMcNo{5v8izsMKqV8Xwzp_wprnWl)Nz2%s|7&>(=*UKqLkJYc2a(p}t=|ke0&A%$` z)7|<4`URUK(J$GS8I)y3?3X!{D0FIb3A=x6e(`dmeBW#JbhsJmTM;<7X1n4Kfmq@5h!6e+lZK%OOn60MGC_n!CU{df zsV5;CA&R)#c6v822^EJ{cA4<{kmmgBb+x+yvF~I;lxwR;G%>=9!ykG|l&rg@qQtf^ zN8>o|c8b1|M)Ia&1#wy3QLfr9(Yx0EjYp~9HyrKsK?VBw!x|=EG@KWw*Ivflx6}r# zaJ&nPaR;b5Q7U119PdJ6ZUa2oQ7Q*6bJw0$<3gonQrs=|6$qR|RX8oXs9h^1{g%=a z9=R>W|w1tFVga>KWBg-6H(jxirg}Uwf&#HM=M8i>agj zc*#(#_E78&pdrVo9dQbZioRFt@LJ)hVj{(uXcnf=7Wa>MdjX)WmQ;AUq&X8Ku`&Fuk! zZ1TmbzKR$BBny};1&1orh|Qx=d&u;tcI$9h$9C{?P;{v$F#y29y#0)!-0K} zx-9IsSWarAt2smB=$Pv$tll6+>Gs*eFn8ym&0ACRm;c53>&6}1&ak~QLMI)*Ia=PQ zYi7>2gBL$RGgp!~&<#Io5yHCnWJ@hQ0vY)x;JN;-mF)&E27M4@cu@vf?SRiAc)I$^ z7+-p*+$ZSq{`?gm<}B7S)L+FQt;%YQ5z7~QxU<0O6wK?ymnqX@%G@$Kkqa(c*UAw@ zPCZSxJ=FHy)QLP;{G2SPC%lX{Wj*6i3|@t(Kr{~0?#QK854{s`r6~BcbKcVSlJ(|@ z>_ou*q!YufBnERhWC?k4jX(NdyDA`LZK6Fr;yLdl1tm84ukQvmWrWe~3?IUCuuz`U zg-3Sdsg)c5uWjJ%Nmo!5PCA?inDH<+p(X+^4i_X1f!Y;a(0QwGY7?DO#B@&lkQl`^ sXdCVKD>h)&?A+~vK>O)x|HFr4Kp0g|MCG!Hx_=eSO{|P-4B;{V1=Gsoga7~l