From ead09296c37b617708e4cbd4efff44c9c858581e Mon Sep 17 00:00:00 2001
From: Tomeno <Tomeno@users.noreply.github.com>
Date: Sun, 14 Nov 2021 18:51:02 +0100
Subject: [PATCH] Fix airlock lights (#5334)

* Doors no longer permanently glow orange + logic tweak

* Fix server-side order of operations for deny animation timer

* Delay between deny >= deny length to allow animation to reset

* Fix airlock assets to use the correct deny animation name

Co-authored-by: T <tomeno@lulzsec.co.uk>
---
 Content.Client/Doors/AirlockVisualizer.cs           |   5 +++--
 .../Doors/Components/ServerDoorComponent.cs         |   9 ++++-----
 .../Glass/basic.rsi/{deny.png => deny_unlit.png}    | Bin
 .../Doors/Airlocks/Glass/basic.rsi/meta.json        |   2 +-
 .../Glass/cargo.rsi/{deny.png => deny_unlit.png}    | Bin
 .../Doors/Airlocks/Glass/cargo.rsi/meta.json        |   2 +-
 .../Glass/command.rsi/{deny.png => deny_unlit.png}  | Bin
 .../Doors/Airlocks/Glass/command.rsi/meta.json      |   2 +-
 .../engineering.rsi/{deny.png => deny_unlit.png}    | Bin
 .../Doors/Airlocks/Glass/engineering.rsi/meta.json  |   2 +-
 .../Glass/external.rsi/{deny.png => deny_unlit.png} | Bin
 .../Doors/Airlocks/Glass/external.rsi/meta.json     |   2 +-
 .../Glass/glass.rsi/{deny.png => deny_unlit.png}    | Bin
 .../Doors/Airlocks/Glass/glass.rsi/meta.json        |   2 +-
 .../Glass/medical.rsi/{deny.png => deny_unlit.png}  | Bin
 .../Doors/Airlocks/Glass/medical.rsi/meta.json      |   2 +-
 .../Glass/science.rsi/{deny.png => deny_unlit.png}  | Bin
 .../Doors/Airlocks/Glass/science.rsi/meta.json      |   2 +-
 .../Glass/security.rsi/{deny.png => deny_unlit.png} | Bin
 .../Doors/Airlocks/Glass/security.rsi/meta.json     |   2 +-
 .../Standard/basic.rsi/{deny.png => deny_unlit.png} | Bin
 .../Doors/Airlocks/Standard/basic.rsi/meta.json     |   2 +-
 .../Standard/cargo.rsi/{deny.png => deny_unlit.png} | Bin
 .../Doors/Airlocks/Standard/cargo.rsi/meta.json     |   2 +-
 .../command.rsi/{deny.png => deny_unlit.png}        | Bin
 .../Doors/Airlocks/Standard/command.rsi/meta.json   |   2 +-
 .../engineering.rsi/{deny.png => deny_unlit.png}    | Bin
 .../Airlocks/Standard/engineering.rsi/meta.json     |   2 +-
 .../external.rsi/{deny.png => deny_unlit.png}       | Bin
 .../Doors/Airlocks/Standard/external.rsi/meta.json  |   2 +-
 .../freezer.rsi/{deny.png => deny_unlit.png}        | Bin
 .../Doors/Airlocks/Standard/freezer.rsi/meta.json   |   2 +-
 .../Standard/maint.rsi/{deny.png => deny_unlit.png} | Bin
 .../Doors/Airlocks/Standard/maint.rsi/meta.json     |   2 +-
 .../medical.rsi/{deny.png => deny_unlit.png}        | Bin
 .../Doors/Airlocks/Standard/medical.rsi/meta.json   |   2 +-
 .../science.rsi/{deny.png => deny_unlit.png}        | Bin
 .../Doors/Airlocks/Standard/science.rsi/meta.json   |   2 +-
 .../security.rsi/{deny.png => deny_unlit.png}       | Bin
 .../Doors/Airlocks/Standard/security.rsi/meta.json  |   2 +-
 40 files changed, 26 insertions(+), 26 deletions(-)
 rename Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/{deny.png => deny_unlit.png} (100%)
 rename Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/{deny.png => deny_unlit.png} (100%)
 rename Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/{deny.png => deny_unlit.png} (100%)
 rename Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/{deny.png => deny_unlit.png} (100%)
 rename Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/{deny.png => deny_unlit.png} (100%)
 rename Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/{deny.png => deny_unlit.png} (100%)
 rename Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/{deny.png => deny_unlit.png} (100%)
 rename Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/{deny.png => deny_unlit.png} (100%)
 rename Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/{deny.png => deny_unlit.png} (100%)
 rename Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/{deny.png => deny_unlit.png} (100%)
 rename Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/{deny.png => deny_unlit.png} (100%)
 rename Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/{deny.png => deny_unlit.png} (100%)
 rename Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/{deny.png => deny_unlit.png} (100%)
 rename Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/{deny.png => deny_unlit.png} (100%)
 rename Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/{deny.png => deny_unlit.png} (100%)
 rename Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/{deny.png => deny_unlit.png} (100%)
 rename Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/{deny.png => deny_unlit.png} (100%)
 rename Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/{deny.png => deny_unlit.png} (100%)
 rename Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/{deny.png => deny_unlit.png} (100%)

diff --git a/Content.Client/Doors/AirlockVisualizer.cs b/Content.Client/Doors/AirlockVisualizer.cs
index 60cb788e4a..4802a3f3d0 100644
--- a/Content.Client/Doors/AirlockVisualizer.cs
+++ b/Content.Client/Doors/AirlockVisualizer.cs
@@ -161,7 +161,8 @@ namespace Content.Client.Doors
                     animPlayer.Play(CloseAnimation, AnimationKey);
                     break;
                 case DoorVisualState.Deny:
-                    animPlayer.Play(DenyAnimation, AnimationKey);
+                    if (!animPlayer.HasRunningAnimation(AnimationKey))
+                        animPlayer.Play(DenyAnimation, AnimationKey);
                     break;
                 case DoorVisualState.Welded:
                     weldedVisible = true;
@@ -181,7 +182,7 @@ namespace Content.Client.Doors
 
             if (!_simpleVisuals)
             {
-                sprite.LayerSetVisible(DoorVisualLayers.BaseUnlit, unlitVisible);
+                sprite.LayerSetVisible(DoorVisualLayers.BaseUnlit, unlitVisible && state != DoorVisualState.Closed);
                 sprite.LayerSetVisible(DoorVisualLayers.BaseWelded, weldedVisible);
                 sprite.LayerSetVisible(DoorVisualLayers.BaseBolted, unlitVisible && boltedVisible);
             }
diff --git a/Content.Server/Doors/Components/ServerDoorComponent.cs b/Content.Server/Doors/Components/ServerDoorComponent.cs
index 46596ce67b..42aebf1aa6 100644
--- a/Content.Server/Doors/Components/ServerDoorComponent.cs
+++ b/Content.Server/Doors/Components/ServerDoorComponent.cs
@@ -186,7 +186,7 @@ namespace Content.Server.Doors.Components
         ///     Minimum interval allowed between deny sounds in milliseconds.
         /// </summary>
         [DataField("denySoundMinimumInterval")]
-        public float DenySoundMinimumInterval = 250.0f;
+        public float DenySoundMinimumInterval = 450.0f;
 
         /// <summary>
         ///     Used to stop people from spamming the deny sound.
@@ -607,10 +607,6 @@ namespace Content.Server.Doors.Components
             if (State == DoorState.Open || IsWeldedShut)
                 return;
 
-            _stateChangeCancelTokenSource?.Cancel();
-            _stateChangeCancelTokenSource = new();
-            SetAppearance(DoorVisualState.Deny);
-
             if (DenySound != null)
             {
                 if (LastDenySoundTime == TimeSpan.Zero)
@@ -629,6 +625,9 @@ namespace Content.Server.Doors.Components
                     AudioParams.Default.WithVolume(-3));
             }
 
