diff --git a/code/game/objects/radio/encryptionkey.dm b/code/game/objects/radio/encryptionkey.dm index 2758ddf9099..b7f6ff62e47 100644 --- a/code/game/objects/radio/encryptionkey.dm +++ b/code/game/objects/radio/encryptionkey.dm @@ -1,21 +1,125 @@ + /obj/item/device/encryptionkey/ name = "Standard Encrpytion Key" desc = "An encyption key for a radio headset. Has no special codes in it. WHY DOES IT EXIST? ASK NANOTRASEN." icon = 'radio.dmi' icon_state = "cypherkey" item_state = "" - var/channels = list() - var/translate_hive = 0 var/translate_binary = 0 + var/translate_hive = 0 + var/list/channels = list() + /obj/item/device/encryptionkey/New() /obj/item/device/radio/headset/attackby(obj/item/weapon/W as obj, mob/user as mob) /obj/item/device/encryptionkey/traitor + icon_state = "cypherkey" channels = list("Syndicate" = 1) origin_tech = "syndicate=3" +/obj/item/device/encryptionkey/binary + icon_state = "cypherkey" + translate_binary = 1 + origin_tech = "syndicate=3" + +/obj/item/device/encryptionkey/headset_sec + name = "Security Radio Encryption Key" + desc = "An encyption key for a radio headset. Contains cypherkeys." + icon_state = "sec_cypherkey" + channels = list("Security" = 1) + +/obj/item/device/encryptionkey/headset_eng + name = "Engineering Radio Encryption Key" + desc = "An encyption key for a radio headset. Contains cypherkeys." + icon_state = "eng_cypherkey" + channels = list("Engineering" = 1) + +/obj/item/device/encryptionkey/headset_rob + name = "Robotics Radio Encryption Key" + desc = "An encyption key for a radio headset. Contains cypherkeys." + icon_state = "rob_cypherkey" + channels = list("Engineering" = 1, "Science" = 1) + +/obj/item/device/encryptionkey/headset_med + name = "Medical Radio Encryption Key" + desc = "An encyption key for a radio headset. Contains cypherkeys." + icon_state = "med_cypherkey" + channels = list("Medical" = 1) + +/obj/item/device/encryptionkey/headset_sci + name = "Science Radio Encryption Key" + desc = "An encyption key for a radio headset. Contains cypherkeys." + icon_state = "sci_cypherkey" + channels = list("Science" = 1) + +/obj/item/device/encryptionkey/headset_medsci + name = "Medical Research Radio Encryption Key" + desc = "An encyption key for a radio headset. Contains cypherkeys." + icon_state = "medsci_cypherkey" + channels = list("Medical" = 1, "Science" = 1) + +/obj/item/device/encryptionkey/headset_com + name = "Command Radio Encryption Key" + desc = "An encyption key for a radio headset. Contains cypherkeys." + icon_state = "com_cypherkey" + channels = list("Command" = 1) + +/obj/item/device/encryptionkey/heads/captain + name = "Captain's Encryption Key" + desc = "An encyption key for a radio headset. Contains cypherkeys." + icon_state = "cap_cypherkey" + channels = list("Command" = 1, "Science" = 0, "Medical" = 0, "Security" = 1, "Engineering" = 0, "Mining" = 0, "Cargo" = 0) + +/obj/item/device/encryptionkey/heads/rd + name = "Research Director's Encryption Key" + desc = "An encyption key for a radio headset. Contains cypherkeys." + icon_state = "rd_cypherkey" + channels = list("Science" = 1, "Command" = 1) + +/obj/item/device/encryptionkey/heads/hos + name = "Head of Security's Encryption Key" + desc = "An encyption key for a radio headset. Contains cypherkeys." + icon_state = "hos_cypherkey" + channels = list("Security" = 1, "Command" = 1) + +/obj/item/device/encryptionkey/heads/ce + name = "Chief Engineer's Encryption Key" + desc = "An encyption key for a radio headset. Contains cypherkeys." + icon_state = "ce_cypherkey" + channels = list("Engineering" = 1, "Command" = 1) + +/obj/item/device/encryptionkey/heads/cmo + name = "Chief Medical Officer's Encryption Key" + desc = "An encyption key for a radio headset. Contains cypherkeys." + icon_state = "cmo_cypherkey" + channels = list("Medical" = 1, "Command" = 1) + +/obj/item/device/encryptionkey/heads/hop + name = "Head of Personnel's Encryption Key" + desc = "An encyption key for a radio headset. Contains cypherkeys." + icon_state = "hop_cypherkey" + channels = list("Command" = 1, "Security" = 0, "Cargo" = 1, "Mining" = 0) + +/obj/item/device/encryptionkey/headset_mine + name = "Mining Radio Encryption Key" + desc = "An encyption key for a radio headset. Contains cypherkeys." + icon_state = "mine_cypherkey" + channels = list("Mining" = 1) + +/obj/item/device/encryptionkey/heads/qm + name = "Quartermaster's Encryption Key" + desc = "An encyption key for a radio headset. Contains cypherkeys." + icon_state = "qm_cypherkey" + channels = list("Cargo" = 1, "Mining" = 1) + +/obj/item/device/encryptionkey/headset_cargo + name = "Cargo Radio Encryption Key" + desc = "An encyption key for a radio headset. Contains cypherkeys." + icon_state = "cargo_cypherkey" + channels = list("Cargo" = 1) + /obj/item/device/encryptionkey/nuclear channels = list("Nuclear" = 1) origin_tech = "syndicate=3" @@ -23,88 +127,4 @@ /obj/item/device/encryptionkey/ert name = "NanoTrasen ERT Radio Encryption Key" desc = "An encyption key for a radio headset. Contains cypherkeys." - channels = list("Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Mining" = 1, "Cargo" = 1,) - -/obj/item/device/encryptionkey/binary - translate_binary = 1 - origin_tech = "syndicate=3" - -/obj/item/device/encryptionkey/headset_sec - name = "Security Radio Encryption Key" - - channels = list("Security" = 1) - -/obj/item/device/encryptionkey/headset_eng - name = "Engineering Radio Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." - channels = list("Engineering" = 1) - -/obj/item/device/encryptionkey/headset_rob - name = "Robotics Radio Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." - channels = list("Engineering" = 1, "Science" = 1) - -/obj/item/device/encryptionkey/headset_med - name = "Medical Radio Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." - channels = list("Medical" = 1) - -/obj/item/device/encryptionkey/headset_sci - name = "Science Radio Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." - channels = list("Science" = 1) - -/obj/item/device/encryptionkey/headset_medsci - name = "Medical Research Radio Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." - channels = list("Medical" = 1, "Science" = 1) - -/obj/item/device/encryptionkey/headset_com - name = "Command Radio Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." - channels = list("Command" = 1) - -/obj/item/device/encryptionkey/heads/captain - name = "Captain's Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." - channels = list("Command" = 1, "Science" = 0, "Medical" = 0, "Security" = 1, "Engineering" = 0, "Mining" = 0, "Cargo" = 0) - -/obj/item/device/encryptionkey/heads/rd - name = "Research Director's Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." - channels = list("Science" = 1, "Command" = 1) - -/obj/item/device/encryptionkey/heads/hos - name = "Head of Security's Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." - channels = list("Security" = 1, "Command" = 1) - -/obj/item/device/encryptionkey/heads/ce - name = "Chief Engineer's Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." - channels = list("Engineering" = 1, "Command" = 1) - -/obj/item/device/encryptionkey/heads/cmo - name = "Chief Medical Officer's Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." - channels = list("Medical" = 1, "Command" = 1) - -/obj/item/device/encryptionkey/heads/hop - name = "Head of Personnel's Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." - channels = list("Command" = 1, "Security" = 0, "Cargo" = 1, "Mining" = 0) - -/obj/item/device/encryptionkey/headset_mine - name = "Mining Radio Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." - channels = list("Mining" = 1) - -/obj/item/device/encryptionkey/heads/qm - name = "Quartermaster's Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." - channels = list("Cargo" = 1, "Mining" = 1) - -/obj/item/device/encryptionkey/headset_cargo - name = "Cargo Radio Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." - channels = list("Cargo" = 1) \ No newline at end of file + channels = list("Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Mining" = 1, "Cargo" = 1,) \ No newline at end of file diff --git a/code/game/objects/radio/headset.dm b/code/game/objects/radio/headset.dm index e2aa76282e0..3d21ce3dc57 100644 --- a/code/game/objects/radio/headset.dm +++ b/code/game/objects/radio/headset.dm @@ -1,13 +1,13 @@ /obj/item/device/radio/headset - name = "Radio Headset" - desc = "An intercom that fits over the head." + name = "radio headset" + desc = "An updated, modular intercom that fits over the head. Takes encryption keys" icon_state = "headset" item_state = "headset" g_amt = 0 m_amt = 75 subspace_transmission = 1 protective_temperature = 0 - canhear_range = 1 + canhear_range = 1 // can't hear headsets from very far away var translate_binary = 0 translate_hive = 0 @@ -16,132 +16,139 @@ /obj/item/device/radio/headset/New() ..() - keyslot1 = new /obj/item/device/encryptionkey + keyslot1 = new /obj/item/device/encryptionkey/ recalculateChannels() /obj/item/device/radio/headset/traitor origin_tech = "syndicate=3" canhear_range = 0 - - New() - ..() - del(keyslot1) - keyslot1 = new /obj/item/device/encryptionkey/traitor +/obj/item/device/radio/headset/traitor/New() + ..() + del(keyslot1) + keyslot1 = new /obj/item/device/encryptionkey/traitor + recalculateChannels() /obj/item/device/radio/headset/binary origin_tech = "syndicate=3" canhear_range = 0 - - New() - ..() - del(keyslot1) - keyslot1 = new /obj/item/device/encryptionkey/binary +/obj/item/device/radio/headset/binary/New() + ..() + del(keyslot1) + keyslot1 = new /obj/item/device/encryptionkey/binary + recalculateChannels() /obj/item/device/radio/headset/headset_sec - name = "Security Radio Headset" + name = "security radio headset" desc = "This is used by your elite security force. To access the security channel, use :s." icon_state = "sec_headset" item_state = "headset" keyslot2 = new /obj/item/device/encryptionkey/headset_sec /obj/item/device/radio/headset/headset_eng - name = "Engineering Radio Headset" + name = "engineering radio headset" desc = "When the engineers wish to chat like girls. To access the engineering channel, use :e. " icon_state = "eng_headset" item_state = "headset" keyslot2 = new /obj/item/device/encryptionkey/headset_eng /obj/item/device/radio/headset/headset_rob - name = "Robotics Radio Headset" + name = "robotics radio headset" desc = "Made specifically for the roboticists who cannot decide between departments. To access the engineering channel, use :e. For research, use :n." icon_state = "rob_headset" item_state = "headset" keyslot2 = new /obj/item/device/encryptionkey/headset_rob /obj/item/device/radio/headset/headset_med - name = "Medical Radio Headset" + name = "medical radio headset" desc = "A headset for the trained staff of the medbay. To access the medical channel, use :m." icon_state = "med_headset" item_state = "headset" keyslot2 = new /obj/item/device/encryptionkey/headset_med /obj/item/device/radio/headset/headset_sci - name = "Science Radio Headset" + name = "science radio headset" desc = "A sciency headset. Like usual. To access the science channel, use :n." icon_state = "com_headset" item_state = "headset" keyslot2 = new /obj/item/device/encryptionkey/headset_sci /obj/item/device/radio/headset/headset_medsci - name = "Medical Research Radio Headset" + name = "medical research radio headset" desc = "A headset that is a result of the mating between medical and science. To access the medical channel, use :m. For science, use :n." icon_state = "med_headset" item_state = "headset" keyslot2 = new /obj/item/device/encryptionkey/headset_medsci /obj/item/device/radio/headset/headset_com - name = "Command Radio Headset" + name = "command radio headset" desc = "A headset with a commanding channel. To access the command channel, use :c." icon_state = "com_headset" item_state = "headset" keyslot2 = new /obj/item/device/encryptionkey/headset_com /obj/item/device/radio/headset/heads/captain - name = "Captain's Headset" + name = "captain's headset" desc = "The headset of the boss. Channels are as follows: :c - command, :s - security, :e - engineering, :d - mining, :q - cargo, :m - medical, :n - science." icon_state = "com_headset" item_state = "headset" keyslot2 = new /obj/item/device/encryptionkey/heads/captain /obj/item/device/radio/headset/heads/rd - name = "Research Director's Headset" + name = "Research Director's headset" desc = "Headset of the researching God. To access the science channel, use :n. For command, use :c." icon_state = "com_headset" item_state = "headset" keyslot2 = new /obj/item/device/encryptionkey/heads/rd /obj/item/device/radio/headset/heads/hos - name = "Head of Security's Headset" + name = "head of security's headset" desc = "The headset of the man who protects your worthless lifes. To access the security channel, use :s. For command, use :c." icon_state = "com_headset" item_state = "headset" keyslot2 = new /obj/item/device/encryptionkey/heads/hos /obj/item/device/radio/headset/heads/ce - name = "Chief Engineer's Headset" + name = "chief engineer's headset" desc = "The headset of the guy who is in charge of morons. To access the engineering channel, use :e. For command, use :c." icon_state = "com_headset" item_state = "headset" keyslot2 = new /obj/item/device/encryptionkey/heads/ce /obj/item/device/radio/headset/heads/cmo - name = "Chief Medical Officer's Headset" + name = "chief medical officer's headset" desc = "The headset of the highly trained medical chief. To access the medical channel, use :m. For command, use :c." icon_state = "com_headset" item_state = "headset" keyslot2 = new /obj/item/device/encryptionkey/heads/cmo /obj/item/device/radio/headset/heads/hop - name = "Head of Personnel's Headset" + name = "head of personnel's headset" desc = "The headset of the guy who will one day be captain. Channels are as follows: :c - command, :s - security, :q - cargo, :d - mining." icon_state = "com_headset" item_state = "headset" keyslot2 = new /obj/item/device/encryptionkey/heads/hop /obj/item/device/radio/headset/headset_mine - name = "Mining Radio Headset" + name = "mining radio headset" desc = "Headset used by miners. How useless. To access the mining channel, use :d." icon_state = "mine_headset" item_state = "headset" keyslot2 = new /obj/item/device/encryptionkey/headset_mine /obj/item/device/radio/headset/heads/qm - name = "Quartermaster's Headset" + name = "quartermaster's headset" desc = "The headset of the man who control your toiletpaper supply. To access the cargo channel, use :q. For mining, use :d." icon_state = "cargo_headset" item_state = "headset" keyslot2 = new /obj/item/device/encryptionkey/heads/qm +/obj/item/device/radio/headset/headset_cargo + name = "cargo radio headset" + desc = "Headset used by the QM's slaves. To access the cargo channel, use :q." + icon_state = "cargo_headset" + item_state = "headset" + keyslot2 = new /obj/item/device/encryptionkey/headset_cargo + /obj/item/device/radio/headset/nuclear freerange = 1 listening = 0 @@ -155,22 +162,21 @@ freerange = 1 keyslot2 = new /obj/item/device/encryptionkey/ert -/obj/item/device/radio/headset/headset_cargo - name = "Cargo Radio Headset" - desc = "Headset used by the QM's slaves. To access the cargo channel, use :q." - icon_state = "cargo_headset" - item_state = "headset" - keyslot2 = new /obj/item/device/encryptionkey/headset_cargo - /obj/item/device/radio/headset/attackby(obj/item/weapon/W as obj, mob/user as mob) // ..() user.machine = src - if (!istype(W, /obj/item/weapon/screwdriver) && !istype(W, /obj/item/device/encryptionkey/)) + if (!( istype(W, /obj/item/weapon/screwdriver) || (istype(W, /obj/item/device/encryptionkey/ )))) return if(istype(W, /obj/item/weapon/screwdriver)) if(keyslot1 || keyslot2) + + for(var/ch_name in channels) + radio_controller.remove_object(src, radiochannels[ch_name]) + secure_radio_connections[ch_name] = null + + if(keyslot1) user.put_in_hands(keyslot1) keyslot1 = null @@ -200,7 +206,9 @@ W.loc = src keyslot2 = W + recalculateChannels() + return @@ -208,10 +216,13 @@ src.channels = list() src.translate_binary = 0 src.translate_hive = 0 - var/temp_channels = list() if(keyslot1) - temp_channels += keyslot1.channels + for(var/ch_name in keyslot1.channels) + if(ch_name in src.channels) + continue + src.channels += ch_name + src.channels[ch_name] = keyslot1.channels[ch_name] if(keyslot1.translate_binary) src.translate_binary = 1 @@ -220,7 +231,11 @@ src.translate_hive = 1 if(keyslot2) - temp_channels += keyslot2.channels + for(var/ch_name in keyslot2.channels) + if(ch_name in src.channels) + continue + src.channels += ch_name + src.channels[ch_name] = keyslot2.channels[ch_name] if(keyslot2.translate_binary) src.translate_binary = 1 @@ -228,13 +243,14 @@ if(keyslot2.translate_hive) src.translate_hive = 1 - config(temp_channels) for (var/ch_name in channels) if(!radio_controller) sleep(30) // Waiting for the radio_controller to be created. if(!radio_controller) - src.name = "Broken Radio Headset" + src.name = "broken radio headset" return + secure_radio_connections[ch_name] = radio_controller.add_object(src, radiochannels[ch_name], RADIO_CHAT) + return \ No newline at end of file diff --git a/icons/obj/radio.dmi b/icons/obj/radio.dmi index 69180436a7c..e2d376d604c 100644 Binary files a/icons/obj/radio.dmi and b/icons/obj/radio.dmi differ