fixed some shooter things
Merge branch 'temp'