]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
New Sprites for cables (#34955)
authorLinkbro <104574466+Linkbro1@users.noreply.github.com>
Wed, 16 Apr 2025 20:26:25 +0000 (21:26 +0100)
committerGitHub <noreply@github.com>
Wed, 16 Apr 2025 20:26:25 +0000 (16:26 -0400)
* initial textures

* Makes it have layers because Milon wanted it

* Makes it have layers because Milon wanted it

* in do NOT understand github

* tested, works

* Update Content.Client/Power/Visualizers/CableVisualizerComponent.cs

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
* Update Content.Client/Power/Visualizers/CableVisualizerComponent.cs

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
* remove extra newline

* EmoGarbage Review - Adjust MV cables to use orange stripes

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
46 files changed:
Content.Client/Power/Visualizers/CableVisualizerComponent.cs
Content.Client/Power/Visualizers/CableVisualizerSystem.cs
Resources/Prototypes/Entities/Structures/Power/cables.yml
Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-10.png
Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-20.png
Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-30.png
Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-10.png
Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-20.png
Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-30.png
Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-equipped-BELT.png
Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-inhand-left.png
Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-inhand-right.png
Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_4.png
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/meta.json
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_0.png
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_1.png
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_10.png
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_11.png
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_12.png
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_13.png
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_14.png
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_15.png
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_2.png
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_3.png
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_4.png
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_5.png
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_6.png
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_7.png
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_8.png
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_9.png
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_0.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_1.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_10.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_11.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_12.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_13.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_14.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_15.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_2.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_3.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_4.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_5.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_6.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_7.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_8.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_9.png [new file with mode: 0644]

index c88d92423b28d8823de8aea175a6d30fe1d0010d..f6379260cf9be69a36c0187d4f47992948a047b6 100644 (file)
@@ -3,6 +3,9 @@ namespace Content.Client.Power.Visualizers;
 [RegisterComponent]
 public sealed partial class CableVisualizerComponent : Component
 {
-    [DataField("statePrefix")]
+    [DataField]
     public string? StatePrefix;
+
+    [DataField]
+    public string? ExtraLayerPrefix;
 }
index 60fb0d127a7832098d5401eca6c71718e6431cf7..bea15a060299ae2fb76345785a8a31d599a931bf 100644 (file)
@@ -31,5 +31,7 @@ public sealed class CableVisualizerSystem : EntitySystem
             mask = WireVisDirFlags.None;
 
         args.Sprite.LayerSetState(0, $"{component.StatePrefix}{(int) mask}");
+        if (component.ExtraLayerPrefix != null)
+            args.Sprite.LayerSetState(1, $"{component.ExtraLayerPrefix}{(int) mask}");
     }
 }
index 6cb9e3d13841aecfe292644f67d66148d9c8f69f..53e2c4a91f15cfd36861b0990dc2bec5d8684262 100644 (file)
   description: A medium voltage power cable.
   components:
   - type: Sprite
-    color: Yellow
     sprite: Structures/Power/Cables/mv_cable.rsi
-    state: mvcable_0
+    layers:
+    - state: mvcable_0
+      color: Yellow
+    - state: mvstripes_0
   - type: Icon
-    color: Yellow
     sprite: Structures/Power/Cables/mv_cable.rsi
     state: mvcable_4
   - type: NodeContainer
         acts: [ "Destruction" ]
   - type: CableVisualizer
     statePrefix: mvcable_
+    extraLayerPrefix: mvstripes_
 
 - type: entity
   id: CableMVUncuttable
