Sprites defined for all non-generic computer boards. Added new syndicate computer...

* Defined sprites for non-generic computer boards. Added new syndicate computer board sprite.

* Added new sprite to meta.json and updated attribution.

* Reformatted module.rsi meta.json to match other meta file styles.

* Syndicate board sprite made less yellow/gold, changed outer chips to black. Using grey/silver for CPU centre, akin to syndie agent PDA theme, and to keep distinctive from security board.

* Corrected indentation spacing for currently edited entities.

* Update Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml

* add pr link to attribution

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
index de7513e735b9bd8ea0180bb50020c8806ec2ca89..08968c9b6cfbdaad8821c3bed42f4b9048c2d0d4 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -150,10 +150,12 @@
   name: cargo shuttle console board
   description: A computer printed circuit board for a cargo shuttle console.
   components:
-    - type: ComputerBoard
-      prototype: ComputerShuttleCargo
-    - type: StealTarget
-      stealGroup: CargoShuttleConsoleCircuitboard
+  - type: Sprite
+    state: cpu_supply
+  - type: ComputerBoard
+    prototype: ComputerShuttleCargo
+  - type: StealTarget
+    stealGroup: CargoShuttleConsoleCircuitboard
 
 - type: entity
   parent: BaseComputerCircuitboard
@@ -161,11 +163,13 @@
   name: surveillance camera monitor board
   description: A computer printed circuit board for a surveillance camera monitor.
   components:
-    - type: ComputerBoard
-      prototype: ComputerSurveillanceCameraMonitor
-    - type: Tag
-      tags:
-        - SurveillanceCameraMonitorCircuitboard
+  - type: Sprite
+    state: cpu_security
+  - type: ComputerBoard
+    prototype: ComputerSurveillanceCameraMonitor
+  - type: Tag
+    tags:
+    - SurveillanceCameraMonitorCircuitboard
 
 - type: entity
   parent: BaseComputerCircuitboard
@@ -173,8 +177,10 @@
   name: surveillance wireless camera monitor board
   description: A computer printed circuit board for a surveillance wireless camera monitor.
   components:
-    - type: ComputerBoard
-      prototype: ComputerSurveillanceWirelessCameraMonitor
+  - type: Sprite
+    state: cpu_security
+  - type: ComputerBoard
+    prototype: ComputerSurveillanceWirelessCameraMonitor
 
 - type: entity
   parent: BaseComputerCircuitboard
@@ -227,8 +233,10 @@
   name: crew monitoring computer board
   description: A computer printed circuit board for a crew monitoring console.
   components:
-    - type: ComputerBoard
-      prototype: ComputerCrewMonitoring
+  - type: Sprite
+    state: cpu_medical
+  - type: ComputerBoard
+    prototype: ComputerCrewMonitoring
 
 - type: entity
   parent: [BaseComputerCircuitboard, BaseGrandTheftContraband]
@@ -274,14 +282,18 @@
   name: syndicate communications computer board
   description: A computer printed circuit board for a syndicate communications console.
   components:
-    - type: ComputerBoard
-      prototype: SyndicateComputerComms
+  - type: Sprite
+    state: cpu_syndicate
+  - type: ComputerBoard
+    prototype: SyndicateComputerComms
 
 - type: entity
   parent: BaseComputerCircuitboard
   id: RadarConsoleCircuitboard
   name: radar console computer board
   components:
+  - type: Sprite
+    state: cpu_supply
   - type: ComputerBoard
     prototype: ComputerRadar
 
@@ -331,8 +343,10 @@
   name: shuttle console board
   description: A computer printed circuit board for a shuttle console.
   components:
-    - type: ComputerBoard
-      prototype: ComputerShuttle
+  - type: Sprite
+    state: cpu_supply
+  - type: ComputerBoard
+    prototype: ComputerShuttle
 
 - type: entity
   parent: BaseComputerCircuitboard
@@ -340,8 +354,10 @@
   name: syndicate shuttle console board
   description: A computer printed circuit board for a syndicate shuttle console.
   components:
-    - type: ComputerBoard
-      prototype: ComputerShuttleSyndie
+  - type: Sprite
+    state: cpu_syndicate
+  - type: ComputerBoard
+    prototype: ComputerShuttleSyndie
 
 - type: entity
   parent: BaseComputerCircuitboard
@@ -371,8 +387,10 @@
   name: syndicate IFF console board
   description: Allows you to control the IFF and stealth characteristics of this vessel.
   components:
