Migrated weapons and ammo crates to the new 'pickup' entities
Some cleanup of the new pickup code
More PickupType cleanup