Pains me to submit this, but gourmet beverage containers can be refilled with another liquid, and still grant the morale boost.

I finished this whiskey, filled it with water and..

*snipping log*

Refilling it won't result in that nice continued bonus any longer.

This will go in with the next clump of fixes.