Room5 major fixes

Room 5 fixes incoming
Merge branch 'master' of https://github.com/cognimancer/infinidungeon