From b6fef2185c9874ab1aac233bf472f21faeb35146 Mon Sep 17 00:00:00 2001 From: shazbot194 Date: Sun, 25 Sep 2016 01:45:38 -0800 Subject: [PATCH] Changed the way smg & toy icon updates. Switched from using math to fit the icon's name to having the icon's name fit the math, also changed the normal SMG's mag so it can also updates properly. --- .../projectiles/ammunition/magazines.dm | 6 +++--- icons/obj/ammo.dmi | Bin 24099 -> 24289 bytes 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index 139126fe2c2..0f587c54bf4 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -269,7 +269,7 @@ /obj/item/ammo_box/magazine/smgm9mm/update_icon() ..() - icon_state = "[initial(icon_state)]-[round(ammo_count(),6)]" + icon_state = "[initial(icon_state)]-[round(ammo_count()+1,4)]" /obj/item/ammo_box/magazine/pistolm9mm name = "pistol magazine (9mm)" @@ -373,12 +373,12 @@ /obj/item/ammo_box/magazine/toy/smg name = "foam force SMG magazine" - icon_state = "smg9mm-30" + icon_state = "smg9mm-20" max_ammo = 20 /obj/item/ammo_box/magazine/toy/smg/update_icon() ..() - icon_state = "smg9mm-[round(ammo_count()+1,4)*6/4]" + icon_state = "smg9mm-[round(ammo_count()+1,4)]" /obj/item/ammo_box/magazine/toy/smg/riot ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index b6bbd8ab349323993bbbeb6690685be217bb0b51..a7db164c0fc06ad2f8a97d2cf108edee8f6de3f1 100644 GIT binary patch delta 3816 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 delta 3625 zcmZXU2T+qux5pn^=v|O19i{hQ<-_}aGk50RojEiA-7~xYv%lFr3oS&2%|yw9M2Hk2L6GLjg2{3TdbB7( zy`3$ID1(x9esp65*?yb9X5g8XW6(V#9`coGxmUf@5S}gQj0U7B_H;SH`{!pAUG1%A zrryq@-R~^zinhJW1(gV=fb;xXxm?=Xb`!yzsqt5@mlw?xy(?)8mKP`3?w!st*WLL# zF4bgaCSCBRXg)hah74pOQy^m|mSxV0?1Qdw%e`pm5*I+d>!?Vt&tR&uShP0$X!zVx zL|T+}fQZ?3fvb}5QV9GN{Fg$`bzvIUWFsC*PhGa#c_PHJqs^#yWk-uq>B^2~xN}E5 zsa81cl`?5EhG6m%>yP?OA(H=N9A;RhXO&G!<@OxRlV;U6p>(@7kuJ^J@mI`W3T@L% zvHEvK(r)cQr=Z?=wJRyrBtN<1`duawiCfmp61U7R!{jmyE<=Y|;!9ukvOkmrF@yZ_ zzN=s8XHMAQO&liM1tItRWf37$+h`bNTp)CxRd`4?k+1k{y7d9Iy>+@9_-;z8pFK6} zipfXKHTq5cle%906Gx7o9-jP^ePlyQhgke}JWP_DNs0m!do?b?Sw`GvGO?N4c!aNn zY;fHFLUPU@<@R)7ZY^X0o|3nRJk|0K`oz;~r?Shwd_#PMOIi4CqopNQdO=D23MT*U zE}&_5L)CsbzcJjcV7o>Z#Fa1dXKi6N6dN44ybvhTDc+OqDV+;N9Df!MLHCTJ6La|d zsKcIrASXyJ2P*S*gyyTT+HscZsfSw7mXdf#*kPT@!8giVr#O)Vj`OI%{1wWkXOVOW z2!k;>38hC#IO*Ohtm}C5;#R@NKxLq*U;>ahhQIeUhX*!)rhfun)kt<0<~9Ho^oHk* zAbx0@D4$L2QKp-3dXdz_1qVHcY}@&BF>1PX-Jq^t5s^)d%hY=jVnR7PVBV3fXHMDq zyVBc%me+a{(~Rq-$9|YtW^yG)VZ@o?BJC#~RL_(MO>X@6b`RZ6B5y$@QUVUA&nDgT zWp+XpZJI0SOoDHJ6rY@Brmj5_Tc4X{UWfmRI;lH~8d$X_gmA4s4oS=R9uH6Z(70Qs zGL~t) zL!r!|Mrz=|j0*hpS-{?-6pED6JV&{{)SLXQEh%Sc0-aB*s>22MiewYRz#J0r=7 z0Bq=n!hW7Qdgka^$k5Zz>2uud2mP!o=wDb*uaT?PQ8fekJ{POhKt=ul2&q~BpiC18 z$pO{i6y;-QyB10Rh>8&I4=OQg48a0a@-y!A_T&N5p{gA-Z5JrHc#bhRQ{> zY$S|Hu&hW8kgu>{5n~7_$XFiR|A_foQt|fQ{5)??((;zr$XItEgQj@4RIjZ1HTsi{ zbADNFJDVB1+yC`-5xHAW_=?{H!e(1XD&=Qemrka*B-kipD*K0s0k&8kT3SWGH0s@I zc0%PCo?1kp^ocrAcdNPlmZ6*9cN)NRHUlDk_eR8nP>2IaiT61GWAbqQMk_oaH_@hg zWxp}-)WwOGz`_2)`A=&)>!m3^RZ6@J+frHBniksdu&3PsfZv!~^K_IYU~D8yYtLES z+>{s+I;lni8jn-x_Ojs5@#p8~y^{V74%<&#Jn!EZ>7$O;jK&Ew@Fb{N+;)$lN^dp`D# z1?oDG(~*kLrAuEvAZhEile^|QYgtdfq=$Wgqo<>hc&(ulf89NaXex8&1QqQ4Xw{^XD5Eg0enL4yFw4^j7IiV+I~zfsxK|X7=G2@ z+%MeA9ecey2stlJg5t0ju(qV6T)Z0}F%f77CsfQJU45Nb-#>s+&iK?kZs5lho34^KIW_W-qj>cR*kI zHjW!juHk1l0xsgLQWr}JdkE-WO`lDUnucxWgU1&Nds!I7h3-E_M3}UZ$)_VP#g0l6 z@O|T=Aa3A=4nZL%R!TM>Z=HfosU+g%=P%V%hlIt&l~8^9cjg7e#l@8}a02}N1)?4Q zF9rT@&WMOPCFseyB7eUxJ;2Cl&f-b})7G|%o&Xpa8Ljyg0d2(ao|h8#X+oSR1WTK& zkGMG)lu+g*1^siL9NR3>A)#5so<{~NB7V2(gKT(XtTB3Gz{uGD1rk;gl|FOUJ*!^f zkE|yHypRpPfBJtRc-BSn;44X|VfUPkP2YsQB-6HMg8w{*nv-2RTWK1;MI!5U?CtGc z=wS^9>QfRGwZRK}_-}c%z}KrBI`D3aO=u0RGSkqK3d2zO4lk^L={5W;sU_HMo+MzCQ z^U=_cA41cQkaqqV_PfPs{__a$1H5(-`z8^uXiBsI!4GHiPY+hN_=}xSyZ~4rMU)58 zx7JELw}Vj$Cd)P4nMn%1sD4zh2t%ih3ekOps(YixQsSx1VmbS;`Mj%eUYS9j$E7nrxqJw4L zIX4>dBOUU*(hjR!)$m!dL0&vXG#6_>31INIL^S3#p_bq`VzG?rUW#URb={ZklFZl2<OaYxcj_zeCbi^`Fn4C-9;x1Zf{x9+D&4?R_OJyj?fp~i)+L;Q0U@kBM* zTXq4uYlN!_AmiA17D4kbDF0r_{2ls$|I>5gU8xxM%9OyG3Y4#v{OY~r#Mv-O0T)G~ z!j=~9EIW`pssfU>ARWa}uPh&xvd&B)6!vAy(PKv{VmAvk7}&c3a)U|olXtDLP)vrX({*1uPoJ&j} zjbd!i5|W|r%t`0nmW|IY|55gW9kBmSHee;Q5?r;YN3B^>s6uwBB~rbxTic7(Z9%y)Z#rp<=UHSYR)4a!aB<<4mGaMgS|A1V zm;lT=PjNgb{zuG@Z6EkoW=TkA8CTkJ^1Vxinb0ltkbbTbSy~Cme9=Fj=KsnJI~k30 z3dIU8M|ToRj=Q&nJ{BImxJ5IMb2E`bygH8v#Az}J*UO>sBgYrRXrV+Z(Nszbbab{Ga zm2y;v6`O$w3E>H;xk#*s9_PO9&EK4V*bZYW5#3H_^V=cf7eWP3cgQc>)crVGz&bt2 zX;$j)N8!YzB!0%+jvR454yreS{>Kr*Aty)CwD1@dR&F}Z9OjjSI>Ls4SU z6+Lko+Q>k;E&wc^CN2vYg-8x$9vkV*ntLj~UDe;%`CFJB4C)B1I@s7Fe!_S!} zMMJ}*q~ilYqhR*Feo<;kd3p3B){+n9TIyoIcF_jYd*9RQw?4p2Euhtst=7@@nSbf% zTkE{F!9H)^sV&XAe`vt5XRqSa)1`~A?-zz6$JRKr>)>6t8T;f>#m_*M#D4(3w(QaX