From 7b7a200155a768fbe27059ed9d56ace70fddb7d8 Mon Sep 17 00:00:00 2001
From: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Date: Fri, 16 Nov 2012 18:53:03 +1000
Subject: [PATCH] added nullcheck to ZAS func, fix for severed powernets still
 being connected

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
---
 code/ZAS/FEA_system.dm      | 4 ++++
 code/modules/power/power.dm | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/code/ZAS/FEA_system.dm b/code/ZAS/FEA_system.dm
index 4434d9d2d40..11f48bfdb93 100644
--- a/code/ZAS/FEA_system.dm
+++ b/code/ZAS/FEA_system.dm
@@ -277,6 +277,10 @@ datum
 
 			proc/ConsiderRebuild(var/turf/simulated/T, var/turf/NT)
 
+				//zones should naturally spread to these tiles eventually
+				if(!T.zone || !NT.zone)
+					return
+
 				if(istype(NT, /turf/simulated) && NT.zone != T.zone)
 					T.zone.RemoveTurf(NT)
 					if(NT.zone)
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index 8fff49211e6..c5447698f18 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -119,6 +119,8 @@
 			if(!unmarked || !C.powernet)
 				if(C.d1 == fdir || C.d2 == fdir)
 					. += C
+				else if(C.d1 == turn(C.d2, 180))
+					. += C
 	return .