From b13be9240ca6ed955a0053739dd85af7398d24b8 Mon Sep 17 00:00:00 2001 From: XDTM Date: Sat, 20 Jan 2018 02:29:21 +0100 Subject: [PATCH 1/5] 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! From 097f2b2ddf2568eff9be3f052b1090130609d313 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 20 Jan 2018 13:18:25 -0600 Subject: [PATCH 2/5] Update life.dm --- code/modules/mob/living/simple_animal/slime/life.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm index 0fc25b1603..83fcd889d8 100644 --- a/code/modules/mob/living/simple_animal/slime/life.dm +++ b/code/modules/mob/living/simple_animal/slime/life.dm @@ -338,9 +338,6 @@ 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 @@ -350,8 +347,6 @@ 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! From e02d7ae786a84927f8db1a07798a183dc2756352 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 21 Jan 2018 14:14:19 -0600 Subject: [PATCH 3/5] Update life.dm --- .../modules/mob/living/simple_animal/slime/life.dm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm index d2f743d69b..b27e464898 100644 --- a/code/modules/mob/living/simple_animal/slime/life.dm +++ b/code/modules/mob/living/simple_animal/slime/life.dm @@ -338,12 +338,14 @@ if(L in Friends) // No eating friends! continue - 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 - if(F in L.faction) - ally = TRUE - break + + 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 if(issilicon(L) && (rabid || attacked)) // They can't eat silicons, but they can glomp them in defence From c408f37b4ca8d4ce618a9f8d259c7cb78174448d Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 21 Jan 2018 14:21:23 -0600 Subject: [PATCH 4/5] Update life.dm --- code/modules/mob/living/simple_animal/slime/life.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm index b27e464898..59b37e4562 100644 --- a/code/modules/mob/living/simple_animal/slime/life.dm +++ b/code/modules/mob/living/simple_animal/slime/life.dm @@ -341,8 +341,8 @@ 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 == "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 From 84b9c4bb2b56c87c834dc8048666e00ede713262 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 21 Jan 2018 23:09:22 -0600 Subject: [PATCH 5/5] Update life.dm --- code/modules/mob/living/simple_animal/slime/life.dm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm index 59b37e4562..bf03dcc6a7 100644 --- a/code/modules/mob/living/simple_animal/slime/life.dm +++ b/code/modules/mob/living/simple_animal/slime/life.dm @@ -9,8 +9,6 @@ /mob/living/simple_animal/slime/Life() set invisibility = 0 - set background = BACKGROUND_ENABLED - if (notransform) return if(..()) @@ -339,15 +337,16 @@ if(L in Friends) // No eating friends! continue - var/ally = FALSE - for(var/F in faction) + 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(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!