From a39c3ec9ba55c0f4dacdca37393aa3bfc9191506 Mon Sep 17 00:00:00 2001
From: Markolie <markvanalphen2@gmail.com>
Date: Mon, 21 Sep 2015 02:33:53 +0200
Subject: [PATCH] gcDestroyed fixes

---
 code/ATMOSPHERICS/atmospherics.dm             | 5 +++--
 code/ATMOSPHERICS/pipes/pipe.dm               | 2 +-
 code/modules/garbage collection/gc_testing.dm | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm
index 393b825f35e..5748857bbf3 100644
--- a/code/ATMOSPHERICS/atmospherics.dm
+++ b/code/ATMOSPHERICS/atmospherics.dm
@@ -161,7 +161,7 @@ Pipelines + Other Objects -> Pipe network
 			user << "<span class='warning'>As you begin unwrenching \the [src] a gush of air blows in your face... maybe you should reconsider?</span>"
 			unsafe_wrenching = TRUE //Oh dear oh dear
 		
-		if (do_after(user, 40, target = src) && !gcDestroyed)
+		if (do_after(user, 40, target = src) && isnull(gcDestroyed))
 			user.visible_message( \
 				"[user] unfastens \the [src].", \
 				"<span class='notice'>You have unfastened \the [src].</span>", \
@@ -306,4 +306,5 @@ Pipelines + Other Objects -> Pipe network
 	
 /obj/machinery/atmospherics/singularity_pull(S, current_size)
 	if(current_size >= STAGE_FIVE)
-		Deconstruct()	
\ No newline at end of file
+		Deconstruct()	
+		
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/pipes/pipe.dm b/code/ATMOSPHERICS/pipes/pipe.dm
index fa51cf83869..7ff4141076b 100644
--- a/code/ATMOSPHERICS/pipes/pipe.dm
+++ b/code/ATMOSPHERICS/pipes/pipe.dm
@@ -27,7 +27,7 @@
 			qdel(meter)
 	. = ..()
 
-	if(parent && !parent.gcDestroyed)
+	if(parent && isnull(parent.gcDestroyed))
 		qdel(parent)
 	parent = null
 
diff --git a/code/modules/garbage collection/gc_testing.dm b/code/modules/garbage collection/gc_testing.dm
index 5035ee04d8e..f571a00c791 100644
--- a/code/modules/garbage collection/gc_testing.dm	
+++ b/code/modules/garbage collection/gc_testing.dm	
@@ -175,7 +175,7 @@ var/global/list/ghdels_profiled = list()
 	if(garbageCollector)
 		while(garbageCollector.queue.len)
 			var/datum/o = locate(garbageCollector.queue[1])
-			if(istype(o) && o.gcDestroyed)
+			if(istype(o) && !isnull(o.gcDestroyed))
 				del(o)
 				garbageCollector.dels_count++
 			garbageCollector.queue.Cut(1, 2)