]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Added Warning state for AME (#24699)
authorSergey Dikiy <siarhei.dziki@gmail.com>
Thu, 1 Feb 2024 08:40:57 +0000 (09:40 +0100)
committerGitHub <noreply@github.com>
Thu, 1 Feb 2024 08:40:57 +0000 (19:40 +1100)
added warning state for AME

Content.Server/Ame/EntitySystems/AmeControllerSystem.cs
Content.Shared/Ame/SharedAmeControllerComponent.cs
Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
Resources/Textures/Structures/Power/Generation/ame.rsi/control_warning.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Generation/ame.rsi/meta.json

index af3e474d08bb3d272b5921c1c702e9db01731129..93b2a29a7679a623f53eca8e9e77273eabc48200 100644 (file)
@@ -263,6 +263,7 @@ public sealed class AmeControllerSystem : EntitySystem
         {
             < 10 => AmeControllerState.Fuck,
             < 50 => AmeControllerState.Critical,
+            < 80 => AmeControllerState.Warning,
             _ => AmeControllerState.On,
         };
 
index 8dde66724d5b6f9597ce9833d314b708d6f1237f..11925a82a09fd2e185ca3d15590eabf88c7a9af0 100644 (file)
@@ -69,6 +69,7 @@ public enum AmeControllerVisuals
 public enum AmeControllerState
 {
     On,
+    Warning,
     Critical,
     Fuck,
     Off,
index d12301b3f30d6e36d0c40421459db6aaff4a4ada..78fdaae01a485e756df1df43726190f02500b42a 100644 (file)
@@ -67,6 +67,7 @@
         display:
           Off: { visible: false }
           On: { state: control_on, visible: true }
+          Warning: { state: control_warning, visible: true }
           Critical: { state: control_critical, visible: true }
           Fuck: { state: control_fuck, visible: true }
   - type: NodeContainer
diff --git a/Resources/Textures/Structures/Power/Generation/ame.rsi/control_warning.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/control_warning.png
new file mode 100644 (file)
index 0000000..7f64302
Binary files /dev/null and b/Resources/Textures/Structures/Power/Generation/ame.rsi/control_warning.png differ
index 8f1a2b7a31114576eed62a67db93c343b241f6f9..d63698143c6de5ddf8f55333000a54a425f2fc7b 100644 (file)
     },
        {
       "name": "static"
+    },
+       {
+      "name": "control_warning",
+      "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,
+          0.1,
+          0.1
+        ]
+      ]
     },
     {
       "name": "control_critical",