Fixes #4721

Also added the multitool to bomb supply storage.
Merge branch 'issuefix' of https://github.com/Jarcolr/Baystation12 into issuefix