Requesting re-merge of lost changes

https://github.com/tgstation/-tg-station/pull/507

Originally merged by @Giacomand , these changes have since somehow been lost