Replace direct modifications of player::pain with calls to player::mod_pain() to unify handling of pain related traits.
Merge pull request #5528 from kevingranade/unify-pain-handling

Unify pain handling