Another try at fixing the smoke addicted dwarves.

What makes fixing this even harder is that somehow I cannot replicate the bug in my games, and I had many different game states running at once trying to replicate it to no success, and since reloading fixes the issue that makes it even worse.

Sorry everyone for this madness. Hopefully third time's the charm.

(This is yet another hotfix 30 minutes after the first that introduces additional safeguards and cleanups. So if you donwloaded the hotfix half hour ago please redownload)