Removes IsHandgun() proc, adds slot flag

code/modules/projectiles/guns/energy/laser.dm

@@ -4,6 +4,7 @@
 	icon_state = "laser"
 	item_state = "laser"
 	fire_sound = 'sound/weapons/Laser.ogg'
+	slot_flags = SLOT_BELT|SLOT_BACK
 	w_class = 3.0
 	matter = list("metal" = 2000)
 	origin_tech = "combat=3;magnets=2"
@@ -70,13 +71,11 @@ obj/item/weapon/gun/energy/laser/retro
 	icon_state = "lasercannon"
 	fire_sound = 'sound/weapons/lasercannonfire.ogg'
 	origin_tech = "combat=4;materials=3;powerstorage=3"
+	slot_flags = SLOT_BELT|SLOT_BACK
 	projectile_type = "/obj/item/projectile/beam/heavylaser"
 
 	fire_delay = 20
 
-	isHandgun()
-		return 0
-
 /obj/item/weapon/gun/energy/lasercannon/cyborg/load_into_chamber()
 	if(in_chamber)
 		return 1
@@ -106,6 +105,7 @@ obj/item/weapon/gun/energy/laser/retro
 	desc = "Standard issue weapon of the Imperial Guard"
 	projectile_type = "/obj/item/projectile/beam/lastertag/blue"
 	origin_tech = "combat=1;magnets=2"
+	slot_flags = SLOT_BELT|SLOT_HOLSTER
 	clumsy_check = 0
 	var/charge_tick = 0
 
@@ -143,6 +143,7 @@ obj/item/weapon/gun/energy/laser/retro
 	desc = "Standard issue weapon of the Imperial Guard"
 	projectile_type = "/obj/item/projectile/beam/lastertag/red"
 	origin_tech = "combat=1;magnets=2"
+	slot_flags = SLOT_BELT|SLOT_HOLSTER
 	clumsy_check = 0
 	var/charge_tick = 0
 

code/modules/projectiles/guns/energy/nuclear.dm

@@ -40,6 +40,7 @@
 	desc = "An energy gun with an experimental miniaturized reactor."
 	icon_state = "nucgun"
 	origin_tech = "combat=3;materials=5;powerstorage=3"
+	slot_flags = SLOT_BELT
 	var/lightfail = 0
 	var/charge_tick = 0
 

code/modules/projectiles/guns/energy/pulse.dm

@@ -3,6 +3,7 @@
 	desc = "A heavy-duty, pulse-based energy weapon, preferred by front-line combat personnel."
 	icon_state = "pulse"
 	item_state = null	//so the human update icon uses the icon_state instead.
+	slot_flags = SLOT_BELT|SLOT_BACK
 	force = 10
 	fire_sound = 'sound/weapons/pulse.ogg'
 	charge_cost = 200
@@ -33,9 +34,6 @@
 				projectile_type = /obj/item/projectile/beam/pulse
 		return
 
-	isHandgun()
-		return 0
-
 /obj/item/weapon/gun/energy/pulse_rifle/cyborg/load_into_chamber()
 	if(in_chamber)
 		return 1
@@ -62,9 +60,7 @@
 /obj/item/weapon/gun/energy/pulse_rifle/M1911
 	name = "\improper M1911-P"
 	desc = "It's not the size of the gun, it's the size of the hole it puts through people."
+	slot_flags = SLOT_BELT|SLOT_HOLSTER
 	icon_state = "m1911-p"
 	cell_type = "/obj/item/weapon/cell/infinite"
 	fire_delay = 10
-
-	isHandgun()
-		return 1

code/modules/projectiles/guns/energy/special.dm

@@ -141,6 +141,7 @@ obj/item/weapon/gun/energy/staff
 	desc = "For the love of god, make sure you're aiming this the right way!"
 	icon_state = "riotgun"
 	item_state = "c20r"
+	slot_flags = SLOT_BELT|SLOT_BACK
 	w_class = 4
 	projectile_type = "/obj/item/projectile/meteor"
 	charge_cost = 100
@@ -176,6 +177,7 @@ obj/item/weapon/gun/energy/staff
 	icon_state = "pen"
 	item_state = "pen"
 	w_class = 1
+	slot_flags = SLOT_BELT
 
 
 /obj/item/weapon/gun/energy/mindflayer
@@ -191,6 +193,7 @@ obj/item/weapon/gun/energy/staff/focus
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "focus"
 	item_state = "focus"
+	slot_flags = SLOT_BACK
 	projectile_type = "/obj/item/projectile/forcebolt"
 	/*
 	attack_self(mob/living/user as mob)
@@ -215,7 +218,7 @@ obj/item/weapon/gun/energy/staff/focus
 
 /obj/item/weapon/gun/energy/sniperrifle
 	name = "\improper L.W.A.P. sniper rifle"
-	desc = "A rifle constructed of lightweight materials, fitted with a SMART aiming-system scope."
+	desc = "A high-power laser rifle fitted with a SMART aiming-system scope."
 	icon = 'icons/obj/gun.dmi'
 	icon_state = "sniper"
 	fire_sound = 'sound/weapons/marauder.ogg'
@@ -224,7 +227,7 @@ obj/item/weapon/gun/energy/staff/focus
 	slot_flags = SLOT_BACK
 	charge_cost = 250
 	fire_delay = 35
-	w_class = 4.0
+	w_class = 4
 	zoomdevicename = "scope"
 
 /obj/item/weapon/gun/energy/sniperrifle/verb/scope()

code/modules/projectiles/guns/energy/stun.dm

@@ -60,6 +60,7 @@
 	item_state = "crossbow"
 	matter = list("metal" = 2000)
 	origin_tech = "combat=2;magnets=2;syndicate=5"
+	slot_flags = SLOT_BELT
 	silenced = 1
 	fire_sound = 'sound/weapons/Genhit.ogg'
 	projectile_type = /obj/item/projectile/energy/bolt
@@ -96,7 +97,7 @@
 /obj/item/weapon/gun/energy/crossbow/largecrossbow
 	name = "Energy Crossbow"
 	desc = "A weapon favored by mercenary infiltration teams."
-	w_class = 4.0
+	w_class = 4
 	force = 10
 	matter = list("metal" = 200000)
 	projectile_type = /obj/item/projectile/energy/bolt/large

code/modules/projectiles/guns/energy/temperature.dm

@@ -7,6 +7,7 @@
 	var/current_temperature = T20C
 	charge_cost = 100
 	origin_tech = "combat=3;materials=4;powerstorage=3;magnets=2"
+	slot_flags = SLOT_BELT|SLOT_BACK
 
 	projectile_type = "/obj/item/projectile/temp"
 	cell_type = "/obj/item/weapon/cell/crap"