[pickup logic + small multiplayer fix]
Merge branch 'backupMaster' into mergeStuff
[merge ready]