From c02bbf5b11284591af68e28ddbdaea9e6163b250 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Tue, 1 Mar 2022 00:12:12 -0700 Subject: [PATCH] Update turf_changing.dm --- code/game/turfs/turf_changing.dm | 56 ++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/code/game/turfs/turf_changing.dm b/code/game/turfs/turf_changing.dm index 295ebab221..5c51101c52 100644 --- a/code/game/turfs/turf_changing.dm +++ b/code/game/turfs/turf_changing.dm @@ -61,29 +61,49 @@ cut_overlays(TRUE) RemoveElement(/datum/element/turf_z_transparency) - changing_turf = TRUE - qdel(src) - var/turf/W = new N( locate(src.x, src.y, src.z) ) if(ispath(N, /turf/simulated/floor)) + var/turf/simulated/W = new N( locate(src.x, src.y, src.z) ) if(old_fire) - W.fire = old_fire - W.RemoveLattice() - else if(old_fire) - old_fire.RemoveFire() + fire = old_fire - if(tell_universe) - universe.OnTurfChange(W) + if (istype(W,/turf/simulated/floor)) + W.RemoveLattice() - if(air_master) - air_master.mark_for_update(W) + if(tell_universe) + universe.OnTurfChange(W) - for(var/turf/space/S in range(W, 1)) - S.update_starlight() - W.levelupdate() - W.update_icon(1) - W.post_change() - . = W + if(air_master) + air_master.mark_for_update(src) //handle the addition of the new turf. + + for(var/turf/space/S in range(W,1)) + S.update_starlight() + + W.levelupdate() + W.update_icon(1) + W.post_change() + . = W + + else + + var/turf/W = new N( locate(src.x, src.y, src.z) ) + + if(old_fire) + old_fire.RemoveFire() + + if(tell_universe) + universe.OnTurfChange(W) + + if(air_master) + air_master.mark_for_update(src) + + for(var/turf/space/S in range(W,1)) + S.update_starlight() + + W.levelupdate() + W.update_icon(1) + W.post_change() + . = W dangerous_objects = old_dangerous_objects @@ -112,4 +132,4 @@ space_tile.update_starlight() if(preserve_outdoors) - outdoors = old_outdoors \ No newline at end of file + outdoors = old_outdoors