Implement weapon pick/drop

Fix collision detection when Y coord was the same on
both colliders.
Replace tabs with spaces.