Merge pull request #3380 from Zuhayr/feature

Vox shuttle mapfix.
Armalis pinning fix.
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
Another fucking vox shuttle mapfix. Should stop the rsc corruption issues.