Merge pull request #1922 from Kreastr/master

Fix for issue #1868.
2025-12-25 09:31:13 +00:00 · 2012-11-12 12:12:11 -08:00
parent 16eaaffee0 2faf9c7a9c
commit b067372880
2 changed files with 4 additions and 2 deletions
--- a/code/ATMOSPHERICS/components/unary/vent_pump.dm
+++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm
@@ -324,6 +324,7 @@
 			del(src)

 	/obj/machinery/atmospherics/unary/vent_pump/Del()
-		initial_loc.air_scrub_info -= id_tag
+		if (initial_loc.air_scrub_info)
+			initial_loc.air_scrub_info -= id_tag
 		..()
 		return
--- a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
+++ b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
@@ -260,6 +260,7 @@
 			del(src)

 	/obj/machinery/atmospherics/unary/vent_scrubber/Del()
-		initial_loc.air_scrub_info -= id_tag
+		if (initial_loc.air_scrub_info)
+			initial_loc.air_scrub_info -= id_tag
 		..()
 		return