nightshift changes

2020-01-02 23:56:40 -08:00
parent 82db38d5d6
commit 8e1affa1f5
7 changed files with 128 additions and 65 deletions
@@ -98,6 +98,7 @@
 	var/force_update = 0
 	var/emergency_lights = FALSE
 	var/nightshift_lights = FALSE
+	var/nightshift_requires_auth = FALSE
 	var/last_nightshift_switch = 0
 	var/update_state = -1
 	var/update_overlay = -1
@@ -239,6 +240,7 @@
 	update_icon()

 	make_terminal()
+	update_nightshift_auth_requirement()

 	addtimer(CALLBACK(src, .proc/update), 5)

@@ -806,6 +808,7 @@
 /obj/machinery/power/apc/ui_data(mob/user)
 	var/list/data = list(
 		"locked" = locked && !(integration_cog && is_servant_of_ratvar(user)),
+		"lock_nightshift" = nightshift_requires_auth,
 		"failTime" = failure_timer,
 		"isOperating" = operating,
 		"externalPower" = main_status,
@@ -913,70 +916,73 @@
 		. = UI_INTERACTIVE

 /obj/machinery/power/apc/ui_act(action, params)
-	if(..() || !can_use(usr, 1) || (locked && !usr.has_unlimited_silicon_privilege && !failure_timer && !(integration_cog && (is_servant_of_ratvar(usr)))))
+	if(..() || !can_use(usr, 1))
 		return
-	switch(action)
-		if("lock")
-			if(usr.has_unlimited_silicon_privilege)
-				if((obj_flags & EMAGGED) || (stat & (BROKEN|MAINT)))
-					to_chat(usr, "The APC does not respond to the command.")
-				else
-					locked = !locked
-					update_icon()
-					. = TRUE
-		if("cover")
-			coverlocked = !coverlocked
-			. = TRUE
-		if("breaker")
-			toggle_breaker()
-			. = TRUE
-		if("toggle_nightshift")
-			toggle_nightshift_lights()
-			. = TRUE
-		if("charge")
-			chargemode = !chargemode
-			if(!chargemode)
-				charging = APC_NOT_CHARGING
-				update_icon()
-			. = TRUE
-		if("channel")
-			if(params["eqp"])
-				equipment = setsubsystem(text2num(params["eqp"]))
-				update_icon()
-				update()
-			else if(params["lgt"])
-				lighting = setsubsystem(text2num(params["lgt"]))
-				update_icon()
-				update()
-			else if(params["env"])
-				environ = setsubsystem(text2num(params["env"]))
-				update_icon()
-				update()
-			. = TRUE
-		if("overload")
-			if(usr.has_unlimited_silicon_privilege)
-				overload_lighting()
-				. = TRUE
-		if("hack")
-			if(get_malf_status(usr))
-				malfhack(usr)
-		if("occupy")
-			if(get_malf_status(usr))
-				malfoccupy(usr)
-		if("deoccupy")
-			if(get_malf_status(usr))
-				malfvacate()
-		if("reboot")
+	if(failure_timer)
+		if(action == "reboot")
 			failure_timer = 0
 			update_icon()
 			update()
-		if("emergency_lighting")
-			emergency_lights = !emergency_lights
-			for(var/obj/machinery/light/L in area)
-				if(!initial(L.no_emergency)) //If there was an override set on creation, keep that override
-					L.no_emergency = emergency_lights
-					INVOKE_ASYNC(L, /obj/machinery/light/.proc/update, FALSE)
-				CHECK_TICK
+	var/authorized = (!locked || !usr.has_unlimited_silicon_privilege || failure_timer || (integration_cog && (is_servant_of_ratvar(usr))))
+	if((action == "toggle_nightshift") && (!nightshift_requires_auth || authorized))
+		toggle_nightshift_lights()
+		. = TRUE
+	if(authorized)
+		switch(action)
+			if("lock")
+				if(usr.has_unlimited_silicon_privilege)
+					if((obj_flags & EMAGGED) || (stat & (BROKEN|MAINT)))
+						to_chat(usr, "The APC does not respond to the command.")
+					else
+						locked = !locked
+						update_icon()
+						. = TRUE
+			if("cover")
+				coverlocked = !coverlocked
+				. = TRUE
+			if("breaker")
+				toggle_breaker()
+				. = TRUE
+			if("charge")
+				chargemode = !chargemode
+				if(!chargemode)
+					charging = APC_NOT_CHARGING
+					update_icon()
+				. = TRUE
+			if("channel")
+				if(params["eqp"])
+					equipment = setsubsystem(text2num(params["eqp"]))
+					update_icon()
+					update()
+				else if(params["lgt"])
+					lighting = setsubsystem(text2num(params["lgt"]))
+					update_icon()
+					update()
+				else if(params["env"])
+					environ = setsubsystem(text2num(params["env"]))
+					update_icon()
+					update()
+				. = TRUE
+			if("overload")
+				if(usr.has_unlimited_silicon_privilege)
+					overload_lighting()
+					. = TRUE
+			if("hack")
+				if(get_malf_status(usr))
+					malfhack(usr)
+			if("occupy")
+				if(get_malf_status(usr))
+					malfoccupy(usr)
+			if("deoccupy")
+				if(get_malf_status(usr))
+					malfvacate()
+			if("emergency_lighting")
+				emergency_lights = !emergency_lights
+				for(var/obj/machinery/light/L in area)
+					if(!initial(L.no_emergency)) //If there was an override set on creation, keep that override
+						L.no_emergency = emergency_lights
+						INVOKE_ASYNC(L, /obj/machinery/light/.proc/update, FALSE)
+					CHECK_TICK
 	return 1

 /obj/machinery/power/apc/proc/toggle_breaker()
@@ -1383,6 +1389,8 @@

 /obj/machinery/power/apc/proc/set_nightshift(on)
 	set waitfor = FALSE
+	if(nightshift_lights == on)
+		return
 	nightshift_lights = on
 	for(var/obj/machinery/light/L in area)
 		if(L.nightshift_allowed)
@@ -1390,6 +1398,18 @@
 			L.update(FALSE)
 		CHECK_TICK

+/obj/machinery/power/apc/proc/update_nightshift_auth_requirement()
+	nightshift_requires_auth = nightshift_toggle_requires_auth()
+
+/obj/machinery/power/apc/proc/nightshift_toggle_requires_auth()
+	if(!area)
+		return FALSE
+	var/configured_level = CONFIG_GET(number/nightshift_public_areas_only)
+	var/our_level = area.nightshift_public_area
+	var/public_requires_auth = CONFIG_GET(flag/nightshift_toggle_public_requires_auth)
+	var/normal_requires_auth = CONFIG_GET(flag/nightshift_toggle_requires_auth)
+	return (configured_level && our_level && (our_level <= configured_level))? public_requires_auth : normal_requires_auth)
+
 #undef UPSTATE_CELL_IN
 #undef UPSTATE_OPENED1
 #undef UPSTATE_OPENED2