From d6e8e781eb19c23befc820d07eed2ede1ff2ed42 Mon Sep 17 00:00:00 2001 From: Lohikar Date: Fri, 11 Aug 2017 10:27:01 -0500 Subject: [PATCH] Fix changeturf not working quite right with space turfs (#3269) ChangeTurf(/turf/space) will now always changeturf to openturfs if there is a below Z; this fixes some oddities with singularities. --- code/game/turfs/turf_changing.dm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/code/game/turfs/turf_changing.dm b/code/game/turfs/turf_changing.dm index 27fbcf8956e..92b638a6754 100644 --- a/code/game/turfs/turf_changing.dm +++ b/code/game/turfs/turf_changing.dm @@ -27,11 +27,9 @@ if (!N) return - // This makes sure that turfs are not changed to space when one side is part of a zone - if(N == /turf/space) - var/turf/below = GetBelow(src) - if(istype(below) && !istype(below,/turf/space)) - N = /turf/simulated/open + // This makes sure that turfs are not changed to space when there's a multi-z turf below + if(N == /turf/space && HasBelow(z)) + N = /turf/simulated/open var/obj/fire/old_fire = fire var/old_baseturf = baseturf