Revert "Maint 11 (miscelleaneous changes)"

This reverts commit 4a543a2a6893c547b4c62bc336a0370c8efab4e6.

Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
Merge branch 'Bleeding-Edge' of https://github.com/IratePirate/vgstation13 into Bleeding-Edge