diff --git a/Resources/Locale/en-US/_HL/headset/headset-component.ftl b/Resources/Locale/en-US/_HL/headset/headset-component.ftl index f11a9af570..27df53436c 100644 --- a/Resources/Locale/en-US/_HL/headset/headset-component.ftl +++ b/Resources/Locale/en-US/_HL/headset/headset-component.ftl @@ -8,5 +8,6 @@ chat-radio-event2 = Wideband B chat-radio-event3 = Wideband C chat-radio-interdyne = Interdyne chat-radio-dominos-robotics = Dominos Robotics +chat-radio-talon = ADF-TALON examine-radio-intrinsic-channels = Intrinsic frequencies: diff --git a/Resources/Prototypes/_HL/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/_HL/Entities/Objects/Devices/encryption_keys.yml index e27e608adf..9f937d89f0 100644 --- a/Resources/Prototypes/_HL/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/_HL/Entities/Objects/Devices/encryption_keys.yml @@ -146,3 +146,17 @@ layers: - state: crypt_purple - state: dominosrobotics_label +- type: entity + parent: [EncryptionKey, RecyclableItemDeviceTiny] + id: EncryptionKeyADFTalon + name: ADF-Talon Encrypton Key + description: An encyption key used by members of ADF-Talon to communicate securely. + components: + - type: EncryptionKey + channels: + - ADFTalon + defaultChannel: ADFTalon + - type: Sprite + layers: + - state: crypt_avaliblue + \ No newline at end of file diff --git a/Resources/Prototypes/_HL/radio_channels.yml b/Resources/Prototypes/_HL/radio_channels.yml index 6e10110d48..da13f74ebd 100644 --- a/Resources/Prototypes/_HL/radio_channels.yml +++ b/Resources/Prototypes/_HL/radio_channels.yml @@ -73,3 +73,12 @@ frequency: 1389 color: "#AE1A14" longRange: true + +- type: radioChannel + id: ADFTalon + name: chat-radio-talon + keycode: "`" + frequency: 2004 + color: "#FFA500" + # Long range because Avali Nexus tech + longRange: true \ No newline at end of file diff --git a/Resources/Prototypes/radio_channels.yml b/Resources/Prototypes/radio_channels.yml index 204852a0b8..877cb605c1 100644 --- a/Resources/Prototypes/radio_channels.yml +++ b/Resources/Prototypes/radio_channels.yml @@ -123,3 +123,4 @@ keycode: "/" frequency: 1995 color: "#9900ff" + diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_avali.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_avali.png new file mode 100644 index 0000000000..f373d5fbc0 Binary files /dev/null and b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_avali.png differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_avaliblue.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_avaliblue.png new file mode 100644 index 0000000000..b30272dc8e Binary files /dev/null and b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_avaliblue.png differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json b/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json index 88ced962a4..1fdb4beb73 100644 --- a/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by DSC@300074782328750080 for Space Station 14, borg_label taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi and modified by ArtisticRoomba, crypt states modified by Flareguy for Space Station 14, nano/cartel/arca by Sera for Hardlight", + "copyright": "Created by DSC@300074782328750080 for Space Station 14, borg_label taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi and modified by ArtisticRoomba, crypt states modified by Flareguy for Space Station 14, nano/cartel/arca by Sera for Hardlight, Avali crypt modified by Nyxu for hardlight using a base sprite from Avali Triage github https://github.com/Avali-Triage-Team/Avali ", "size": { "x": 32, "y": 32 @@ -49,6 +49,9 @@ {"name": "a_label"}, {"name": "b_label"}, {"name": "c_label"}, - {"name": "crypt-interdyne"} + {"name": "crypt-interdyne"}, + {"name": "crypt_avali"}, + {"name": "crypt_avaliblue"} + ] }