Merge branch 'master' into mapsyncs43293845982

code/game/machinery/computer/camera_advanced.dm

@@ -283,6 +283,9 @@
 	if(!is_servant_of_ratvar(user))
 		to_chat(user, "<span class='warning'>[src]'s keys are in a language foreign to you, and you don't understand anything on its screen.</span>")
 		return
+	if(clockwork_ark_active())
+		to_chat(user, "<span class='warning'>The Ark is active, and [src] has shut down.</span>")
+		return
 	. = ..()
 
 /datum/action/innate/servant_warp

code/game/machinery/computer/communications.dm

@@ -130,7 +130,6 @@
 			if(authenticated==2)
 				playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
 				make_announcement(usr)
-				deadchat_broadcast("<span class='deadsay bold'>[usr.name] made an priority announcement.</span>", usr)
 
 		if("crossserver")
 			if(authenticated==2)
@@ -702,6 +701,7 @@
 	if(!input || !user.canUseTopic(src))
 		return
 	SScommunications.make_announcement(user, is_silicon, input)
+	deadchat_broadcast("<span class='deadsay bold'>[user.name] made an priority announcement.</span>", user)
 
 /obj/machinery/computer/communications/proc/post_status(command, data1, data2)