From d10ec78a79d868eec4f12dd53f106d51f5f92b75 Mon Sep 17 00:00:00 2001 From: Kyep Date: Sat, 12 Sep 2020 22:39:20 -0700 Subject: [PATCH] is it stat == DEAD, or not? --- .../mob/living/simple_animal/hostile/terror_spiders/purple.dm | 2 +- .../mob/living/simple_animal/hostile/terror_spiders/queen.dm | 2 +- .../simple_animal/hostile/terror_spiders/terror_spiders.dm | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/purple.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/purple.dm index 7e36b411bae..907e46b523e 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/purple.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/purple.dm @@ -47,7 +47,7 @@ /mob/living/simple_animal/hostile/poison/terror_spider/purple/Life(seconds, times_fired) . = ..() - if(.) // if mob is NOT dead + if(stat != DEAD) // Can't use if(.) for this due to the fact it can sometimes return FALSE even when mob is alive. if(!degenerate && spider_myqueen) if(dcheck_counter >= 10) dcheck_counter = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm index 4b18626a687..737b6eba22a 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm @@ -66,7 +66,7 @@ /mob/living/simple_animal/hostile/poison/terror_spider/queen/Life(seconds, times_fired) . = ..() - if(.) // if mob is NOT dead + if(stat != DEAD) // Can't use if(.) for this due to the fact it can sometimes return FALSE even when mob is alive. if(ckey && canlay < 12 && hasnested) // max 12 eggs worth stored at any one time, realistically that's tons. if(world.time > (spider_lastspawn + spider_spawnfrequency)) if(eggslaid >= 20) diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm index 2805ba2ede3..ab36c6ca313 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm @@ -297,9 +297,7 @@ GLOBAL_LIST_EMPTY(ts_spiderling_list) return ..() /mob/living/simple_animal/hostile/poison/terror_spider/Life(seconds, times_fired) - if(QDELETED(src)) - return - ..() + . = ..() if(stat == DEAD) // Can't use if(.) for this due to the fact it can sometimes return FALSE even when mob is alive. if(prob(2)) // 2% chance every cycle to decompose