diff --git a/Resources/Locale/en-US/_HL/headset/headset-component.ftl b/Resources/Locale/en-US/_HL/headset/headset-component.ftl index bd01b762006..4b7a684fb10 100644 --- a/Resources/Locale/en-US/_HL/headset/headset-component.ftl +++ b/Resources/Locale/en-US/_HL/headset/headset-component.ftl @@ -11,5 +11,6 @@ chat-radio-dominos-robotics = Dominos Robotics chat-radio-talon = ADF-TALON chat-radio-starbound = Starbound BSS chat-radio-dusk-enclave = Dusk Enclave +chat-radio-cerulean-collective = Cerulean Collective 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 82e265aec9a..36c90f005e8 100644 --- a/Resources/Prototypes/_HL/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/_HL/Entities/Objects/Devices/encryption_keys.yml @@ -191,4 +191,17 @@ - state: crypt_purple - state: duskenclave_label - +- type: entity + parent: [EncryptionKey, RecyclableItemDeviceTiny] + id: EncryptionKeyCeruleanCollective + name: Cerulean Collective Encryption Key + description: An encyption key used to link into the Cerulean Collective Network. + components: + - type: EncryptionKey + channels: + - CeruleanCollective + defaultChannel: CeruleanCollective + - type: Sprite + layers: + - state: crypt_black + - state: cerul_label diff --git a/Resources/Prototypes/_HL/radio_channels.yml b/Resources/Prototypes/_HL/radio_channels.yml index d0a5d83f5f1..657149c6716 100644 --- a/Resources/Prototypes/_HL/radio_channels.yml +++ b/Resources/Prototypes/_HL/radio_channels.yml @@ -98,3 +98,11 @@ frequency: 1375 color: "#00ff95" longRange: true + +- type: radioChannel + id: CeruleanCollective + name: chat-radio-cerulean-collective + keycode: "[" + frequency: 1377 + color: "#0009ff" + longRange: true diff --git a/Resources/Prototypes/_Mono/companies.yml b/Resources/Prototypes/_Mono/companies.yml index 5cb00101cb2..87ded84221f 100644 --- a/Resources/Prototypes/_Mono/companies.yml +++ b/Resources/Prototypes/_Mono/companies.yml @@ -81,7 +81,7 @@ id: Suburbia form: Protagonist name: Suburbia - color: "#FFEA00" + color: "#FFEA00" - type: company id: SBS @@ -93,7 +93,7 @@ id: HELGG form: Protagonist name: Holy Empire of the Lords Golden Grace - color: "#C4A23C" + color: "#C4A23C" - type: company id: TBG @@ -217,6 +217,29 @@ name: United Nation Sectors of America color: "#89CFF0" # Light Blue +- type: company + id: CERUL + form: Protagonist + name: Cerulean Collective + color: "#0009ff" # deep blue + disabled: true + logins: # based on https://docs.google.com/spreadsheets/d/1PtsJXzuLuylBiLF4VJAmTIxuBhr3YwDnMBGYAN9hsMo/edit?usp=sharing + - MsEpic + - orhu + - Usuala + - Paintminer + - Sempervali + - TECK + - Lyruun + - ShadesMars + - MallowSune + - LadyXahte + - Henryboiye + - Kabuki + - Hammeredmantis + - FrogVoid + - vex_silverscales + - type: company id: AED form: Protagonist @@ -225,7 +248,7 @@ disabled: true # Open to devs, technical oriented mappers, and architecture oriented engineers. logins: - Notarin - + # ====Rogue / Antag. Companies==== - type: company id: TheViperGroup diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/cerul_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/cerul_label.png new file mode 100644 index 00000000000..69260cd7f57 Binary files /dev/null and b/Resources/Textures/Objects/Devices/encryption_keys.rsi/cerul_label.png differ