From 033fca0b7b3dd929915e87b51ed52a8c2c0d3ff0 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 19 Sep 2021 16:51:38 +0200 Subject: [PATCH] [MIRROR] Default Baselighting to white (#8270) * Default Baselighting to white (#61544) * Default Baselighting to white Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com> --- code/datums/mapgen/JungleGenerator.dm | 2 +- code/game/area/areas/away_content.dm | 2 +- code/game/area/areas/centcom.dm | 10 +++++----- code/game/area/areas/holodeck.dm | 2 +- code/game/area/space_station_13_areas.dm | 2 +- code/modules/lighting/lighting_area.dm | 2 +- code/modules/mafia/map_pieces.dm | 2 +- code/modules/mob/living/silicon/ai/multicam.dm | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/code/datums/mapgen/JungleGenerator.dm b/code/datums/mapgen/JungleGenerator.dm index 0a3b3f01399..7a878641dcb 100644 --- a/code/datums/mapgen/JungleGenerator.dm +++ b/code/datums/mapgen/JungleGenerator.dm @@ -89,5 +89,5 @@ name = "planet generation area" static_lighting = FALSE base_lighting_alpha = 255 - base_lighting_color = COLOR_WHITE + map_generator = /datum/map_generator/jungle_generator diff --git a/code/game/area/areas/away_content.dm b/code/game/area/areas/away_content.dm index f805e21b999..c2206719c8c 100644 --- a/code/game/area/areas/away_content.dm +++ b/code/game/area/areas/away_content.dm @@ -24,6 +24,6 @@ Unused icons for new areas are "awaycontent1" ~ "awaycontent30" name = "Super Secret Room" static_lighting = FALSE base_lighting_alpha = 255 - base_lighting_color = COLOR_WHITE + has_gravity = STANDARD_GRAVITY diff --git a/code/game/area/areas/centcom.dm b/code/game/area/areas/centcom.dm index 29485bb75a1..38047e08be9 100644 --- a/code/game/area/areas/centcom.dm +++ b/code/game/area/areas/centcom.dm @@ -40,7 +40,7 @@ name = "Supplypod Facility" icon_state = "supplypod" static_lighting = FALSE - base_lighting_color = COLOR_WHITE + base_lighting_alpha = 255 /area/centcom/supplypod/pod_storage @@ -99,14 +99,14 @@ icon_state = "thunder" static_lighting = FALSE base_lighting_alpha = 255 - base_lighting_color = COLOR_WHITE + /area/tdome/arena_source name = "Thunderdome Arena Template" icon_state = "thunder" static_lighting = FALSE base_lighting_alpha = 255 - base_lighting_color = COLOR_WHITE + /area/tdome/tdome1 name = "Thunderdome (Team 1)" @@ -146,7 +146,7 @@ icon_state = "yellow" requires_power = FALSE area_flags = UNIQUE_AREA | NOTELEPORT - base_lighting_color = COLOR_WHITE + base_lighting_alpha = 255 has_gravity = STANDARD_GRAVITY flags_1 = NONE @@ -180,7 +180,7 @@ icon_state = "yellow" requires_power = FALSE static_lighting = FALSE - base_lighting_color = COLOR_WHITE + base_lighting_alpha = 255 has_gravity = STANDARD_GRAVITY flags_1 = NONE diff --git a/code/game/area/areas/holodeck.dm b/code/game/area/areas/holodeck.dm index a0a99e81dca..c900e99c89c 100644 --- a/code/game/area/areas/holodeck.dm +++ b/code/game/area/areas/holodeck.dm @@ -2,7 +2,7 @@ name = "Holodeck" icon_state = "Holodeck" static_lighting = FALSE - base_lighting_color = COLOR_WHITE + base_lighting_alpha = 255 flags_1 = NONE sound_environment = SOUND_ENVIRONMENT_PADDED_CELL diff --git a/code/game/area/space_station_13_areas.dm b/code/game/area/space_station_13_areas.dm index bb92c0c812e..56517fdfcd7 100644 --- a/code/game/area/space_station_13_areas.dm +++ b/code/game/area/space_station_13_areas.dm @@ -26,7 +26,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station requires_power = TRUE always_unpowered = TRUE static_lighting = FALSE - base_lighting_color = COLOR_WHITE + base_lighting_alpha = 255 power_light = FALSE power_equip = FALSE diff --git a/code/modules/lighting/lighting_area.dm b/code/modules/lighting/lighting_area.dm index fcb76e9ee20..bd5cdd99026 100644 --- a/code/modules/lighting/lighting_area.dm +++ b/code/modules/lighting/lighting_area.dm @@ -7,7 +7,7 @@ ///alpha 0-255 of lighting_effect and thus baselighting intensity var/base_lighting_alpha = 0 ///The colour of the light acting on this area - var/base_lighting_color = null + var/base_lighting_color = COLOR_WHITE /area/proc/set_base_lighting(new_base_lighting_color = -1, new_alpha = -1) if(base_lighting_alpha == new_alpha && base_lighting_color == new_base_lighting_color) diff --git a/code/modules/mafia/map_pieces.dm b/code/modules/mafia/map_pieces.dm index a2342847b09..cf83a882cd6 100644 --- a/code/modules/mafia/map_pieces.dm +++ b/code/modules/mafia/map_pieces.dm @@ -30,7 +30,7 @@ name = "Mafia Minigame" icon_state = "mafia" static_lighting = FALSE - base_lighting_color = COLOR_WHITE + base_lighting_alpha = 255 requires_power = FALSE has_gravity = STANDARD_GRAVITY diff --git a/code/modules/mob/living/silicon/ai/multicam.dm b/code/modules/mob/living/silicon/ai/multicam.dm index 5e35bd80d19..4139215546b 100644 --- a/code/modules/mob/living/silicon/ai/multicam.dm +++ b/code/modules/mob/living/silicon/ai/multicam.dm @@ -92,7 +92,7 @@ name = "ai_multicam_room" icon_state = "ai_camera_room" static_lighting = FALSE - base_lighting_color = COLOR_WHITE + base_lighting_alpha = 255 area_flags = NOTELEPORT | HIDDEN_AREA | UNIQUE_AREA ambientsounds = null