From 3eb350461c40b42275fb7a2baa5221fc8ce35eb5 Mon Sep 17 00:00:00 2001 From: cuberound Date: Tue, 23 Jun 2026 17:38:12 +0200 Subject: [PATCH 1/3] perhaps now --- .../living/simple_animal/hostile/retaliate/giant_lizard.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/giant_lizard.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/giant_lizard.dm index 5d4c3eba4bd6..dc18d26f145a 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/giant_lizard.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/giant_lizard.dm @@ -167,10 +167,9 @@ . = ..() wound_icon_holder = new(null, src) wound_icon_holder.icon = wound_icon - if(has_tongue) - tongue_icon_holder = new(null, src) - tongue_icon_holder.pixel_x = 2 - vis_contents += tongue_icon_holder + tongue_icon_holder = new(null, src) + tongue_icon_holder.pixel_x = 2 + vis_contents += tongue_icon_holder vis_contents += wound_icon_holder From 00b45ed3c8a81f2166640a3da5d4ca9c2d9328e5 Mon Sep 17 00:00:00 2001 From: cuberound Date: Wed, 24 Jun 2026 11:20:56 +0200 Subject: [PATCH 2/3] stop pulling --- .../mob/living/simple_animal/hostile/retaliate/bortrough.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/bortrough.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/bortrough.dm index b790c6f65e49..b0101be4bd91 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/bortrough.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/bortrough.dm @@ -19,6 +19,10 @@ has_tongue = FALSE var/pulling_state = "Bortrough Running Open Jaws" +/mob/living/simple_animal/hostile/retaliate/giant_lizard/bortrough/Destroy() + . = ..() + stop_pulling() + /mob/living/simple_animal/hostile/retaliate/giant_lizard/bortrough/ListTargets(dist = 4) . = ..() From 0a9e5f5a619efde130094fc77607a251548c2acf Mon Sep 17 00:00:00 2001 From: cuberound Date: Wed, 24 Jun 2026 11:30:15 +0200 Subject: [PATCH 3/3] exceptions for create and destroy --- code/modules/unit_tests/create_and_destroy.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/unit_tests/create_and_destroy.dm b/code/modules/unit_tests/create_and_destroy.dm index 50d9a2d91c93..53e1529c1944 100644 --- a/code/modules/unit_tests/create_and_destroy.dm +++ b/code/modules/unit_tests/create_and_destroy.dm @@ -16,7 +16,9 @@ GLOBAL_VAR_INIT(create_and_destroy_ignore_paths, generate_ignore_paths()) /obj/item/explosive/grenade/flashbang/cluster/segment, /obj/item/explosive/grenade/flashbang/cluster_piece, /mob/living/simple_animal/hostile/retaliate/giant_lizard, + /mob/living/simple_animal/hostile/retaliate/giant_lizard/bortrough, /obj/effect/landmark/lizard_spawn, + /obj/effect/landmark/lizard_spawn/bortrough, /obj/effect/fake_attacker, /atom/movable/lighting_mask, //leave it alone //This is meant to fail extremely loud every single time it occurs in any environment in any context, and it falsely alarms when this unit test iterates it. Let's not spawn it in.