fixes #9256 (error with deactivating bots and dropping ammo)
hopefully fixes #9256 (additional fixes)
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into fix_9256
hopefully completes the fix of fix #9256 !
Merge pull request #9284 from DavidKeaton/fix_9256

fixes #9256