Changed carboy to the more generally understood term 'jug'
Prevent monsters with no path from following us down stairs. Fix contributed by Uronym.
Make player::has_watertight_container() check weapon slot as well as inventory
String and rope no longer choppable. Closes #222
Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA
Merge pull request #220 from GlyphGryph/carboy_name_change

Changed carboy to the more generally understood term 'jug'
Merge pull request #221 from areasaside/master

Fixed bug where you can't fill wielded bottles
fix conflict