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

Job	Run time
Collect data for other tasks	21s
Lint with OpenDream	30s
Run Linters	2m 10s
Compile Maps	2m 11s
Windows Build	1m 42s
Integration Tests (birdshot) / run_integration_tests	8m 20s
Integration Tests (deltastation) / run_integration_tests	8m 24s
Integration Tests (gateway_test) / run_integration_tests	9m 31s
Integration Tests (icebox) / run_integration_tests	9m 1s
Integration Tests (metastation) / run_integration_tests	8m 19s
Integration Tests (multiz_debug) / run_integration_tests	7m 46s
Integration Tests (northstar) / run_integration_tests	13m 22s
Integration Tests (runtimestation) / run_integration_tests	7m 34s
Integration Tests (tramstation) / run_integration_tests	12m 22s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	7m 15s
Check Alternate Tests	1s
Compare Screenshot Tests	0s
	1h 38m 49s

Provide feedback