From f0c88dbe4edeac185940c90d344a111eddf8c371 Mon Sep 17 00:00:00 2001 From: chuga-git <98280110+chuga-git@users.noreply.github.com> Date: Fri, 23 Aug 2024 16:15:35 -0500 Subject: [PATCH] /atom/movable/Destroy() now gets loc at the beginning of the proc (#26579) --- code/game/atoms_movable.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 058f0bbea647..c4ca156e5df5 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -92,19 +92,23 @@ add_overlay(list(em_block)) /atom/movable/Destroy() + var/turf/T = loc unbuckle_all_mobs(force = TRUE) QDEL_NULL(em_block) + . = ..() + if(loc) loc.handle_atom_del(src) + for(var/atom/movable/AM in contents) qdel(AM) + LAZYCLEARLIST(client_mobs_in_contents) loc = null if(pulledby) pulledby.stop_pulling() - var/turf/T = loc if(opacity && istype(T)) var/old_has_opaque_atom = T.has_opaque_atom T.recalc_atom_opacity()