From c1b3577e6cf1d0138ed0ac707881291a0af0a08a Mon Sep 17 00:00:00 2001 From: ScarKy0 Date: Mon, 17 Feb 2025 13:23:57 +0100 Subject: [PATCH 1/4] init --- .../Entities/Mobs/Player/admin_ghost.yml | 5 ++- .../Devices/Circuitboards/computer.yml | 11 ++++++ .../Machines/Computers/computers.yml | 32 ++++++++++++++++++ .../Objects/Misc/module.rsi/cpu_centcomm.png | Bin 0 -> 7015 bytes .../Objects/Misc/module.rsi/meta.json | 3 ++ 5 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Misc/module.rsi/cpu_centcomm.png diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml index 0a40e64fd7..d4531dd15d 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml @@ -66,7 +66,10 @@ - type: SolarControlConsole # look ma i AM the computer! - type: CommunicationsConsole title: comms-console-announcement-title-centcom - color: "#228b22" + color: "#488c40" + delay: 10 + initialDelay: 0 + global: true - type: RadarConsole followEntity: true - type: CargoOrderConsole diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml index be4a105429..fe061e72d6 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml @@ -298,6 +298,17 @@ - type: ComputerBoard prototype: WizardComputerComms +- type: entity + parent: [ BaseComputerCircuitboard, BaseCentcommContraband ] + id: CentcommCommsComputerCircuitboard + name: central command communications computer board + description: A computer printed circuit board for a central command communications console. + components: + - type: Sprite + state: cpu_centcomm + - type: ComputerBoard + prototype: CentcommComputerComms + - type: entity parent: BaseComputerCircuitboard id: RadarConsoleCircuitboard diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index ac7877b6c8..60398c7d15 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -748,6 +748,38 @@ energy: 1.6 color: "#F317F3" +- type: entity + parent: ComputerComms + id: CentcommComputerComms + name: central command communications computer + description: A computer used to make world wide announcements via keyboard. The superior cousin of the regular communications computer. + components: + - type: Sprite + layers: + - map: ["computerLayerBody"] + state: computer + - map: ["computerLayerKeyboard"] + state: generic_keyboard + - map: ["computerLayerScreen"] + state: comm_logs + - map: ["computerLayerKeys"] + state: generic_keys + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open + - type: AccessReader + access: [[ "CentralCommand" ]] + - type: CommunicationsConsole + title: comms-console-announcement-title-centcom + color: "#488c40" + canShuttle: false + global: true + - type: Computer + board: CentcommCommsComputerCircuitboard + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#00FF00" + - type: entity parent: BaseComputerAiAccess id: ComputerSolarControl diff --git a/Resources/Textures/Objects/Misc/module.rsi/cpu_centcomm.png b/Resources/Textures/Objects/Misc/module.rsi/cpu_centcomm.png new file mode 100644 index 0000000000000000000000000000000000000000..f89a8839303f29e7a822263b13abe47613f2e2aa GIT binary patch literal 7015 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 HQ$iB}l^`F; literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/module.rsi/meta.json b/Resources/Textures/Objects/Misc/module.rsi/meta.json index b6f6c6d819..fed9220aae 100644 --- a/Resources/Textures/Objects/Misc/module.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/module.rsi/meta.json @@ -139,6 +139,9 @@ { "name": "cpu_wizard" }, + { + "name": "cpu_centcomm" + }, { "name": "cpuboard" }, From d71b469922c1678aab1de6462970e1599cb082a5 Mon Sep 17 00:00:00 2001 From: ScarKy0 Date: Mon, 17 Feb 2025 13:46:50 +0100 Subject: [PATCH 2/4] slightly lighter --- Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml | 2 +- .../Entities/Structures/Machines/Computers/computers.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml index d4531dd15d..65a16ad34f 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml @@ -66,7 +66,7 @@ - type: SolarControlConsole # look ma i AM the computer! - type: CommunicationsConsole title: comms-console-announcement-title-centcom - color: "#488c40" + color: "#55ad4b" delay: 10 initialDelay: 0 global: true diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index 60398c7d15..ee6e9b2b2c 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -770,7 +770,7 @@ access: [[ "CentralCommand" ]] - type: CommunicationsConsole title: comms-console-announcement-title-centcom - color: "#488c40" + color: "#55ad4b" canShuttle: false global: true - type: Computer From 5ffe14e2ab7a93be1c0a9b5ec93b1fc26101dd00 Mon Sep 17 00:00:00 2001 From: ScarKy0 Date: Mon, 17 Feb 2025 13:52:26 +0100 Subject: [PATCH 3/4] i cant decide --- Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml | 2 +- .../Entities/Structures/Machines/Computers/computers.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml index 65a16ad34f..7a29d45747 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml @@ -66,7 +66,7 @@ - type: SolarControlConsole # look ma i AM the computer! - type: CommunicationsConsole title: comms-console-announcement-title-centcom - color: "#55ad4b" + color: "#4bad40" delay: 10 initialDelay: 0 global: true diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index ee6e9b2b2c..10c52600c8 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -770,7 +770,7 @@ access: [[ "CentralCommand" ]] - type: CommunicationsConsole title: comms-console-announcement-title-centcom - color: "#55ad4b" + color: "#4bad40" canShuttle: false global: true - type: Computer From eb930f5b7aaa1590687da04ed2a4238abf076763 Mon Sep 17 00:00:00 2001 From: ScarKy0 Date: Mon, 17 Feb 2025 20:13:29 +0100 Subject: [PATCH 4/4] blue --- Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml | 2 +- .../Entities/Structures/Machines/Computers/computers.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml index 7a29d45747..3eabbd8700 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml @@ -66,7 +66,7 @@ - type: SolarControlConsole # look ma i AM the computer! - type: CommunicationsConsole title: comms-console-announcement-title-centcom - color: "#4bad40" + color: "#1d8bad" delay: 10 initialDelay: 0 global: true diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index 10c52600c8..3a1684bbc7 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -770,7 +770,7 @@ access: [[ "CentralCommand" ]] - type: CommunicationsConsole title: comms-console-announcement-title-centcom - color: "#4bad40" + color: "#1d8bad" canShuttle: false global: true - type: Computer