]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Apc & Substation resprite (#28998)
authorNemanja <98561806+EmoGarbage404@users.noreply.github.com>
Sun, 16 Jun 2024 10:43:22 +0000 (06:43 -0400)
committerGitHub <noreply@github.com>
Sun, 16 Jun 2024 10:43:22 +0000 (05:43 -0500)
* substation

* apcs

* top pixels

* new screens

40 files changed:
Content.Client/Power/APC/ApcVisualizerComponent.cs
Resources/Prototypes/Entities/Structures/Power/apc.yml
Resources/Prototypes/Entities/Structures/Power/substation.yml
Resources/Textures/Structures/Power/apc.rsi/base.png
Resources/Textures/Structures/Power/apc.rsi/broken.png
Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png [deleted file]
Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png [deleted file]
Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png [deleted file]
Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png [deleted file]
Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png [deleted file]
Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png [deleted file]
Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png [deleted file]
Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png [deleted file]
Resources/Textures/Structures/Power/apc.rsi/channel2-auto_off.png [deleted file]
Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png [deleted file]
Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png [deleted file]
Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png [deleted file]
Resources/Textures/Structures/Power/apc.rsi/display-charging.png
Resources/Textures/Structures/Power/apc.rsi/display-full.png
Resources/Textures/Structures/Power/apc.rsi/display-lack.png
Resources/Textures/Structures/Power/apc.rsi/display-remote.png
Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png
Resources/Textures/Structures/Power/apc.rsi/frame.png
Resources/Textures/Structures/Power/apc.rsi/lock0-locked.png
Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png [deleted file]
Resources/Textures/Structures/Power/apc.rsi/lock1-locked.png
Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png [deleted file]
Resources/Textures/Structures/Power/apc.rsi/meta.json
Resources/Textures/Structures/Power/apc.rsi/panel.png
Resources/Textures/Structures/Power/apc.rsi/static.png
Resources/Textures/Structures/Power/substation.rsi/charging.png
Resources/Textures/Structures/Power/substation.rsi/dead.png
Resources/Textures/Structures/Power/substation.rsi/full.png
Resources/Textures/Structures/Power/substation.rsi/meta.json
Resources/Textures/Structures/Power/substation.rsi/screen.png
Resources/Textures/Structures/Power/substation.rsi/screen_wall.png [new file with mode: 0644]
Resources/Textures/Structures/Power/substation.rsi/substation.png
Resources/Textures/Structures/Power/substation.rsi/substation_static.png
Resources/Textures/Structures/Power/substation.rsi/substation_wall.png
Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png

index 87cb70019f50819c54bd51db148ddc1339955577..e356a80177287e3ac8255a12f1aff82635c24e8f 100644 (file)
@@ -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("#2e8ad1"), Color.FromHex("#3db83b"), Color.FromHex("#ffac1c")};
+    public Color[] ScreenColors = new Color[(byte)ApcChargeState.NumStates]{Color.FromHex("#d1332e"), Color.FromHex("#dcdc28"), Color.FromHex("#82ff4c"), Color.FromHex("#ffac1c")};
 
     /// <summary>
     /// The sprite state of the unlit overlay used for the APC screen when the APC has been emagged.
index 71e450649544035eb8e5100448543b879725770c..1621ac858cdf4575d03bf406bd026d2fdef046d4 100644 (file)
     - state: display-charging
       shader: unshaded
       map: ["enum.ApcVisualLayers.ChargeState"]
-    - state: lock0-unlocked
+    - state: lock0-locked
       shader: unshaded
       map: ["enum.ApcVisualLayers.InterfaceLock"]
-    - state: lock1-unlocked
+      visible: false
+    - state: lock1-locked
       shader: unshaded
       map: ["enum.ApcVisualLayers.PanelLock"]
-    - state: channel0-auto_on
+      visible: false
+    - state: lock1-locked #when these are implemented get actual sprites.
       shader: unshaded
       map: ["enum.ApcVisualLayers.Equipment"]
