Merge branch 'master' of https://github.com/Baystation12/Baystation12

Conflicts:
	code/setup.dm
Revert "Merge pull request #7053 from DJSnapshot/adminfeatures"

This reverts commit 61745c68c2665273e06261b31d4753eeebd75ec1, reversing
changes made to 9b98d08d602759277f5f486b580a35a9e3dfe07c.
Revert "Merge pull request #7049 from DJSnapshot/adminfeatures"

This reverts commit aa4bbbb6de55177265f84690e70374890d548f78, reversing
changes made to d0d2a100bd72398c49ee8e8f36f9832e25f91522.

Conflicts:
	code/setup.dm
fuck