CleverRaven/Cataclysm-DDA — pull request #5352 by dvolk (2014-01-02 18:06:13+00:00)
Title: add pacifist trait

for -4, you get combat skill increase at 1/3 of normal, and "negative adaptation" to killing monsters with the GUILT flag.