Burning people fix
Merge branch 'stable' of https://github.com/nan0desu/Baystation12 into stable