If possible, could you make the Gunsmith tools a drainable item, or something with a condition? Would make sense that the tools would go through some wear and tear. And if this is the case, maybe the gun toolkit, improvised gun toolkit and WD40 from Firearms B41 (and the Revamped version) could be used to restore condition on the Gunsmith tools? As well as any extra gunsmith tools you find could be used to restore condition by 'replacing' the broken tools in the kit. Kinda sucks having all these other weapon repair items lying around without any use, and all these extra Gunsmith Tools lying about as well