-    - state: channel1-auto_on
+      visible: false
+    - state: lock1-locked
       shader: unshaded
       map: ["enum.ApcVisualLayers.Lighting"]
-    - state: channel2-auto_on
+      visible: false
+    - state: lock1-locked
       shader: unshaded
       map: ["enum.ApcVisualLayers.Environment"]
+      visible: false
   - type: Appearance
   - type: ApcVisuals
   - type: Battery
index 347b18ecaee93aa942227fdebf3c965a923ba51c..692f027386b82079479a5f099ab4a30d71ffc35d 100644 (file)
@@ -23,8 +23,8 @@
   - type: ExaminableBattery
   - type: PointLight
     radius: 1.5
-    energy: 1.6
-    color: "#3db83b"
+    energy: 1
+    color: "#ff6900"
     castShadows: false
   - type: NodeContainer
     examinable: true
       path: /Audio/Ambience/Objects/buzzing.ogg
   - type: PointLight
     radius: 1.5
-    energy: 1.6
-    color: "#3db83b"
+    energy: 1
+    color: "#ff6900"
     netsync: false
     castShadows: false
+    offset: 0, -0.2
   - type: Clickable
   - type: AccessReader
     access: [["Engineering"]]
     sprite: Structures/Power/substation.rsi
     layers:
     - state: substation_wall
-    - state: screen
+    - state: screen_wall
       shader: unshaded
   - type: Battery
     maxCharge: 2000000
