From b13be9240ca6ed955a0053739dd85af7398d24b8 Mon Sep 17 00:00:00 2001
From: XDTM <heliumt@yahoo.it>
Date: Sat, 20 Jan 2018 02:29:21 +0100
Subject: [PATCH] Fixes slimes not attacking anybody

---
 code/modules/mob/living/simple_animal/slime/life.dm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm
index 6cc1df085c..0fc25b1603 100644
--- a/code/modules/mob/living/simple_animal/slime/life.dm
+++ b/code/modules/mob/living/simple_animal/slime/life.dm
@@ -339,6 +339,19 @@
 					if(L in Friends) // No eating friends!
 						continue
 
+<<<<<<< HEAD
+=======
+					var/ally = FALSE
+					for(var/F in faction)
+						if(F == "neutral") //slimes are neutral so other mobs not target them, but they can target neutral mobs
+							continue
+						if(F in L.faction)
+							ally = TRUE
+							break
+					if(ally)
+						continue
+
+>>>>>>> 389e21e... Fixes slimes not attacking anybody (#34667)
 					if(issilicon(L) && (rabid || attacked)) // They can't eat silicons, but they can glomp them in defence
 						targets += L // Possible target found!