diff --git a/Content.Shared/Wires/SharedWiresComponent.cs b/Content.Shared/Wires/SharedWiresComponent.cs index 2239fd72b1..b81f8330fb 100644 --- a/Content.Shared/Wires/SharedWiresComponent.cs +++ b/Content.Shared/Wires/SharedWiresComponent.cs @@ -209,106 +209,22 @@ namespace Content.Shared.Wires { public static string Name(this WireColor color) { - return Loc.GetString(color switch - { - WireColor.Red => "Red", - WireColor.Blue => "Blue", - WireColor.Green => "Green", - WireColor.Orange => "Orange", - WireColor.Brown => "Brown", - WireColor.Gold => "Gold", - WireColor.Gray => "Gray", - WireColor.Cyan => "Cyan", - WireColor.Navy => "Navy", - WireColor.Purple => "Purple", - WireColor.Pink => "Pink", - WireColor.Fuchsia => "Fuchsia", - _ => throw new InvalidOperationException() - }); + return Loc.GetString("Red"); } public static Color ColorValue(this WireColor color) { - return color switch - { - WireColor.Red => Color.Red, - WireColor.Blue => Color.Blue, - WireColor.Green => Color.LimeGreen, - WireColor.Orange => Color.Orange, - WireColor.Brown => Color.Brown, - WireColor.Gold => Color.Gold, - WireColor.Gray => Color.Gray, - WireColor.Cyan => Color.Cyan, - WireColor.Navy => Color.Navy, - WireColor.Purple => Color.Purple, - WireColor.Pink => Color.Pink, - WireColor.Fuchsia => Color.Fuchsia, - _ => throw new InvalidOperationException() - }; + return Color.Red; } public static string Name(this WireLetter letter) { - return Loc.GetString(letter switch - { - WireLetter.α => "Alpha", - WireLetter.β => "Beta", - WireLetter.γ => "Gamma", - WireLetter.δ => "Delta", - WireLetter.ε => "Epsilon", - WireLetter.ζ => "Zeta", - WireLetter.η => "Eta", - WireLetter.θ => "Theta", - WireLetter.ι => "Iota", - WireLetter.κ => "Kappa", - WireLetter.λ => "Lambda", - WireLetter.μ => "Mu", - WireLetter.ν => "Nu", - WireLetter.ξ => "Xi", - WireLetter.ο => "Omicron", - WireLetter.π => "Pi", - WireLetter.ρ => "Rho", - WireLetter.σ => "Sigma", - WireLetter.τ => "Tau", - WireLetter.υ => "Upsilon", - WireLetter.φ => "Phi", - WireLetter.χ => "Chi", - WireLetter.ψ => "Psi", - WireLetter.ω => "Omega", - _ => throw new InvalidOperationException() - }); + return Loc.GetString("Sigma"); } public static char Letter(this WireLetter letter) { - return letter switch - { - WireLetter.α => 'α', - WireLetter.β => 'β', - WireLetter.γ => 'γ', - WireLetter.δ => 'δ', - WireLetter.ε => 'ε', - WireLetter.ζ => 'ζ', - WireLetter.η => 'η', - WireLetter.θ => 'θ', - WireLetter.ι => 'ι', - WireLetter.κ => 'κ', - WireLetter.λ => 'λ', - WireLetter.μ => 'μ', - WireLetter.ν => 'ν', - WireLetter.ξ => 'ξ', - WireLetter.ο => 'ο', - WireLetter.π => 'π', - WireLetter.ρ => 'ρ', - WireLetter.σ => 'σ', - WireLetter.τ => 'τ', - WireLetter.υ => 'υ', - WireLetter.φ => 'φ', - WireLetter.χ => 'χ', - WireLetter.ψ => 'ψ', - WireLetter.ω => 'ω', - _ => throw new InvalidOperationException() - }; + return 'σ'; } } } diff --git a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml index 4c24117caa..f9c9b64940 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml @@ -16,8 +16,10 @@ stackType: Cable - type: Sprite sprite: Objects/Tools/cable-coils.rsi + color: Red - type: Item sprite: Objects/Tools/cable-coils.rsi + color: Red size: Small storedRotation: -90 - type: CablePlacer @@ -174,18 +176,18 @@ suffix: Full components: - type: Sprite - state: coillv-30 + state: coilmv-30 layers: - - state: coillv-30 + - state: coilmv-30 map: ["base"] - type: Item heldPrefix: coillv - type: Stack baseLayer: base layerStates: - - coillv-10 - - coillv-20 - - coillv-30 + - coilmv-10 + - coilmv-20 + - coilmv-30 - type: CablePlacer cablePrototypeID: CableApcExtension blockingWireType: Apc @@ -207,7 +209,7 @@ suffix: 10 components: - type: Sprite - state: coillv-10 + state: coilmv-10 - type: Stack count: 10 @@ -226,6 +228,6 @@ suffix: 1 components: - type: Sprite - state: coillv-10 + state: coilmv-10 - type: Stack count: 1 diff --git a/Resources/Prototypes/Entities/Structures/Power/cables.yml b/Resources/Prototypes/Entities/Structures/Power/cables.yml index f1ae038bc1..44b767d0b5 100644 --- a/Resources/Prototypes/Entities/Structures/Power/cables.yml +++ b/Resources/Prototypes/Entities/Structures/Power/cables.yml @@ -52,14 +52,16 @@ parent: CableBase id: CableHV name: HV power cable - description: An orange high voltage power cable. + description: A red high voltage power cable. components: - type: Sprite sprite: Structures/Power/Cables/hv_cable.rsi + color: Red state: hvcable_0 drawdepth: ThickWire - type: Icon sprite: Structures/Power/Cables/hv_cable.rsi + color: Red state: hvcable_4 - type: NodeContainer nodes: @@ -113,11 +115,11 @@ description: A medium voltage power cable. components: - type: Sprite - color: Yellow + color: Red sprite: Structures/Power/Cables/mv_cable.rsi state: mvcable_0 - type: Icon - color: Yellow + color: Red sprite: Structures/Power/Cables/mv_cable.rsi state: mvcable_4 - type: NodeContainer @@ -165,11 +167,11 @@ description: A cable used to connect machines to an APC. #APCs aren't area defined anymore so need this cable to connect things to the APC. This description should be dynamic in future. components: - type: Sprite - color: Green + color: Red sprite: Structures/Power/Cables/lv_cable.rsi state: lvcable_0 - type: Icon - color: Green + color: Red sprite: Structures/Power/Cables/lv_cable.rsi state: lvcable_4 - type: NodeContainer