Merge remote-tracking branch 'upstream/master' into issue7440_joints
iuse::smoking works with cigars, cigarettes, handrolls, and joints.
used to light up one time use items. changed appropriate use actions.

can no longer directly use weed or tobacco to trigger pipe smoking.

iuse::smoking_pipe empty shell while I figure out how I want to
handle smoking via pipe.

idea is to flag SMOKABLE items and, when using a pipe, allow the player
to choose item from a menu, toke and then consume the item.
Merge remote-tracking branch 'upstream/master' into issue7440_joints
It's a beautiful day for name_plural.
Finish pipe smoking, which restores the ability to smoke weed and tobacco
via one of the pipes.

crackpipe, tobacco pipe, and glass pipe have a use_action of SMOKING_PIPE.

Two things are smokable now through the iuse::smoking_pipe command:
tobacco and weed.

Menu always pops up even with limited choices. I like this because I can
at least escape the menu if I accidentally apply the pipe.

This concludes the work for issue #7440.
Ran suggested aystle command on code.
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!)
Merge remote-tracking branch 'upstream/master' into issue7440_joints
Clean up code so jenkins likes it.
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
Add note about loading 9mm turrets

Exactly what it says on the label affixed to all turrets.
Fix fedora encumberance to jive with HatFitting