From 21f92e65fdc473bae0a9619e6f8c998239f56d7e Mon Sep 17 00:00:00 2001
From: Doxxmedearly <38594443+Doxxmedearly@users.noreply.github.com>
Date: Fri, 4 Aug 2023 07:31:42 -0400
Subject: [PATCH] Paxazide stops harm intent (#16940)

* Paxazide stops harm intent

* Update code/modules/mob/living/life.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
---
 code/modules/mob/living/carbon/human/human_helpers.dm | 6 ++++++
 code/modules/mob/living/life.dm                       | 4 ++--
 html/changelogs/doxxmedearly-pacify_fixes.yml         | 4 ++++
 3 files changed, 12 insertions(+), 2 deletions(-)
 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 e2e6b129fc9..fd5a2d48a5f 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..a667ad51409 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -107,8 +107,8 @@
 	//Ears
 	handle_hearing()
 
-	if((is_pacified()) && a_intent == I_HURT)
-		to_chat(src, "<span class='notice'>You don't feel like harming anybody.</span>")
+	if((is_pacified()) && a_intent == I_HURT && !is_berserk())
+		to_chat(src, SPAN_NOTICE("You don't feel like harming anybody."))
 		a_intent_change(I_HELP)
 
 //this handles hud updates. Calls update_vision() and handle_hud_icons()
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."