Update toward item pickups

Been working towards getting item pickups to obay the limited inventory
rules. Incomplete, but have copied vanilla code into custom files