From 7b7674d0efa6f9165a1c7beecf1bb4a311a686d9 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 4 Feb 2018 23:18:51 -0600 Subject: [PATCH] [MIRROR] Fixes ancient goliathes tentacle attack continuing after death (#5285) * Fixes ancient goliathes tentacle attack (#35243) * Fixes ancient goliathes tentacle attack continuing after death --- .../mob/living/simple_animal/hostile/mining_mobs/goliath.dm | 2 ++ 1 file changed, 2 insertions(+) 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 de995f951a..e06cce6d3e 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 @@ -119,6 +119,8 @@ /mob/living/simple_animal/hostile/asteroid/goliath/beast/ancient/Life() . = ..() + if(!.) // dead + return if(isturf(loc)) if(!LAZYLEN(cached_tentacle_turfs) || loc != last_location || tentacle_recheck_cooldown <= world.time) LAZYCLEARLIST(cached_tentacle_turfs)