Merge pull request #4968 from Citadel-Station-13/upstream-merge-34667
[MIRROR] Fixes slimes not attacking anybody
This commit is contained in:
@@ -9,8 +9,6 @@
|
|||||||
|
|
||||||
/mob/living/simple_animal/slime/Life()
|
/mob/living/simple_animal/slime/Life()
|
||||||
set invisibility = 0
|
set invisibility = 0
|
||||||
set background = BACKGROUND_ENABLED
|
|
||||||
|
|
||||||
if (notransform)
|
if (notransform)
|
||||||
return
|
return
|
||||||
if(..())
|
if(..())
|
||||||
@@ -341,6 +339,8 @@
|
|||||||
|
|
||||||
var/ally = FALSE
|
var/ally = FALSE
|
||||||
for(var/F in faction)
|
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)
|
if(F in L.faction)
|
||||||
ally = TRUE
|
ally = TRUE
|
||||||
break
|
break
|
||||||
|
|||||||
Reference in New Issue
Block a user