Pick up bottles in town

This fixes #1159 - can now pick up and throw the bottles in the tavern.

Replaces #1252