mech part repath (#7009)

Tears apart the overloaded `/obj/item/mecha_parts` into a few different
paths.

`/obj/item/vehicle_chassis` for the base part that things attach on
(this is the mech construction holder)
`/obj/item/vehicle_part` for things you attach to chassis
`/obj/item/vehicle_component` for integral components
`/obj/item/vehicle_module` for equipment

This is to prepare for further work on mecha as a system, and to get
some of the massive line changes out of the way.

Also:

- tears apart a few files that were just too long to be handled and
groups everything with their mechs
- erases some code reuse

Author: silicons

citadel.dme

@@ -5260,87 +5260,116 @@
 #include "code\modules\vehicles\sealed\mecha\mecha_construction_paths.dm"
 #include "code\modules\vehicles\sealed\mecha\mecha_control_console.dm"
 #include "code\modules\vehicles\sealed\mecha\mecha_helpers.dm"
-#include "code\modules\vehicles\sealed\mecha\mecha_parts.dm"
-#include "code\modules\vehicles\sealed\mecha\mecha_vr.dm"
 #include "code\modules\vehicles\sealed\mecha\mecha_wreckage.dm"
-#include "code\modules\vehicles\sealed\mecha\components\_component.dm"
+#include "code\modules\vehicles\sealed\mecha\vehicle_chassis.dm"
+#include "code\modules\vehicles\sealed\mecha\vehicle_component.dm"
+#include "code\modules\vehicles\sealed\mecha\vehicle_module-dynamicprocs.dm"
+#include "code\modules\vehicles\sealed\mecha\vehicle_module.dm"
+#include "code\modules\vehicles\sealed\mecha\vehicle_part.dm"
+#include "code\modules\vehicles\sealed\mecha\vehicle_tracking_beacon.dm"
 #include "code\modules\vehicles\sealed\mecha\components\actuators.dm"
 #include "code\modules\vehicles\sealed\mecha\components\armor.dm"
 #include "code\modules\vehicles\sealed\mecha\components\electrical.dm"
 #include "code\modules\vehicles\sealed\mecha\components\hull.dm"
 #include "code\modules\vehicles\sealed\mecha\components\lifesupport.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\mecha_equipment.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\mecha_equipment_dynamicprocs.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\armor_melee.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\armor_ranged.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\cable_layer.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\catapult.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\cloak.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\drill.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\energy_relay.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\extinguisher.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\generator.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\hardpoint_actuator.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\hydraulic_clamp.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\inflatables.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\jetpack.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\medigun_vr.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\orescanner.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\passenger.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\powertool.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\rcd.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\repair_droid.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\running_board.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\shield.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\shield_omni.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\sleeper.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\speedboost.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\syringe_gun.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\teleporter.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\tools.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\weldinglaser.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\tools\wormhole.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\weapons\honk.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\weapons\reticent.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\weapons\weapons.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\weapons\ballistic\automatic.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\weapons\ballistic\ballistic.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\weapons\ballistic\mortar.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\weapons\ballistic\shotgun.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\weapons\defense\shocker.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\weapons\energy\energy.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\weapons\energy\ion.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\weapons\energy\laser.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\weapons\energy\phased.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\weapons\energy\pulse.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\weapons\energy\stun.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\weapons\explosive\grenade.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\weapons\explosive\missile.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\weapons\fire\flamethrower.dm"
-#include "code\modules\vehicles\sealed\mecha\equipment\weapons\fire\incendiary.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\armor_melee.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\armor_ranged.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\cable_layer.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\catapult.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\cloak.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\drill.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\energy_relay.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\extinguisher.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\generator.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\hardpoint_actuator.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\hydraulic_clamp.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\inflatables.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\jetpack.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\medigun_vr.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\orescanner.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\passenger.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\powertool.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\rcd.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\repair_droid.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\running_board.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\shield.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\shield_omni.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\sleeper.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\speedboost.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\syringe_gun.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\teleporter.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\tools.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\weldinglaser.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\tools\wormhole.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\weapons\honk.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\weapons\reticent.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\weapons\weapons.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\weapons\ballistic\automatic.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\weapons\ballistic\ballistic.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\weapons\ballistic\mortar.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\weapons\ballistic\shotgun.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\weapons\defense\shocker.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\weapons\energy\energy.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\weapons\energy\ion.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\weapons\energy\laser.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\weapons\energy\phased.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\weapons\energy\pulse.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\weapons\energy\stun.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\weapons\explosive\grenade.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\weapons\explosive\missile.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\weapons\fire\flamethrower.dm"
+#include "code\modules\vehicles\sealed\mecha\modules\weapons\fire\incendiary.dm"
 #include "code\modules\vehicles\sealed\mecha\subtypes\combat.dm"
 #include "code\modules\vehicles\sealed\mecha\subtypes\medical.dm"
 #include "code\modules\vehicles\sealed\mecha\subtypes\micro.dm"
 #include "code\modules\vehicles\sealed\mecha\subtypes\working.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\combat\durand-construction.dm"
 #include "code\modules\vehicles\sealed\mecha\subtypes\combat\durand.dm"
 #include "code\modules\vehicles\sealed\mecha\subtypes\combat\fighter.dm"
 #include "code\modules\vehicles\sealed\mecha\subtypes\combat\gorilla.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\combat\gygax-construction.dm"
 #include "code\modules\vehicles\sealed\mecha\subtypes\combat\gygax.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\combat\honker-construction.dm"
 #include "code\modules\vehicles\sealed\mecha\subtypes\combat\honker.dm"
 #include "code\modules\vehicles\sealed\mecha\subtypes\combat\marauder.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\combat\phazon-construction.dm"
 #include "code\modules\vehicles\sealed\mecha\subtypes\combat\phazon.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\combat\reticent-construction.dm"
 #include "code\modules\vehicles\sealed\mecha\subtypes\combat\reticent.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\combat\fighter\allure.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\combat\fighter\baron-construction.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\combat\fighter\baron.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\combat\fighter\cludge.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\combat\fighter\duke-construction.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\combat\fighter\duke.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\combat\fighter\pinnace-construction.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\combat\fighter\pinnace.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\combat\fighter\scoralis.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\combat\gygax\serenity-construction.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\combat\gygax\serenity.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\combat\phazon\janus-construction.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\combat\phazon\janus.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\medical\odysseus-construction.dm"
 #include "code\modules\vehicles\sealed\mecha\subtypes\medical\odysseus.dm"
-#include "code\modules\vehicles\sealed\mecha\subtypes\micro\mecha_construction_paths_vr.dm"
-#include "code\modules\vehicles\sealed\mecha\subtypes\micro\mecha_parts_vr.dm"
 #include "code\modules\vehicles\sealed\mecha\subtypes\micro\mecha_vr.dm"
 #include "code\modules\vehicles\sealed\mecha\subtypes\micro\mechfab_designs_vr.dm"
 #include "code\modules\vehicles\sealed\mecha\subtypes\micro\micro_equipment.dm"
-#include "code\modules\vehicles\sealed\mecha\subtypes\micro\security.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\micro\sec.dm"
 #include "code\modules\vehicles\sealed\mecha\subtypes\micro\utility.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\micro\sec\polecat-construction.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\micro\sec\polecat.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\micro\sec\weasel-construction.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\micro\sec\weasel.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\micro\utility\gopher-construction.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\micro\utility\gopher.dm"
 #include "code\modules\vehicles\sealed\mecha\subtypes\working\hoverpod.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\working\ripley-construction.dm"
 #include "code\modules\vehicles\sealed\mecha\subtypes\working\ripley.dm"
 #include "code\modules\vehicles\sealed\mecha\subtypes\working\shuttle.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\working\ripley\firefighter-construction.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\working\ripley\firefighter.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\working\ripley\geiger-construction.dm"
+#include "code\modules\vehicles\sealed\mecha\subtypes\working\ripley\geiger.dm"
 #include "code\modules\vehicles_legacy\bike.dm"
 #include "code\modules\vehicles_legacy\cargo_train.dm"
 #include "code\modules\vehicles_legacy\construction.dm"

code/__HELPERS/type_processing.dm

@@ -16,8 +16,12 @@
 		/obj/item/reagent_containers/food = "//food",
 		/obj/machinery/atmospherics = "//atmos",
 		/obj/machinery/portable_atmospherics = "//port_atmos",
-		/obj/item/mecha_parts/mecha_equipment/weapon = "//mech_weapon",
-		/obj/item/mecha_parts = "//mech_part",
+		/obj/vehicle = "//vehicle",
+		/obj/item/vehicle_chassis = "//vehicle_chassis",
+		/obj/item/vehicle_part = "//vehicle_part",
+		/obj/item/vehicle_component  = "//vehicle_component",
+		/obj/item/vehicle_module = "//vehicle_module",
+		/obj/item/vehicle_module/weapon = "//vehicle_weapon",
 		/obj/item/organ = "//organ",
 		/obj/item/gun_attachment = "//gun-attachment",
 		/obj/item/gun_component = "//gun-component",

code/datums/uplink/visible_weapons.dm

@@ -62,7 +62,7 @@
 /datum/uplink_item/item/visible_weapons/riggedlaser
 	name = "Exosuit Rigged Laser"
 	item_cost = 60
-	path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser
+	path = /obj/item/vehicle_module/weapon/energy/riggedlaser
 
 /datum/uplink_item/item/visible_weapons/revolver
 	name = "Revolver"

code/game/objects/items/circuitboards/machinery/ships.dm

@@ -9,7 +9,7 @@
 	build_path = /obj/machinery/power/pointdefense
 	origin_tech = list(TECH_ENGINEERING = 3, TECH_COMBAT = 2)
 	req_components = list(
-		/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser = 1,
+		/obj/item/vehicle_module/weapon/energy/laser = 1,
 		/obj/item/stock_parts/capacitor = 2,
 		/obj/item/stock_parts/manipulator = 2,
 	)

code/game/objects/items/contraband.dm

@@ -255,43 +255,43 @@
 	. = ..()
 	if(.)
 		return
-	var/loot = pick(/obj/item/mecha_parts/chassis/phazon,
-		/obj/item/mecha_parts/part/phazon_head,
-		/obj/item/mecha_parts/part/phazon_left_arm,
-		/obj/item/mecha_parts/part/phazon_left_leg,
-		/obj/item/mecha_parts/part/phazon_right_arm,
-		/obj/item/mecha_parts/part/phazon_right_leg,
-		/obj/item/mecha_parts/part/phazon_torso,
-		/obj/item/mecha_parts/part/honker_torso,
-		/obj/item/mecha_parts/part/honker_head,
-		/obj/item/mecha_parts/part/honker_left_arm,
-		/obj/item/mecha_parts/part/honker_left_leg,
-		/obj/item/mecha_parts/part/honker_right_arm,
-		/obj/item/mecha_parts/part/honker_right_leg,
-		/obj/item/mecha_parts/part/honker_armour,
-		/obj/item/mecha_parts/chassis/honker,
-		/obj/item/mecha_parts/part/reticent_torso,
-		/obj/item/mecha_parts/part/reticent_head,
-		/obj/item/mecha_parts/part/reticent_left_arm,
-		/obj/item/mecha_parts/part/reticent_left_leg,
-		/obj/item/mecha_parts/part/reticent_right_arm,
-		/obj/item/mecha_parts/part/reticent_right_leg,
-		/obj/item/mecha_parts/chassis/reticent,
-		/obj/item/mecha_parts/part/reticent_armour,
-		/obj/item/mecha_parts/part/durand_torso,
-		/obj/item/mecha_parts/part/durand_head,
-		/obj/item/mecha_parts/part/durand_left_arm,
-		/obj/item/mecha_parts/part/durand_left_leg,
-		/obj/item/mecha_parts/part/durand_right_arm,
-		/obj/item/mecha_parts/part/durand_right_leg,
-		/obj/item/mecha_parts/chassis/durand,
-		/obj/item/mecha_parts/part/gygax_torso,
-		/obj/item/mecha_parts/part/gygax_head,
-		/obj/item/mecha_parts/part/gygax_left_arm,
-		/obj/item/mecha_parts/part/gygax_left_leg,
-		/obj/item/mecha_parts/part/gygax_right_arm,
-		/obj/item/mecha_parts/part/gygax_right_leg,
-		/obj/item/mecha_parts/chassis/serenity)
+	var/loot = pick(/obj/item/vehicle_chassis/phazon,
+		/obj/item/vehicle_part/phazon_head,
+		/obj/item/vehicle_part/phazon_left_arm,
+		/obj/item/vehicle_part/phazon_left_leg,
+		/obj/item/vehicle_part/phazon_right_arm,
+		/obj/item/vehicle_part/phazon_right_leg,
+		/obj/item/vehicle_part/phazon_torso,
+		/obj/item/vehicle_part/honker_torso,
+		/obj/item/vehicle_part/honker_head,
+		/obj/item/vehicle_part/honker_left_arm,
+		/obj/item/vehicle_part/honker_left_leg,
+		/obj/item/vehicle_part/honker_right_arm,
+		/obj/item/vehicle_part/honker_right_leg,
+		/obj/item/vehicle_part/honker_armour,
+		/obj/item/vehicle_chassis/honker,
+		/obj/item/vehicle_part/reticent_torso,
+		/obj/item/vehicle_part/reticent_head,
+		/obj/item/vehicle_part/reticent_left_arm,
+		/obj/item/vehicle_part/reticent_left_leg,
+		/obj/item/vehicle_part/reticent_right_arm,
+		/obj/item/vehicle_part/reticent_right_leg,
+		/obj/item/vehicle_chassis/reticent,
+		/obj/item/vehicle_part/reticent_armour,
+		/obj/item/vehicle_part/durand_torso,
+		/obj/item/vehicle_part/durand_head,
+		/obj/item/vehicle_part/durand_left_arm,
+		/obj/item/vehicle_part/durand_left_leg,
+		/obj/item/vehicle_part/durand_right_arm,
+		/obj/item/vehicle_part/durand_right_leg,
+		/obj/item/vehicle_chassis/durand,
+		/obj/item/vehicle_part/gygax_torso,
+		/obj/item/vehicle_part/gygax_head,
+		/obj/item/vehicle_part/gygax_left_arm,
+		/obj/item/vehicle_part/gygax_left_leg,
+		/obj/item/vehicle_part/gygax_right_arm,
+		/obj/item/vehicle_part/gygax_right_leg,
+		/obj/item/vehicle_chassis/serenity)
 	new loot(usr.drop_location())
 	to_chat(user, "You unwrap the package.")
 	qdel(src)

code/game/objects/items/robot/gripper.dm

@@ -334,10 +334,10 @@
 	desc = "A large, heavy-duty grasping tool used in construction of mechs."
 
 	can_hold = list(
-		/obj/item/mecha_parts/part,
-		/obj/item/mecha_parts/micro/part,
-		/obj/item/mecha_parts/mecha_equipment,
-		/obj/item/mecha_parts/mecha_tracking
+		/obj/item/vehicle_part,
+		/obj/item/vehicle_part/micro,
+		/obj/item/vehicle_module,
+		/obj/item/vehicle_tracking_beacon
 		)
 
 /obj/item/gripper/no_use/loader //This is used to disallow building with metal.

code/game/objects/items/shield_projector/shield_projector.dm

@@ -303,7 +303,7 @@
 	max_shield_health = 200
 
 	var/obj/vehicle/sealed/mecha/my_mecha = null
-	var/obj/item/mecha_parts/mecha_equipment/combat_shield/my_tool = null
+	var/obj/item/vehicle_module/combat_shield/my_tool = null
 
 /obj/item/shield_projector/line/exosuit/process()
 	..()

code/game/objects/items/tools/weldingtool.dm

@@ -713,15 +713,15 @@
 	desc = "If you're seeing this, someone did a dum-dum."
 
 /obj/item/weldingtool/electric/mounted/exosuit
-	var/obj/item/mecha_parts/mecha_equipment/equip_mount = null
+	var/obj/item/vehicle_module/equip_mount = null
 	flame_intensity = 1
 	eye_safety_modifier = 2
 	always_process = TRUE
 
 /obj/item/weldingtool/electric/mounted/exosuit/Initialize(mapload)
 	. = ..()
 
-	if(istype(loc, /obj/item/mecha_parts/mecha_equipment))
+	if(istype(loc, /obj/item/vehicle_module))
 		equip_mount = loc
 
 /obj/item/weldingtool/electric/mounted/exosuit/process()

code/game/objects/items/weapons/RCD.dm

@@ -334,8 +334,8 @@
 		var/obj/item/hardsuit_module/module = loc
 		if(module.holder) // Is it attached to a HARDSUIT?
 			return module.holder.cell
-	if(istype(loc, /obj/item/mecha_parts/mecha_equipment)) // In a mech.
-		var/obj/item/mecha_parts/mecha_equipment/ME = loc
+	if(istype(loc, /obj/item/vehicle_module)) // In a mech.
+		var/obj/item/vehicle_module/ME = loc
 		if(ME.chassis) // Is the part attached to a mech?
 			return ME.chassis.cell
 	return null