From a13470f260af583b53549a3eedb3a4fc25c021c4 Mon Sep 17 00:00:00 2001 From: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Date: Sun, 2 Feb 2025 17:10:49 +0100 Subject: [PATCH] Fixes persisting brimbeams (#89318) ## About The Pull Request If a brimdemon gets destroyed instantly, their beams would persist because of a runtime here as owner in actions can be null. Fixes https://github.com/tgstation/tgstation/issues/81994 ## Changelog :cl: fix: Fixed an issue with persisting brimbeams /:cl: --- code/modules/mob/living/basic/lavaland/brimdemon/brimbeam.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/basic/lavaland/brimdemon/brimbeam.dm b/code/modules/mob/living/basic/lavaland/brimdemon/brimbeam.dm index 5900289cae5..2daef4e1ae9 100644 --- a/code/modules/mob/living/basic/lavaland/brimdemon/brimbeam.dm +++ b/code/modules/mob/living/basic/lavaland/brimdemon/brimbeam.dm @@ -86,7 +86,8 @@ /datum/action/cooldown/mob_cooldown/brimbeam/proc/extinguish_laser() if(!length(beam_parts)) return FALSE - owner.move_resist = initial(owner.move_resist) + if (owner) + owner.move_resist = initial(owner.move_resist) for(var/obj/effect/brimbeam/beam in beam_parts) beam.disperse() beam_parts = list()