diff --git a/Content.Client/Power/Visualizers/CableVisualizerComponent.cs b/Content.Client/Power/Visualizers/CableVisualizerComponent.cs index c88d92423b..f6379260cf 100644 --- a/Content.Client/Power/Visualizers/CableVisualizerComponent.cs +++ b/Content.Client/Power/Visualizers/CableVisualizerComponent.cs @@ -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; } diff --git a/Content.Client/Power/Visualizers/CableVisualizerSystem.cs b/Content.Client/Power/Visualizers/CableVisualizerSystem.cs index 60fb0d127a..bea15a0602 100644 --- a/Content.Client/Power/Visualizers/CableVisualizerSystem.cs +++ b/Content.Client/Power/Visualizers/CableVisualizerSystem.cs @@ -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}"); } } diff --git a/Resources/Prototypes/Entities/Structures/Power/cables.yml b/Resources/Prototypes/Entities/Structures/Power/cables.yml index 6cb9e3d138..53e2c4a91f 100644 --- a/Resources/Prototypes/Entities/Structures/Power/cables.yml +++ b/Resources/Prototypes/Entities/Structures/Power/cables.yml @@ -115,11 +115,12 @@ 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 @@ -151,6 +152,7 @@ acts: [ "Destruction" ] - type: CableVisualizer statePrefix: mvcable_ + extraLayerPrefix: mvstripes_ - type: entity id: CableMVUncuttable diff --git a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-10.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-10.png index 707aed405c..ffa2ed50b7 100644 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 diff --git a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-20.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-20.png index 00d5df993d..68c140b335 100644 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 diff --git a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-30.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-30.png index f26264bf3f..d653ae7085 100644 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 diff --git a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-10.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-10.png index 061bfd9987..c7c122a0eb 100644 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 diff --git a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-20.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-20.png index 93df81a835..1499d89d31 100644 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 diff --git a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-30.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-30.png index 56b7c91dd5..b4905627b0 100644 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 diff --git a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-equipped-BELT.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-equipped-BELT.png index 1f7b0e8f69..9fa3ca4982 100644 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 diff --git a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-inhand-left.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-inhand-left.png index 0976b3aaf5..ba97c97304 100644 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 diff --git a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-inhand-right.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-inhand-right.png index 6072367e40..52b73f761f 100644 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 diff --git a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_4.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_4.png index f8fb64122d..355700eb83 100644 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 diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/meta.json b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/meta.json index 76b5eb294a..5c9442cbce 100644 --- a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/meta.json +++ b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/meta.json @@ -70,6 +70,70 @@ { "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" + } ] } diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_0.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_0.png index 47f04f63c2..3b0665ee1e 100644 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 diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_1.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_1.png index bd958a82f3..fe2f6702cc 100644 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 diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_10.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_10.png index 690f9cda8f..7fb6e6c90d 100644 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 diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_11.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_11.png index 0da1d5e1d1..e4fc7333e2 100644 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 diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_12.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_12.png index 02edf964cd..1276a93708 100644 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 diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_13.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_13.png index a13a602d9b..af31b7b9c9 100644 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 diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_14.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_14.png index 1579a277eb..9e14127ebb 100644 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 diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_15.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_15.png index 94ae29374c..665b4ce828 100644 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 diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_2.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_2.png index ee8e0b5dc6..8423573dd1 100644 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 diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_3.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_3.png index a3fe54b5a0..25fe79acc2 100644 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 diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_4.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_4.png index 137138e8e3..c1cd23c9ad 100644 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 diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_5.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_5.png index 96065f62da..4f77fb0881 100644 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 diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_6.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_6.png index 83b583a15d..146a658848 100644 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 diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_7.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_7.png index 6596ad217d..92e6f95ade 100644 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 diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_8.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_8.png index 7d0efd026e..ba863778bc 100644 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 diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_9.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_9.png index 6627343841..5ec716e43f 100644 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 index 0000000000..7244b37f5c 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 index 0000000000..50f9570fff 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 index 0000000000..0b7fa5327a 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 index 0000000000..98413e4239 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 index 0000000000..366ef79e58 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 index 0000000000..474c5c59a4 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 index 0000000000..dd7434c43c 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 index 0000000000..73e0ed269c 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 index 0000000000..7107594858 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 index 0000000000..6d51d19b52 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 index 0000000000..7a520185f1 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 index 0000000000..e705474dd3 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 index 0000000000..965f779f30 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 index 0000000000..79094d1059 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 index 0000000000..ef45b5ce15 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 index 0000000000..0963e111ad Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvstripes_9.png differ