Fixes slimes not attacking anybody

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!