From ec0ccbaf40fdedf08b74f9cffcd76d54907af05a Mon Sep 17 00:00:00 2001 From: xxalpha Date: Thu, 27 Aug 2015 18:48:31 +0100 Subject: [PATCH] Merged with recent change --- code/game/machinery/bots/mulebot.dm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index 9c57d710916..f7c760893ab 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -80,9 +80,9 @@ var/global/mulebot_count = 0 name = "\improper Mulebot ([suffix])" /obj/machinery/bot/mulebot/Destroy() + unload(0) qdel(wires) wires = null - load = null return ..() obj/machinery/bot/mulebot/bot_reset() @@ -862,10 +862,6 @@ obj/machinery/bot/mulebot/CanPass(atom/movable/mover, turf/target, height=1.5) new /obj/effect/decal/cleanable/oil(loc) qdel(src) -/obj/machinery/bot/mulebot/Destroy() - unload(0) - return ..() - #undef SIGH #undef ANNOYED -#undef DELIGHT +#undef DELIGHT