From 3a1d07454fecc6b548e420a68656b66c1981e74c Mon Sep 17 00:00:00 2001 From: Isaac Erwin Date: Tue, 13 Sep 2016 19:27:15 -0400 Subject: [PATCH 1/2] Okay, foxxy --- code/modules/projectiles/ammunition/magazines.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index 137d4258410..fb14eee2dc3 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -199,16 +199,16 @@ desc = "A gun magazine. Seems to be broken and can only hold one bullet. Pretty useless." max_ammo = 1 +/obj/item/ammo_box/magazine/m10mm/empty/update_icon() + icon_state = "[initial(icon_state)]-[stored_ammo.len ? "8" : "0"]" + /obj/item/ammo_box/magazine/m45 name = "handgun magazine (.45)" icon_state = "45" ammo_type = /obj/item/ammo_casing/c45 caliber = ".45" max_ammo = 8 - -/obj/item/ammo_box/magazine/m45/update_icon() - ..() - icon_state = "[initial(icon_state)]-[ammo_count() ? "8" : "0"]" + multiple_sprites = 2 /obj/item/ammo_box/magazine/wt550m9 name = "wt550 magazine (4.6x30mm)" From 8986dca9d878d9f2890481466cf7bfd6e9cabd03 Mon Sep 17 00:00:00 2001 From: Isaac Erwin Date: Wed, 14 Sep 2016 14:42:18 -0400 Subject: [PATCH 2/2] Now the 45 mag can use all 9 sprites --- code/modules/projectiles/ammunition/magazines.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index fb14eee2dc3..a5eafacba51 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -208,7 +208,7 @@ ammo_type = /obj/item/ammo_casing/c45 caliber = ".45" max_ammo = 8 - multiple_sprites = 2 + multiple_sprites = 1 /obj/item/ammo_box/magazine/wt550m9 name = "wt550 magazine (4.6x30mm)"