Traps now disarm when picked up while armed Traps have their own persisted data, stores their current armed state Fixed some cases where orphaned trap hints could hang around