Merge pull request #6820 from Citadel-Station-13/upstream-merge-37938

[MIRROR] Fixes some issues with pacifism by disabling intent auto-switch

code/modules/mob/living/carbon/human/life.dm

@@ -63,10 +63,6 @@
 	else if(eye_blurry)			//blurry eyes heal slowly
 		adjust_blurriness(-1)
 
-	if(has_trait(TRAIT_PACIFISM) && a_intent == INTENT_HARM)
-		to_chat(src, "<span class='notice'>You don't feel like harming anybody.</span>")
-		a_intent_change(INTENT_HELP)
-
 	if (getBrainLoss() >= 60 && !incapacitated(TRUE))
 		SendSignal(COMSIG_ADD_MOOD_EVENT, "brain_damage", /datum/mood_event/brain_damage)
 		if(prob(3))

code/modules/mob/living/life.dm

@@ -133,9 +133,6 @@
 		eye_blurry = max(eye_blurry-1, 0)
 		if(client && !eye_blurry)
 			clear_fullscreen("blurry")
-	if(has_trait(TRAIT_PACIFISM) && a_intent == INTENT_HARM)
-		to_chat(src, "<span class='notice'>You don't feel like harming anybody.</span>")
-		a_intent_change(INTENT_HELP)
 
 /mob/living/proc/update_damage_hud()
 	return