Missed some change requests; Moved supermatter computer into it's own…

… RSI.

Resources/Prototypes/_EE/Entities/Objects/Devices/Circuitboards/computer.yml

@@ -4,7 +4,7 @@
   name: supermatter monitoring console board
   description: A computer printed circuit board for a supermatter monitoring console.
   components:
-    - type: Sprite
-      state: cpu_engineering
-    - type: ComputerBoard
-      prototype: ComputerSupermatter
+  - type: Sprite
+    state: cpu_engineering
+  - type: ComputerBoard
+    prototype: ComputerSupermatter

Resources/Prototypes/_EE/Entities/Structures/Machines/Computers/computers.yml

@@ -7,6 +7,7 @@
   - type: Computer
     board: SupermatterComputerCircuitboard
   - type: Sprite
+    sprite: _EE/Structures/Machines/computers.rsi
     layers:
     - map: ["computerLayerBody"]
       state: computer

Resources/Prototypes/_EE/Entities/Structures/Power/Generation/Supermatter/supermatter.yml

@@ -5,75 +5,75 @@
   placement:
     mode: SnapgridCenter
   components:
-    - type: Supermatter
-    - type: AtmosDevice
-    - type: RadiationSource
-    - type: AmbientSound
-      range: 20
-      volume: -5
-      sound:
-        path: /Audio/_EE/Supermatter/calm.ogg
-    - type: EmitSoundOnTrigger
-      sound:
-        collection: SupermatterAccentNormal
-    - type: Physics
-    - type: Speech
-      speechSounds: null
-      speechVerb: Supermatter
-      suffixSpeechVerbs:
-        chat-speech-verb-suffix-exclamation-strong: Supermatter
-        chat-speech-verb-suffix-exclamation: Supermatter
-        chat-speech-verb-suffix-question: Supermatter
-        chat-speech-verb-suffix-stutter: Supermatter
-        chat-speech-verb-suffix-mumble: Supermatter
-    - type: Fixtures
-      fixtures:
-        fix1:
-          shape:
-            !type:PhysShapeAabb
-            bounds: "-0.25,-0.25,0.25,0.4"
-          mask:
-            - Impassable
-            - MidImpassable
-            - HighImpassable
-            - LowImpassable
-            - InteractImpassable
-            - Opaque
-          layer:
-            - MidImpassable
-            - HighImpassable
-            - BulletImpassable
-            - InteractImpassable
-    - type: Transform
-      anchored: true
-      noRot: true
-    - type: CollisionWake
-      enabled: false
-    - type: Clickable
-    - type: InteractionOutline
-    - type: Sprite
-      sprite: _EE/Structures/Power/Generation/Supermatter/supermatter.rsi
-      state: supermatter
-      drawdepth: Mobs
-      snapCardinals: true
-      offset: -0.015,0.295
-    - type: Icon
-      sprite: _EE/Structures/Power/Generation/Supermatter/supermatter.rsi
-      state: supermatter
-    - type: PointLight
-      enabled: true
-      radius: 10
-      energy: 5
-      color: "#ffe000"
-    - type: Explosive
-      explosionType: Supermatter
-      totalIntensity: 120000
-      intensitySlope: 5
-      maxIntensity: 100
-    - type: GuideHelp
-      guides: [ Supermatter, Power ]
-    - type: WarpPoint
-      follow: true
-      location: supermatter
-    - type: SinguloFood
-      energy: 10000
+  - type: Supermatter
+  - type: AtmosDevice
+  - type: RadiationSource
+  - type: AmbientSound
+    range: 20
+    volume: -5
+    sound:
+      path: /Audio/_EE/Supermatter/calm.ogg
+  - type: EmitSoundOnTrigger
+    sound:
+      collection: SupermatterAccentNormal
+  - type: Physics
+  - type: Speech
+    speechSounds: null
+    speechVerb: Supermatter
+    suffixSpeechVerbs:
+      chat-speech-verb-suffix-exclamation-strong: Supermatter
+      chat-speech-verb-suffix-exclamation: Supermatter
+      chat-speech-verb-suffix-question: Supermatter
+      chat-speech-verb-suffix-stutter: Supermatter
+      chat-speech-verb-suffix-mumble: Supermatter
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.25,-0.25,0.25,0.4"
+        mask:
+          - Impassable
+          - MidImpassable
+          - HighImpassable
+          - LowImpassable
+          - InteractImpassable
+          - Opaque
+        layer:
+          - MidImpassable
+          - HighImpassable
+          - BulletImpassable
+          - InteractImpassable
+  - type: Transform
+    anchored: true
+    noRot: true
+  - type: CollisionWake
+    enabled: false
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Sprite
+    sprite: _EE/Structures/Power/Generation/Supermatter/supermatter.rsi
+    state: supermatter
+    drawdepth: Mobs
+    snapCardinals: true
+    offset: -0.015,0.295
+  - type: Icon
+    sprite: _EE/Structures/Power/Generation/Supermatter/supermatter.rsi
+    state: supermatter
+  - type: PointLight
+    enabled: true
+    radius: 10
+    energy: 5
+    color: "#ffe000"
+  - type: Explosive
+    explosionType: Supermatter
+    totalIntensity: 120000
+    intensitySlope: 5
+    maxIntensity: 100
+  - type: GuideHelp
+    guides: [ Supermatter, Power ]
+  - type: WarpPoint
+    follow: true
+    location: supermatter
+  - type: SinguloFood
+    energy: 10000

