Merge pull request #3927 from Anewbe/intercom

Adds more channels to intercom msg

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

@@ -125,3 +125,6 @@
 	name = "\improper ERT radio encryption key"
 	icon_state = "cent_cypherkey"
 	channels = list("Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1)
+
+/obj/item/device/encryptionkey/omni		//Literally only for the admin intercoms
+	channels = list("Mercenary" = 1, "Raider" = 1, "Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1)

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

@@ -310,6 +310,9 @@
 //	freerange = 1
 	ks2type = /obj/item/device/encryptionkey/ert
 
+/obj/item/device/radio/headset/omni		//Only for the admin intercoms
+	ks2type = /obj/item/device/encryptionkey/omni
+
 /obj/item/device/radio/headset/ia
 	name = "internal affair's headset"
 	desc = "The headset of your worst enemy."

code/modules/admin/admin.dm

@@ -675,7 +675,7 @@ proc/admin_notice(var/message, var/rights)
 	if(!check_rights(0))	return
 
 	//This is basically how death alarms do it
-	var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset/ert(null)
+	var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset/omni(null)
 
 	var/channel = input("Channel for message:","Channel", null) as null|anything in (list("Common") + a.keyslot2.channels) // + a.keyslot1.channels