index 707aed405cdc7d9a8530467f1b854c4da2bbc9c3..ffa2ed50b7b0850b7fa650fbbb0f8e16a294f976 100644 (file)
Binary files a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-10.png and b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-10.png differ
index 00d5df993d58e3fef74e52aa925d6990a37fd23e..68c140b3359277252559a990838ce40219aef2e4 100644 (file)
Binary files a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-20.png and b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-20.png differ
index f26264bf3fca0d73f25cef3e07bf3538be43138b..d653ae708526cef60d45119755878286132e3f13 100644 (file)
Binary files a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-30.png and b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-30.png differ
index 061bfd998768605bd92c7a090f63c3a98588e05f..c7c122a0eb74e70a1181e50b9e14e656b5712189 100644 (file)
Binary files a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-10.png and b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-10.png differ
index 93df81a835567ab3342f534ddf6611cf9e571fb9..1499d89d3188bb214d0cfe33eceb72d2f17cc0ed 100644 (file)
Binary files a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-20.png and b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-20.png differ
index 56b7c91dd58a9f16885715fdf26750c54507f0e0..b4905627b0d46d590138ffd4b24849b2f3cf413c 100644 (file)
Binary files a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-30.png and b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-30.png differ
index 1f7b0e8f6948440d32337fca856f60b16a67cd9b..9fa3ca4982b7fb4223f72ff9eafc417961ecc152 100644 (file)
Binary files a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-equipped-BELT.png and b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-equipped-BELT.png differ
index 0976b3aaf59a1a115039299b02d2c3bb052a96ce..ba97c97304d86ff6a997cc70fcc42e280f012506 100644 (file)
Binary files a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-inhand-left.png and b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-inhand-left.png differ
index 6072367e40fdcb43987c162fca4d136ab64824ca..52b73f761fad247494dd2d6ff6697d50a8945cec 100644 (file)
Binary files a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-inhand-right.png and b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-inhand-right.png differ
index f8fb64122dc7cbf1c61699a7b92ff31fbcacbb98..355700eb83d42e83a2153cca14dd767e3b29b708 100644 (file)
Binary files a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_4.png and b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_4.png differ
index 76b5eb294a1e6dd1bbe3494d608c0d649f8f4389..5c9442cbcece0a5544dacca69b6c24266dff1593 100644 (file)
         {
             "name": "mvcable_15"
 
+        },
+        {
+            "name": "mvstripes_0"
+
+        },
+        {
+            "name": "mvstripes_1"
+
+        },
+        {
+            "name": "mvstripes_2"
+
+        },
+        {
+            "name": "mvstripes_3"
+
+        },
+        {
+            "name": "mvstripes_4"
+
+        },
+        {
+            "name": "mvstripes_5"
+
+        },
+        {
+            "name": "mvstripes_6"
+
+        },
+        {
+            "name": "mvstripes_7"
+
+        },
+        {
+            "name": "mvstripes_8"
+
+        },
+        {
+            "name": "mvstripes_9"
+
+        },
+        {
+            "name": "mvstripes_10"
+
+        },
+        {
+            "name": "mvstripes_11"
+
+        },
+        {
+            "name": "mvstripes_12"
+
+        },
+        {
+            "name": "mvstripes_13"
+
+        },
+        {
+            "name": "mvstripes_14"
+
+        },
+        {
+            "name": "mvstripes_15"
+
         }
     ]
 }
