implemented shooting limit
Merge branch 'master' into feature/networking