Merge pull request #123 from Fluffy-Frontier/upstream-mirror-24402 #586

Job	Run time
Run Linters	20s
Collect data for other tasks	23s
Windows Build	38s
Compile Maps	41s
Integration Tests (birdshot) / run_integration_tests	42s
Integration Tests (deltastation) / run_integration_tests	49s
Integration Tests (icebox) / run_integration_tests	46s
Integration Tests (gateway_test) / run_integration_tests	42s
Integration Tests (metastation) / run_integration_tests	40s
Integration Tests (kilostation2) / run_integration_tests	46s
Integration Tests (multiz_debug) / run_integration_tests	1m 44s
Integration Tests (northstar) / run_integration_tests	44s
Integration Tests (nssjourney) / run_integration_tests	41s
Integration Tests (runtimestation) / run_integration_tests	43s
Integration Tests (tramstation) / run_integration_tests	45s
Integration Tests (voidraptor) / run_integration_tests	43s
Alternate Tests (515, 1603, runtimestation) / run_integration_tests	41s
Check Alternate Tests	0s
Compare Screenshot Tests	15s
	12m 43s

Provide feedback