Merge branch 'tgstation:master' into master #16

Job	Run time
Run Linters	2m 30s
Collect data for other tasks	14s
Compile Maps	2m 24s
Windows Build	1m 39s
Integration Tests (birdshot) / run_integration_tests	8m 46s
Integration Tests (deltastation) / run_integration_tests	8m 35s
Integration Tests (gateway_test) / run_integration_tests	9m 58s
Integration Tests (icebox) / run_integration_tests	8m 54s
Integration Tests (metastation) / run_integration_tests	8m 38s
Integration Tests (multiz_debug) / run_integration_tests	7m 42s
Integration Tests (northstar) / run_integration_tests	9m 15s
Integration Tests (runtimestation) / run_integration_tests	7m 31s
Integration Tests (tramstation) / run_integration_tests	8m 46s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	7m 23s
Integration Tests (wawastation) / run_integration_tests	8m 37s
Check Alternate Tests	1s
Compare Screenshot Tests	14s
	1h 41m 7s

Provide feedback