Merge remote-tracking branch 'citadel/master' into nightshift_1

2020-01-12 18:27:03 -08:00
parent 8725ffe916 8c50b578b4
commit 8f5d4a0a49
1055 changed files with 194026 additions and 195699 deletions
@@ -1,61 +1,61 @@
-SUBSYSTEM_DEF(nightshift)
-	name = "Night Shift"
-	wait = 600
-	flags = SS_NO_TICK_CHECK
-
-	var/nightshift_active = FALSE
-	var/nightshift_start_time = 702000		//7:30 PM, station time
-	var/nightshift_end_time = 270000		//7:30 AM, station time
-	var/nightshift_first_check = 30 SECONDS
-
-	var/high_security_mode = FALSE
-
-/datum/controller/subsystem/nightshift/Initialize()
-	if(!CONFIG_GET(flag/enable_night_shifts))
-		can_fire = FALSE
-	return ..()
-
-/datum/controller/subsystem/nightshift/fire(resumed = FALSE)
-	if(world.time - SSticker.round_start_time < nightshift_first_check)
-		return
-	check_nightshift()
-
-/datum/controller/subsystem/nightshift/proc/announce(message)
-	priority_announce(message, sound='sound/misc/notice2.ogg', sender_override="Automated Lighting System Announcement")
-
-/datum/controller/subsystem/nightshift/proc/check_nightshift()
-	var/emergency = GLOB.security_level >= SEC_LEVEL_RED
-	var/announcing = TRUE
-	var/time = STATION_TIME(FALSE)
-	var/night_time = (time < nightshift_end_time) || (time > nightshift_start_time)
-	if(high_security_mode != emergency)
-		high_security_mode = emergency
-		if(night_time)
-			announcing = FALSE
-			if(!emergency)
-				announce("Restoring night lighting configuration to normal operation.")
-			else
-				announce("Disabling night lighting: Station is in a state of emergency.")
-	if(emergency)
-		night_time = FALSE
-	if(nightshift_active != night_time)
-		update_nightshift(night_time, announcing)
-
-/datum/controller/subsystem/nightshift/proc/update_nightshift(active, announce = TRUE, max_level_override)
-	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.")
-		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.")
-	var/max_level
-	var/configured_level = CONFIG_GET(number/night_shift_public_areas_only)
-	if(isnull(max_level_override))
-		max_level = active? configured_level : INFINITY		//by default, deactivating shuts off nightshifts everywhere.
-	else
-		max_level = max_level_override
-	for(var/A in GLOB.apcs_list)
-		var/obj/machinery/power/apc/APC = A
-		if(APC.area && (!max_level || !APC.area.nightshift_public_area || (APC.area.nightshift_public_area <= max_level)) && (APC.area.type in GLOB.the_station_areas))
-			APC.set_nightshift(active)
-			CHECK_TICK
+SUBSYSTEM_DEF(nightshift)
+	name = "Night Shift"
+	wait = 600
+	flags = SS_NO_TICK_CHECK
+
+	var/nightshift_active = FALSE
+	var/nightshift_start_time = 702000		//7:30 PM, station time
+	var/nightshift_end_time = 270000		//7:30 AM, station time
+	var/nightshift_first_check = 30 SECONDS
+
+	var/high_security_mode = FALSE
+
+/datum/controller/subsystem/nightshift/Initialize()
+	if(!CONFIG_GET(flag/enable_night_shifts))
+		can_fire = FALSE
+	return ..()
+
+/datum/controller/subsystem/nightshift/fire(resumed = FALSE)
+	if(world.time - SSticker.round_start_time < nightshift_first_check)
+		return
+	check_nightshift()
+
+/datum/controller/subsystem/nightshift/proc/announce(message)
+	priority_announce(message, sound='sound/misc/notice2.ogg', sender_override="Automated Lighting System Announcement")
+
+/datum/controller/subsystem/nightshift/proc/check_nightshift()
+	var/emergency = GLOB.security_level >= SEC_LEVEL_RED
+	var/announcing = TRUE
+	var/time = STATION_TIME(FALSE)
+	var/night_time = (time < nightshift_end_time) || (time > nightshift_start_time)
+	if(high_security_mode != emergency)
+		high_security_mode = emergency
+		if(night_time)
+			announcing = FALSE
+			if(!emergency)
+				announce("Restoring night lighting configuration to normal operation.")
+			else
+				announce("Disabling night lighting: Station is in a state of emergency.")
+	if(emergency)
+		night_time = FALSE
+	if(nightshift_active != night_time)
+		update_nightshift(night_time, announcing)
+
+/datum/controller/subsystem/nightshift/proc/update_nightshift(active, announce = TRUE, max_level_override)
+	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.")
+		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.")
+	var/max_level
+	var/configured_level = CONFIG_GET(number/night_shift_public_areas_only)
+	if(isnull(max_level_override))
+		max_level = active? configured_level : INFINITY		//by default, deactivating shuts off nightshifts everywhere.
+	else
+		max_level = max_level_override
+	for(var/A in GLOB.apcs_list)
+		var/obj/machinery/power/apc/APC = A
+		if(APC.area && (!max_level || !APC.area.nightshift_public_area || (APC.area.nightshift_public_area <= max_level)) && (APC.area.type in GLOB.the_station_areas))
+			APC.set_nightshift(active)
+			CHECK_TICK