Merge branch 'master' into dev

tests/DMAPI/LongRunning/Test.dm

@@ -132,6 +132,12 @@ var/run_bridge_test
 	if(tactics8)
 		return received_health_check ? "received health check" : "did not receive health check"
 
+	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")
+		kajigger_test = TRUE
+		return "we love casting spells"
+
 	TgsChatBroadcast(new /datum/tgs_message_content("Recieved non-tgs topic: `[T]`"))
 
 	return "feck"
@@ -151,10 +157,18 @@ var/run_bridge_test
 	world.TgsChatBroadcast(new /datum/tgs_message_content("2/3 queued detached chat messages"))
 	world.TgsChatBroadcast(new /datum/tgs_message_content("3/3 queued detached chat messages"))
 
+var/kajigger_test = FALSE
+
 /world/Reboot(reason)
 	TgsChatBroadcast("World Rebooting")
+
+	if(kajigger_test && !fexists("kajigger.txt"))
+		FailTest("TGS STOLE MY KAJIGGER (#1548 regression)")
+
 	TgsReboot()
 
+	..()
+
 var/received_health_check = FALSE
 
 /datum/tgs_event_handler/impl
@@ -186,6 +200,7 @@ var/received_health_check = FALSE
 	world.log << "Done sleep, calling Reboot"
 	world.Reboot()
 
+
 /datum/tgs_chat_command/embeds_test
 	name = "embeds_test"
 	help_text = "dumps an embed"