Remove intent auto switch from pacifism (#37938)

2018-05-21 02:54:14 -05:00
parent 6963275d45
commit 2b9d18597b
2 changed files with 0 additions and 7 deletions
@@ -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