+            _stateChangeCancelTokenSource?.Cancel();
+            _stateChangeCancelTokenSource = new();
+            SetAppearance(DoorVisualState.Deny);
             Owner.SpawnTimer(DenyTime, () =>
             {
                 SetAppearance(DoorVisualState.Closed);
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/deny.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/deny_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/meta.json
index 9a14300b5e..01a3cdf00c 100644
--- a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/meta.json
@@ -46,7 +46,7 @@
       ]
     },
     {
-      "name": "deny",
+      "name": "deny_unlit",
       "delays": [
         [
           0.1,
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/deny.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/deny_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/meta.json
index 9a14300b5e..01a3cdf00c 100644
--- a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/meta.json
@@ -46,7 +46,7 @@
       ]
     },
     {
-      "name": "deny",
+      "name": "deny_unlit",
       "delays": [
         [
           0.1,
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/deny.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/deny_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/meta.json
index 9a14300b5e..01a3cdf00c 100644
--- a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/meta.json
@@ -46,7 +46,7 @@
       ]
     },
     {
-      "name": "deny",
+      "name": "deny_unlit",
       "delays": [
         [
           0.1,
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/deny.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/deny_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/meta.json
index 9a14300b5e..01a3cdf00c 100644
--- a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/meta.json
@@ -46,7 +46,7 @@
       ]
     },
     {
-      "name": "deny",
+      "name": "deny_unlit",
       "delays": [
         [
           0.1,
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/deny.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/deny_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/meta.json
index 24cd01570b..79e2ba28b3 100644
--- a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/meta.json
@@ -38,7 +38,7 @@
       ]
     },
     {
-      "name": "deny",
+      "name": "deny_unlit",
       "delays": [
         [
           0.1,
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/deny.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/deny_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/meta.json
index 27e3c7714f..a00faa6df8 100644
--- a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/meta.json
@@ -100,7 +100,7 @@
       ]
     },
     {
-      "name": "deny",
+      "name": "deny_unlit",
       "delays": [
         [
           0.1,
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/deny.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/deny_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/meta.json
index 9a14300b5e..01a3cdf00c 100644
--- a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/meta.json
@@ -46,7 +46,7 @@
       ]
     },
     {
-      "name": "deny",
+      "name": "deny_unlit",
       "delays": [
         [
           0.1,
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/deny.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/deny_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/meta.json
index 9a14300b5e..01a3cdf00c 100644
--- a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/meta.json
@@ -46,7 +46,7 @@
       ]
     },
     {
-      "name": "deny",
+      "name": "deny_unlit",
       "delays": [
         [
           0.1,
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/deny.png
rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/deny_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/meta.json
index 9a14300b5e..01a3cdf00c 100644
--- a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/meta.json
@@ -46,7 +46,7 @@
       ]
     },
     {
-      "name": "deny",
+      "name": "deny_unlit",
       "delays": [
         [
           0.1,
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/deny.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/deny_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/meta.json
index 9a14300b5e..01a3cdf00c 100644
--- a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/meta.json
@@ -46,7 +46,7 @@
       ]
     },
     {
-      "name": "deny",
+      "name": "deny_unlit",
       "delays": [
         [
           0.1,
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/deny.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/deny_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/meta.json
index 9a14300b5e..01a3cdf00c 100644
--- a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/meta.json
@@ -46,7 +46,7 @@
       ]
     },
     {
-      "name": "deny",
+      "name": "deny_unlit",
       "delays": [
         [
           0.1,
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/deny.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/deny_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/meta.json
index 9a14300b5e..01a3cdf00c 100644
--- a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/meta.json
@@ -46,7 +46,7 @@
       ]
     },
     {
-      "name": "deny",
+      "name": "deny_unlit",
       "delays": [
         [
           0.1,
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/deny.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/deny_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/meta.json
index 9a14300b5e..01a3cdf00c 100644
--- a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/meta.json
@@ -46,7 +46,7 @@
       ]
     },
     {
-      "name": "deny",
+      "name": "deny_unlit",
       "delays": [
         [
           0.1,
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/deny.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/deny_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/meta.json
index 24cd01570b..79e2ba28b3 100644
--- a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/meta.json
@@ -38,7 +38,7 @@
       ]
     },
     {
-      "name": "deny",
+      "name": "deny_unlit",
       "delays": [
         [
           0.1,
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/deny.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/deny_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/meta.json
index 9a14300b5e..01a3cdf00c 100644
--- a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/meta.json
@@ -46,7 +46,7 @@
       ]
     },
     {
-      "name": "deny",
+      "name": "deny_unlit",
       "delays": [
         [
           0.1,
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/deny.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/deny_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json
index 9a14300b5e..01a3cdf00c 100644
--- a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json
@@ -46,7 +46,7 @@
       ]
     },
     {
-      "name": "deny",
+      "name": "deny_unlit",
       "delays": [
         [
           0.1,
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/deny.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/deny_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/meta.json
index 9a14300b5e..01a3cdf00c 100644
--- a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/meta.json
@@ -46,7 +46,7 @@
       ]
     },
     {
-      "name": "deny",
+      "name": "deny_unlit",
       "delays": [
         [
           0.1,
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/deny.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/deny_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/meta.json
index 9a14300b5e..01a3cdf00c 100644
--- a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/meta.json
@@ -46,7 +46,7 @@
       ]
     },
     {
-      "name": "deny",
+      "name": "deny_unlit",
       "delays": [
         [
           0.1,
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/deny_unlit.png
similarity index 100%
rename from Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/deny.png
rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/deny_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/meta.json
index 9a14300b5e..01a3cdf00c 100644
--- a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/meta.json
@@ -46,7 +46,7 @@
       ]
     },
     {
-      "name": "deny",
+      "name": "deny_unlit",
       "delays": [
         [
           0.1,