diff --git a/code/modules/mob/living/simple_animal/hostile/sarlacc.dm b/code/modules/mob/living/simple_animal/hostile/sarlacc.dm index b639175bcee..cea4f67c70e 100644 --- a/code/modules/mob/living/simple_animal/hostile/sarlacc.dm +++ b/code/modules/mob/living/simple_animal/hostile/sarlacc.dm @@ -135,9 +135,8 @@ /mob/living/simple_animal/hostile/greatworm/Destroy() SSmobs.greatworms -= src - if(sarlacc) - qdel(sarlacc) - sarlacc = null + QDEL_NULL(sarlacc) + QDEL_LIST(active_tentacles) return ..() /mob/living/simple_animal/hostile/greatworm/Life(seconds_per_tick, times_fired) @@ -289,6 +288,7 @@ /mob/living/simple_animal/hostile/lesserworm/Destroy() if(originator) originator.active_tentacles -= src + originator = null return ..() /mob/living/simple_animal/hostile/lesserworm/proc/Penetrate() diff --git a/html/changelogs/hellfirejag-worm-harddel.yml b/html/changelogs/hellfirejag-worm-harddel.yml new file mode 100644 index 00000000000..0be8f591bed --- /dev/null +++ b/html/changelogs/hellfirejag-worm-harddel.yml @@ -0,0 +1,4 @@ +author: Hellfirejag +delete-after: True +changes: + - bugfix: "Fixed a hard delete caused by worm monsters."