Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/SuperSayu/-tg-station
MakeDirty moved out of floor/new and a loop has been put in the master controller's setup phase.