Added some new logic checking for PickupType = None and Consumable items. This is just an extension of logic that has been in use since 2019.