From 926c4a5e17b68ea6b9b6f7d27af0c8b65716c427 Mon Sep 17 00:00:00 2001 From: Squirgenheimer Date: Mon, 29 Oct 2018 01:20:33 -0400 Subject: [PATCH] fixes deleting mechs causing a runtime -removed unnecessary code handled by detach() --- code/game/mecha/equipment/mecha_equipment.dm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm index 62928c95be5..743b8a097e6 100644 --- a/code/game/mecha/equipment/mecha_equipment.dm +++ b/code/game/mecha/equipment/mecha_equipment.dm @@ -31,19 +31,13 @@ /obj/item/mecha_parts/mecha_equipment/Destroy()//missiles detonating, teleporter creating singularity? if(chassis) - detach(chassis) - chassis.equipment -= src - listclearnulls(chassis.equipment) - if(chassis.selected == src) - chassis.selected = null - src.update_chassis_page() chassis.occupant_message("The [src] is destroyed!") chassis.log_append_to_last("[src] is destroyed.",1) if(istype(src, /obj/item/mecha_parts/mecha_equipment/weapon)) chassis.occupant << sound('sound/mecha/weapdestr.ogg', volume = 50) else chassis.occupant << sound('sound/mecha/critdestr.ogg', volume = 50) - chassis = null + detach(chassis) return ..() /obj/item/mecha_parts/mecha_equipment/proc/critfail()