Merge pull request #5429 from tigercat2000/mecha

/tg/ mecha - Part 1

code/modules/research/designs/mechfabricator_designs.dm

@@ -601,7 +601,7 @@
 	name = "Exosuit Engineering Equipment (Cable Layer)"
 	id = "mech_cable_layer"
 	build_type = MECHFAB
-	build_path = /obj/item/mecha_parts/mecha_equipment/tool/cable_layer
+	build_path = /obj/item/mecha_parts/mecha_equipment/cable_layer
 	materials = list(MAT_METAL=10000)
 	construction_time = 100
 	category = list("Exosuit Equipment")
@@ -610,7 +610,7 @@
 	name = "Exosuit Engineering Equipment (Drill)"
 	id = "mech_drill"
 	build_type = MECHFAB
-	build_path = /obj/item/mecha_parts/mecha_equipment/tool/drill
+	build_path = /obj/item/mecha_parts/mecha_equipment/drill
 	materials = list(MAT_METAL=10000)
 	construction_time = 100
 	category = list("Exosuit Equipment")
@@ -619,7 +619,7 @@
 	name = "Exosuit Engineering Equipment (Extinguisher)"
 	id = "mech_extinguisher"
 	build_type = MECHFAB
-	build_path = /obj/item/mecha_parts/mecha_equipment/tool/extinguisher
+	build_path = /obj/item/mecha_parts/mecha_equipment/extinguisher
 	materials = list(MAT_METAL=10000)
 	construction_time = 100
 	category = list("Exosuit Equipment")
@@ -628,7 +628,7 @@
 	name = "Exosuit Engineering Equipment (Hydraulic Clamp)"
 	id = "mech_hydraulic_clamp"
 	build_type = MECHFAB
-	build_path = /obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp
+	build_path = /obj/item/mecha_parts/mecha_equipment/hydraulic_clamp
 	materials = list(MAT_METAL=10000)
 	construction_time = 100
 	category = list("Exosuit Equipment")
@@ -638,7 +638,7 @@
 	id = "mech_sleeper"
 	build_type = MECHFAB
 	req_tech = list("biotech" = 2)
-	build_path = /obj/item/mecha_parts/mecha_equipment/tool/sleeper
+	build_path = /obj/item/mecha_parts/mecha_equipment/medical/sleeper
 	materials = list(MAT_METAL=5000,MAT_GLASS=10000)
 	construction_time = 100
 	category = list("Exosuit Equipment")
@@ -648,7 +648,7 @@
 	id = "mech_syringe_gun"
 	build_type = MECHFAB
 	req_tech = list("magnets" = 3,"biotech" = 3)
-	build_path = /obj/item/mecha_parts/mecha_equipment/tool/syringe_gun
+	build_path = /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun
 	materials = list(MAT_METAL=3000,MAT_GLASS=2000)
 	construction_time = 200
 	category = list("Exosuit Equipment")
@@ -723,7 +723,7 @@
 	desc = "An exosuit-mounted Mime Rapid Construction Device."
 	id = "mech_mrcd"
 	build_type = MECHFAB
-	build_path = /obj/item/mecha_parts/mecha_equipment/tool/mimercd
+	build_path = /obj/item/mecha_parts/mecha_equipment/mimercd
 	materials = list(MAT_METAL=30000,MAT_TRANQUILLITE=10000)
 	construction_time = 700
 	category = list("Exosuit Equipment")
@@ -735,7 +735,7 @@
 	id = "mech_diamond_drill"
 	build_type = MECHFAB
 	req_tech = list("materials" = 4, "engineering" = 3)
-	build_path = /obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill
+	build_path = /obj/item/mecha_parts/mecha_equipment/drill/diamonddrill
 	materials = list(MAT_METAL=10000,MAT_DIAMOND=6500)
 	construction_time = 100
 	category = list("Exosuit Equipment")
@@ -744,7 +744,7 @@
 	name = "Exosuit Engineering Equipement (Mining Scanner)"
 	id = "mech_mscanner"
 	build_type = MECHFAB
-	build_path = /obj/item/mecha_parts/mecha_equipment/tool/mining_scanner
+	build_path = /obj/item/mecha_parts/mecha_equipment/mining_scanner
 	materials = list(MAT_METAL=5000,MAT_GLASS=2500)
 	construction_time = 50
 	category = list("Exosuit Equipment")
@@ -788,7 +788,7 @@
 	id = "mech_rcd"
 	build_type = MECHFAB
 	req_tech = list("materials" = 4, "bluespace" = 3, "magnets" = 4, "powerstorage"=4, "engineering" = 4)
-	build_path = /obj/item/mecha_parts/mecha_equipment/tool/rcd
+	build_path = /obj/item/mecha_parts/mecha_equipment/rcd
 	materials = list(MAT_METAL=30000,MAT_GOLD=20000,MAT_PLASMA=25000,MAT_SILVER=20000)
 	construction_time = 1200
 	category = list("Exosuit Equipment")

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

@@ -59,7 +59,7 @@
 
 	else if(istype(AM,/obj/mecha))
 		var/obj/mecha/M = AM
-		if(istype(M.selected,/obj/item/mecha_parts/mecha_equipment/tool/drill))
+		if(istype(M.selected,/obj/item/mecha_parts/mecha_equipment/drill))
 			M.selected.action(src)
 
 /obj/structure/boulder/attackby(obj/item/weapon/W as obj, mob/user as mob, params)

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

@@ -3,40 +3,11 @@
 	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
+	stepsound = 'sound/machines/hiss.ogg'
 
 /obj/mecha/working/hoverpod/Process_Spacemove(var/movement_dir = 0)
 	return 1 // puts the hover in hoverpod
 
-//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*/