diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm index 82db351ed12..85af948f96e 100644 --- a/code/game/mecha/equipment/mecha_equipment.dm +++ b/code/game/mecha/equipment/mecha_equipment.dm @@ -228,6 +228,8 @@ return ..() /obj/item/mecha_parts/mecha_equipment/proc/detach(atom/moveto=null) + if(!chassis) + return moveto = moveto || get_turf(chassis) forceMove(moveto) chassis.equipment -= src