CleverRaven/Cataclysm-DDA — pull request #5528 by kevingranade (2014-01-13 05:40:33+00:00)
Title: Unify pain handling

Pull most direct modifications of player::pain into player::mod_pain() to eliminate redundant checks of traits.
Minor side issue, base stim handling for alchohol metabolism trait on stim value of the food instead of making an exception for a specific food.