2aab5fa71c
https://github.com/tgstation/-tg-station/pull/3609 Squashes the commits from the above pull request. Should hopefully be a lot less cluttered.