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
Made the Internal Temp bionic consume power, and tweaked its behaviour
Sunny and clear weather now warm the player
Made Internal Climate Control bionic actually draw power
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.
Increased volume on some items, bear traps are a lot larger now.