Make player::has_watertight_container() check weapon slot as well as inventory
Merge pull request #221 from areasaside/master

Fixed bug where you can't fill wielded bottles