Paxazide stops harm intent

Doxxmedearly · Jul 30, 2023 · 3a81c2b · 3a81c2b
1 parent 251c64c
commit 3a81c2b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git 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
@@ -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, "<span class='notice'>You don't feel like harming anybody.</span>")
 		a_intent_change(I_HELP)
 

diff --git a/html/changelogs/doxxmedearly-pacify_fixes.yml 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."