From b383b8799efeea9e6f5b6b0dd00ab28a1dbda72f Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sun, 19 Apr 2026 01:28:57 -0400 Subject: [PATCH] Another Observer Hard Del Fix (#22284) Another and hopefully my last fix for the Observer hard dels. This probably but might not also clear the Storyteller harddel since they're an observer child. But I dunno. I have actually tested this. image --- code/modules/mob/abstract/ghost/observer/observer.dm | 5 +++++ code/modules/mob/mob.dm | 1 + html/changelogs/hellfirejag-another-observer-harddel.yml | 4 ++++ 3 files changed, 10 insertions(+) create mode 100644 html/changelogs/hellfirejag-another-observer-harddel.yml diff --git a/code/modules/mob/abstract/ghost/observer/observer.dm b/code/modules/mob/abstract/ghost/observer/observer.dm index b352c24290d..97f47bf0111 100644 --- a/code/modules/mob/abstract/ghost/observer/observer.dm +++ b/code/modules/mob/abstract/ghost/observer/observer.dm @@ -85,7 +85,12 @@ real_name = name /mob/abstract/ghost/observer/Destroy() + if(client) + for(var/image/I in client.images) + if(I.loc == src) + qdel(I) QDEL_NULL(hud) + mind = null return ..() /mob/abstract/ghost/observer/proc/initialise_postkey(set_timers = TRUE) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index cec039d6388..fe433e932b9 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -7,6 +7,7 @@ GLOB.mob_list -= src GLOB.dead_mob_list -= src GLOB.living_mob_list -= src + GLOB.player_list -= src unset_machine() QDEL_NULL(hud_used) diff --git a/html/changelogs/hellfirejag-another-observer-harddel.yml b/html/changelogs/hellfirejag-another-observer-harddel.yml new file mode 100644 index 00000000000..a3b2c68e481 --- /dev/null +++ b/html/changelogs/hellfirejag-another-observer-harddel.yml @@ -0,0 +1,4 @@ +author: Hellfirejag +delete-after: True +changes: + - bugfix: "Fixed another harddel related to observers."