diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index 0d7faf4735632..fb0b732b92486 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -1315,11 +1315,11 @@ "id": "PSYCHOPATH", "name": { "str": "Uncaring" }, "points": 2, - "description": "You don't feel any remorse or guilt for harming your fellow man.", + "description": "You don't feel any strong feelings for your fellow man.", "starting_trait": true, "random_at_chargen": false, "valid": false, - "social_modifiers": { "intimidate": 5 }, + "social_modifiers": { "lie": -5, "persuade": -5 }, "types": [ "HUMAN_EMPATHY" ], "flags": [ "PSYCHOPATH" ] }, diff --git a/data/json/npcs/common_chat/TALK_COMMON_ALLY.json b/data/json/npcs/common_chat/TALK_COMMON_ALLY.json index 605e35fd9e021..596620f7c4939 100644 --- a/data/json/npcs/common_chat/TALK_COMMON_ALLY.json +++ b/data/json/npcs/common_chat/TALK_COMMON_ALLY.json @@ -52,7 +52,11 @@ }, { "text": "Please go to this location.", "topic": "TALK_GOTO_LOCATION", "effect": "goto_location" }, { "text": "There's something I want you to do.", "topic": "TALK_ALLY_ORDERS" }, - { "text": "I just wanted to talk for a bit.", "topic": "TALK_ALLY_SOCIAL" }, + { + "text": "I just wanted to talk for a bit.", + "condition": { "not": { "u_has_trait": "PSYCHOPATH" } }, + "topic": "TALK_ALLY_SOCIAL" + }, { "text": "Can you help me understand something? (HELP/TUTORIAL)", "topic": "TALK_ALLY_TUTORIAL" }, { "text": "[DEBUG MIND CONTROL] Now listen closely… (DEBUG FUNCTIONS)",