Revert "Apc & Substation resprite"

Content.Client/Power/APC/ApcVisualizerComponent.cs

@@ -87,7 +87,7 @@ public sealed partial class ApcVisualsComponent : Component
     /// </summary>
     [DataField("screenColors")]
     [ViewVariables(VVAccess.ReadWrite)]
-    public Color[] ScreenColors = new Color[(byte)ApcChargeState.NumStates]{Color.FromHex("#d1332e"), Color.FromHex("#dcdc28"), Color.FromHex("#82ff4c"), Color.FromHex("#ffac1c")};
+    public Color[] ScreenColors = new Color[(byte)ApcChargeState.NumStates]{Color.FromHex("#d1332e"), Color.FromHex("#2e8ad1"), Color.FromHex("#3db83b"), Color.FromHex("#ffac1c")};
 
     /// <summary>
     /// The sprite state of the unlit overlay used for the APC screen when the APC has been emagged.

Resources/Prototypes/Entities/Structures/Power/apc.yml

@@ -35,26 +35,21 @@
     - state: display-charging
       shader: unshaded
       map: ["enum.ApcVisualLayers.ChargeState"]
-    - state: lock0-locked
+    - state: lock0-unlocked
       shader: unshaded
       map: ["enum.ApcVisualLayers.InterfaceLock"]
-      visible: false
-    - state: lock1-locked
+    - state: lock1-unlocked
       shader: unshaded
       map: ["enum.ApcVisualLayers.PanelLock"]
-      visible: false
-    - state: lock1-locked #when these are implemented get actual sprites.
+    - state: channel0-auto_on
       shader: unshaded
       map: ["enum.ApcVisualLayers.Equipment"]
-      visible: false
-    - state: lock1-locked
+    - state: channel1-auto_on
       shader: unshaded
       map: ["enum.ApcVisualLayers.Lighting"]
-      visible: false
-    - state: lock1-locked
+    - state: channel2-auto_on
       shader: unshaded
       map: ["enum.ApcVisualLayers.Environment"]
-      visible: false
   - type: Appearance
   - type: ApcVisuals
   - type: Battery

Resources/Prototypes/Entities/Structures/Power/substation.yml

@@ -23,8 +23,8 @@
   - type: ExaminableBattery
   - type: PointLight
     radius: 1.5
-    energy: 1
-    color: "#ff6900"
+    energy: 1.6
+    color: "#3db83b"
     castShadows: false
   - type: NodeContainer
     examinable: true
@@ -127,11 +127,10 @@
       path: /Audio/Ambience/Objects/buzzing.ogg
   - type: PointLight
     radius: 1.5
-    energy: 1
-    color: "#ff6900"
+    energy: 1.6
+    color: "#3db83b"
     netsync: false
     castShadows: false
-    offset: 0, -0.2
   - type: Clickable
   - type: AccessReader
     access: [["Engineering"]]
@@ -153,7 +152,7 @@
     sprite: Structures/Power/substation.rsi
     layers:
     - state: substation_wall
-    - state: screen_wall
+    - state: screen
       shader: unshaded
   - type: Battery
     maxCharge: 2000000

Resources/Textures/Structures/Power/apc.rsi/meta.json

@@ -1,106 +1,88 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and heavily modified by EmoGarbage404 (github)",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "base",
-      "directions": 4
+      "name": "base"
     },
 	{
       "name": "static"
     },
     {
-      "name": "broken",
-      "directions": 4
+      "name": "broken"
     },
     {
-      "name": "frame",
-      "directions": 4
+      "name": "frame"
     },
     {
-      "name": "panel",
-      "directions": 4
+      "name": "panel"
     },
     {
-      "name": "lock0-locked",
-      "directions": 4
+      "name": "lock0-unlocked"
     },
     {
-      "name": "lock1-locked",
-      "directions": 4
+      "name": "lock0-locked"
+    },
+    {
+      "name": "lock1-unlocked"
+    },
+    {
+      "name": "lock1-locked"
+    },
+    {
+      "name": "channel0-auto_off"
+    },
+    {
+      "name": "channel0-manual_off"
+    },
+    {
+      "name": "channel0-auto_on"
+    },
+    {
+      "name": "channel0-manual_on"
+    },
+    {
+      "name": "channel1-auto_off"
+    },
+    {
+      "name": "channel1-manual_off"
+    },
+    {
+      "name": "channel1-auto_on"
+    },
+    {
+      "name": "channel1-manual_on"
+    },
+    {
+      "name": "channel2-auto_off"
+    },
+    {
+      "name": "channel2-manual_off"
+    },
+    {
+      "name": "channel2-auto_on"
+    },
+    {
+      "name": "channel2-manual_on"
     },
     {
       "name": "display-lack",
-      "directions": 4,
       "delays": [
         [
-          0.25,
-          0.25,
-          1,
-          3
-        ],
-        [
-          0.25,
-          0.25,
-          1,
-          3
-        ],
-        [
-          0.25,
-          0.25,
           1,
-          3
-        ],
-        [
-          0.25,
-          0.25,
-          1,
-          3
+          2
         ]
       ]
     },
     {
       "name": "display-charging",
-      "directions": 4,
       "delays": [
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.2
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.2
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.2
-        ],
-        [
-          0.1,
-          0.1,
           0.1,
           0.1,
           0.1,
@@ -112,20 +94,7 @@
     },
     {
       "name": "display-full",
-      "directions": 4,
       "delays": [
-        [
-          1,
-          1
-        ],
-        [
-          1,
-          1
-        ],
-        [
-          1,
-          1
-        ],
         [
           1,
           1
@@ -134,29 +103,7 @@
     },
     {
       "name": "display-remote",
-      "directions": 4,
       "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,
@@ -168,20 +115,7 @@
     },
     {
       "name": "emag-unlit",
-      "directions": 4,
       "delays": [
-        [
-          0.5,
-          0.5
-        ],
-        [
-          0.5,
-          0.5
-        ],
-        [
-          0.5,
-          0.5
-        ],
         [
           0.5,
           0.5

Resources/Textures/Structures/Power/substation.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
-  "license": "CC0-1.0",
-  "copyright": "Created by EmoGarbage404 (github)",
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Drawn by Ubaser.",
   "size": {
     "x": 32,
     "y": 32
@@ -13,39 +13,8 @@
 	{
 	  "name": "substation_static"
 	},
-    {
-      "name": "substation_wall",
-      "directions": 4
-    },
-    {
-      "name": "screen_wall",
-      "directions": 4,
-      "delays": [
-        [
-          5.0,
-          0.5,
-          0.5,
-          0.5
-        ],
-        [
-          5.0,
-          0.5,
-          0.5,
-          0.5
-        ],
-        [
-          5.0,
-          0.5,
-          0.5,
-          0.5
-        ],
-        [
-          5.0,
-          0.5,
-          0.5,
-          0.5
-        ]
-      ]
+    {		
+      "name": "substation_wall"
     },
 	{
 	  "name": "substation_wall_static"
@@ -54,31 +23,21 @@
       "name": "full"
     },
     {
-      "name": "charging",
-      "delays": [
-        [
-          0.1,
-          0.1
-        ]
-      ]
+      "name": "charging"
     },
     {
-      "name": "dead",
-      "delays": [
-        [
-          0.3,
-          0.1
-        ]
-      ]
+      "name": "dead"
     },
     {
       "name": "screen",
       "delays": [
         [
-          5.0,
-          0.5,
-          0.5,
-          0.5
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15
         ]
       ]
     }