Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

code/unit_tests/decl_tests.dm

@@ -0,0 +1,26 @@
+/datum/unit_test/emotes_shall_have_unique_keys
+	name = "DECLS: Emotes Shall Have Unique Keys"
+
+/datum/unit_test/emotes_shall_have_unique_keys/start_test()
+
+	var/list/keys = list()
+	var/list/duplicates = list()
+
+	var/list/all_emotes = decls_repository.get_decls_of_subtype(/decl/emote)
+	for(var/etype in all_emotes)
+		var/decl/emote/emote = all_emotes[etype]
+		if(!emote.key)
+			continue
+		if(emote.key in keys)
+			if(!duplicates[emote.key])
+				duplicates[emote.key] = list() 
+			duplicates[emote.key] += etype
+		else
+			keys += emote.key
+
+	if(length(duplicates))
+		fail("[length(duplicates)] emote\s had overlapping keys: [english_list(duplicates)].")
+	else
+		pass("All emotes had unique keys.")
+
+	return TRUE

code/unit_tests/map_tests.dm

@@ -115,9 +115,42 @@
 	var/list/edge_log = list()
 	if(active_edges)
 		for(var/connection_edge/E in air_master.active_edges)
+			var/a_temp = E.A.air.temperature
+			var/a_moles = E.A.air.total_moles
+			var/a_vol = E.A.air.volume
+			var/a_gas = ""
+			for(var/gas in E.A.air.gas)
+				a_gas += "[gas]=[E.A.air.gas[gas]]"
+			
+			var/b_temp
+			var/b_moles
+			var/b_vol
+			var/b_gas = ""
+			
+			// Two zones mixing
+			if(istype(E, /connection_edge/zone))
+				var/connection_edge/zone/Z = E
+				b_temp = Z.B.air.temperature
+				b_moles = Z.B.air.total_moles
+				b_vol = Z.B.air.volume
+				for(var/gas in Z.B.air.gas)
+					b_gas += "[gas]=[Z.B.air.gas[gas]]"
+
+			// Zone and unsimulated turfs mixing
+			if(istype(E, /connection_edge/unsimulated))
+				var/connection_edge/unsimulated/U = E
+				b_temp = U.B.temperature
+				b_moles = "Unsim"
+				b_vol = "Unsim"
+				for(var/gas in U.air.gas)
+					b_gas += "[gas]=[U.air.gas[gas]]"
+			
 			edge_log += "Active Edge [E] ([E.type])"
+			edge_log += "Edge side A: T:[a_temp], Mol:[a_moles], Vol:[a_vol], Gas:[a_gas]"
+			edge_log += "Edge side B: T:[b_temp], Mol:[b_moles], Vol:[b_vol], Gas:[b_gas]"
+			
 			for(var/turf/T in E.connecting_turfs)
-				edge_log += "+--- Connecting Turf [T] @ [T.x], [T.y], [T.z]"
+				edge_log += "+--- Connecting Turf [T] ([T.type]) @ [T.x], [T.y], [T.z] ([T.loc])"
 
 	if(active_edges)
 		fail("Maps contained [active_edges] active edges at round-start.\n" + edge_log.Join("\n"))