From 018bc09cb5b38f45c928c210b0ef0a94b6c47939 Mon Sep 17 00:00:00 2001
From: SirRichardFrancis <ahrfburton@gmail.com>
Date: Fri, 20 Dec 2024 19:58:02 +0300
Subject: [PATCH] unfuck ZAS

---
 code/ZAS/Connection.dm             | 15 +++++++--------
 code/ZAS/Turf.dm                   |  8 +++++---
 code/controllers/subsystems/air.dm |  2 ++
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/code/ZAS/Connection.dm b/code/ZAS/Connection.dm
index 7f4153d46e9..b8d0ab8f9d7 100644
--- a/code/ZAS/Connection.dm
+++ b/code/ZAS/Connection.dm
@@ -97,13 +97,14 @@ Class Procs:
 	return !(state & CONNECTION_INVALID)
 
 /connection/proc/erase()
-	edge.remove_connection(src)
+	if(edge)
+		edge.remove_connection(src)
 	state |= CONNECTION_INVALID
 	//world << "Connection Erased: [state]"
 
 /connection/proc/update()
 	//world << "Updated, \..."
-	if(!istype(A,/turf))
+	if(!A.is_simulated)
 		//world << "Invalid A."
 		erase()
 		return
@@ -118,10 +119,8 @@ Class Procs:
 	else
 		mark_direct()
 
-	var/b_is_space = !istype(B,/turf)
-
 	if(state & CONNECTION_SPACE)
-		if(!b_is_space)
+		if(B.is_simulated)
 			//world << "Invalid B."
 			erase()
 			return
@@ -131,16 +130,16 @@ Class Procs:
 				erase()
 				//world << "erased."
 				return
-			else
+			if(edge)
 				edge.remove_connection(src)
 				edge = SSair.get_edge(A.zone, B)
 				edge.add_connection(src)
-				zoneA = A.zone
+			zoneA = A.zone
 
 		//world << "valid."
 		return
 
-	else if(b_is_space)
+	else if(!B.is_simulated)
 		//world << "Invalid B."
 		erase()
 		return
diff --git a/code/ZAS/Turf.dm b/code/ZAS/Turf.dm
index dbe426e8ab1..4eb6ab78717 100644
--- a/code/ZAS/Turf.dm
+++ b/code/ZAS/Turf.dm
@@ -54,7 +54,7 @@
 
 		var/previously_open = open_directions
 		open_directions = 0
-		var/list/postponed
+		var/list/postponed = list()
 		#ifdef ZLEVELS
 		for(var/d = 1, d < 64, d *= 2)
 		#else
@@ -96,8 +96,6 @@
 						//    we are blocking them and not blocking ourselves - this prevents tiny zones from forming on doorways.
 						if(((block & ZONE_BLOCKED) && !(r_block & ZONE_BLOCKED)) || ((r_block & ZONE_BLOCKED) && !(s_block & ZONE_BLOCKED)))
 							//Postpone this tile rather than exit, since a connection can still be made.
-							if(!postponed)
-								postponed = list()
 							postponed.Add(neighbour_turf)
 						else
 							neighbour_turf.zone.add(src)
@@ -106,6 +104,10 @@
 							#endif
 					else if(neighbour_turf.zone != zone)
 						SSair.connect(src, neighbour_turf)
+			else if(zone)
+				SSair.connect(src, neighbour_turf)
+			else // This tile does not yet have a valid zone, but likely to get one from other neighbours
+				postponed.Add(neighbour_turf)
 
 		if(!TURF_HAS_VALID_ZONE(src)) //Still no zone, make a new one.
 			var/zone/newzone = new/zone()
diff --git a/code/controllers/subsystems/air.dm b/code/controllers/subsystems/air.dm
index 087dfb86a5e..742ffed92e9 100644
--- a/code/controllers/subsystems/air.dm
+++ b/code/controllers/subsystems/air.dm
@@ -329,6 +329,8 @@ SUBSYSTEM_DEF(air)
 	#ifdef ZASDBG
 	ASSERT(isturf(A))
 	ASSERT(isturf(B))
+	if(istype(B, /turf/space))
+		return FALSE
 	#endif
 
 	var/ablock = A.c_airblock(B)