Restore functionality where depleted tools that don't revert to inactive are destroyed, particularly for acid bombs,
Make fish traps not disappear when they run out of bait.
Merge pull request #9165 from kevingranade/fix-immortal-acid-bombs

Fix immortal acid bombs