diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index 2c9e36c0b79..5016ad369e9 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -28,102 +28,90 @@ /obj/item/device/encryptionkey/headset_sec name = "Security Radio Encryption Key" - desc = "An encryption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. To access the security channel, use :s." icon_state = "sec_cypherkey" channels = list("Security" = 1) /obj/item/device/encryptionkey/headset_eng name = "Engineering Radio Encryption Key" - desc = "An encryption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. To access the engineering channel, use :e." icon_state = "eng_cypherkey" channels = list("Engineering" = 1) /obj/item/device/encryptionkey/headset_rob name = "Robotics Radio Encryption Key" - desc = "An encryption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. To access the engineering channel, use :e. For research, use :n." icon_state = "rob_cypherkey" - channels = list("Engineering" = 1, "Science" = 1) + channels = list("Science" = 1, "Engineering" = 1) /obj/item/device/encryptionkey/headset_med name = "Medical Radio Encryption Key" - desc = "An encryption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. To access the medical channel, use :m." icon_state = "med_cypherkey" channels = list("Medical" = 1) /obj/item/device/encryptionkey/headset_sci name = "Science Radio Encryption Key" - desc = "An encryption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. To access the science channel, use :n." icon_state = "sci_cypherkey" channels = list("Science" = 1) /obj/item/device/encryptionkey/headset_medsci name = "Medical Research Radio Encryption Key" - desc = "An encryption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. To access the medical channel, use :m. For science, use :n." icon_state = "medsci_cypherkey" - channels = list("Medical" = 1, "Science" = 1) + channels = list("Science" = 1, "Medical" = 1) /obj/item/device/encryptionkey/headset_com name = "Command Radio Encryption Key" - desc = "An encryption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. To access the command channel, use :c." icon_state = "com_cypherkey" channels = list("Command" = 1) /obj/item/device/encryptionkey/heads/captain name = "Captain's Encryption Key" - desc = "An encryption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. Channels are as follows: :c - command, :s - security, :e - engineering, :u - supply, :v - service, :m - medical, :n - science." icon_state = "cap_cypherkey" channels = list("Command" = 1, "Security" = 1, "Engineering" = 0, "Science" = 0, "Medical" = 0, "Supply" = 0, "Service" = 0) /obj/item/device/encryptionkey/heads/rd name = "Research Director's Encryption Key" - desc = "An encryption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. To access the science channel, use :n. For command, use :c." 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 encryption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. To access the security channel, use :s. For command, use :c." icon_state = "hos_cypherkey" channels = list("Security" = 1, "Command" = 1) /obj/item/device/encryptionkey/heads/ce name = "Chief Engineer's Encryption Key" - desc = "An encryption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. To access the engineering channel, use :e. For command, use :c." 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 encryption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. To access the medical channel, use :m. For command, use :c." 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 encryption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. Channels are as follows: :u - supply, :v - service, :c - command." icon_state = "hop_cypherkey" - channels = list("Supply" = 1, "Command" = 1, "Service" = 1, "Security" = 0) -/* -/obj/item/device/encryptionkey/headset_mine - name = "Mining Radio Encryption Key" - desc = "An encryption key for a radio headset. Contains cypherkeys." - icon_state = "mine_cypherkey" - channels = list("Mining" = 1) + channels = list("Supply" = 1, "Service" = 1, "Command" = 1) -/obj/item/device/encryptionkey/heads/qm - name = "Quartermaster's Encryption Key" - desc = "An encryption key for a radio headset. Contains cypherkeys." - icon_state = "qm_cypherkey" - channels = list("Cargo" = 1, "Mining" = 1) -*/ /obj/item/device/encryptionkey/headset_cargo name = "Supply Radio Encryption Key" - desc = "An encryption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. To access the supply channel, use :u." icon_state = "cargo_cypherkey" channels = list("Supply" = 1) /obj/item/device/encryptionkey/headset_service name = "Service Radio Encryption Key" - desc = "An encryption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. To access the service channel, use :v." icon_state = "srv_cypherkey" channels = list("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 c9adef0d22d..a5570dc567b 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -130,25 +130,11 @@ /obj/item/device/radio/headset/heads/hop name = "head of personnel's headset" - desc = "The headset of the guy who will one day be captain. Channels are as follows: :u - supply, :v - service, :c - command, :s - security" + desc = "The headset of the guy who will one day be captain. Channels are as follows: :u - supply, :v - service, :c - command." 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" - 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" - 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 = "supply radio headset" desc = "A headset used by the QM and his slaves. To access the supply channel, use :u." diff --git a/html/changelog.html b/html/changelog.html index 51fe20d5fd8..ead9bb503ce 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -49,9 +49,18 @@ Stuff which is in development and not yet visible to players or just code relate (ie. code improvements for expandability, etc.) should not be listed here. They should be listed in the changelog upon commit tho. Thanks. --> - + -