From 1c06a2b2773064474b0ab723ddd0fdfd2c11cbd3 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 13 Sep 2017 16:53:52 -0500 Subject: [PATCH] [MIRROR] Fixes goliath tentacles (#2738) * Merge pull request #30646 from ChangelingRain/tentafix Fixes goliath tentacles * Fixes goliath tentacles --- .../mob/living/simple_animal/hostile/mining_mobs/goliath.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm index 12388807ba..de995f951a 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm @@ -146,8 +146,9 @@ /obj/effect/temp_visual/goliath_tentacle/Initialize(mapload, mob/living/new_spawner) . = ..() - if(locate(/obj/effect/temp_visual/goliath_tentacle) in loc) - return INITIALIZE_HINT_QDEL + for(var/obj/effect/temp_visual/goliath_tentacle/T in loc) + if(T != src) + return INITIALIZE_HINT_QDEL if(!QDELETED(new_spawner)) spawner = new_spawner if(ismineralturf(loc))