From 7e8e7a3e73e64540cbeea5cbb98674f8f5dbbc36 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 3 Dec 2021 12:10:29 +0100 Subject: [PATCH] [MIRROR] Fixes nearspace tiles not lighting up properly [MDB IGNORE] (#9848) * Fixes nearspace tiles not lighting up properly (#63017) * Fixes nearspace tiles not lighting up properly Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com> --- code/game/turfs/open/space/space.dm | 3 +++ code/game/turfs/turf.dm | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/code/game/turfs/open/space/space.dm b/code/game/turfs/open/space/space.dm index 54f973a56ac..655ad37c32d 100644 --- a/code/game/turfs/open/space/space.dm +++ b/code/game/turfs/open/space/space.dm @@ -57,6 +57,9 @@ smoothing_flags |= SMOOTH_OBJ SET_BITFLAG_LIST(canSmoothWith) + var/area/our_area = loc + if(our_area.area_has_base_lighting && always_lit) //Only provide your own lighting if the area doesn't for you + add_overlay(GLOB.fullbright_overlay) if(requires_activation) SSair.add_to_active(src, TRUE) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index bedb942e000..565d7587152 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -83,6 +83,10 @@ GLOBAL_LIST_EMPTY(station_turfs) * Turf Initialize * * Doesn't call parent, see [/atom/proc/Initialize] + * Please note, space tiles do not run this code. + * This is done because it's called so often that any extra code just slows things down too much + * If you add something relevant here add it there too + * [/turf/open/space/Initialize] */ /turf/Initialize(mapload) SHOULD_CALL_PARENT(FALSE) @@ -113,7 +117,8 @@ GLOBAL_LIST_EMPTY(station_turfs) for(var/atom/movable/content as anything in src) Entered(content, null) - if(always_lit) + var/area/our_area = loc + if(our_area.area_has_base_lighting && always_lit) //Only provide your own lighting if the area doesn't for you add_overlay(GLOB.fullbright_overlay) if(requires_activation)