astyle npcmove.cpp, prevent npcs from deciding to go pick up liquids.

I can resubmit with just the function astyled if it affects other people's stuff in progress. But I was getting tired of seeing single-space indents when trying to grok the code...