diff --git a/code/__DEFINES/colours.dm b/code/__DEFINES/colours.dm index 309dd7bcff11..ed0d38994a68 100644 --- a/code/__DEFINES/colours.dm +++ b/code/__DEFINES/colours.dm @@ -120,14 +120,18 @@ #define LIGHT_COLOR_FIRE "#FAA019" /// Very warm yellow, leaning slightly towards orange. rgb(196, 138, 24) #define LIGHT_COLOR_LAVA "#C48A18" +/// Very warm yellowish-white color for candlelight. rgb(255, 187, 110) +#define LIGHT_COLOR_CANDLE "#FFBB6E" /// Bright, non-saturated red. Leaning slightly towards pink for visibility. rgb(250, 100, 75) #define LIGHT_COLOR_FLARE "#FA644B" /// Weird color, between yellow and green, very slimy. rgb(175, 200, 75) #define LIGHT_COLOR_SLIME_LAMP "#AFC84B" -/// Extremely diluted yellow, close to skin color (for some reason). rgb(250, 225, 175) -#define LIGHT_COLOR_TUNGSTEN "#FAE1AF" +/// Incandascent warm white, for usage in lights. rgb(255, 239, 210) +#define LIGHT_COLOR_TUNGSTEN "#FFEFD2" /// Barely visible cyan-ish hue, as the doctor prescribed. rgb(240, 250, 250) #define LIGHT_COLOR_HALOGEN "#F0FAFA" +/// Bluish cyan color for blue lights. rgb(210, 227, 236) +#define LIGHT_COLOR_XENON "#D2E3EC" /// The default color for admin say, used as a fallback when the preference is not enabled diff --git a/code/game/machinery/hybrisa_lights.dm b/code/game/machinery/hybrisa_lights.dm index 13780c33b113..20c500272ce9 100644 --- a/code/game/machinery/hybrisa_lights.dm +++ b/code/game/machinery/hybrisa_lights.dm @@ -48,6 +48,7 @@ icon = 'icons/obj/structures/props/streetlights.dmi' icon_state = "street_off" layer = BILLBOARD_LAYER + light_color = LIGHT_COLOR_XENON /obj/structure/machinery/colony_floodlight/street/Initialize(mapload, ...) . = ..() diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 3ffbcc46a345..2c3182bdef52 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -259,6 +259,7 @@ icon_state = "menorah" item_state = "menorah" light_range = 2 + light_color = LIGHT_COLOR_CANDLE w_class = SIZE_LARGE on = 1 breaking_sound = null @@ -270,6 +271,7 @@ icon_state = "candelabra" force = 15 on = TRUE + light_color = LIGHT_COLOR_CANDLE breaking_sound = null @@ -285,6 +287,7 @@ desc = "An emergency light tube mounted onto a tripod. It seemingly lasts forever." icon_state = "tripod_lamp" light_range = 6//pretty good + light_color = LIGHT_COLOR_XENON w_class = SIZE_LARGE on = 1 diff --git a/code/modules/clothing/suits/marine_armor/_marine_armor.dm b/code/modules/clothing/suits/marine_armor/_marine_armor.dm index ebaa6bccd270..0f648ab7ac6b 100644 --- a/code/modules/clothing/suits/marine_armor/_marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor/_marine_armor.dm @@ -85,6 +85,7 @@ light_power = 3 light_range = 4 + light_color = LIGHT_COLOR_TUNGSTEN light_system = MOVABLE_LIGHT var/flashlight_cooldown = 0 //Cooldown for toggling the light diff --git a/code/modules/lighting/lighting_mask/lighting_mask.dm b/code/modules/lighting/lighting_mask/lighting_mask.dm index e02184d9925f..8ec2fe2bb977 100644 --- a/code/modules/lighting/lighting_mask/lighting_mask.dm +++ b/code/modules/lighting/lighting_mask/lighting_mask.dm @@ -6,7 +6,7 @@ /atom/movable/lighting_mask name = "" icon = LIGHTING_ICON_BIG - icon_state = "light_big" + icon_state = "light_normalized" anchored = TRUE plane = LIGHTING_PLANE diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 873621e2a572..033293b1e8f1 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -144,9 +144,10 @@ active_power_usage = 20 power_channel = POWER_CHANNEL_LIGHT //Lights are calc'd via area so they dont need to be in the machine list light_system = STATIC_LIGHT + light_color = LIGHT_COLOR_TUNGSTEN var/on = 0 // 1 if on, 0 if off var/on_gs = 0 - var/brightness = 8 // luminosity when on, also used in power calculation + var/brightness = 6 // luminosity when on, also used in power calculation var/status = LIGHT_OK // LIGHT_OK, _EMPTY, _BURNED or _BROKEN var/flickering = 0 var/light_type = /obj/item/light_bulb/tube // the type of light item @@ -171,6 +172,7 @@ icon_state = "btube1" base_state = "btube" desc = "A lighting fixture that is fitted with a bright blue fluorescent light tube. Looking at it for too long makes your eyes go watery." + light_color = LIGHT_COLOR_XENON // the smaller bulb light fixture @@ -189,6 +191,7 @@ brightness = 4 desc = "A small lighting fixture that is fitted with a bright blue fluorescent light bulb. Looking at it for too long makes your eyes go watery." light_type = /obj/item/light_bulb/bulb + light_color = LIGHT_COLOR_XENON /obj/structure/machinery/light/double icon_state = "ptube1" @@ -199,6 +202,7 @@ icon_state = "bptube1" base_state = "bptube" desc = "A lighting fixture that can be fitted with two bright fluorescent light tubes for that extra eye-watering goodness." + light_color = LIGHT_COLOR_XENON /obj/structure/machinery/light/spot name = "spotlight" @@ -217,6 +221,7 @@ fitting = "large tube" light_type = /obj/item/light_bulb/tube/large/ brightness = 12 + light_color = LIGHT_COLOR_XENON // Dropship lights that use no power /obj/structure/machinery/light/dropship @@ -233,17 +238,20 @@ /obj/structure/machinery/light/dropship/green icon_state = "gtube1" base_state = "gtube" - desc = "A lighting fixture that is fitted with a bright green fluorescent light tube. Looking at it for too long makes your eyes go watery. Used by aircraft vehicles" + desc = "A lighting fixture that is fitted with a bright green fluorescent light tube. Looking at it for too long makes your eyes go watery. Used by aircraft vehicles." + light_color = LIGHT_COLOR_GREEN /obj/structure/machinery/light/dropship/red icon_state = "rtube1" base_state = "rtube" - desc = "A lighting fixture that is fitted with a bright red fluorescent light tube. Looking at it for too long makes your eyes go watery. Used by aircraft vehicles" + desc = "A lighting fixture that is fitted with a bright red fluorescent light tube. Looking at it for too long makes your eyes go watery. Used by aircraft vehicles." + light_color = LIGHT_COLOR_RED /obj/structure/machinery/light/dropship/blue icon_state = "btube1" base_state = "btube" - desc = "A lighting fixture that is fitted with a bright blue fluorescent light tube. Looking at it for too long makes your eyes go watery. Used by aircraft vehicles" + desc = "A lighting fixture that is fitted with a bright blue fluorescent light tube. Looking at it for too long makes your eyes go watery. Used by aircraft vehicles." + light_color = LIGHT_COLOR_BLUE /obj/structure/machinery/light/built/Initialize() . = ..() @@ -788,6 +796,7 @@ power_channel = POWER_CHANNEL_LIGHT //Lights are calc'd via area so they dont need to be in the machine list unslashable = TRUE unacidable = TRUE + light_color = LIGHT_COLOR_FLARE var/obj/docking_port/stationary/marine_dropship/linked_port = null //Don't allow blowing those up, so Marine nades don't fuck them