From aeee6aa3ef5aa7fc2a1cb3749df56398ca4546f4 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sun, 12 Apr 2026 18:19:13 -0400 Subject: [PATCH] Water Hard Del Fix (#22210) Small mistake that makes fire extinguishers cause a hard delete. Water effects were nulling the effect reagents before calling their parent, but then their parent attempts to QDEL_NULL(reagents) a reference that it can no longer correctly cleanup. The simple solution was to get rid of the Destroy() override on effect/water since it wasn't needed. --- code/game/objects/effects/chem/water.dm | 3 --- html/changelogs/hellfirejag-water-hard-del fix.yml | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/hellfirejag-water-hard-del fix.yml diff --git a/code/game/objects/effects/chem/water.dm b/code/game/objects/effects/chem/water.dm index e342623a49b..12d7f8bd485 100644 --- a/code/game/objects/effects/chem/water.dm +++ b/code/game/objects/effects/chem/water.dm @@ -9,9 +9,6 @@ . = ..() QDEL_IN(src, 15 SECONDS) // In case whatever made it forgets to delete it -/obj/effect/effect/water/Destroy() - reagents = null - return ..() /obj/effect/effect/water/proc/set_color() // Call it after you move reagents to it if(!reagents) diff --git a/html/changelogs/hellfirejag-water-hard-del fix.yml b/html/changelogs/hellfirejag-water-hard-del fix.yml new file mode 100644 index 00000000000..aa316b22a55 --- /dev/null +++ b/html/changelogs/hellfirejag-water-hard-del fix.yml @@ -0,0 +1,4 @@ +author: Hellfirejag +delete-after: True +changes: + - bugfix: "Fixed a hard delete in water effects."