index 47f04f63c27e6ba48863c69b55837183d1cd4eb9..3b0665ee1e34074ca39a95a7628b1f7cb2a992d6 100644 (file)
Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_0.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_0.png differ
index bd958a82f3cd57790264660ba101bf7550980c9b..fe2f6702cc9c311e0d7f99dcfa3667011eb07247 100644 (file)
Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_1.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_1.png differ
index 690f9cda8fa42a3481a1145b1cf66ef56c8e57a7..7fb6e6c90d7a3cd0f21e9d8f32512671368ecfc2 100644 (file)
Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_10.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_10.png differ
index 0da1d5e1d1c5cd12d9b018a597f1a6c9e49986d8..e4fc7333e21f41b2203c69f802b308f92a58e6ac 100644 (file)
Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_11.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_11.png differ
index 02edf964cd3dc2f3711880e8f685277a3990c5a3..1276a93708f7e848313d0c603abbba2e7edd301b 100644 (file)
Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_12.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_12.png differ
index a13a602d9bbb2135af4407f15083e6b5bcc4bb02..af31b7b9c905e353467c0de102959cfd9e62a43e 100644 (file)
Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_13.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_13.png differ
index 1579a277ebe9a565723a84f6a702ac96ecf4bd22..9e14127ebb385bef277daf679188acf0f63cb16d 100644 (file)
Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_14.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_14.png differ
index 94ae29374ced8a42738253b8028372ef1b78012a..665b4ce82863b3db55f8b8a924c3ffd364bc4c22 100644 (file)
Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_15.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_15.png differ
index ee8e0b5dc68b759d674c723b7938ec2a199004f1..8423573dd190c6aa7b9dd1298b26e2a2e62a1533 100644 (file)
Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_2.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_2.png differ
index a3fe54b5a0016ff3f80849e874a80cca6b206742..25fe79acc25cbdc403c7accb98e9464449ca447e 100644 (file)
Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_3.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_3.png differ
index 137138e8e33a17f7805f5f69d428883ba95d2a32..c1cd23c9ad9f31ce491464900925a1c725893114 100644 (file)
Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_4.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_4.png differ
index 96065f62da11dfff882945b5a4f662ab8bdc1568..4f77fb0881d997542284b4874bea15b8a720ac96 100644 (file)
Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_5.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_5.png differ
index 83b583a15d13bc9adf0230dddda07af8675c75e1..146a658848968056ddc891e6073ef09277c2cee9 100644 (file)
Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_6.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_6.png differ
index 6596ad217dd6fd9ec16b1f82e41c9c07b6f28adb..92e6f95aded27c9a2e4005e7fa246e673365daa7 100644 (file)
Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_7.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_7.png differ
index 7d0efd026e45247cfcc6081123d32553401221b8..ba863778bcf2976372161ea6e4743e0fc892940f 100644 (file)
Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_8.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_8.png differ
index 66273438415da39292cf27c5794fc575fbc55b94..5ec716e43f82de2ce44046faca0bcd5af928bca0 100644 (file)
Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_9.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_9.png differ
diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_0.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_0.png
new file mode 100644 (file)
index 0000000..7244b37
Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_0.png differ
diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_1.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_1.png
new file mode 100644 (file)
index 0000000..50f9570
Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_1.png differ
diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_10.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_10.png
new file mode 100644 (file)
index 0000000..0b7fa53
Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_10.png differ
diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_11.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_11.png
new file mode 100644 (file)
index 0000000..98413e4
Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_11.png differ
diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_12.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_12.png
new file mode 100644 (file)
index 0000000..366ef79
Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_12.png differ
diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_13.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_13.png
new file mode 100644 (file)
index 0000000..474c5c5
Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_13.png differ
diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_14.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_14.png
new file mode 100644 (file)
index 0000000..dd7434c
Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_14.png differ
diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_15.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_15.png
new file mode 100644 (file)
index 0000000..73e0ed2
Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_15.png differ
diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_2.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_2.png
new file mode 100644 (file)
index 0000000..7107594
Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_2.png differ
diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_3.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_3.png
new file mode 100644 (file)
index 0000000..6d51d19
Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_3.png differ
diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_4.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_4.png
new file mode 100644 (file)
index 0000000..7a52018
Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_4.png differ
diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_5.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_5.png
new file mode 100644 (file)
index 0000000..e705474
Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_5.png differ
diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_6.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_6.png
new file mode 100644 (file)
index 0000000..965f779
Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_6.png differ
diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_7.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_7.png
new file mode 100644 (file)
index 0000000..79094d1
Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_7.png differ
diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_8.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_8.png
new file mode 100644 (file)
index 0000000..ef45b5c
Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_8.png differ
diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_9.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_9.png
new file mode 100644 (file)
index 0000000..0963e11
Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_9.png differ