Fix welder charges, allow code to force-mark tools as available
Merge welder fix.