cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13951 from VOREStation/upstream-merge-8772

Browse Source 
[MIRROR] Fixes a bug with deleted disposal outlets
This commit is contained in:
Casey
2022-10-23 14:53:07 -04:00
committed by CHOMPStation2
parent 35b0db8c4d
commit 1ecc47c8b1
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/recycling/disposal.dm
View File

@@ -1539,6 +1539,12 @@
if(trunk) if(trunk)
trunk.linked = src // link the pipe trunk to self trunk.linked = src // link the pipe trunk to self
/obj/structure/disposaloutlet/Destroy()
var/obj/structure/disposalpipe/trunk/trunk = locate() in loc
if(trunk && trunk.linked == src)
trunk.linked = null
return ..()
// expel the contents of the holder object, then delete it // expel the contents of the holder object, then delete it
// called when the holder exits the outlet // called when the holder exits the outlet
/obj/structure/disposaloutlet/proc/expel(var/obj/structure/disposalholder/H) /obj/structure/disposaloutlet/proc/expel(var/obj/structure/disposalholder/H)