From 57bf6fc7baa7bda9ba10309d123f3bda3cceb478 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 30 Jun 2017 22:42:58 -0500 Subject: [PATCH] Machinery clears it's occupant var if removed (#1767) --- code/game/machinery/machinery.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 7746bde50c..39c240716f 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -495,3 +495,8 @@ Class Procs: emp_act(2) else ex_act(2) + +/obj/machinery/Exited(atom/movable/AM, atom/newloc) + . = ..() + if (AM == occupant) + occupant = null