Make picking things up take energy again, and fix autopickup behaviour.  Closes #1759, partial reversionof e8e462c5.