Merge pull request #2586 from Spamcat/BEF-staging

Mid-round arrival announcements

code/game/objects/items/devices/radio/radio.dm

@@ -210,10 +210,12 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 	if (!connection)
 		return
 
-	Broadcast_Message(connection, new /mob/living/silicon/ai(src,null,null,1),
+	var/mob/living/silicon/ai/A = new /mob/living/silicon/ai(src, null, null, 1)
+	Broadcast_Message(connection, A,
 						0, "*garbled automated announcement*", src,
 						message, from, "Automated Announcement", from, "synthesized voice",
-						4, 0, 1)
+						4, 0, list(1), 1459)
+	del(A)
 	return
 
 /obj/item/device/radio/talk_into(mob/living/M as mob, message, channel)

code/modules/mob/new_player/new_player.dm

@@ -291,13 +291,7 @@
 	proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank)
 		if (ticker.current_state == GAME_STATE_PLAYING)
 			var/obj/item/device/radio/intercom/a = new /obj/item/device/radio/intercom(null)// BS12 EDIT Arrivals Announcement Computer, rather than the AI.
-
-			//unlikely for this to be an issue, but just in case
-			if(istype(character.wear_id, /obj/item/weapon/card/id))
-				var/obj/item/weapon/card/id/I = character.wear_id
-				a.autosay("\"[character.real_name],[I.assignment ? " [I.assignment]," : "" ] has arrived on the station.\"", "Arrivals Announcement Computer")
-			else
-				a.autosay("\"[character.real_name], visitor, has arrived on the station.\"", "Arrivals Announcement Computer")
+			a.autosay("[character.real_name],[rank ? " [rank]," : " visitor," ] has arrived on the station.", "Arrivals Announcement Computer")
 			del(a)
 
 	proc/LateChoices()