pickup updated (needs more work)
Merge branch 'master' of https://github.com/TeamZilla/Destroyer