From 9105520cd0f0381716e01cbe67a4a1e8f9ce0523 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 11 Apr 2022 03:29:03 +0200 Subject: [PATCH 1/2] [MIRROR] Makes brimdemons delete their beams when deleted [MDB IGNORE] (#12673) * Makes brimdemons delete their beams in Destroy() (#66095) About The Pull Request Fixes #66062, where brimdemon beams would remain active forever if the demon got deleted as the callback to delete the beam would never happen. Why It's Good For The Game Infinite death laser bad Changelog cl fix: Fixes brimdemon lasers never disappearing if the demon was deleted while firing. /cl * Makes brimdemons delete their beams when deleted Co-authored-by: GoblinBackwards <22856555+GoblinBackwards@users.noreply.github.com> --- .../mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm index f1cd6903d58..96a071e89ea 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm @@ -44,6 +44,10 @@ /// A list of all the beam parts. var/list/beamparts = list() +/mob/living/simple_animal/hostile/asteroid/brimdemon/Destroy() + QDEL_LIST(beamparts) + return ..() + /mob/living/simple_animal/hostile/asteroid/brimdemon/Login() ranged = TRUE return ..() From a6287f0d4fc879dbe7dfe4af7b05c64d986f1b86 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 11 Apr 2022 03:29:06 +0200 Subject: [PATCH 2/2] Automatic changelog generation for PR #12673 [ci skip] --- html/changelogs/AutoChangeLog-pr-12673.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12673.yml diff --git a/html/changelogs/AutoChangeLog-pr-12673.yml b/html/changelogs/AutoChangeLog-pr-12673.yml new file mode 100644 index 00000000000..65fc2b9d21b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12673.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - bugfix: "Fixes brimdemon lasers never disappearing if the demon was deleted while firing."