diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 7896bae1287..9792d24b256 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -244,7 +244,7 @@ BLIND     // can't see anything
 			return
 		var/obj/item/weapon/gun/W = usr.get_active_hand()
 		if (!W.isHandgun())
-			usr << "\red This gun won't fit in holster!"
+			usr << "\red This gun won't fit in \the [H]!"
 			return
 		H.holstered = usr.get_active_hand()
 		usr.drop_item()
@@ -258,7 +258,7 @@ BLIND     // can't see anything
 				usr.visible_message("\red [usr] draws \the [H.holstered], ready to shoot!", \
 				"\red You draw \the [H.holstered], ready to shoot!")
 			else
-				usr.visible_message("\blue [usr] draws \the [H.holstered], pointing it at tthe ground.", \
+				usr.visible_message("\blue [usr] draws \the [H.holstered], pointing it at the ground.", \
 				"\blue You draw \the [H.holstered], pointing it at tthe ground.")
 			usr.put_in_hands(H.holstered)
-			H.holstered = null
+			H.holstered = null
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 9d41c71a3aa..1dd3ca5114b 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -131,20 +131,4 @@
 
 
 /obj/item/weapon/gun/proc/isHandgun()
-	if(istype(src,/obj/item/weapon/gun/projectile/shotgun))
-		return 0
-	if(istype(src,/obj/item/weapon/gun/projectile/automatic))
-		return 0
-	if(istype(src,/obj/item/weapon/gun/energy/lasercannon))
-		return 0
-	if(istype(src,/obj/item/weapon/gun/energy/pulse_rifle))
-		return 0
-	if(istype(src,/obj/item/weapon/gun/energy/ionrifle))
-		return 0
-	if(istype(src,/obj/item/weapon/gun/energy/ionrifle))
-		return 0
-	if(istype(src,/obj/item/weapon/gun/energy/decloner))
-		return 0
-	if(istype(src,/obj/item/weapon/gun/energy/staff))
-		return 0
 	return 1
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 4ec5c4c9696..2f6cb028f54 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -71,6 +71,8 @@ obj/item/weapon/gun/energy/laser/retro
 	origin_tech = "combat=4;materials=3;powerstorage=3"
 	projectile_type = "/obj/item/projectile/beam/heavylaser"
 
+	isHandgun()
+		return 0
 
 /obj/item/weapon/gun/energy/xray
 	name = "xray laser gun"
diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm
index 9dcd62b42b7..934ab698087 100644
--- a/code/modules/projectiles/guns/energy/pulse.dm
+++ b/code/modules/projectiles/guns/energy/pulse.dm
@@ -32,6 +32,8 @@
 				projectile_type = "/obj/item/projectile/beam/pulse"
 		return
 
+	isHandgun()
+		return 0
 
 /obj/item/weapon/gun/energy/pulse_rifle/destroyer
 	name = "pulse destroyer"
@@ -49,4 +51,7 @@
 	icon_state = "m1911-p"
 	cell_type = "/obj/item/weapon/cell/infinite"
 
+	isHandgun()
+		return 1
+
 
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index fad12395e4f..cea9ea44eac 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -17,6 +17,9 @@
 	else
 		return
 
+	isHandgun()
+		return 0
+
 /obj/item/weapon/gun/energy/decloner
 	name = "biological demolecularisor"
 	desc = "A gun that discharges high amounts of controlled radiation to slowly break a target into component elements."
@@ -26,6 +29,9 @@
 	charge_cost = 100
 	projectile_type = "/obj/item/projectile/energy/declone"
 
+	isHandgun()
+		return 0
+
 obj/item/weapon/gun/energy/staff
 	name = "staff of change"
 	desc = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself"
@@ -62,6 +68,9 @@ obj/item/weapon/gun/energy/staff
 		update_icon()
 		return 1
 
+	isHandgun()
+		return 0
+
 /obj/item/weapon/gun/energy/floragun
 	name = "floral somatoray"
 	desc = "A tool that discharges controlled radiation which induces mutation in plant cells."
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 9436d2d65e1..70a21307644 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -8,6 +8,8 @@
 	origin_tech = "combat=4;materials=2"
 	ammo_type = "/obj/item/ammo_casing/c9mm"
 
+	isHandgun()
+		return 0
 
 
 /obj/item/weapon/gun/projectile/automatic/mini_uzi
@@ -20,6 +22,8 @@
 	origin_tech = "combat=5;materials=2;syndicate=8"
 	ammo_type = "/obj/item/ammo_casing/c45"
 
+	isHandgun()
+		return 1
 
 
 /obj/item/weapon/gun/projectile/automatic/c20r
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 29168a1b71c..ac1f15d66a0 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -4,7 +4,7 @@
 	icon_state = "detective"
 	caliber = "38"
 	origin_tech = "combat=2;materials=2"
-	ammo_type = "/obj/item/ammo_casing/c38"
+	ammo_type = "/obj/item/ammo_magazine/c38"
 
 /*
 	special_check(var/mob/living/carbon/human/M)
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index fc8080affb0..5170421e17e 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -15,6 +15,8 @@
 	var/pumped = 0
 	var/obj/item/ammo_casing/current_shell = null
 
+	isHandgun()
+		return 0
 
 	load_into_chamber()
 		if(in_chamber)