From 74ac2b9611169d7a9f042864c63aecea31fa6e0f Mon Sep 17 00:00:00 2001 From: "giacomand@gmail.com" Date: Sat, 15 Dec 2012 16:54:36 +0000 Subject: [PATCH] -Fixed vent pumps/vent scrubbers runtiming on deletion when it is dragged and then consumed by a singularity. -Fixed vents not correctly updating the area with their deletion. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5329 316c924e-a436-60f5-8080-3fe189b3f50e --- code/ATMOSPHERICS/components/unary/vent_pump.dm | 9 +++++---- code/ATMOSPHERICS/components/unary/vent_scrubber.dm | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm index b58a12b8b80..c40044c4f69 100644 --- a/code/ATMOSPHERICS/components/unary/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm @@ -323,7 +323,8 @@ new /obj/item/pipe(loc, make_from=src) del(src) - /obj/machinery/atmospherics/unary/vent_pump/Del() - initial_loc.air_scrub_info -= id_tag - ..() - return +/obj/machinery/atmospherics/unary/vent_pump/Del() + if(initial_loc) + initial_loc.air_vent_info -= id_tag + ..() + return diff --git a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm index 21484d25e19..feb8e9b16ec 100644 --- a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm @@ -259,7 +259,7 @@ new /obj/item/pipe(loc, make_from=src) del(src) - /obj/machinery/atmospherics/unary/vent_scrubber/Del() - initial_loc.air_scrub_info -= id_tag - ..() - return +/obj/machinery/atmospherics/unary/vent_scrubber/Del() + initial_loc.air_scrub_info -= id_tag + ..() + return