Add whip
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into whipit
Whip now uses proper "generic_no_ammo"
Added "WHIP" ammo effect
Changed whip skill to melee, added melee to ranged time_to_fire
Whip now makes "Crack!" noise of 50
Fix NO_AMMO weapons displaying their no ammo when firing
NO_AMMO weapons no longer display ammo in menus
Add archaeologist profession
Add bullwhip to item spawns and crafing recipe
Whip can now be used to pull yourself out of sinkholes, lower yourself down a level
Remove unused whip ammo type
Fix long rope description (30 foot rope?! Whoa!)
Tweak bullwhip recipe
Fix rope descriptions again (I guess feet does make more sense!)
Change whip noise to 20
Archaeologist changes- fix description, change gun to S&W 619, remove
etched skull
Fix fedora description
Remove cutting quality from whip
Whip now has chance to disarm NPC if melee skill is high enough
Disarming with whip now prints message, no longer disarm when no weapon is held
Fix fedora encumberance to jive with HatFitting
Merge pull request #7774 from TranquilMarmot/whipit

Whip it!