Fixed conflicts/most outlying issues with Atlas draft (#2518) #6740

Job	Run time
Collect data for other tasks	18s
Run Linters	3m 6s
Compile Maps	2m 3s
Windows Build	1m 55s
Integration Tests (combatarena) / run_integration_tests	15m 30s
Integration Tests (combatarena_snow) / run_integration_tests	14m 54s
Integration Tests (deltastation) / run_integration_tests	47m 10s
Integration Tests (combatarena_desert) / run_integration_tests	15m 27s
Integration Tests (drought) / run_integration_tests	31m 19s
Integration Tests (icebox) / run_integration_tests	39m 5s
Integration Tests (kilostation) / run_integration_tests	35m 31s
Integration Tests (metastation) / run_integration_tests	41m 57s
Integration Tests (mammoth) / run_integration_tests	42m 18s
Integration Tests (minimammoth) / run_integration_tests	33m 20s
Integration Tests (multiz_debug) / run_integration_tests	16m 53s
Integration Tests (runtimestation) / run_integration_tests	16m 5s
Integration Tests (tramstation) / run_integration_tests	45m 6s
Integration Tests (sunlightdebug) / run_integration_tests	14m 51s
Integration Tests (eaglelakemall) / run_integration_tests	32m 51s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	55s
Check Alternate Tests	0s
Compare Screenshot Tests	0s
	7h 30m 34s

Provide feedback