From b9fc8bc8b3ff2aa8caf3d8f30914b6785ad7f670 Mon Sep 17 00:00:00 2001
From: Henri215 <77684085+Henri215@users.noreply.github.com>
Date: Thu, 14 Dec 2023 00:48:00 -0300
Subject: [PATCH] Fixes cleanables not garbage collecting properly (#23553)

---
 code/game/objects/effects/decals/cleanable.dm | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm
index 8e70132e678..0c5600e7f08 100644
--- a/code/game/objects/effects/decals/cleanable.dm
+++ b/code/game/objects/effects/decals/cleanable.dm
@@ -13,13 +13,6 @@
 	var/gravity_check = TRUE
 	hud_possible = list(JANI_HUD)
 
-/obj/effect/decal/cleanable/Initialize(mapload)
-	. = ..()
-	var/datum/atom_hud/data/janitor/jani_hud = GLOB.huds[DATA_HUD_JANITOR]
-	prepare_huds()
-	jani_hud.add_to_hud(src)
-	jani_hud_set_sign()
-
 /obj/effect/decal/cleanable/proc/replace_decal(obj/effect/decal/cleanable/C) // Returns true if we should give up in favor of the pre-existing decal
 	if(mergeable_decal)
 		return TRUE
@@ -103,10 +96,16 @@
 		QUEUE_SMOOTH_NEIGHBORS(src)
 	if(iswallturf(loc) && plane == FLOOR_PLANE)
 		plane = GAME_PLANE // so they can be seen above walls
+	var/datum/atom_hud/data/janitor/jani_hud = GLOB.huds[DATA_HUD_JANITOR]
+	prepare_huds()
+	jani_hud.add_to_hud(src)
+	jani_hud_set_sign()
 
 /obj/effect/decal/cleanable/Destroy()
 	if(smoothing_flags)
 		QUEUE_SMOOTH_NEIGHBORS(src)
+	var/datum/atom_hud/data/janitor/jani_hud = GLOB.huds[DATA_HUD_JANITOR]
+	jani_hud.remove_from_hud(src)
 	return ..()
 
 /obj/effect/decal/cleanable/proc/try_merging_decal(turf/T)