diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm index 27d8e3c6765..53f14f61477 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -53,21 +53,19 @@ name = "[initial_loc.name] Air Scrubber #[length(initial_loc.scrubbers)]" /obj/machinery/atmospherics/unary/vent_scrubber/Destroy() - . = ..() + if(initial_loc) + initial_loc.scrubbers -= src + GLOB.all_scrubbers -= src + return ..() + /obj/machinery/atmospherics/unary/vent_scrubber/examine(mob/user) . = ..() . += "This filters the atmosphere of harmful gas. Filtered gas goes straight into the connected pipenet. Controlled by an Air Alarm." if(welded) . += "It seems welded shut." -/obj/machinery/atmospherics/unary/vent_scrubber/Destroy() - if(initial_loc) - initial_loc.scrubbers -= src - - return ..() - /obj/machinery/atmospherics/unary/vent_scrubber/update_overlays() . = ..() plane = FLOOR_PLANE