Fixes #4721

Also added the multitool to bomb supply storage.
Merge pull request #4745 from Jarcolr/issuefix

Fixes #4721