From f44765d510b97da7de4306de7df9b8d2a41447ec Mon Sep 17 00:00:00 2001
From: Yenwodyah <yenwodyah@gmail.com>
Date: Tue, 25 Feb 2020 08:19:38 -0600
Subject: [PATCH] Re-adds insect welfare (#49542)

* cleans pacifist consciences

* Update code/modules/mob/living/simple_animal/hostile/cockroach.dm

Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>

* other mobs can be pacifists too

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
---
 code/modules/mob/living/simple_animal/hostile/cockroach.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/modules/mob/living/simple_animal/hostile/cockroach.dm b/code/modules/mob/living/simple_animal/hostile/cockroach.dm
index 11eb42c25b6..f55fa50b2b5 100644
--- a/code/modules/mob/living/simple_animal/hostile/cockroach.dm
+++ b/code/modules/mob/living/simple_animal/hostile/cockroach.dm
@@ -66,6 +66,9 @@
 		if(isliving(AM))
 			var/mob/living/A = AM
 			if(A.mob_size > MOB_SIZE_SMALL && !(A.movement_type & FLYING))
+				if(HAS_TRAIT(A, TRAIT_PACIFISM))
+					A.visible_message("<span class='notice'>[A] carefully steps over [src].</span>", "<span class='notice'>You carefully step over [src] to avoid hurting it.</span>")
+					return
 				if(prob(squish_chance))
 					A.visible_message("<span class='notice'>[A] squashed [src].</span>", "<span class='notice'>You squashed [src].</span>")
 					adjustBruteLoss(1) //kills a normal cockroach