Merge branch 'master' of https://github.com/Baystation12/Baystation12

code/ZAS/Connection.dm

@@ -158,6 +158,7 @@ connection
 		if(!istype(zone_1) || !istype(zone_2))
 			return
 
+		if(indirect != CONNECTION_CLOSED)
 			//Handle disconnection of indirectly or directly connected zones.
 			if( (zone_1 in zone_2.connected_zones) || (zone_2 in zone_1.connected_zones) )
 
@@ -181,6 +182,7 @@ connection
 						if(!zone_2.connected_zones.len)
 							zone_2.connected_zones = null
 
+		else
 			//Handle disconnection of closed zones.
 			if( (zone_1 in zone_2.closed_connection_zones) || (zone_2 in zone_1.closed_connection_zones) )
 
@@ -259,9 +261,8 @@ connection
 
 				//The door is instead closed.
 				else if(indirect > CONNECTION_CLOSED)
-					indirect = CONNECTION_CLOSED
-
 					DisconnectZones(A.zone, B.zone)
+					indirect = CONNECTION_CLOSED
 					ConnectZones(A.zone, B.zone)
 
 			//If I can no longer pass air, better delete

code/modules/power/solar.dm

@@ -461,6 +461,8 @@ var/list/solars_list = list()
 		if(src.trackrate) nexttime = world.time + 6000/trackrate
 		track = text2num(href_list["track"])
 		if(powernet && (track == 2))
+			if(!solars_list.Find(src,1,0))
+				solars_list.Add(src)
 			for(var/obj/machinery/power/tracker/T in get_solars_powernet())
 				if(powernet.nodes[T])
 					cdir = T.sun_angle