Second hiding people adds

These are all the changes from first-hiding-people-adds (there was some error when I did my last pull request). Also there is some new content. I fixed some bugs that occurred after we added floor 2 (in the 'shooter close, but player still runs' contingency). Also I added some content for when the shooter is far away that is a bit more experimental.