Fixes #7929

Makes tent and harmless traps work alike, and all traps get the pickup
item after disarming.