-    - type: ComputerBoard
-      prototype: ComputerIFFSyndicate
+  - type: Sprite
+    state: cpu_syndicate
+  - type: ComputerBoard
+    prototype: ComputerIFFSyndicate
 
 - type: entity
   parent: BaseComputerCircuitboard

diff --git a/Resources/Textures/Objects/Misc/module.rsi/cpu_syndicate.png b/Resources/Textures/Objects/Misc/module.rsi/cpu_syndicate.png
new file mode 100644 (file)
index 0000000..9f890eb
Binary files /dev/null and b/Resources/Textures/Objects/Misc/module.rsi/cpu_syndicate.png differ

diff --git a/Resources/Textures/Objects/Misc/module.rsi/meta.json b/Resources/Textures/Objects/Misc/module.rsi/meta.json
index e332bf6c19ba44c6b548ffc5ec4b2801c262f3c5..b36674173805ea50b60d0baa7e81acd229449a18 100644 (file)
--- a/Resources/Textures/Objects/Misc/module.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/module.rsi/meta.json
@@ -1 +1,352 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0, generic, service, command, science, security, medical, supply, and engineering taken from shiptest at https://github.com/shiptest-ss13/Shiptest/pull/1473, additional sprites created by EmoGarbage404", "states": [{"name": "abductor_mod"}, {"name": "airalarm_electronics"}, {"name": "ash_plating"}, {"name": "beaker_holder"}, {"name": "blank_mod"}, {"name": "bluespacearray"}, {"name": "boris"}, {"name": "boris_recharging", "delays": [[1.0, 1.0]]}, {"name": "card_mini"}, {"name": "card_mod"}, {"name": "cargodisk"}, {"name": "cart_connector"}, {"name": "cddrive"}, {"name": "cell"}, {"name": "cell_con"}, {"name": "cell_con_micro"}, {"name": "cell_micro"}, {"name": "cell_mini"}, {"name": "charger_APC"}, {"name": "charger_lambda"}, {"name": "charger_pda"}, {"name": "charger_wire"}, {"name": "clock_mod", "delays": [[0.6, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "command"}, {"name": "cpu"}, {"name": "cpu_adv"}, {"name": "cpu_command"}, {"name": "cpu_engineering"}, {"name": "cpu_medical"}, {"name": "cpu_science"}, {"name": "cpu_security"}, {"name": "cpu_service"}, {"name": "cpu_super", "delays": [[0.1, 0.1]]}, {"name": "cpu_supply"}, {"name": "cpuboard"}, {"name": "cpuboard_adv"}, {"name": "cpuboard_super", "delays": [[0.1, 0.1]]}, {"name": "cyborg_upgrade"}, {"name": "cyborg_upgrade1"}, {"name": "cyborg_upgrade2"}, {"name": "cyborg_upgrade3"}, {"name": "cyborg_upgrade4"}, {"name": "cyborg_upgrade5"}, {"name": "datadisk_base"},  {"name": "datadisk_gene", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk_encrypted", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "datadisk_hydro", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk_label"}, {"name": "depositbox"}, {"name": "door_electronics"}, {"name": "engineering"}, {"name": "flopdrive"}, {"name": "generic"}, {"name": "harddisk"}, {"name": "harddisk_micro"}, {"name": "harddisk_mini"}, {"name": "holodisk", "delays": [[0.1, 0.1]]}, {"name": "id_mod"}, {"name": "mainboard"}, {"name": "mcontroller"}, {"name": "medical"}, {"name": "net_wired"}, {"name": "power_mod"}, {"name": "printer"}, {"name": "printer_mini"}, {"name": "prizevendor"}, {"name": "radio"}, {"name": "radio_micro"}, {"name": "radio_mini"}, {"name": "ram"}, {"name": "rndmajordisk"}, {"name": "science"}, {"name": "secmodschematic"}, {"name": "security"}, {"name": "selfrepair_off"}, {"name": "selfrepair_on", "delays": [[0.1, 0.1, 0.1, 0.1]]}, {"name": "service"}, {"name": "servo"}, {"name": "ssd"}, {"name": "ssd_large"}, {"name": "ssd_micro"}, {"name": "ssd_mini"}, {"name": "std_mod"}, {"name": "supply"}]}
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0, generic, service, command, science, security, medical, supply, and engineering taken from shiptest at https://github.com/shiptest-ss13/Shiptest/pull/1473, additional sprites created by EmoGarbage404, cpu_syndicate sprite derived from previous examples and created by Alpaccalypse at https://github.com/space-wizards/space-station-14/pull/34104",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "abductor_mod"
+    },
+    {
+      "name": "airalarm_electronics"
+    },
+    {
+      "name": "ash_plating"
+    },
+    {
+      "name": "beaker_holder"
+    },
+    {
+      "name": "blank_mod"
+    },
+    {
+      "name": "bluespacearray"
+    },
+    {
+      "name": "boris"
+    },
+    {
+      "name": "boris_recharging",
+      "delays": [
+        [
+          1.0,
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "card_mini"
+    },
+    {
+      "name": "card_mod"
+    },
+    {
+      "name": "cargodisk"
+    },
+    {
+      "name": "cart_connector"
+    },
+    {
+      "name": "cddrive"
+    },
+    {
+      "name": "cell"
+    },
+    {
+      "name": "cell_con"
+    },
+    {
+      "name": "cell_con_micro"
+    },
+    {
+      "name": "cell_micro"
+    },
+    {
+      "name": "cell_mini"
+    },
+    {
+      "name": "charger_APC"
+    },
+    {
+      "name": "charger_lambda"
+    },
+    {
+      "name": "charger_pda"
+    },
+    {
+      "name": "charger_wire"
+    },
+    {
+      "name": "clock_mod",
+      "delays": [
+        [
+          0.6,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "command"
+    },
+    {
+      "name": "cpu"
+    },
+    {
+      "name": "cpu_adv"
+    },
+    {
+      "name": "cpu_command"
+    },
+    {
+      "name": "cpu_engineering"
+    },
+    {
+      "name": "cpu_medical"
+    },
+    {
+      "name": "cpu_science"
+    },
+    {
+      "name": "cpu_security"
+    },
+    {
+      "name": "cpu_service"
+    },
+    {
+      "name": "cpu_super",
+      "delays": [
+        [
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "cpu_supply"
+    },
+    {
+      "name": "cpu_syndicate"
+    },
+    {
+      "name": "cpuboard"
+    },
+    {
+      "name": "cpuboard_adv"
+    },
+    {
+      "name": "cpuboard_super",
+      "delays": [
+        [
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "cyborg_upgrade"
+    },
+    {
+      "name": "cyborg_upgrade1"
+    },
+    {
+      "name": "cyborg_upgrade2"
+    },
+    {
+      "name": "cyborg_upgrade3"
+    },
+    {
+      "name": "cyborg_upgrade4"
+    },
+    {
+      "name": "cyborg_upgrade5"
+    },
+    {
+      "name": "datadisk_base"
+    },
+    {
+      "name": "datadisk_gene",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "datadisk_encrypted",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "datadisk_hydro",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "datadisk_label"
+    },
+    {
+      "name": "depositbox"
+    },
+    {
+      "name": "door_electronics"
+    },
+    {
+      "name": "engineering"
+    },
+    {
+      "name": "flopdrive"
+    },
+    {
+      "name": "generic"
+    },
+    {
+      "name": "harddisk"
+    },
+    {
+      "name": "harddisk_micro"
+    },
+    {
+      "name": "harddisk_mini"
+    },
+    {
+      "name": "holodisk",
+      "delays": [
+        [
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "id_mod"
+    },
+    {
+      "name": "mainboard"
+    },
+    {
+      "name": "mcontroller"
+    },
+    {
+      "name": "medical"
+    },
+    {
+      "name": "net_wired"
+    },
+    {
+      "name": "power_mod"
+    },
+    {
+      "name": "printer"
+    },
+    {
+      "name": "printer_mini"
+    },
+    {
+      "name": "prizevendor"
+    },
+    {
+      "name": "radio"
+    },
+    {
+      "name": "radio_micro"
+    },
+    {
+      "name": "radio_mini"
+    },
+    {
+      "name": "ram"
+    },
+    {
+      "name": "rndmajordisk"
+    },
+    {
+      "name": "science"
+    },
+    {
+      "name": "secmodschematic"
+    },
+    {
+      "name": "security"
+    },
+    {
+      "name": "selfrepair_off"
+    },
+    {
+      "name": "selfrepair_on",
+      "delays": [
+        [
+          0.1, 
+          0.1, 
+          0.1, 
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "service"
+    },
+    {
+      "name": "servo"
+    },
+    {
+      "name": "ssd"
+    },
+    {
+      "name": "ssd_large"
+    },
+    {
+      "name": "ssd_micro"
+    },
+    {
+      "name": "ssd_mini"
+    },
+    {
+      "name": "std_mod"
+    },
+    {
+      "name": "supply"
+    }
+  ]
+}