From 0816b7037bf9045bbc1575ac95056a7313ef335d Mon Sep 17 00:00:00 2001 From: Kiyahitayika <69871346+Kiyahitayika@users.noreply.github.com> Date: Sun, 4 Oct 2020 20:48:28 -0400 Subject: [PATCH 1/2] Update code/game/objects/structures/morgue.dm Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> --- code/game/objects/structures/morgue.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 1f96cebc191..62fd39cdec7 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -156,8 +156,8 @@ /obj/structure/morgue/Destroy() if(!connected) - var/turf/T = src.loc - for(var/atom/movable/A as mob|obj in src) + var/turf/T = loc + for(var/atom/movable/A in src) A.forceMove(T) else QDEL_NULL(connected) From 8282cfaef4a0461282c22297fbf7287d9ace51f0 Mon Sep 17 00:00:00 2001 From: Kiyahitayika <69871346+Kiyahitayika@users.noreply.github.com> Date: Sun, 4 Oct 2020 20:48:35 -0400 Subject: [PATCH 2/2] Update code/game/objects/structures/morgue.dm Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> --- code/game/objects/structures/morgue.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 62fd39cdec7..3421927fd07 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -395,8 +395,8 @@ /obj/structure/crematorium/Destroy() if(!connected) - var/turf/T = src.loc - for(var/atom/movable/A as mob|obj in src) + var/turf/T = loc + for(var/atom/movable/A in src) A.forceMove(T) else QDEL_NULL(connected)