diff --git a/baystation12.int b/baystation12.int
index b82874fded..fd01a6c594 100644
--- a/baystation12.int
+++ b/baystation12.int
@@ -1,6 +1,11 @@
 // BEGIN_INTERNALS
 /*
 MAP_ICON_TYPE: 0
+LAST_COMPILE_VERSION: 503.1224
+WINDOW: code\modules\admin\verbs\mapping.dm;code\ZAS\ConnectionGroup.dm;code\ZAS\Debug.dm;code\ZAS\_docs.dm
+DIR: code code\modules code\modules\admin code\modules\admin\verbs code\ZAS 
+FILE: code\ZAS\_docs.dm
+LAST_COMPILE_TIME: 1392997541
 AUTO_FILE_DIR: OFF
 */
 // END_INTERNALS
diff --git a/code/ZAS/_docs.dm b/code/ZAS/_docs.dm
index 26bb4d3b21..8d084dc4c9 100644
--- a/code/ZAS/_docs.dm
+++ b/code/ZAS/_docs.dm
@@ -27,7 +27,7 @@ Notes for people who used ZAS before:
 
 */
 
-#define ZASDBG
+//#define ZASDBG
 //#define ZLEVELS
 
 #define AIR_BLOCKED 1
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
index f984e17447..ab7ef30e91 100644
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -125,20 +125,20 @@ var/intercom_range_display_status = 0
 	feedback_add_details("admin_verb","mIRD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 var/list/debug_verbs = list (
-	/client/proc/do_not_use_these       
-        ,/client/proc/camera_view    
+	/client/proc/do_not_use_these
+        ,/client/proc/camera_view
         ,/client/proc/sec_camera_report
-        ,/client/proc/intercom_view    
-        ,/client/proc/air_status 
-        ,/client/proc/Cell 
-        ,/client/proc/atmosscan 
-        ,/client/proc/powerdebug 
+        ,/client/proc/intercom_view
+        ,/client/proc/air_status
+        ,/client/proc/Cell
+        ,/client/proc/atmosscan
+        ,/client/proc/powerdebug
         ,/client/proc/count_objects_on_z_level
         ,/client/proc/count_objects_all
         ,/client/proc/cmd_assume_direct_control
         ,/client/proc/jump_to_dead_group
         ,/client/proc/startSinglo
-        ,/client/proc/ticklag       
+        ,/client/proc/ticklag
         ,/client/proc/cmd_admin_grantfullaccess
         ,/client/proc/kaboom
         ,/client/proc/splash
@@ -158,8 +158,8 @@ var/list/debug_verbs = list (
         ,/client/proc/Test_ZAS_Connection
         ,/client/proc/ZoneTick
         ,/client/proc/hide_debug_verbs
-	,/client/proc/testZAScolors
-	,/client/proc/testZAScolors_remove
+	,/client/proc/testZAScolors
+	,/client/proc/testZAScolors_remove
 	)
 
 
@@ -193,16 +193,17 @@ var/list/debug_verbs = list (
 	testZAScolors_zones += Z
 	if(recurse_level > 10)
 		return
-	var/icon/yellow = new('icons/misc/debug_group.dmi', "yellow") 
+	var/icon/yellow = new('icons/misc/debug_group.dmi', "yellow")
 
 	for(var/turf/T in Z.contents)
 		images += image(yellow, T, "zasdebug", TURF_LAYER)
 		testZAScolors_turfs += T
-	for(var/zone/connected in Z.connected_zones)
+	for(var/connection_edge/zone/edge in Z.edges)
+		var/zone/connected = edge.get_connected_zone(Z)
 		if(connected in testZAScolors_zones)
 			continue
 		recurse_zone(connected,recurse_level+1)
-	
+
 
 /client/proc/testZAScolors()
 	set category = "ZAS"
@@ -211,17 +212,17 @@ var/list/debug_verbs = list (
 	if(!check_rights(R_DEBUG)) return
 	testZAScolors_remove()
 
-	var/turf/location = get_turf(usr)
-
-	if(!istype(location, /turf/simulated)) // We're in space, let's not cause runtimes.
-		usr << "\red this debug tool cannot be used from space"
-		return
+	var/turf/simulated/location = get_turf(usr)
+
+	if(!istype(location, /turf/simulated)) // We're in space, let's not cause runtimes.
+		usr << "\red this debug tool cannot be used from space"
+		return
 
 	var/icon/red = new('icons/misc/debug_group.dmi', "red")		//created here so we don't have to make thousands of these.
-	var/icon/green = new('icons/misc/debug_group.dmi', "green") 
-	var/icon/blue = new('icons/misc/debug_group.dmi', "blue") 
+	var/icon/green = new('icons/misc/debug_group.dmi', "green")
+	var/icon/blue = new('icons/misc/debug_group.dmi', "blue")
 
-	if(!usedZAScolors)	
+	if(!usedZAScolors)
 		usr << "ZAS Test Colors"
 		usr << "Green = Zone you are standing in"
 		usr << "Blue = Connected zone to the zone you are standing in"
@@ -233,12 +234,14 @@ var/list/debug_verbs = list (
 	for(var/turf/T in location.zone.contents)
 		images += image(green, T,"zasdebug", TURF_LAYER)
 		testZAScolors_turfs += T
-	for(var/zone/Z in location.zone.connected_zones)
-		testZAScolors_zones += Z		
+	for(var/connection_edge/zone/edge in location.zone.edges)
+		var/zone/Z = edge.get_connected_zone(location.zone)
+		testZAScolors_zones += Z
 		for(var/turf/T in Z.contents)
 			images += image(blue, T,"zasdebug",TURF_LAYER)
 			testZAScolors_turfs += T
-		for(var/zone/connected in Z.connected_zones)
+		for(var/connection_edge/zone/z_edge in Z.edges)
+			var/zone/connected = z_edge.get_connected_zone(Z)
 			if(connected in testZAScolors_zones)
 				continue
 			recurse_zone(connected,1)