From df857171d031de926cf3d9e3dcbfdb33506ef014 Mon Sep 17 00:00:00 2001 From: TheDanseMacabre <57339900+TheDanseMacabre@users.noreply.github.com> Date: Wed, 23 Sep 2020 04:50:50 -0400 Subject: [PATCH] Danse's Gun Changes: 3 - cleaning up my mess edition (#10043) --- .../projectiles/guns/projectile/automatic.dm | 4 ++-- icons/obj/guns/arifle.dmi | Bin 2850 -> 2848 bytes icons/obj/guns/carbine.dmi | Bin 4798 -> 4442 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 62ff9834f93..469e81d1122 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -237,9 +237,9 @@ /obj/item/gun/projectile/automatic/rifle/z8/update_icon() ..() if(ammo_magazine) - icon_state = "carbine-[round(ammo_magazine.stored_ammo.len,2)]" - else icon_state = "carbine" + else + icon_state = "carbine-empty" if(wielded) item_state = "carbine-wielded" else diff --git a/icons/obj/guns/arifle.dmi b/icons/obj/guns/arifle.dmi index 2ad8a58f09cd180bb23d3a547b8bbb585f18b1ee..1dc0ed591ea83eafb57811c9af80c9ad7c50c7fb 100644 GIT binary patch delta 48 zcmV-00MGxT7N8ce7y$vPlNkYH5YtV~EhwoZQgM7v212C?VUvylHVCza)vZ#|WTmsr G0agi|(h?j1 delta 50 zcmV-20L}lP7NQog7y$vRlNkYH5{pmGEhwoZR&h=SLZt~lmAYV)i~%+XEgaR~g!Y;` Iv&sQh39~p7O#lD@ diff --git a/icons/obj/guns/carbine.dmi b/icons/obj/guns/carbine.dmi index bd2bcf30e3f0c774d6b3511fde01f366966afcce..3da64335974303ca21ee8f41a308f9f4eb039585 100644 GIT binary patch literal 4442 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 literal 4798 zcma)AcT^K;yPse}0O?H-G$<^fRAB*^E>%!KlujfRX;MOyZh{~vU5OM0jEG1F6{&&H z%Tg3XM1&&P1xe1KkedGX@vce#7(7MHJUTJ<({zbl>4EL zVAYT*Cfk^t8qD`H?LHe0x7#9e4&su>RiX$F+@+ZYA1-}~=y@GgH}%%NJu5@*gnWh= zI|uC^+x+r@+s$fHb}h^{_?sm@KLPCGwLse<_KN^ z0G>`0gG*N7dE|Vwm*_%%Z>#t~#wqVi^7O5-hVVV#I`x}Vui!g@kItGu3fp>_0V{a% z%r7l67d?&afOE{zVnCQhoq<_>uBeT@*1P!u1_){Q+mR$^(>lx$wU zbgS^D{kOi|spFIs58DGz#(Kqb5}bWAQl)hv;^#i&`BTpx5smf3BVh}g9ol z2Nqz8*~EjhMxR9S=@z|9B@!|G$!xLh+_CMCc7FrF-|r?W+CD$~h-G&UJNH<^#NF{4 zINxR5#U=}($~UKUw!~*MQOrk;8@)31oI1#OS7+f@RDKiz>e}w(!r_uCB&wNU>h5?@ z6$`gOb{(uu)a`WDG=4YP1f(989nJ|>&!RL_=H^3#Sq9)*>;LaD=S-q*- zE#(W$eYb6L8Y?GA!5`JuTN{B75~0Yo95>*G!y->T`@5z7&z}3cKos~+X}I0%o8);J zIAyMR+Ez+Z@;!cXDlaV#>ddWUQMI#k2hf$^4J^tJ4i3Jp^mN&kKSFoD_ zTn(7*fT7HovJQhAMbAFIe1pKFQBhq@2=!Hy&K_{M?ge9Q6MK5q=o&u^GjN~AS1Fz3 z-D)QOV=E#hEzR}z?S9+4)xDoTKT%g#Pm0z?FCJJS+MrrmT9=EiKevmi?70aiaVFNP`0e9`v2D2|L=IQ0sJb;B2w+A=oCN!V?#;9iYt%GrZs zZHtT2KNl7tz*2|<07%A8OxU9&pw88PzTHYpV{pax)zylb2dfM2yYOYwvB3`?*f7HB z4uez2uH6NWBU>V^wZhi&7M`ZFBKZwdQc}E_?3|oJ#NYMU53B5u#3~BK$__LHFNgy}sUG<+t&Q^Y^98vcs6WrmOm3$ z;%k*on0^0s`OE;Uldqraq3hR;h~dzC+l*BZz99H$G@50puTSV_M6{xmbW+Onw74~6 z^_{FZ?spcjLmDVv@V2!&WQ|Vk*VH40b)pP?raf*1%h$9)DbT0>5eI+$-LYU=zHet` zTonK4qt@a307@|$_<9o-*Uqh{uh4W>b-Kg>VwW&-@Ln0a>#PVh$*}UU9P+p8?dcio zd=T}1MZS%uQc9-konS!P(n)v6YkWqGvh~b^Df9?{FmaJSDA81iqqgca2nVJQ4JoOr zX)IW?WQnHE5NH57X+6vi#g{0&v(-A)me!o$gO03O*~HajJQkyzeA$FdE*ec9&k5%g zGs!r~o`9r0SieuL+;9~bu8yg=^(dFJ9SAv+$g^?td)-2;;F{^BRysfZy)x{H9TN+b zSu>yBHhuR2%4-LzF2rt47Eiq{>P;+jNB_mnWtoRXrsS5MlS8-DI=> z20Oco`x6N362kE}X+V@UUrX2E{mqO>R?o;t2NiL#I!I~8Xxsvl_@b2YF7#2 z`X8G0H-G#sYG%ExG0hvSQcKd1H;FnIF3kE6f?fs(AOU}~!Entgqq97KqHoj!KYRj# z4-*xLnPlwG2MIsE3~fYy7`2`eJDA%_b7Q(Ji7U(H>>kA9XXjb9`xw;bxg6kn>62j) zXtZQi@80v*R?^o)HD#_^Sd`n)DG|LRN8EFDSd1i&2kifT-xDnku;u-^gZN18LyteN zUx0*r3p%0&0!GEYR14RRh)mI~>ln!!wc%D3~g)H~gq;&m`ZEiH1RLNi9d4vEx7ulsXA3Oz1+*gMdm zYG_7Jrki7dbw^{wmYSUdtt+=Dxh!K|f$EzSXv2_J)-5xC+%O z3GUnNwO0bam3j*sx8U&f~^9xkKtFdo37LBf9Yrb#7&( z)wh92Ohd}U0isfmik_lS$6Ut)X}Rr!EBk1WO=n7rpMRniqc~)R-S!OuAYiw{dS_#y z)lf`v#-ULxlw-=*oidsuKwn9C5R3_Om$6Gl9x8pk07DvTze1*U~Rf387W_EJ=KgoB08G+h*VhU>+AQ; z2Q@_P$pg4O!2f_WSzz@oMmpi>#Zmb;3%%H~n;$F=;b+Sm^TI>P-?!l;Djuw%H!T|}GY z=S-RG721e~@Bk~_VYnk*hzQ*bjyPLC`T9gQLMmD=|Gg*4zeF4Kkf-L^E^(XxqqY1e znEp5K`ELsxnG~1X*90*;Rbi3H@TFq=JfRbgRopn7r?n-!TVNn$Nb_sH(fUn=0T}9O zy%L(Xp^R%dB4F!PSUPI_8U_Mz6A7WmpSdQpfp2E>Spt zW(3Rqp_QyudXJB!=S)2inu_2=aa4ZZaSn_15S+$zq^RB1QXeX89sStq2YHf(;Q*v7 zrn*kGZL^{c{d%9qs{xfpIe2H`#E8-Hnjg%&=~v1zG`}LZ5ZZp&XJPqF)6&5N2UJSi z2bF-z?;0Zn;#kARCySc!3-W3HajKin^_`bCs??O^o3}@0{nL|WreDxR1d6kCrP9Xy zpY6nFW9qi-cEo~_u|A6?ivQ`=|LuDHmzn>67kEnppiF$5s-5H?V;`c;&R=NmDOasm zDyjX(S^W)V3xIqb7uUP1qL(4Dv%6dtxioLflluI=gh?4n3hv|Bg2~ZJ`@=0f^@N|t zoJi{PuA*#IH+gLAZgBf;jqTQj-3B!zgy|mSR?Wm+ZP^na@y2gUbhC~>>`s7C74%Ir zUNOg=>2mD^mB$xRJ#yh&3$N+`(R`c0vl^`&_S4m}y?bk6@2&zU95$0YEbL-}B1Vcr zL3c1J{4ug8${5ct4|?I)VkDVbpVmq8DlgB>TzKdzRP?Ebh_Sn*5UNFXVD+g%%lW!C znJ5ZSjb#?!2l-O1iQf3rq zT4dA~(l|f(#ttM@BaE}H>PQQ?uXkp9Z|_))i$b(`*IZyNAM{m-RE3V6K2G}kq zjBU+Vt5FVfUTkmuAlH*@9P_y*1zficPxBjIlIH)!JYX&?k`=hQ-^{kk*-Q#oKF6wX zxbktVFt-(ct%XUwF}8ay@XoDUugcWf2&(}y2dV>9Odd5Qs4?Z1QYlkZVuNtnWZ`%f z%fP@umcl(SVf3;A-5*MKJYn z@k=u}`_QNmr0qIWXlhD|82+Qr#Nfc&#V(4cke`M?UjUDke4M(w@{1dP#q(-?zJJZ= zb$Do)dSPK9*`H~|$P4xl3I2ZteFAhwZO>CY#5I?7-TNG{*(=4VlwkAMcpm%~z@T20R}AMH$Bx&rcD_PI*MC>W(oKt)idO8wa2f4<1*iyc0(G~)pI5@9qpRz_ z%uYwnm3I;*cJ}riwnWCwza%`~DyvSNb>QnRbAFy?d6H{GnR