From c60d92bc96a75750b9f00b0efed9fb4435b5887b Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Fri, 13 Jun 2025 11:40:15 -0700 Subject: [PATCH] [MIRROR] small fixes for color grading (#11064) Co-authored-by: Will <7099514+Willburd@users.noreply.github.com> Co-authored-by: Cameron Lennox --- code/game/area/areas.dm | 5 ++--- code/modules/planet/weather.dm | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 40e6879751..c88d492327 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -51,7 +51,7 @@ GLOBAL_LIST_EMPTY(areas_by_type) var/list/forced_ambience = null var/sound_env = STANDARD_STATION var/turf/base_turf //The base turf type of the area, which can be used to override the z-level's base turf - VAR_PRIVATE/color_grading = null // Color blending for clients that enter this area + VAR_PROTECTED/color_grading = null // Color blending for clients that enter this area /area/New() // Used by the maploader, this must be done in New, not init @@ -399,8 +399,7 @@ var/list/mob/living/forced_ambiance_list = new check_phase_shift(M) //RS Port #658 // Update the area's color grading - var/area/A = get_area(L) - if(L.client && L.client.color != A?.get_color_tint()) // Try to check if we should bother changing before doing blending + if(L.client && L.client.color != get_color_tint()) // Try to check if we should bother changing before doing blending L.update_client_color() /area/proc/play_ambience(var/mob/living/L, initial = TRUE) diff --git a/code/modules/planet/weather.dm b/code/modules/planet/weather.dm index f0e3cc00a8..9a5649c391 100644 --- a/code/modules/planet/weather.dm +++ b/code/modules/planet/weather.dm @@ -205,7 +205,7 @@ var/indoor_sounds_type = null var/effect_flags = NONE - VAR_PRIVATE/color_grading = null // Color blending for weather to feel hotter, colder, or stranger + VAR_PROTECTED/color_grading = null // Color blending for weather to feel hotter, colder, or stranger /datum/weather/New() if(outdoor_sounds_type)