Merge branch 'master' of https://github.com/Singul0/tgstation #11

Job	Run time
Collect data for other tasks	11s
Run Linters	1m 37s
Windows Build	1m 27s
Compile Maps	2m 12s
Integration Tests (gateway_test) / run_integration_tests	9m 30s
Integration Tests (birdshot) / run_integration_tests	8m 17s
Integration Tests (deltastation) / run_integration_tests	8m 21s
Integration Tests (icebox) / run_integration_tests	8m 57s
Integration Tests (metastation) / run_integration_tests	7m 48s
Integration Tests (multiz_debug) / run_integration_tests	7m 39s
Integration Tests (northstar) / run_integration_tests	9m 11s
Integration Tests (runtimestation) / run_integration_tests	7m 25s
Integration Tests (tramstation) / run_integration_tests	8m 38s
Alternate Tests (515, 1621, runtimestation) / run_integration_tests	7m 31s
Check Alternate Tests	1s
Compare Screenshot Tests	18s
	1h 29m 3s

Provide feedback