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 for teleport duplicating monsters.
Made Player::Has_matching_liquid() check weapon slot.
Removed check in handle liquid that did not allow selection of weapon slot when using a half full container.
Merge pull request #224 from AreasAside/master

Finished fixing bug preventing containers in the weapon slot from being filled all the way
Merge remote-tracking branch 'upstream/master' into freq