mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-23 05:07:51 +01:00
[MIRROR] Fixes disposal bins not unlinking properly when being deconstructed and causing a hard del (#12778)
Co-authored-by: Reo Lozzot <84661000+ReoDaProtovali@users.noreply.github.com> Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
co-authored by
Reo Lozzot
Cameron Lennox
parent
3a2cb02d23
commit
0062dcdccb
@@ -58,6 +58,7 @@
|
||||
update_icon()
|
||||
|
||||
/obj/machinery/disposal/Destroy()
|
||||
SEND_SIGNAL(src, COMSIG_DISPOSAL_UNLINK) //Just to be safe.
|
||||
eject()
|
||||
return ..()
|
||||
|
||||
@@ -613,6 +614,7 @@
|
||||
for(var/atom/movable/AM in src)
|
||||
AM.forceMove(T)
|
||||
//..() //*cough
|
||||
SEND_SIGNAL(src, COMSIG_DISPOSAL_UNLINK) //unlinks in destroy, too. Multi-sending shouldnt be too bad.
|
||||
qdel(src) //Parent above should do this, but that's not a thing as of writing this.
|
||||
|
||||
|
||||
|
||||
@@ -27,6 +27,7 @@
|
||||
SEND_SIGNAL(src, COMSIG_DISPOSAL_LINK, trunk)
|
||||
|
||||
/obj/structure/disposaloutlet/Destroy()
|
||||
SEND_SIGNAL(src, COMSIG_DISPOSAL_UNLINK) //Just to be safe.
|
||||
target = null
|
||||
. = ..()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user