[Fenris447]

I checked it out and it's great! Though at the risk of sounding like a choosing beggar (asking for help then complaining), I did find a few issues.

1. The situational asterisk does show up for both. But the "add 1d4" etc. only shows on the hover-over text for the skill, not the tools
2. For some reason, the little "(X)" circle doesn't show up on the skill after it's selected, only on the tool.
3. It doesn't play nice with the adjustment to add a proficiency. When you use that adjustment, whatever new skill you want is limited to the skills from this feature. Also, whatever skill or tool you pick will likewise get the situational bonus.

I did come up with a different potential solution for this, which I could pursue if you're not interested in tweaking it further. It would be array-based; the skill would be relatively easy. For the tool, it would be branching arrays; selecting Artisan's Tools would create a new array to pick which one of those, same for Instruments and Gaming Sets. It wouldn't be self-generating for new tools from additional sourcebooks, hence the inelegance.