Removed pushing M for map. Also fixed the weapon info being displayed when not in collision
Merge branch 'master' of github.com:Mayple7/SausageFox150