Merge pull request #34591 from XDTM/goodBoy

Fixes slimes attacking people with the slime faction
This commit is contained in:
Jordan Brown
2018-01-19 10:23:31 -05:00
committed by CitadelStationBot
parent c6f227fc18
commit 7b9fda5411
@@ -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!