Make food adjustable again.
Merge remote-tracking branch 'nethack4/nicehack' into upstream
Merge branch 'upstream'