Merge pull request #7008 from Zuhayr/spaceninjas

Hardsuit/voidsuit change, ninja refactor.

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

@@ -77,6 +77,18 @@ 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/mob/living/carbon/human/H = loc
+	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
@@ -84,7 +96,7 @@ obj/item/weapon/gun/energy/laser/retro
 		var/mob/living/silicon/robot/R = src.loc
 		if(R && R.cell)
 			R.cell.use(250)
-			in_chamber = new/obj/item/projectile/beam(src)
+			in_chamber = new/obj/item/projectile/beam/heavylaser(src)
 			return 1
 	return 0
 

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

@@ -35,8 +35,18 @@
 		else
 			user.update_inv_r_hand()
 
-
-
+/obj/item/weapon/gun/energy/gun/mounted/load_into_chamber()
+	if(in_chamber)
+		return 1
+	var/mob/living/carbon/human/H = loc
+	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"

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

@@ -96,7 +96,9 @@
 	update_icon()
 		return
 
-
+/obj/item/weapon/gun/energy/crossbow/ninja
+	name = "energy dart thrower"
+	projectile_type = "/obj/item/projectile/energy/dart"
 
 /obj/item/weapon/gun/energy/crossbow/largecrossbow
 	name = "Energy Crossbow"