index 2b42c54935a53e44d836c54983a944700b94b17d..68b83101d21fc74be03e53fcb4682cefeba232d7 100644 (file)
Binary files a/Resources/Textures/Structures/Power/apc.rsi/base.png and b/Resources/Textures/Structures/Power/apc.rsi/base.png differ
index 092694c371fa9c18fdb01aab86fb6eb7912b4520..bb54b4bdc7dc14ced556ef1191947ba42336fa2a 100644 (file)
Binary files a/Resources/Textures/Structures/Power/apc.rsi/broken.png and b/Resources/Textures/Structures/Power/apc.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png
deleted file mode 100644 (file)
index ba84b7d..0000000
Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png
deleted file mode 100644 (file)
index 6cce72f..0000000
Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png
deleted file mode 100644 (file)
index 61ae057..0000000
Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png
deleted file mode 100644 (file)
index 6cc48bd..0000000
Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png
deleted file mode 100644 (file)
index b31bed6..0000000
Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png
deleted file mode 100644 (file)
index 959a05c..0000000
Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png
deleted file mode 100644 (file)
index 3bb505e..0000000
Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png
deleted file mode 100644 (file)
index bd8b013..0000000
Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_off.png
deleted file mode 100644 (file)
index 0cca860..0000000
Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_off.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png
deleted file mode 100644 (file)
index 56802dc..0000000
Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png
deleted file mode 100644 (file)
index 5ac134c..0000000
Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png
deleted file mode 100644 (file)
index 5ebec4f..0000000
Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png and /dev/null differ
index 67e3b3df19b80ff3a55403d46b12617316b41bcb..0f26ba31bd31de4d7dcedb7a37e94fbac440a1a3 100644 (file)
Binary files a/Resources/Textures/Structures/Power/apc.rsi/display-charging.png and b/Resources/Textures/Structures/Power/apc.rsi/display-charging.png differ
index 1739853e2b74824c2cd5ce82178aa05284d89b17..9b1e28db26d9ab8853db0f0d307df28ddcb94d78 100644 (file)
Binary files a/Resources/Textures/Structures/Power/apc.rsi/display-full.png and b/Resources/Textures/Structures/Power/apc.rsi/display-full.png differ
index c4c103eeb9637ba3dd9fa8325d5cfc68a16a8bb1..e360f9c6bb03889b661d04fb010294d449fd8beb 100644 (file)
Binary files a/Resources/Textures/Structures/Power/apc.rsi/display-lack.png and b/Resources/Textures/Structures/Power/apc.rsi/display-lack.png differ
index be343a987b0cc7cde7d68596c08969209dccc843..089eb9345e78d51c68b75681f40f1d1ebb87f34d 100644 (file)
Binary files a/Resources/Textures/Structures/Power/apc.rsi/display-remote.png and b/Resources/Textures/Structures/Power/apc.rsi/display-remote.png differ
index 2713c5506a26dd8ce21e650e66dac594f0164c6f..140ae850be75c670e691701c33df11db87fc403c 100644 (file)
Binary files a/Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png and b/Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png differ
index 7d3529f63f585d058a609a523196e357fe83a8d1..4f8ba4d56effeee7f96e45ec924337bb6f6d9b2b 100644 (file)
Binary files a/Resources/Textures/Structures/Power/apc.rsi/frame.png and b/Resources/Textures/Structures/Power/apc.rsi/frame.png differ
index 45562de8a662c387f05d1685b25ed63dc88b5c01..20f2e17d94c50daa37bd596d91b0b51f3f10bf19 100644 (file)
Binary files a/Resources/Textures/Structures/Power/apc.rsi/lock0-locked.png and b/Resources/Textures/Structures/Power/apc.rsi/lock0-locked.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png b/Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png
deleted file mode 100644 (file)
index f6377a3..0000000
Binary files a/Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png and /dev/null differ
index f92c04aac46374de8c4d906075a9c0e424b7c63c..3dfeb215d2ff01d79fb46bf242d484906ca36ce3 100644 (file)
Binary files a/Resources/Textures/Structures/Power/apc.rsi/lock1-locked.png and b/Resources/Textures/Structures/Power/apc.rsi/lock1-locked.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png b/Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png
deleted file mode 100644 (file)
index 44f9af7..0000000
Binary files a/Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png and /dev/null differ
index 82f78ccb875d61dcec133761b34e3f4a4b8b8a1b..66df303df9466e803d31fef1a9aeaf706ecb30a1 100644 (file)
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and heavily modified by EmoGarbage404 (github)",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "base"
+      "name": "base",
+      "directions": 4
     },
        {
       "name": "static"
     },
     {
-      "name": "broken"
+      "name": "broken",
+      "directions": 4
     },
     {
-      "name": "frame"
+      "name": "frame",
+      "directions": 4
     },
     {
-      "name": "panel"
+      "name": "panel",
+      "directions": 4
     },
     {
-      "name": "lock0-unlocked"
+      "name": "lock0-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": "lock1-locked",
+      "directions": 4
     },
     {
       "name": "display-lack",
+      "directions": 4,
       "delays": [
         [
+          0.25,
+          0.25,
+          1,
+          3
+        ],
+        [
+          0.25,
+          0.25,
+          1,
+          3
+        ],
+        [
+          0.25,
+          0.25,
           1,
-          2
+          3
+        ],
+        [
+          0.25,
+          0.25,
+          1,
+          3
         ]
       ]
     },
     {
       "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,
     },
     {
       "name": "display-full",
+      "directions": 4,
       "delays": [
+        [
+          1,
+          1
+        ],
+        [
+          1,
+          1
+        ],
+        [
+          1,
+          1
+        ],
         [
           1,
           1
     },
     {
       "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,
     },
     {
       "name": "emag-unlit",
+      "directions": 4,
       "delays": [
+        [
+          0.5,
+          0.5
+        ],
+        [
+          0.5,
+          0.5
+        ],
+        [
+          0.5,
+          0.5
+        ],
         [
           0.5,
           0.5
index 97f8471f29e30df700fcd88f2e89db8ebb290d77..9e64b70a503745fe9a4001e5a9249cdf822f3f6a 100644 (file)
Binary files a/Resources/Textures/Structures/Power/apc.rsi/panel.png and b/Resources/Textures/Structures/Power/apc.rsi/panel.png differ
index 43089d0d81144d506157dafe4d56335d3d60f0a3..7275cfc9feb5182fb6fd1c14eaf65a667ea4a70f 100644 (file)
Binary files a/Resources/Textures/Structures/Power/apc.rsi/static.png and b/Resources/Textures/Structures/Power/apc.rsi/static.png differ
index 538dc2b7a84725b3e452fb9a460b24e371e07177..7675535164c696445d22a30336b8736b6b4b9958 100644 (file)
Binary files a/Resources/Textures/Structures/Power/substation.rsi/charging.png and b/Resources/Textures/Structures/Power/substation.rsi/charging.png differ
index 9fbff744ca74ec82634e041fb8fa3282c7f97b12..27440c1c7704fb77a945727db1d5c5adaf4244aa 100644 (file)
Binary files a/Resources/Textures/Structures/Power/substation.rsi/dead.png and b/Resources/Textures/Structures/Power/substation.rsi/dead.png differ
index d179742669917dc41f20ab033580a2627040ed23..d0b9726cacf1f8b56586214f2694b0c88393ffb7 100644 (file)
Binary files a/Resources/Textures/Structures/Power/substation.rsi/full.png and b/Resources/Textures/Structures/Power/substation.rsi/full.png differ
index 0125458641c7e4d2cecdb7d7756cca19c45f4075..d19066274d15e5573359bdcc3b95236c61b0a567 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Drawn by Ubaser.",
+  "license": "CC0-1.0",
+  "copyright": "Created by EmoGarbage404 (github)",
   "size": {
     "x": 32,
     "y": 32
        {
          "name": "substation_static"
        },
-    {          
-      "name": "substation_wall"
+    {
+      "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_static"
       "name": "full"
     },
     {
-      "name": "charging"
+      "name": "charging",
+      "delays": [
+        [
+          0.1,
+          0.1
+        ]
+      ]
     },
     {
-      "name": "dead"
+      "name": "dead",
+      "delays": [
+        [
+          0.3,
+          0.1
+        ]
+      ]
     },
     {
       "name": "screen",
       "delays": [
         [
-          0.15,
-          0.15,
-          0.15,
-          0.15,
-          0.15,
-          0.15
+          5.0,
+          0.5,
+          0.5,
+          0.5
         ]
       ]
     }
index 60c922c53f622e8de11faeb00b4aa198b0404c04..24420ec31ca2d5dd80bb669b47d3d8e334345aa8 100644 (file)
Binary files a/Resources/Textures/Structures/Power/substation.rsi/screen.png and b/Resources/Textures/Structures/Power/substation.rsi/screen.png differ
diff --git a/Resources/Textures/Structures/Power/substation.rsi/screen_wall.png b/Resources/Textures/Structures/Power/substation.rsi/screen_wall.png
new file mode 100644 (file)
index 0000000..c1dfb87
Binary files /dev/null and b/Resources/Textures/Structures/Power/substation.rsi/screen_wall.png differ
index b9d1eb18d8fc4e3583acdf6ac0a8aa11d53deee7..68ef981ae5f3ca0804a5e4256f7281ececa23eec 100644 (file)
Binary files a/Resources/Textures/Structures/Power/substation.rsi/substation.png and b/Resources/Textures/Structures/Power/substation.rsi/substation.png differ
index 9d5b8598f4b8d92b0a1af88b799a6f72c26186c4..eee995843f194939f7b115fd33950de15b7016e1 100644 (file)
Binary files a/Resources/Textures/Structures/Power/substation.rsi/substation_static.png and b/Resources/Textures/Structures/Power/substation.rsi/substation_static.png differ
index 155ced7128aadd1cd7719d655ee751d5741d5e57..ab250c6747ddcc8bb5486ae9b54352e4557df9c9 100644 (file)
Binary files a/Resources/Textures/Structures/Power/substation.rsi/substation_wall.png and b/Resources/Textures/Structures/Power/substation.rsi/substation_wall.png differ
index e810e6a5a4a1f05b179ffa3ce073d8b35b632e6d..f4cc933b4a505d373702a5af5eb4eac868e92d88 100644 (file)
Binary files a/Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png and b/Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png differ