From 31cf3687061303ba3c71ada8e7cac6b45b2a4e58 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Wed, 20 Jan 2016 18:39:45 -0500 Subject: [PATCH] Fixes Holstering a Few Guns --- code/modules/projectiles/guns/energy/pulse.dm | 3 +++ code/modules/projectiles/guns/projectile/shotgun.dm | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm index fbf71b120ed..e063a6b3bdf 100644 --- a/code/modules/projectiles/guns/energy/pulse.dm +++ b/code/modules/projectiles/guns/energy/pulse.dm @@ -80,6 +80,9 @@ item_state = "gun" cell_type = "/obj/item/weapon/stock_parts/cell/pulse/pistol" +/obj/item/weapon/gun/energy/pulse_rifle/pistol/isHandgun() + return 1 + /obj/item/weapon/gun/energy/pulse_rifle/pistol/m1911 name = "\improper M1911-P" desc = "A compact pulse core in a classic handgun frame for Nanotrasen officers. It's not the size of the gun, it's the size of the hole it puts through people." diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index f69b903b3be..d73f7ffee1a 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -74,6 +74,9 @@ if (chambered) user << "A [chambered.BB ? "live" : "spent"] one is in the chamber." +/obj/item/weapon/gun/projectile/shotgun/isHandgun() //You cannot, in fact, holster a shotgun. + return 0 + // RIOT SHOTGUN // /obj/item/weapon/gun/projectile/shotgun/riot //for spawn in the armory @@ -160,6 +163,9 @@ else user << "[src] is empty." +/obj/item/weapon/gun/projectile/revolver/doublebarrel/isHandgun() //contrary to popular opinion, double barrels are not, shockingly, handguns + return 0 + // IMPROVISED SHOTGUN // /obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised