Guns fix
Merge branch 'bs12-merge' of https://github.com/nan0desu/Baystation12 into bs12-merge