From 7b9fda5411a52c308c939f4f12ebb6a86fa59fbe Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Fri, 19 Jan 2018 10:23:31 -0500
Subject: [PATCH] Merge pull request #34591 from XDTM/goodBoy

Fixes slimes attacking people with the slime faction
---
 code/modules/mob/living/simple_animal/slime/life.dm | 8 ++++++++
 1 file changed, 8 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..c4288cbfae 100644
--- a/code/modules/mob/living/simple_animal/slime/life.dm
+++ b/code/modules/mob/living/simple_animal/slime/life.dm
@@ -339,6 +339,14 @@
 					if(L in Friends) // No eating friends!
 						continue
 
+					var/ally = FALSE
+					for(var/F in faction)
+						if(F in L.faction)
+							ally = TRUE
+							break
+					if(ally)
+						continue
+
 					if(issilicon(L) && (rabid || attacked)) // They can't eat silicons, but they can glomp them in defence
 						targets += L // Possible target found!