Merge with upstream/master

Fixes conflicts

code/modules/computer3/computers/communications.dm

@@ -42,6 +42,12 @@
 	var/status_display_freq = "1435"
 	var/stat_msg1
 	var/stat_msg2
+	
+	var/datum/announcement/priority/crew_announcement = new
+	
+	New()
+		..()
+		crew_announcement.newscast = 1
 
 	Reset()
 		..()
@@ -53,7 +59,7 @@
 	Topic(var/href, var/list/href_list)
 		if(!interactable() || !computer.radio || ..(href,href_list) )
 			return
-		if (computer.z > 1)
+		if (!(computer.z in config.station_levels))
 			usr << "\red <b>Unable to establish a connection</b>: \black You're too far away from the station!"
 			return
 
@@ -68,11 +74,11 @@
 				authenticated = 1
 				if(access_captain in I.GetAccess())
 					authenticated = 2
-			if(istype(I,/obj/item/weapon/card/emag))
-				authenticated = 2
-				computer.emagged = 1
+					crew_announcement.announcer = GetNameAndAssignmentFromId(I)
+				
 		if("logout" in href_list)
 			authenticated = 0
+			crew_announcement.announcer = ""
 
 		if("swipeidseclevel" in href_list)
 			var/mob/M = usr
@@ -104,13 +110,13 @@
 				usr << "You need to swipe your ID."
 		if("announce" in href_list)
 			if(authenticated==2)
-				if(message_cooldown)	return
-				var/input = stripped_input(usr, "Please choose a message to announce to the station crew.", "What?")
+				if(message_cooldown)
+					usr << "Please allow at least one minute to pass between announcements"
+					return
+				var/input = input(usr, "Please write a message to announce to the station crew.", "Priority Announcement")
 				if(!input || !interactable())
 					return
-				captain_announce(input)//This should really tell who is, IE HoP, CE, HoS, RD, Captain
-				log_say("[key_name(usr)] has made a captain announcement: [input]")
-				message_admins("[key_name_admin(usr)] has made a captain announcement.", 1)
+				crew_announcement.Announce(input)
 				message_cooldown = 1
 				spawn(600)//One minute cooldown
 					message_cooldown = 0

code/modules/computer3/computers/shuttle.dm

@@ -60,11 +60,13 @@
 					world << "\blue <B>All authorizations to shorting time for shuttle launch have been revoked!</B>"
 					src.authorized.len = 0
 					src.authorized = list(  )
-
-		else if (istype(W, /obj/item/card/emag) && !emagged)
+		return
+		
+	emag_act(user as mob)
+		if (!emagged)
 			var/choice = alert(user, "Would you like to launch the shuttle?","Shuttle control", "Launch", "Cancel")
 
-			if(!emagged && emergency_shuttle.location == 1 && user.get_active_hand() == W)
+			if(!emagged && emergency_shuttle.location == 1)
 				switch(choice)
 					if("Launch")
 						world << "\blue <B>Alert: Shuttle launch time shortened to 10 seconds!</B>"
@@ -72,4 +74,3 @@
 						emagged = 1
 					if("Cancel")
 						return
-		return