Fixes #4721

Also added the multitool to bomb supply storage.