merged from pre-dda mod
finally stopped npcs leaping to their death in a quest for some random cookie
Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA into feature/npc
reload if in vehicles over using melee
Merge branch 'master' into feature/npc
why I should at least complile code before I checkin
allow use of silenced firearms, added combat option for player to toggle
npcs detection for incoming cars
merge conflicts fixed
undo new avoidance system because I didn't think how it was going to work, and it doesn't
added basecamp, tied into bulletin boards
allowed npcs to wait at basecamp
Merge branch 'master' into feature/npc
Merge branch 'master' into feature/npc
Fixed formatting issue with help display
Changed carboy to the more generally understood term 'jug'
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'