From e342bf8a3af33dc27fbfa596f2770464d43f148c Mon Sep 17 00:00:00 2001
From: GinjaNinja32 <ginjaninja32@gmail.com>
Date: Mon, 30 Mar 2015 03:54:18 +0100
Subject: [PATCH] Fixes #8673, also makes some messages clearer and removes the
 twin cooldowns on rig weapons

---
 code/modules/clothing/spacesuits/rig/modules/combat.dm | 2 +-
 code/modules/projectiles/guns/energy/laser.dm          | 1 +
 code/modules/projectiles/guns/energy/nuclear.dm        | 1 +
 code/modules/projectiles/guns/energy/stun.dm           | 2 ++
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/modules/clothing/spacesuits/rig/modules/combat.dm b/code/modules/clothing/spacesuits/rig/modules/combat.dm
index b106e41255..a9f7f53f8c 100644
--- a/code/modules/clothing/spacesuits/rig/modules/combat.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/combat.dm
@@ -85,7 +85,7 @@
 	desc = "A shoulder-mounted battery-powered laser cannon mount."
 	selectable = 1
 	usable = 1
-	use_power_cost = 10
+	module_cooldown = 0
 
 	engage_string = "Configure"
 
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 2bc36508d8..156db44c44 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -57,6 +57,7 @@ obj/item/weapon/gun/energy/retro
 	fire_delay = 20
 
 /obj/item/weapon/gun/energy/lasercannon/mounted
+	name = "mounted laser cannon"
 	self_recharge = 1
 	use_external_power = 1
 	recharge_time = 10
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index e2b97672c7..dc503388ed 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -35,6 +35,7 @@
 		user.update_inv_r_hand()
 
 /obj/item/weapon/gun/energy/gun/mounted
+	name = "mounted energy gun"
 	self_recharge = 1
 	use_external_power = 1
 
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index a99b71337a..b0d2dc4c0f 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -9,10 +9,12 @@
 	cell_type = /obj/item/weapon/cell/crap
 
 /obj/item/weapon/gun/energy/taser/mounted
+	name = "mounted taser gun"
 	self_recharge = 1
 	use_external_power = 1
 
 /obj/item/weapon/gun/energy/taser/mounted/cyborg
+	name = "taser gun"
 	cell_type = /obj/item/weapon/cell/secborg
 	recharge_time = 10 //Time it takes for shots to recharge (in ticks)