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' of github.com:TheDarklingWolf/Cataclysm-DDA
Merge branch 'master' into feature/npc
Spawn frequency and spawn group rewrite: The start
Typos, indentation
Moved the monster picker code to mongroupdef.cpp, fixed up a few other loose ends
Merge remote-tracking branch 'upstream/master' into freq
Merge remote-tracking branch 'upstream/master' into freq