diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index c1505051aa1..9469b60ba46 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -10,7 +10,6 @@ icon_state = "unknown" layer = AREA_LAYER plane = AREA_PLANE //Keeping this on the default plane, GAME_PLANE, will make area overlays fail to render on FLOOR_PLANE. - luminosity = 0 mouse_opacity = MOUSE_OPACITY_TRANSPARENT invisibility = INVISIBILITY_LIGHTING @@ -119,17 +118,11 @@ base_lighting_color = null static_lighting = TRUE - - if(requires_power) - luminosity = 0 - else + if(!requires_power) power_light = TRUE power_equip = TRUE power_environ = TRUE - if(static_lighting) - luminosity = 0 - . = ..() if(!static_lighting) diff --git a/code/modules/lighting/lighting_area.dm b/code/modules/lighting/lighting_area.dm index d90aacc18d7..4bd355eaa48 100644 --- a/code/modules/lighting/lighting_area.dm +++ b/code/modules/lighting/lighting_area.dm @@ -87,7 +87,6 @@ GLOBAL_LIST_INIT_TYPED(fullbright_overlays, /mutable_appearance, list(create_ful add_overlay(lighting_effects[1]) var/list/z_offsets = SSmapping.z_level_to_plane_offset for(var/turf/T in src) - T.luminosity = 1 // This outside loop is EXTREMELY hot because it's run by space tiles. Don't want no part in that // We will only add overlays to turfs not on the first z layer, because that's a significantly lesser portion // And we need to do them separate, or lighting will go fuckey diff --git a/code/modules/lighting/lighting_object.dm b/code/modules/lighting/lighting_object.dm index d1d543f68e8..58094af31c1 100644 --- a/code/modules/lighting/lighting_object.dm +++ b/code/modules/lighting/lighting_object.dm @@ -42,7 +42,6 @@ GLOBAL_LIST_EMPTY(default_lighting_underlays_by_z) stack_trace("a lighting object was assigned to a turf that already had a lighting object!") affected_turf.lighting_object = src - affected_turf.luminosity = 0 // This path is really hot. this is faster // Really this should be a global var or something, but lets not think about that yes? @@ -59,7 +58,6 @@ GLOBAL_LIST_EMPTY(default_lighting_underlays_by_z) SSlighting.objects_queue -= src if (isturf(affected_turf)) affected_turf.lighting_object = null - affected_turf.luminosity = 1 affected_turf = null return ..() @@ -109,8 +107,7 @@ GLOBAL_LIST_EMPTY(default_lighting_underlays_by_z) alpha_corner.cache_r, alpha_corner.cache_g, alpha_corner.cache_b, 00, 00, 00, 00, 01 ) - - affected_turf.luminosity = set_luminosity + SSdemo.mark_turf(affected_turf) diff --git a/code/modules/lighting/lighting_source.dm b/code/modules/lighting/lighting_source.dm index 30c1fc20f0d..99129fc902c 100644 --- a/code/modules/lighting/lighting_source.dm +++ b/code/modules/lighting/lighting_source.dm @@ -273,8 +273,6 @@ if(source_turf) var/uses_multiz = !!GET_LOWEST_STACK_OFFSET(source_turf.z) - var/oldlum = source_turf.luminosity - source_turf.luminosity = CEILING(light_range, 1) if(uses_multiz) for(var/turf/T in view(CEILING(light_range, 1), source_turf)) if(IS_OPAQUE_TURF(T)) @@ -311,8 +309,6 @@ INSERT_CORNERS(corners, T) SSdemo.mark_turf(T) - source_turf.luminosity = oldlum - SETUP_CORNERS_CACHE(src) var/list/datum/lighting_corner/new_corners = (corners - src.effect_str)