From 6c756f98c02300a3a3d106eab89980cff6097880 Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Wed, 24 Apr 2024 07:45:16 +0200 Subject: [PATCH] Makes the walls from Desecrated Duel GC properly (#24990) * GC is a thing of all time * Spacing --- .../antagonists/vampire/vampire_powers/gargantua_powers.dm | 2 +- .../mob/living/simple_animal/hostile/mining/elites/elite.dm | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/antagonists/vampire/vampire_powers/gargantua_powers.dm b/code/modules/antagonists/vampire/vampire_powers/gargantua_powers.dm index ee34ccebd81..d69d28fe36a 100644 --- a/code/modules/antagonists/vampire/vampire_powers/gargantua_powers.dm +++ b/code/modules/antagonists/vampire/vampire_powers/gargantua_powers.dm @@ -259,6 +259,7 @@ user.apply_status_effect(STATUS_EFFECT_VAMPIRE_GLADIATOR) spell_active = TRUE timer = addtimer(CALLBACK(src, PROC_REF(dispel), user, TRUE), 30 SECONDS, TIMER_STOPPABLE) + INVOKE_ASYNC(src, PROC_REF(arena_trap), get_turf(target)) //Gets another arena trap queued up for when this one runs out. RegisterSignal(user, COMSIG_PARENT_QDELETING, PROC_REF(dispel)) arena_checks(get_turf(target), user) @@ -266,7 +267,6 @@ if(!spell_active || QDELETED(src)) return INVOKE_ASYNC(src, PROC_REF(fighters_check), user) //Checks to see if our fighters died. - INVOKE_ASYNC(src, PROC_REF(arena_trap), target_turf) //Gets another arena trap queued up for when this one runs out. addtimer(CALLBACK(src, PROC_REF(arena_checks), target_turf, user), 5 SECONDS) /datum/spell/vampire/arena/proc/arena_trap(turf/target_turf) diff --git a/code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm index 84d61570862..0d240100c26 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm @@ -476,6 +476,9 @@ While using this makes the system rely on OnFire, it still gives options for tim if(isliving(mover)) return FALSE +/obj/effect/temp_visual/elite_tumor_wall/gargantua + duration = 35 SECONDS // A bit longer than the spell lasts, it should be cleaned up by the spell otherwise it might not GC properly + /obj/effect/temp_visual/elite_tumor_wall/gargantua/CanPass(atom/movable/mover, border_dir) return FALSE