diff --git a/modular_skyrat/master_files/code/modules/power/lighting/light_mapping_helpers.dm b/modular_skyrat/master_files/code/modules/power/lighting/light_mapping_helpers.dm index 30664a4edfe..a320e635fcb 100644 --- a/modular_skyrat/master_files/code/modules/power/lighting/light_mapping_helpers.dm +++ b/modular_skyrat/master_files/code/modules/power/lighting/light_mapping_helpers.dm @@ -1,9 +1,9 @@ // Kneecapping light values every light at a time. /obj/machinery/light/dim - brightness = 4 - nightshift_brightness = 4 + brightness = 3 + nightshift_brightness = 2.5 bulb_colour = LIGHT_COLOR_TUNGSTEN - bulb_power = 0.4 + bulb_power = 0.8 /obj/machinery/light/small brightness = 5 @@ -17,3 +17,9 @@ /obj/machinery/light/warm bulb_colour = LIGHT_COLOR_TUNGSTEN nightshift_light_color = null + +/obj/machinery/light/floor + brightness = 5.5 + bulb_colour = LIGHT_COLOR_TUNGSTEN + nightshift_light_color = null + nightshift_brightness = 4 diff --git a/modular_skyrat/modules/aesthetics/lights/code/lighting.dm b/modular_skyrat/modules/aesthetics/lights/code/lighting.dm index c668fe7cf67..f811051d0c0 100644 --- a/modular_skyrat/modules/aesthetics/lights/code/lighting.dm +++ b/modular_skyrat/modules/aesthetics/lights/code/lighting.dm @@ -2,22 +2,18 @@ #define NIGHTSHIFT_LIGHT_MODIFIER 0.15 #define NIGHTSHIFT_COLOR_MODIFIER 0.15 -/atom - light_power = 1.25 - /obj/machinery/light - brightness = 6.5 - fire_brightness = 4.5 + brightness = 7.5 + fire_brightness = 6 fire_colour = COLOR_FIRE_LIGHT_RED bulb_colour = COLOR_OFF_WHITE - bulb_power = 1.15 + bulb_power = 0.9 nightshift_light_color = null // Let the dynamic night shift color code handle this. bulb_low_power_colour = LIGHT_COLOR_BROWN - bulb_low_power_brightness_mul = 0.5 - bulb_low_power_pow_min = 0.5 + bulb_low_power_brightness_mul = 0.75 + bulb_low_power_pow_min = 0.75 bulb_emergency_colour = LIGHT_COLOR_INTENSE_RED - bulb_major_emergency_brightness_mul = 0.7 - power_consumption_rate = 5.62 + bulb_major_emergency_brightness_mul = 0.9 var/maploaded = FALSE //So we don't have a lot of stress on startup. var/turning_on = FALSE //More stress stuff. var/constant_flickering = FALSE // Are we always flickering?