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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 R0$L#$+04fDyoqPjzW|jWAIJaz 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