Merge pull request #8290 from mwerezak/gun-rewrite

Fixes captain's laser gun

code/modules/flufftext/Hallucination.dm

@@ -342,7 +342,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
 	/obj/item/weapon/storage/toolbox/syndicate, /obj/item/weapon/aiModule,\
 	/obj/item/device/radio/headset/syndicate,	/obj/item/weapon/plastique,\
 	/obj/item/device/powersink, /obj/item/weapon/storage/box/syndie_kit,\
-	/obj/item/toy/syndicateballoon, /obj/item/weapon/gun/energy/laser/captain,\
+	/obj/item/toy/syndicateballoon, /obj/item/weapon/gun/energy/captain,\
 	/obj/item/weapon/hand_tele, /obj/item/weapon/rcd, /obj/item/weapon/tank/jetpack,\
 	/obj/item/clothing/under/rank/captain, /obj/item/device/aicard,\
 	/obj/item/clothing/shoes/magboots, /obj/item/blueprints, /obj/item/weapon/disk/nuclear,\

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

@@ -21,22 +21,29 @@
 	desc = "A modified version of the basic laser gun, this one fires less concentrated energy bolts designed for target practice."
 	projectile_type = /obj/item/projectile/beam/practice
 
-obj/item/weapon/gun/energy/laser/retro
+obj/item/weapon/gun/energy/retro
 	name = "retro laser"
 	icon_state = "retro"
 	desc = "An older model of the basic lasergun, no longer used by Nanotrasen's security or military forces. Nevertheless, it is still quite deadly and easy to maintain, making it a favorite amongst pirates and other outlaws."
+	fire_sound = 'sound/weapons/Laser.ogg'
+	slot_flags = SLOT_BELT
+	w_class = 3
+	projectile_type = /obj/item/projectile/beam
+	fire_delay = 10
 
 /obj/item/weapon/gun/energy/captain
 	name = "antique laser gun"
 	icon_state = "caplaser"
 	desc = "This is an antique laser gun. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy. On the item is an image of Space Station 13. The station is exploding."
 	force = 5
+	fire_sound = 'sound/weapons/Laser.ogg'
 	slot_flags = SLOT_BELT
+	w_class = 3
+	projectile_type = /obj/item/projectile/beam
 	origin_tech = null
 	charge_cost = 200 //to compensate a bit for self-recharging
 	self_recharge = 1
 
-
 /obj/item/weapon/gun/energy/lasercannon
 	name = "laser cannon"
 	desc = "With the laser cannon, the lasing medium is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core. This incredible technology may help YOU achieve high excitation rates with small laser volumes!"
@@ -62,6 +69,7 @@ obj/item/weapon/gun/energy/laser/retro
 	origin_tech = "combat=5;materials=3;magnets=2;syndicate=2"
 	projectile_type = /obj/item/projectile/beam/xray
 	charge_cost = 50
+	fire_delay = 1
 
 /obj/item/weapon/gun/energy/sniperrifle
 	name = "\improper L.W.A.P. sniper rifle"

code/modules/research/xenoarchaeology/finds/finds.dm

@@ -345,7 +345,7 @@
 			/obj/item/weapon/gun/energy/laser/practice/xenoarch,\
 			/obj/item/weapon/gun/energy/laser/xenoarch,\
 			/obj/item/weapon/gun/energy/xray/xenoarch,\
-			/obj/item/weapon/gun/energy/laser/captain/xenoarch)
+			/obj/item/weapon/gun/energy/captain/xenoarch)
 			if(spawn_type)
 				var/obj/item/weapon/gun/energy/new_gun = new spawn_type(src.loc)
 				new_item = new_gun

code/modules/research/xenoarchaeology/finds/finds_eguns.dm

@@ -19,7 +19,7 @@
 	update_icon()
 		return
 
-/obj/item/weapon/gun/energy/laser/captain/xenoarch
+/obj/item/weapon/gun/energy/captain/xenoarch
 	icon = 'icons/obj/xenoarchaeology.dmi'
 	update_icon()
-		return
+		return