From 60c0d5e493463bb4c705e1fefdb0aa2fa361f390 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 16 Nov 2022 16:53:21 +0100 Subject: [PATCH] [MIRROR] [GBP Ignore] Disposals pipes now correctly release their contents when destroyed by damage. [MDB IGNORE] (#17503) * [GBP Ignore] Disposals pipes now correctly release their contents when destroyed by damage. (#71276) ## About The Pull Request Disposals pipes didn't correctly release their contents when they were destroyed by damage, causing anything inside to be deleted. That has been fixed. Fixes #71252. ## Why It's Good For The Game Bugfix ## Changelog :cl: fix: Fixed disposals pipes qdel-ing their contents when their integrity hits zero. /:cl: * [GBP Ignore] Disposals pipes now correctly release their contents when destroyed by damage. Co-authored-by: zxaber <37497534+zxaber@users.noreply.github.com> --- code/modules/recycling/disposal/pipe.dm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/code/modules/recycling/disposal/pipe.dm b/code/modules/recycling/disposal/pipe.dm index ef5aa12cee5..b29ca8146ed 100644 --- a/code/modules/recycling/disposal/pipe.dm +++ b/code/modules/recycling/disposal/pipe.dm @@ -50,10 +50,6 @@ qdel(stored) return ..() -/obj/structure/disposalpipe/deconstruct() - spew_forth() - return ..() - /** * Expells the pipe's contents. * @@ -167,15 +163,13 @@ transfer_fingerprints_to(stored) stored.setDir(dir) stored = null - if (contents.len > 1) // if there is actually something in the pipe - var/obj/structure/disposalholder/holder = locate() in src - expel(holder, loc, dir) else var/turf/T = get_turf(src) for(var/D in GLOB.cardinals) if(D & dpdir) var/obj/structure/disposalpipe/broken/P = new(T) P.setDir(D) + spew_forth() qdel(src)