Merge pull request #7974 from mwerezak/ert

ERT adjustment and fixes

code/modules/clothing/spacesuits/rig/modules/combat.dm

@@ -111,6 +111,16 @@
 	gun.Fire(target,holder.wearer)
 	return 1
 
+/obj/item/rig_module/mounted/egun
+
+	name = "mounted energy gun"
+	desc = "A forearm-mounted energy projector."
+
+	interface_name = "mounted energy gun"
+	interface_desc = "A forearm-mounted suit-powered energy gun."
+
+	gun_type = /obj/item/weapon/gun/energy/gun/mounted
+
 /obj/item/rig_module/mounted/taser
 
 	name = "mounted taser"
@@ -124,7 +134,7 @@
 	interface_name = "mounted energy gun"
 	interface_desc = "A shoulder-mounted cell-powered energy gun."
 
-	gun_type = /obj/item/weapon/gun/energy/gun/mounted
+	gun_type = /obj/item/weapon/gun/energy/taser/mounted
 
 /obj/item/rig_module/mounted/energy_blade
 

code/modules/clothing/spacesuits/rig/modules/rig_weapons.dm

@@ -0,0 +1,51 @@
+//Weapon types intended to be used with rig modules
+
+/obj/item/weapon/gun/energy/lasercannon/mounted/load_into_chamber()
+	if(in_chamber)
+		return 1
+	var/obj/item/rig_module/module = loc
+	if(!istype(module))
+		return 0
+	if(module.holder && module.holder.wearer)
+		var/mob/living/carbon/human/H = module.holder.wearer
+		if(istype(H) && H.back)
+			var/obj/item/weapon/rig/suit = H.back
+			if(istype(suit) && suit.cell && suit.cell.charge >= 250)
+				suit.cell.use(250)
+				in_chamber = new /obj/item/projectile/beam/heavylaser(src)
+				return 1
+	return 0
+
+/obj/item/weapon/gun/energy/gun/mounted/load_into_chamber()
+	if(in_chamber)
+		return 1
+	var/obj/item/rig_module/module = loc
+	if(!istype(module))
+		return 0
+	if(module.holder && module.holder.wearer)
+		var/mob/living/carbon/human/H = module.holder.wearer
+		if(istype(H) && H.back)
+			var/obj/item/weapon/rig/suit = H.back
+			if(istype(suit) && suit.cell && suit.cell.charge >= 250)
+				suit.cell.use(250)
+				var/prog_path = text2path(projectile_type)
+				in_chamber = new prog_path(src)
+				return 1
+	return 0
+
+/obj/item/weapon/gun/energy/taser/mounted/load_into_chamber()
+	if(in_chamber)
+		return 1
+	var/obj/item/rig_module/module = loc
+	if(!istype(module))
+		return 0
+	if(module.holder && module.holder.wearer)
+		var/mob/living/carbon/human/H = module.holder.wearer
+		if(istype(H) && H.back)
+			var/obj/item/weapon/rig/suit = H.back
+			if(istype(suit) && suit.cell && suit.cell.charge >= 250)
+				suit.cell.use(250)
+				var/prog_path = text2path(projectile_type)
+				in_chamber = new prog_path(src)
+				return 1
+	return 0

code/modules/clothing/spacesuits/rig/suits/ert.dm

@@ -23,7 +23,6 @@
 		/obj/item/rig_module/ai_container,
 		/obj/item/rig_module/maneuvering_jets,
 		/obj/item/rig_module/datajack,
-		/obj/item/rig_module/mounted
 		)
 
 /obj/item/weapon/rig/ert/engineer
@@ -62,5 +61,5 @@
 		/obj/item/rig_module/ai_container,
 		/obj/item/rig_module/maneuvering_jets,
 		/obj/item/rig_module/grenade_launcher,
-		/obj/item/rig_module/mounted
+		/obj/item/rig_module/mounted/egun,
 		)

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

@@ -77,22 +77,6 @@ obj/item/weapon/gun/energy/laser/retro
 	isHandgun()
 		return 0
 
-/obj/item/weapon/gun/energy/lasercannon/mounted/load_into_chamber()
-	if(in_chamber)
-		return 1
-	var/obj/item/rig_module/module = loc
-	if(!istype(module))
-		return 0
-	if(module.holder && module.holder.wearer)
-		var/mob/living/carbon/human/H = module.holder.wearer
-		if(istype(H) && H.back)
-			var/obj/item/weapon/rig/suit = H.back
-			if(istype(suit) && suit.cell && suit.cell.charge >= 250)
-				suit.cell.use(250)
-				in_chamber = new /obj/item/projectile/beam/heavylaser(src)
-				return 1
-	return 0
-
 /obj/item/weapon/gun/energy/lasercannon/cyborg/load_into_chamber()
 	if(in_chamber)
 		return 1

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

@@ -35,23 +35,6 @@
 		else
 			user.update_inv_r_hand()
 
-/obj/item/weapon/gun/energy/gun/mounted/load_into_chamber()
-	if(in_chamber)
-		return 1
-	var/obj/item/rig_module/module = loc
-	if(!istype(module))
-		return 0
-	if(module.holder && module.holder.wearer)
-		var/mob/living/carbon/human/H = module.holder.wearer
-		if(istype(H) && H.back)
-			var/obj/item/weapon/rig/suit = H.back
-			if(istype(suit) && suit.cell && suit.cell.charge >= 250)
-				suit.cell.use(250)
-				var/prog_path = text2path(projectile_type)
-				in_chamber = new prog_path(src)
-				return 1
-	return 0
-
 /obj/item/weapon/gun/energy/gun/nuclear
 	name = "advanced energy gun"
 	desc = "An energy gun with an experimental miniaturized reactor."