From d0a175994dec49080ce880b163858e95fb2dc1ac Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sun, 24 Sep 2017 02:00:58 -0500 Subject: [PATCH] Adds more channels to intercom msg --- code/game/objects/items/devices/radio/encryptionkey.dm | 3 +++ code/game/objects/items/devices/radio/headset.dm | 3 +++ code/modules/admin/admin.dm | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index e26b75486e..0d81f8559e 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/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) \ No newline at end of file diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 5a8a73ee72..ba5d338a0d 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/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." diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 2f2f17dd1d..9e4a5a6344 100644 --- a/code/modules/admin/admin.dm +++ b/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