Fixes #4721

Also added the multitool to random bomb supply storage since it wasn't there already.