Merge branch 'V6' into OpenDream

tests/DMAPI/LongRunning/Test.dm

@@ -176,6 +176,10 @@ var/run_bridge_test
 	if(tactics8)
 		return received_health_check ? "received health check" : "did not receive health check"
 
+	var/tactics_broadcast = data["tgs_integration_test_tactics_broadcast"]
+	if(tactics_broadcast)
+		return last_tgs_broadcast || "!!NULL!!"
+
 	var/legalize_nuclear_bombs = data["shadow_wizard_money_gang"]
 	if(legalize_nuclear_bombs)
 		text2file("I expect this to remain here for a while", "kajigger.txt")

tests/DMAPI/test_prelude.dm

@@ -3,7 +3,8 @@
 #define TGS_READ_GLOBAL(Name) global.##Name
 #define TGS_WRITE_GLOBAL(Name, Value) global.##Name = ##Value
 #define TGS_PROTECT_DATUM(Path)
-#define TGS_WORLD_ANNOUNCE(message) world << ##message
+var/last_tgs_broadcast
+#define TGS_WORLD_ANNOUNCE(message) if(TRUE) { var/__tgs_announce_message_local = ##message; world << __tgs_announce_message_local; last_tgs_broadcast = __tgs_announce_message_local; }
 #define TGS_WARNING_LOG(message) world.log << "Warn: [##message]"
 #define TGS_NOTIFY_ADMINS(event)
 #define TGS_CLIENT_COUNT 0