From 9b7ccae9c91ca2a4c779c218c551f8287e30baa4 Mon Sep 17 00:00:00 2001 From: Spades Date: Fri, 1 Sep 2017 03:11:12 -0400 Subject: [PATCH] Fixes Colt pistol not switching icons when empty. The "Detective" pistol worked fine but the base Colt did not. This fixes both. --- code/modules/projectiles/guns/projectile/pistol.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index e77f219edc4..504350a198a 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -10,11 +10,7 @@ fire_sound = 'sound/weapons/semiauto.ogg' load_method = MAGAZINE -/obj/item/weapon/gun/projectile/colt/detective - desc = "A Martian recreation of an old Terran pistol. Uses .45 rounds." - magazine_type = /obj/item/ammo_magazine/m45/rubber - -/obj/item/weapon/gun/projectile/colt/detective/update_icon() +/obj/item/weapon/gun/projectile/colt/update_icon() if(ammo_magazine) if(unique_reskin) icon_state = unique_reskin @@ -26,6 +22,10 @@ else icon_state = "[initial(icon_state)]-e" +/obj/item/weapon/gun/projectile/colt/detective + desc = "A Martian recreation of an old Terran pistol. Uses .45 rounds." + magazine_type = /obj/item/ammo_magazine/m45/rubber + /obj/item/weapon/gun/projectile/colt/detective/verb/rename_gun() set name = "Name Gun" set category = "Object"