Tweak previous commits to be more reasonable.
Merge branch 'Bleeding-Edge' of https://github.com/VelardAmakar/vgstation13 into Bleeding-Edge