From 8378428136bb767dbd4f97998534a32a6f0f02c1 Mon Sep 17 00:00:00 2001 From: Verkister Date: Thu, 30 Sep 2021 04:33:00 +0300 Subject: [PATCH 1/2] Fixes runtime in mech equipment deletion (#8308) * Fixes runtime in mech equipment deletion No need to detach from anything when you're already loose. * Update mecha_equipment.dm --- code/game/mecha/equipment/mecha_equipment.dm | 2 ++ 1 file changed, 2 insertions(+) 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