Requesting a re-merge of another change that has mysteriously disappeared, https://github.com/tgstation/-tg-station/pull/485

Originally merged by @Giacomand
Adding lost pulls #590 #528 #574 #563 #529