diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm index 889f2012d1e..0f11bd0e665 100644 --- a/code/modules/mining/minebot.dm +++ b/code/modules/mining/minebot.dm @@ -59,6 +59,10 @@ SetCollectBehavior() +/mob/living/simple_animal/hostile/mining_drone/Destroy() + QDEL_NULL(stored_gun) + return ..() + /mob/living/simple_animal/hostile/mining_drone/emp_act(severity) adjustHealth(100 / severity) to_chat(src, "NOTICE: EMP detected, systems damaged!") 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 eed323d9ebe..d910903c009 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 @@ -312,6 +312,8 @@ GLOBAL_LIST_EMPTY(ts_spiderling_list) /mob/living/simple_animal/hostile/poison/terror_spider/Destroy() GLOB.ts_spiderlist -= src + var/datum/atom_hud/U = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED] + U.remove_hud_from(src) handle_dying() return ..() diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 7a34f746728..356cca68b25 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -140,6 +140,7 @@ if (T && AIStatus == AI_Z_OFF) SSidlenpcpool.idle_mobs_by_zlevel[T.z] -= src + QDEL_LIST(actions) return ..() /mob/living/simple_animal/handle_atom_del(atom/A) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 9d4a22b73cc..87c133b89b3 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -20,6 +20,7 @@ AA.viewers -= src viewing_alternate_appearances = null LAssailant = null + runechat_msg_location = null return ..() /mob/Initialize(mapload)