From 3fb3b491344503e810282fdff5df49aee37299b4 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Fri, 18 Sep 2015 20:09:57 +0800 Subject: [PATCH] Fixes --- .../projectiles/ammunition/magazines.dm | 2 +- .../research/designs/weapon_designs.dm | 4 ++-- icons/obj/guns/projectile.dmi | Bin 24804 -> 24802 bytes 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index 298e02a2cdf..db38846ba80 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -170,7 +170,7 @@ /obj/item/ammo_box/magazine/smgm9mm name = "SMG magazine (9mm)" - icon_state = "smg9mm-42" + icon_state = "smg9mm-30" ammo_type = /obj/item/ammo_casing/c9mm caliber = "9mm" max_ammo = 30 diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index d835fbe5f88..43df41fd1c9 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -215,7 +215,7 @@ name = "WT-550 Auto Gun Urnaium Magazine (9mmTX)" desc = "A 20 round urnaium tipped magazine for the out of date security WT-550 Auto Rifle" id = "mag_oldsmg_tx" - materials = list(MAT_METAL = 6000, MAT_SILVER = 400, MAT_URNAIUM = 2000) + materials = list(MAT_METAL = 6000, MAT_SILVER = 400, MAT_URANIUM = 2000) build_path = /obj/item/ammo_box/magazine/wt550m9/wttx //SABR Mags @@ -248,7 +248,7 @@ name = "SABR SMG Urnaium Magazine (9mmTX)" desc = "A 30-round urnaium tipped round magazine for the prototype submachine gun. Deals toxin damage, but less overall damage." id = "mag_smg_tx" - materials = list(MAT_METAL = 3000, MAT_GLASS = 200, MAT_URNAIUM = 1000) + materials = list(MAT_METAL = 3000, MAT_GLASS = 200, MAT_URANIUM = 1000) build_path = /obj/item/ammo_box/magazine/smgm9mm/toxin /datum/design/stunshell diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi index 89f6f6547f560a0233d3ef6ec9353146c900a6bc..415ce62a79703ad6591dd1940a3551b10e8d1cc5 100644 GIT binary patch delta 781 zcmV+o1M>Xj!2#mI0gxnr?s`;MbVOxyV{&P5bZKvH004NLotVpR+b|GC*Vb1E$+jva zI!@z-H-&>Di{uvyS{hSCC6OR0Kl=4uNOIDJ%sblIz`0kP;S67o>Ce|+Zy)LY{Vh3> z^V)RjE`9o*C#$orLY?l?wMbSqX;p{ej}J0Xx=SA%olJ8g_mHfAD(!r_ON(T6bh4%4 z_YG`ipo5HJ6$L7TJ`qm-wz3N~FoaJ@L_w!b zSiojpp5uZFb*@;pULKHC$pg78UK#_p&S4Pt^u4u?yr+0EjDzJ%*7+h0>q})#t+!5I zp|+8#A%${4E(fxIl&xW)urG)Kex=Cc=_y5y)MP1gmx*{umLhjq@eFbT<6bcA3B$l3 zkgh64&T6V5*=&ViwbVETe2HL7Uf7B!wt^o!b1`um+Y;2(8LNFT4FheAtbj2z&t+pg zRT;H5Tw%P(o1pyLZ}08fS+a^rZsv-pFrQ}E)DRR(qDtgFvf-&o{_#x+!#f;nSY~Rmz)E21fZ4QmK-RAH(m7{o_ zwnqEV^-59P(_4}bDSm%-x>E$*lBLxZgTLKn>E6`Robj(9^YBP`xqL3U*F zipe)j-eSCT$YoYKg*-J380Hsm2;J$d{|mI@2m;@Ky`k&)rSc2Qab}#1J_o)?wPsz# z{tJgCEQAW+J|BR6-cyOJFXynCI|a_I@8_`DPR5fRl)8QoXS+n)bg@u7HW9`C*m=E{n)4b_qXI9eG(3`e)dNT L001DfAOpl*ra*ke delta 781 zcmV+o1M>Xh!2#sK0gxnr@Oo5ObVOxyV{&P5bZKvH004NLotRB-+b|G?*VZY7WLp&y zZ721@n<7DxMRJ9Lmc|rONhC+K_bd4Eez z&q$UP)~t4cec?$aV!9i41x z`1=O7GSERrv5EqfL7xaGe_Ppw8d$=oq9J3Ys~8Gp8V+trmek5Wz^Z(0g6g{{SE8WP zCM;kxFVAs7g*sO(TQ3hts^o!O7B7u~+XxthJ$-MjBkw6*4C7+?l8soTVf|8BQ|qmh zSEy~IYDl3RkjsI8EM;pLDC`SjfL|%{czQ~aBQ;ry++`xixZ(-q;w4^+++{y7Y=dE7 z5ILF^PTh)}*;8ZQ*^=UkFJU$AurX}KhOOYop7T=dG&T~{)fuaOFbxB3jI4k)G*4w? zJXIOBHe6x6$m7L4vCmr=-QunScSTH%r4G)4vD9H1FqS%hD1Kw9gQ7QET`*a*hWCh?_?QW%ZLg~DG9bHOSRmAi#%<%ChrVel6F)PI+?=CGRuwh! zn(ou$+xp98q7do;OtpcFC#)@m@}Qpw{f?mD5%ANj!?Z@v=o9E0-NpB+Ep|nLQRsQv zQ>!uZ&^sT0py>s9mLdl&r=o{!Cm6FHiyv|xSM!G5Fiv7kDz5&?AllSFs6=PsAH)8Da6>3bG@U zS4_TP@)qNzLoTz@scao@o&m%B;tioYo%Mf#RvbZp;CFB6I)17A!g8D$C!^1WFH)^p zSF!)XVF?SN0yyUbFy}p$$oJ(OwsWVzx$pZqY`6LB`@?