From ffdcd8c70bb1fdd60f9690a9ad08207d65076e99 Mon Sep 17 00:00:00 2001 From: MsEpic59 Date: Wed, 29 Apr 2026 19:19:59 -0300 Subject: [PATCH 01/15] Added CERUL as new faction. --- Resources/Prototypes/_Mono/companies.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Mono/companies.yml b/Resources/Prototypes/_Mono/companies.yml index 53be6c5640c..835f309e74c 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 @@ -226,6 +226,13 @@ logins: - Notarin + - type: company + id: CERUL + form: Protagonist + name: The Cerulean Collective + color: "#0009ff" # blue + disabled: false + # ====Rogue / Antag. Companies==== - type: company id: TheViperGroup From b4486d1d545365de2b80117e652130ce0eb38736 Mon Sep 17 00:00:00 2001 From: MsEpic59 Date: Thu, 30 Apr 2026 11:04:42 -0300 Subject: [PATCH 02/15] Update Resources/Prototypes/_Mono/companies.yml Co-authored-by: Lily Autumn <45874270+AutumnalModding@users.noreply.github.com> --- Resources/Prototypes/_Mono/companies.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/_Mono/companies.yml b/Resources/Prototypes/_Mono/companies.yml index 835f309e74c..e4422ba5906 100644 --- a/Resources/Prototypes/_Mono/companies.yml +++ b/Resources/Prototypes/_Mono/companies.yml @@ -226,13 +226,12 @@ logins: - Notarin - - type: company - id: CERUL - form: Protagonist - name: The Cerulean Collective - color: "#0009ff" # blue - disabled: false - +- type: company + id: CERUL + form: Protagonist + name: The Cerulean Collective + color: "#0009ff" # blue + disabled: false # ====Rogue / Antag. Companies==== - type: company id: TheViperGroup From c0c8e914bfc951f4811f361fc51ca2cf63122c66 Mon Sep 17 00:00:00 2001 From: Orhu <49076185+Orhu@users.noreply.github.com> Date: Tue, 5 May 2026 13:40:32 -0500 Subject: [PATCH 03/15] Add CeruleanCollective radio channel Adds Cerulean Collective radio channel with keycode '[' --- Resources/Prototypes/_HL/radio_channels.yml | 8 ++++++++ 1 file changed, 8 insertions(+) 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 From 0bd943286355d33cdac4560cc181c65e68d993c5 Mon Sep 17 00:00:00 2001 From: Orhu <49076185+Orhu@users.noreply.github.com> Date: Tue, 5 May 2026 13:52:14 -0500 Subject: [PATCH 04/15] Add Cerulean Collective radio option --- Resources/Locale/en-US/_HL/headset/headset-component.ftl | 1 + 1 file changed, 1 insertion(+) 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: From 81abf4d4e4e9ee4b22ea7c722009f5dbe6a8cc49 Mon Sep 17 00:00:00 2001 From: Orhu <49076185+Orhu@users.noreply.github.com> Date: Tue, 5 May 2026 13:56:13 -0500 Subject: [PATCH 05/15] Add Cerulean Collective Encryption Key Added a new encryption key for the Cerulean Collective Network with associated components. (partial) --- .../Entities/Objects/Devices/encryption_keys.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/_HL/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/_HL/Entities/Objects/Devices/encryption_keys.yml index 82e265aec9a..50d60e62c50 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_blue + - state: starbound_label From 44e42421caaacf313363798b0e4c8f9087af8874 Mon Sep 17 00:00:00 2001 From: Orhu <49076185+Orhu@users.noreply.github.com> Date: Tue, 5 May 2026 14:10:59 -0500 Subject: [PATCH 06/15] Update encryption_keys.yml --- .../Prototypes/_HL/Entities/Objects/Devices/encryption_keys.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_HL/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/_HL/Entities/Objects/Devices/encryption_keys.yml index 50d60e62c50..ca09df4a33d 100644 --- a/Resources/Prototypes/_HL/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/_HL/Entities/Objects/Devices/encryption_keys.yml @@ -204,4 +204,4 @@ - type: Sprite layers: - state: crypt_blue - - state: starbound_label + - state: cerul_label From d6f70c91932a3b5807ecf3862f025faa46550244 Mon Sep 17 00:00:00 2001 From: Orhu <49076185+Orhu@users.noreply.github.com> Date: Tue, 5 May 2026 14:11:12 -0500 Subject: [PATCH 07/15] Change sprite state from 'crypt_blue' to 'crypt_black' --- .../Prototypes/_HL/Entities/Objects/Devices/encryption_keys.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_HL/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/_HL/Entities/Objects/Devices/encryption_keys.yml index ca09df4a33d..36c90f005e8 100644 --- a/Resources/Prototypes/_HL/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/_HL/Entities/Objects/Devices/encryption_keys.yml @@ -203,5 +203,5 @@ defaultChannel: CeruleanCollective - type: Sprite layers: - - state: crypt_blue + - state: crypt_black - state: cerul_label From 682d576071ce92c4bb1b75454056a463453d25c1 Mon Sep 17 00:00:00 2001 From: Orhu <49076185+Orhu@users.noreply.github.com> Date: Tue, 5 May 2026 14:11:52 -0500 Subject: [PATCH 08/15] Add Cerul Label --- .../Devices/encryption_keys.rsi/cerul_label.png | Bin 0 -> 203 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Resources/Textures/Objects/Devices/encryption_keys.rsi/cerul_label.png 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 0000000000000000000000000000000000000000..69260cd7f571942cdf653f95a9e1dd031b4f6e98 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}t)4E9ArY-_ zFKy&yG8AAr5PM&F<^@B|g~_WHaL@XYwxY4gN7-Y~vzs&V2v?d)Q4fu}U3CktO}wQ5;>t$dc~#qV<&?v*?EH>4-* zTACbmV%xupS*=$4b~TnXu067?FP3}8%$a{LvETlou|E2r%|D=n7(8A5T-G@yGywnz C`cbg} literal 0 HcmV?d00001 From 561837619442e9c46c52b3d218168b183155b59f Mon Sep 17 00:00:00 2001 From: Orhu <49076185+Orhu@users.noreply.github.com> Date: Tue, 5 May 2026 14:19:00 -0500 Subject: [PATCH 09/15] Fix Cerulean Collective position in companies.yml --- Resources/Prototypes/_Mono/companies.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/_Mono/companies.yml b/Resources/Prototypes/_Mono/companies.yml index a8c117d1cd1..86db37188ca 100644 --- a/Resources/Prototypes/_Mono/companies.yml +++ b/Resources/Prototypes/_Mono/companies.yml @@ -217,6 +217,12 @@ name: United Nation Sectors of America color: "#89CFF0" # Light Blue +- type: company + id: CERUL + form: Protagonist + name: Cerulean Collective + color: "#0009ff" # deep blue + - type: company id: AED form: Protagonist @@ -225,13 +231,7 @@ disabled: true # Open to devs, technical oriented mappers, and architecture oriented engineers. logins: - Notarin - -- type: company - id: CERUL - form: Protagonist - name: The Cerulean Collective - color: "#0009ff" # blue - disabled: false + # ====Rogue / Antag. Companies==== - type: company id: TheViperGroup From 00c60cc9e38cbe7f48b1c46873b4720d6ea9d38c Mon Sep 17 00:00:00 2001 From: Orhu <49076185+Orhu@users.noreply.github.com> Date: Sun, 10 May 2026 10:28:17 -0500 Subject: [PATCH 10/15] Added CERUL whitelist --- Resources/Prototypes/_Mono/companies.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Resources/Prototypes/_Mono/companies.yml b/Resources/Prototypes/_Mono/companies.yml index 86db37188ca..fbdb36fdb74 100644 --- a/Resources/Prototypes/_Mono/companies.yml +++ b/Resources/Prototypes/_Mono/companies.yml @@ -222,6 +222,22 @@ 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 - type: company id: AED From 12d301becd01cf3220f7ba79164b76805b3caa69 Mon Sep 17 00:00:00 2001 From: Orhu <49076185+Orhu@users.noreply.github.com> Date: Sun, 10 May 2026 10:29:40 -0500 Subject: [PATCH 11/15] fix case --- Resources/Prototypes/_Mono/companies.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Mono/companies.yml b/Resources/Prototypes/_Mono/companies.yml index fbdb36fdb74..d1c064802ac 100644 --- a/Resources/Prototypes/_Mono/companies.yml +++ b/Resources/Prototypes/_Mono/companies.yml @@ -236,7 +236,7 @@ - ladyxahte - henryboiye - kabuki - - hammeredmantis + - Hammeredmantis - FrogVoid - type: company From 3559dce52433f80d35cb14b74aac42ed7d76b122 Mon Sep 17 00:00:00 2001 From: Orhu <49076185+Orhu@users.noreply.github.com> Date: Sun, 10 May 2026 10:35:28 -0500 Subject: [PATCH 12/15] Correct capitalization of 'kabuki' to 'Kabuki' --- Resources/Prototypes/_Mono/companies.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Mono/companies.yml b/Resources/Prototypes/_Mono/companies.yml index d1c064802ac..fbc8dde3da7 100644 --- a/Resources/Prototypes/_Mono/companies.yml +++ b/Resources/Prototypes/_Mono/companies.yml @@ -235,7 +235,7 @@ - MallowSune - ladyxahte - henryboiye - - kabuki + - Kabuki - Hammeredmantis - FrogVoid From 47ecbd13ad1fd32ff18df44458d3800c7997c540 Mon Sep 17 00:00:00 2001 From: Orhu <49076185+Orhu@users.noreply.github.com> Date: Sun, 10 May 2026 10:36:36 -0500 Subject: [PATCH 13/15] Fix casing for 'henryboiye' in companies.yml --- Resources/Prototypes/_Mono/companies.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Mono/companies.yml b/Resources/Prototypes/_Mono/companies.yml index fbc8dde3da7..2642fae7615 100644 --- a/Resources/Prototypes/_Mono/companies.yml +++ b/Resources/Prototypes/_Mono/companies.yml @@ -234,7 +234,7 @@ - ShadesMars - MallowSune - ladyxahte - - henryboiye + - Henryboiye - Kabuki - Hammeredmantis - FrogVoid From 07e4bcfcfc7aa574f71a02699cf1c7a9f8ca38b8 Mon Sep 17 00:00:00 2001 From: Orhu <49076185+Orhu@users.noreply.github.com> Date: Sun, 10 May 2026 10:38:44 -0500 Subject: [PATCH 14/15] capitalization again --- Resources/Prototypes/_Mono/companies.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Mono/companies.yml b/Resources/Prototypes/_Mono/companies.yml index 2642fae7615..295058fa0d5 100644 --- a/Resources/Prototypes/_Mono/companies.yml +++ b/Resources/Prototypes/_Mono/companies.yml @@ -233,7 +233,7 @@ - Lyruun - ShadesMars - MallowSune - - ladyxahte + - LadyXahte - Henryboiye - Kabuki - Hammeredmantis From 9ce39fec0b60659ffb5e2f123c7c1dfd294536d5 Mon Sep 17 00:00:00 2001 From: Orhu <49076185+Orhu@users.noreply.github.com> Date: Tue, 12 May 2026 20:12:05 -0500 Subject: [PATCH 15/15] Add vex_silverscales to whitelist --- Resources/Prototypes/_Mono/companies.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/_Mono/companies.yml b/Resources/Prototypes/_Mono/companies.yml index 295058fa0d5..87ded84221f 100644 --- a/Resources/Prototypes/_Mono/companies.yml +++ b/Resources/Prototypes/_Mono/companies.yml @@ -238,6 +238,7 @@ - Kabuki - Hammeredmantis - FrogVoid + - vex_silverscales - type: company id: AED