Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenorewrite

code/modules/research/designs.dm

@@ -749,6 +749,15 @@ datum/design/mech_laser
 	build_path = "/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser"
 	category = "Exosuit Equipment"
 
+datum/design/mech_laser_rigged
+	name = "Exosuit Weapon Design (Jury-rigged Laser)"
+	desc = "Allows for the construction a welder-laser assembly package for non-combat exosuits."
+	id = "mech_laser_rigged"
+	build_type = MECHFAB
+	req_tech = list("combat" = 2, "magnets" = 2)
+	build_path = "/obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser"
+	category = "Exosuit Equipment"
+
 datum/design/mech_laser_heavy
 	name = "Exosuit Weapon Design (CH-LC \"Solaris\" Laser Cannon)"
 	desc = "Allows for the construction of CH-LC Laser Cannon."
@@ -758,6 +767,15 @@ datum/design/mech_laser_heavy
 	build_path = "/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy"
 	category = "Exosuit Equipment"
 
+datum/design/mech_ion
+	name = "Exosuit Weapon Design (mkIV Ion Heavy Cannon)"
+	desc = "Allows for the construction of the Ion Cannon."
+	id = "mech_ion"
+	build_type = MECHFAB
+	req_tech = list("combat" = 4, "magnets" = 4)
+	build_path = "/obj/item/mecha_parts/mecha_equipment/weapon/energy/ion"
+	category = "Exosuit Equipment"
+
 datum/design/mech_grenade_launcher
 	name = "Exosuit Weapon Design (SGL-6 Grenade Launcher)"
 	desc = "Allows for the construction of SGL-6 Grenade Launcher."

code/modules/research/xenoarchaeology/artifact/artifact.dm

@@ -20,7 +20,6 @@
 	50;/obj/structure/cult/pylon,\
 	100;/obj/machinery/auto_cloner,\
 	100;/obj/machinery/giga_drill,\
-	100;/obj/mecha/working/hoverpod,\
 	100;/obj/machinery/replicator,\
 	150;/obj/structure/crystal,\
 	1000;/obj/machinery/artifact)

code/modules/research/xenoarchaeology/artifact/artifact_hoverpod.dm

@@ -1,67 +0,0 @@
-
-/obj/mecha/working/hoverpod
-	name = "hover pod"
-	icon_state = "engineering_pod"
-	desc = "Stubby and round, it has a human sized access hatch on the top."
-	wreckage = /obj/effect/decal/mecha_wreckage/hoverpod
-
-//duplicate of parent proc, but without space drifting
-/obj/mecha/working/hoverpod/dyndomove(direction)
-	if(!can_move)
-		return 0
-	if(src.pr_inertial_movement.active())
-		return 0
-	if(!has_charge(step_energy_drain))
-		return 0
-	var/move_result = 0
-	if(hasInternalDamage(MECHA_INT_CONTROL_LOST))
-		move_result = mechsteprand()
-	else if(src.dir!=direction)
-		move_result = mechturn(direction)
-	else
-		move_result	= mechstep(direction)
-	if(move_result)
-		can_move = 0
-		use_power(step_energy_drain)
-		/*if(istype(src.loc, /turf/space))
-			if(!src.check_for_support())
-				src.pr_inertial_movement.start(list(src,direction))
-				src.log_message("Movement control lost. Inertial movement started.")*/
-		if(do_after(step_in))
-			can_move = 1
-		return 1
-	return 0
-
-//these three procs overriden to play different sounds
-/obj/mecha/working/hoverpod/mechturn(direction)
-	dir = direction
-	//playsound(src,'sound/machines/hiss.ogg',40,1)
-	return 1
-
-/obj/mecha/working/hoverpod/mechstep(direction)
-	var/result = step(src,direction)
-	if(result)
-		playsound(src,'sound/machines/hiss.ogg',40,1)
-	return result
-
-
-/obj/mecha/working/hoverpod/mechsteprand()
-	var/result = step_rand(src)
-	if(result)
-		playsound(src,'sound/machines/hiss.ogg',40,1)
-	return result
-
-/obj/effect/decal/mecha_wreckage/hoverpod
-	name = "Hover pod wreckage"
-	icon_state = "engineering_pod-broken"
-
-	/*New()
-		..()
-		var/list/parts = list(
-
-		for(var/i=0;i<2;i++)
-			if(!isemptylist(parts) && prob(40))
-				var/part = pick(parts)
-				welder_salvage += part
-				parts -= part
-		return*/

code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm

@@ -147,9 +147,6 @@
 			return "Automated mining drill - structure composed of titanium-carbide alloy, with tip and drill lines edged in an alloy of diamond and phoron."
 		if(/obj/structure/cult/pylon)
 			return "Tribal pylon - Item resembles statues/emblems built by cargo cult civilisations to honour energy systems from post-warp civilisations."
-		if(/obj/mecha/working/hoverpod)
-			return "Vacuum capable repair pod - Item is a remarkably intact single man repair craft capable of flight in a vacuum. Outer shell composed of primarily \
-			post-warp hull alloys, with internal wiring and circuitry consistent with modern electronics and engineering."
 		if(/obj/machinery/replicator)
 			return "Automated construction unit - Item appears to be able to synthesize synthetic items, some with simple internal circuitry. Method unknown, \
 			phasing suggested?"