Improved pickup behaviour when near item limit

Hah! Did the branch thing right this time! :D