From 4dd2df5f0196874f677e00910311129c704ed296 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sat, 5 Jun 2021 20:08:12 -0400 Subject: [PATCH] Fix fake space edge turfs --- code/game/turfs/space/space.dm | 2 +- code/modules/lighting/lighting_turf.dm | 2 +- maps/submaps/_helpers.dm | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 0094ab19839..33bd3eaa2aa 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -136,7 +136,7 @@ /turf/space/Entered(var/atom/movable/A) . = ..() - if(edge && ticker?.mode) + if(edge && ticker?.mode && !density) // !density so 'fake' space turfs don't fling ghosts everywhere A?.touch_map_edge() /turf/space/proc/Sandbox_Spacemove(atom/movable/A as mob|obj) diff --git a/code/modules/lighting/lighting_turf.dm b/code/modules/lighting/lighting_turf.dm index bc3c0990911..b8a29fc43a1 100644 --- a/code/modules/lighting/lighting_turf.dm +++ b/code/modules/lighting/lighting_turf.dm @@ -27,7 +27,7 @@ return var/area/A = loc - if(A.dynamic_lighting) + if(A.dynamic_lighting && dynamic_lighting) if(!lighting_corners_initialised) generate_missing_corners() diff --git a/maps/submaps/_helpers.dm b/maps/submaps/_helpers.dm index 979afc1c966..4bf18fafbd3 100644 --- a/maps/submaps/_helpers.dm +++ b/maps/submaps/_helpers.dm @@ -3,8 +3,14 @@ /turf/space/internal_edge icon_state = "arrow" opacity = 1 + density = 1 blocks_air = TRUE +/turf/space/internal_edge/Initialize() + . = ..() + opacity = 1 // This will get reset due to using appearances that are precreated in SSskybox, and apps have opacity = 0 + density = 1 + /turf/space/internal_edge/top dir = NORTH forced_dirs = NORTH