cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] small fixes for color grading (#11064)

Browse Source 
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-06-13 11:40:15 -07:00
committed by GitHub
parent 0fe72da3e8
commit c60d92bc96
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/game/area/areas.dm
View File

@@ -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)

2
code/modules/planet/weather.dm
View File

@@ -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)