diff --git a/code/controllers/subsystem/nightshift.dm b/code/controllers/subsystem/nightshift.dm index 927f68eee..58551bfb9 100644 --- a/code/controllers/subsystem/nightshift.dm +++ b/code/controllers/subsystem/nightshift.dm @@ -35,7 +35,7 @@ SUBSYSTEM_DEF(nightshift) if(!emergency) announce("Restoring night lighting configuration to normal operation.") else - announce("Disabling night lighting: Station is in a state of emergency.") + announce("Disabling night lighting: Station is in a state of emergency.") if(emergency) night_time = FALSE if(nightshift_active != night_time) @@ -45,9 +45,9 @@ SUBSYSTEM_DEF(nightshift) nightshift_active = active if(announce) if (active) - announce("Good evening, crew. To reduce power consumption and stimulate the circadian rhythms of some species, all of the lights aboard the station have been dimmed for the night.") + priority_announce("Good evening, crew. To reduce power consumption and stimulate the circadian rhythms of some species, all of the lights aboard the station have been dimmed for the night.", sound='sound/AI/night.ogg', sender_override="Automated Lighting System Announcement") else - announce("Good morning, crew. As it is now day time, all of the lights aboard the station have been restored to their former brightness.") + priority_announce("Good morning, crew. As it is now day time, all of the lights aboard the station have been restored to their former brightness.", sound='sound/AI/night2.ogg', sender_override="Automated Lighting System Announcement") for(var/A in GLOB.apcs_list) var/obj/machinery/power/apc/APC = A if (APC.area && (APC.area.type in GLOB.the_station_areas)) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index a8fa8a147..49c2622a6 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -195,9 +195,9 @@ var/on = FALSE // 1 if on, 0 if off var/on_gs = FALSE var/static_power_used = 0 - var/brightness = 8 // luminosity when on, also used in power calculation + var/brightness = 7 // luminosity when on, also used in power calculation var/bulb_power = 1 // basically the alpha of the emitted light source - var/bulb_colour = "#FFFFFF" // befault colour of the light. + var/bulb_colour = "#ffefda" // befault colour of the light. var/status = LIGHT_OK // LIGHT_OK, _EMPTY, _BURNED or _BROKEN var/flickering = FALSE var/light_type = /obj/item/light/tube // the type of light item @@ -212,9 +212,9 @@ var/nightshift_enabled = FALSE //Currently in night shift mode? var/nightshift_allowed = TRUE //Set to FALSE to never let this light get switched to night mode. - var/nightshift_brightness = 8 + var/nightshift_brightness = 5 var/nightshift_light_power = 0.45 - var/nightshift_light_color = "#FFDDCC" + var/nightshift_light_color = "#dafcff" var/emergency_mode = FALSE // if true, the light is in emergency mode var/no_emergency = FALSE // if true, this light cannot ever have an emergency mode diff --git a/sound/AI/burger.ogg b/sound/AI/burger.ogg new file mode 100644 index 000000000..d75a77a45 Binary files /dev/null and b/sound/AI/burger.ogg differ diff --git a/sound/AI/cleaning.ogg b/sound/AI/cleaning.ogg deleted file mode 100644 index a97a91305..000000000 Binary files a/sound/AI/cleaning.ogg and /dev/null differ diff --git a/sound/AI/commandreport.ogg b/sound/AI/commandreport.ogg index 900666690..8b5e3f486 100644 Binary files a/sound/AI/commandreport.ogg and b/sound/AI/commandreport.ogg differ diff --git a/sound/AI/crystal.ogg b/sound/AI/crystal.ogg index b6e7bbe9a..765568225 100644 Binary files a/sound/AI/crystal.ogg and b/sound/AI/crystal.ogg differ diff --git a/sound/AI/night.ogg b/sound/AI/night.ogg new file mode 100644 index 000000000..1e869fdb1 Binary files /dev/null and b/sound/AI/night.ogg differ diff --git a/sound/AI/night2.ogg b/sound/AI/night2.ogg new file mode 100644 index 000000000..d906c8a0e Binary files /dev/null and b/sound/AI/night2.ogg differ diff --git a/sound/AI/personal/brute.ogg b/sound/AI/personal/brute.ogg new file mode 100644 index 000000000..1ed0e3ce3 Binary files /dev/null and b/sound/AI/personal/brute.ogg differ diff --git a/sound/AI/personal/cleaning.ogg b/sound/AI/personal/cleaning.ogg new file mode 100644 index 000000000..774d0584c Binary files /dev/null and b/sound/AI/personal/cleaning.ogg differ diff --git a/sound/AI/personal/seekmedical.ogg b/sound/AI/personal/seekmedical.ogg new file mode 100644 index 000000000..af1a27e2d Binary files /dev/null and b/sound/AI/personal/seekmedical.ogg differ