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

Job	Run time
Run Linters	4m 12s
Collect data for other tasks	14s
Alternate Tests	0s
Compile Maps	2m 14s
Windows Build	1m 59s
Check Alternate Tests	0s
Integration Tests (birdshot) / run_integration_tests	7m 59s
Integration Tests (deltastation) / run_integration_tests	8m 8s
Integration Tests (gateway_test) / run_integration_tests	8m 54s
Integration Tests (icebox) / run_integration_tests	8m 53s
Integration Tests (metastation) / run_integration_tests	8m 17s
Integration Tests (multiz_debug) / run_integration_tests	7m 24s
Integration Tests (northstar) / run_integration_tests	8m 55s
Integration Tests (runtimestation) / run_integration_tests	7m 3s
Integration Tests (tramstation) / run_integration_tests	8m 37s
Compare Screenshot Tests	0s
	1h 22m 49s

Provide feedback