From 3a81c2b058b904e82e32efe48aa2a3560bc4736e Mon Sep 17 00:00:00 2001 From: Doxxmedearly Date: Sun, 30 Jul 2023 12:19:36 -0400 Subject: [PATCH] Paxazide stops harm intent --- code/modules/mob/living/carbon/human/human_helpers.dm | 6 ++++++ code/modules/mob/living/life.dm | 2 +- html/changelogs/doxxmedearly-pacify_fixes.yml | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/doxxmedearly-pacify_fixes.yml diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 6460ce4fbb8..89029c176a2 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -41,6 +41,12 @@ #undef HUMAN_EATING_NO_MOUTH #undef HUMAN_EATING_BLOCKED_MOUTH +/mob/living/carbon/human/set_intent(var/set_intent) + if(is_pacified() && set_intent == I_HURT && !is_berserk()) + to_chat(src, SPAN_WARNING("You don't want to harm other beings!")) + return + ..() + /mob/living/carbon/human/proc/update_equipment_vision() flash_protection = 0 equipment_tint_total = 0 diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index 4eec046cbf6..fffa8860316 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -107,7 +107,7 @@ //Ears handle_hearing() - if((is_pacified()) && a_intent == I_HURT) + if((is_pacified()) && a_intent == I_HURT && !is_berserk()) to_chat(src, "You don't feel like harming anybody.") a_intent_change(I_HELP) diff --git a/html/changelogs/doxxmedearly-pacify_fixes.yml b/html/changelogs/doxxmedearly-pacify_fixes.yml new file mode 100644 index 00000000000..f7a1b6daa3f --- /dev/null +++ b/html/changelogs/doxxmedearly-pacify_fixes.yml @@ -0,0 +1,4 @@ +author: Doxxmedearly +delete-after: True +changes: + - bugfix: "Being pacified, such as via Paxazide, now properly prevents switching to harm intent unless the user is also berserk."