From 90ba9bcc80eaf73ad4be454d45938fb10257ffb0 Mon Sep 17 00:00:00 2001
From: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Date: Sun, 23 Nov 2025 15:46:12 -0500
Subject: [PATCH] Adds null checks to global terror spiderling list (#31093)
* Adds null checks to global terror spiderling list
* Little cleaner
* Even better
---
.../mob/living/simple_animal/hostile/terror_spiders/hive.dm | 3 +--
.../simple_animal/hostile/terror_spiders/queen_terror.dm | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/hive.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/hive.dm
index f0e7c93a913..b0627b1ba82 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/hive.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/hive.dm
@@ -56,8 +56,7 @@
else
spider_totals[E.spiderling_type] = E.spiderling_number
spider_totals["all"] += E.spiderling_number
- for(var/thing in GLOB.ts_spiderling_list)
- var/mob/living/basic/spiderling/terror_spiderling/L = thing
+ for(var/mob/living/basic/spiderling/terror_spiderling/L in GLOB.ts_spiderling_list)
if(L.stillborn)
continue
if(check_mine && L.spider_myqueen != src)
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen_terror.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen_terror.dm
index fc57aee0bc5..8cc83b817e3 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen_terror.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen_terror.dm
@@ -111,8 +111,7 @@
T.visible_message("[T] writhes in pain!")
to_chat(T, "\The psychic backlash from the death of [src] overwhelms you! You feel the life start to drain out of you...")
T.degenerate = TRUE
- for(var/thing in GLOB.ts_spiderling_list)
- var/mob/living/basic/spiderling/terror_spiderling/T = thing
+ for(var/mob/living/basic/spiderling/terror_spiderling/T in GLOB.ts_spiderling_list)
if(T.spider_myqueen && T.spider_myqueen == src)
qdel(T)
return ..()