From 482089ec8ccd6187a7f9cb9e19ced967aea79460 Mon Sep 17 00:00:00 2001 From: chuga-git <98280110+chuga-git@users.noreply.github.com> Date: Tue, 3 Sep 2024 08:03:41 -0500 Subject: [PATCH] makes slimes clear target on death, and delete actions, and abort walking on destroy (#26621) --- code/modules/mob/living/simple_animal/slime/slime_death.dm | 3 +++ code/modules/mob/living/simple_animal/slime/slime_mob.dm | 2 ++ 2 files changed, 5 insertions(+) diff --git a/code/modules/mob/living/simple_animal/slime/slime_death.dm b/code/modules/mob/living/simple_animal/slime/slime_death.dm index 8aa4e2f67f0..3136f8f0770 100644 --- a/code/modules/mob/living/simple_animal/slime/slime_death.dm +++ b/code/modules/mob/living/simple_animal/slime/slime_death.dm @@ -5,6 +5,9 @@ if(buckled) Feedstop(silent = TRUE) //releases ourselves from the mob we fed on. + if(Target) + Target = null + if(!gibbed) if(is_adult) var/mob/living/simple_animal/slime/M = new(loc, colour) diff --git a/code/modules/mob/living/simple_animal/slime/slime_mob.dm b/code/modules/mob/living/simple_animal/slime/slime_mob.dm index e8f6a7d7c30..304f9ed74c0 100644 --- a/code/modules/mob/living/simple_animal/slime/slime_mob.dm +++ b/code/modules/mob/living/simple_animal/slime/slime_mob.dm @@ -103,9 +103,11 @@ add_language("Bubblish") /mob/living/simple_animal/slime/Destroy() + walk_to(src, 0) for(var/A in actions) var/datum/action/AC = A AC.Remove(src) + qdel(AC) Target = null return ..()