From 09c5452208d241af3dcbd2af7d155a4cd93f745c Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 14 Feb 2021 21:14:53 +0100 Subject: [PATCH] [MIRROR] Vines get destroyed on bud's Destroy() (#3388) * Vines get destroyed on bud's Destroy() (#56902) Simple fix for #56879 caused by qdelling the bud without clearing up the vines. * Vines get destroyed on bud's Destroy() Co-authored-by: Hadzabadza --- .../mob/living/simple_animal/hostile/venus_human_trap.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm index e9960dc4113..e85bfef2b1f 100644 --- a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm +++ b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm @@ -28,6 +28,8 @@ /// The countdown ghosts see to when the plant will hatch var/obj/effect/countdown/flower_bud/countdown + var/list/vines = list() + /obj/structure/alien/resin/flower_bud/Initialize() . = ..() countdown = new(src) @@ -38,12 +40,16 @@ anchors += locate(x+2,y-2,z) for(var/turf/T in anchors) - Beam(T, "vine", maxdistance=5, beam_type=/obj/effect/ebeam/vine) + vines += Beam(T, "vine", maxdistance=5, beam_type=/obj/effect/ebeam/vine) finish_time = world.time + growth_time addtimer(CALLBACK(src, .proc/bear_fruit), growth_time) addtimer(CALLBACK(src, .proc/progress_growth), growth_time/4) countdown.start() +/obj/structure/alien/resin/flower_bud/Destroy() + QDEL_LIST(vines) + return ..() + /** * Spawns a venus human trap, then qdels itself. *