Workshops should be built with the tools in them, not have every dwarf carry around a toy hammer
I agree with that, if you mean the tools should be built
into the shop, like the anvil is. This avoids strewing tools around everywhere, and imposes some cost on setting up shops. Examples:
- Butcher's shop: Knife (possibly axe or sword? maybe any of these?)
- Leatherworker's and Tailor's shop: Awl
- Craftsdwarf's shop: Chisel (used for all types of crafting)
- Carpenter's shop: Axe (this is a key early industry so it should use a very multifunctional tool)
- Forge: Anvil
and hammer- Still and Tannery: Barrel (Still should also require blocks for a furnace)
- Kitchen and Fishery: Knife (Kitchen should also require blocks for an oven)
- Mason's shop: Hammer
- Farmer's workshop: Flail, maybe?
The knife could be a generalization of the dagger. The chisel and awl are new. Any of the hand tools can be made of any industrial metal, except the chisel, which has to be iron or steel.
The exceptions are jobs that don't use workshops. Mining, woodcutting, and hunting are already like that; add fishing (spear), farming (maybe shovel or something; they could just use their hands though), and engraving (hammer and/or chisel). These dwarves would go and pick up the tool when they had one of these labors enabled. If they have more than one, they should carry the tool for the job they're currently doing, and then switch it when they start on a job that requires a different one.