Resources/Prototypes/_EE/Guidebook/engineering.yml

@@ -1,4 +1,4 @@
 - type: guideEntry
   id: Supermatter
   name: guide-entry-sm
-  text: "/ServerInfo/Guidebook/Engineering/Supermatter.xml"
+  text: "/ServerInfo/_EE/Guidebook/Engineering/Supermatter.xml"

Resources/Textures/Structures/Machines/computers.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bd6873fd4dd6a61d7e46f1d75cd4d90f64c40894. comm_syndie made by Veritius, based on comm. generic_panel_open made by Errant, commit https://github.com/space-wizards/space-station-14/pull/32273. Supermatter sprites by AftrLite(Github).",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bd6873fd4dd6a61d7e46f1d75cd4d90f64c40894. comm_syndie made by Veritius, based on comm. generic_panel_open made by Errant, commit https://github.com/space-wizards/space-station-14/pull/32273.",
   "size": {
     "x": 32,
     "y": 32
@@ -1524,56 +1524,6 @@
                 ]
             ]
         },
-        {
-            "name": "supermatter_keys",
-            "directions": 4
-        },
-        {
-            "name": "supermatter-0",
-            "directions": 4
-        },
-        {
-            "name": "supermatter-1",
-            "directions": 4
-        },
-        {
-            "name": "supermatter-2",
-            "directions": 4
-        },
-        {
-            "name": "supermatter-3",
-            "directions": 4
-        },
-        {
-            "name": "supermatter-4",
-            "directions": 4
-        },
-        {
-            "name": "supermatter-5",
-            "directions": 4
-        },
-        {
-            "name": "supermatter-6",
-            "directions": 4,
-            "delays": [
-                [
-                    0.1,
-                    0.1
-                ],
-                [
-                    0.1,
-                    0.1
-                ],
-                [
-                    0.1,
-                    0.1
-                ],
-                [
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
         {
             "name": "supply",
             "directions": 4

Resources/Textures/_EE/Structures/Machines/computers.rsi/meta.json

@@ -0,0 +1,73 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Generic sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bd6873fd4dd6a61d7e46f1d75cd4d90f64c40894. generic_panel_open made by Errant, commit https://github.com/space-wizards/space-station-14/pull/32273. Supermatter computer sprites by AftrLite(Github).",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+    "states": [
+        {
+            "name": "computer",
+            "directions": 4
+        },
+        {
+            "name": "generic_keyboard",
+            "directions": 4
+        },
+        {
+            "name": "generic_panel_open",
+            "directions": 4
+        },
+        {
+            "name": "supermatter_keys",
+            "directions": 4
+        },
+        {
+            "name": "supermatter-0",
+            "directions": 4
+        },
+        {
+            "name": "supermatter-1",
+            "directions": 4
+        },
+        {
+            "name": "supermatter-2",
+            "directions": 4
+        },
+        {
+            "name": "supermatter-3",
+            "directions": 4
+        },
+        {
+            "name": "supermatter-4",
+            "directions": 4
+        },
+        {
+            "name": "supermatter-5",
+            "directions": 4
+        },
+        {
+            "name": "supermatter-6",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        }
+    ]
+}