Revert "Merge branch 'master' of https://github.com/tgstation/-tg-station into wands"

This reverts commit 7d43c830bf60a851d35cbffccb9dc0c99b164664, reversing
changes made to b7b05d53ecf2dc8adf1939fce947fbc23d55cd9f.