Adds emergency access to airlocks (#6500)

Content.Client/Doors/AirlockVisualizer.cs

@@ -46,6 +46,12 @@ namespace Content.Client.Doors
         [DataField("openUnlitVisible")]
         private bool _openUnlitVisible = false;
 
+        /// <summary>
+        ///     Whether the door should have an emergency access layer
+        /// </summary>
+        [DataField("emergencyAccessLayer")]
+        private bool _emergencyAccessLayer = true;
+
         private Animation CloseAnimation = default!;
         private Animation OpenAnimation = default!;
         private Animation DenyAnimation = default!;
@@ -141,6 +147,7 @@ namespace Content.Client.Doors
             var unlitVisible = true;
             var boltedVisible = false;
             var weldedVisible = false;
+            var emergencyLightsVisible = false;
 
             if (animPlayer.HasRunningAnimation(AnimationKey))
             {
@@ -192,11 +199,25 @@ namespace Content.Client.Doors
                 boltedVisible = true;
             }
 
+            if (component.TryGetData(DoorVisuals.EmergencyLights, out bool eaLights) && eaLights)
+            {
+                emergencyLightsVisible = true;
+            }
+
             if (!_simpleVisuals)
             {
                 sprite.LayerSetVisible(DoorVisualLayers.BaseUnlit, unlitVisible && state != DoorState.Closed && state != DoorState.Welded);
                 sprite.LayerSetVisible(DoorVisualLayers.BaseWelded, weldedVisible);
                 sprite.LayerSetVisible(DoorVisualLayers.BaseBolted, unlitVisible && boltedVisible);
+                if (_emergencyAccessLayer)
+                {
+                    sprite.LayerSetVisible(DoorVisualLayers.BaseEmergencyAccess, 
+                            emergencyLightsVisible 
+                            && state != DoorState.Open 
+                            && state != DoorState.Opening 
+                            && state != DoorState.Closing
+                            && unlitVisible);
+                }
             }
         }
     }
@@ -207,5 +228,6 @@ namespace Content.Client.Doors
         BaseUnlit,
         BaseWelded,
         BaseBolted,
+        BaseEmergencyAccess,
     }
 }

Content.Server/Doors/Systems/DoorSystem.cs

@@ -5,6 +5,7 @@ using Content.Server.Construction;
 using Content.Server.Construction.Components;
 using Content.Server.Tools;
 using Content.Server.Tools.Components;
+using Content.Server.Doors.Components;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
 using Content.Shared.Doors;
@@ -96,7 +97,7 @@ public sealed class DoorSystem : SharedDoorSystem
         SoundSystem.Play(filter, sound, uid, audioParams);
     }
 
-    #region DoAfters
+#region DoAfters
     /// <summary>
     ///     Weld or pry open a door.
     /// </summary>
@@ -196,7 +197,7 @@ public sealed class DoorSystem : SharedDoorSystem
         else if (door.State == DoorState.Open)
             StartClosing(uid, door);
     }
-    #endregion
+#endregion
 
     /// <summary>
     ///     Does the user have the permissions required to open this door?
@@ -209,6 +210,10 @@ public sealed class DoorSystem : SharedDoorSystem
         if (user == null || AccessType == AccessTypes.AllowAll)
             return true;
 
+        // If the door is on emergency access we skip the checks.
+        if (TryComp<SharedAirlockComponent>(uid, out var airlock) && airlock.EmergencyAccess)
+            return true;
+
         if (!Resolve(uid, ref access, false))
             return true;
 

Content.Server/Remotes/DoorRemoteComponent.cs

@@ -14,8 +14,8 @@ namespace Content.Server.Remotes
         public enum OperatingMode : byte
         {
             OpenClose,
-            ToggleBolts
-            // ToggleEmergencyAccess
+            ToggleBolts,
+            ToggleEmergencyAccess
         }
     }
 }

Content.Server/Remotes/DoorRemoteSystem.cs

@@ -20,6 +20,7 @@ namespace Content.Server.Remotes
         [Dependency] private readonly SharedDoorSystem _sharedDoorSystem = default!;
         [Dependency] private readonly DoorSystem _doorSystem = default!;
         [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
+        [Dependency] private readonly SharedAirlockSystem _sharedAirlockSystem = default!;
 
         public override void Initialize()
         {
@@ -38,15 +39,13 @@ namespace Content.Server.Remotes
                     _popupSystem.PopupEntity(Loc.GetString("door-remote-switch-state-toggle-bolts"), args.User, Filter.Entities(args.User));
                     break;
                 case DoorRemoteComponent.OperatingMode.ToggleBolts:
-                    component.Mode = DoorRemoteComponent.OperatingMode.OpenClose; // TODO: Swítch to ToggleEmergencyAcces when EA is implemented
-                    _popupSystem.PopupEntity(Loc.GetString("door-remote-switch-state-open-close"), args.User, Filter.Entities(args.User)); // TODO: See the above comment
+                    component.Mode = DoorRemoteComponent.OperatingMode.ToggleEmergencyAccess;
+                    _popupSystem.PopupEntity(Loc.GetString("door-remote-switch-state-toggle-emergency-access"), args.User, Filter.Entities(args.User));
                     break;
-            /*
                 case DoorRemoteComponent.OperatingMode.ToggleEmergencyAccess:
                     component.Mode = DoorRemoteComponent.OperatingMode.OpenClose;
                     _popupSystem.PopupEntity(Loc.GetString("door-remote-switch-state-open-close"), args.User, Filter.Entities(args.User));
                     break;
-            */
             }
         }
 
@@ -88,6 +87,15 @@ namespace Content.Server.Remotes
                     }
                 }
             }
+
+            if (component.Mode == DoorRemoteComponent.OperatingMode.ToggleEmergencyAccess
+                && airlockComponent.IsPowered())
+            {
+                if (_doorSystem.HasAccess(doorComponent.Owner, args.Used))
+                {
+                    _sharedAirlockSystem.ToggleEmergencyAccess(airlockComponent);
+                }
+            }
         }
     }
 }

Content.Shared/Doors/Components/DoorComponent.cs

@@ -204,7 +204,8 @@ public enum DoorVisuals
 {
     State,
     Powered,
-    BoltLights
+    BoltLights,
+    EmergencyLights,
 }
 
 [Serializable, NetSerializable]

Content.Shared/Doors/Components/SharedAirlockComponent.cs

@@ -13,6 +13,10 @@ public abstract class SharedAirlockComponent : Component
     [ViewVariables(VVAccess.ReadWrite)]
     [DataField("safety")]
     public bool Safety = true;
+    
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("emergencyAccess")]
+    public bool EmergencyAccess = false;
 }
 
 [Serializable, NetSerializable]

Content.Shared/Doors/Systems/SharedAirlockSystem.cs

@@ -38,4 +38,19 @@ public abstract class SharedAirlockSystem : EntitySystem
         if (airlock.Safety && DoorSystem.GetColliding(uid).Any())
             args.Cancel();
     }
+
+
+    public void UpdateEmergencyLightStatus(SharedAirlockComponent component)
+    {
+        if (TryComp<AppearanceComponent>(component.Owner, out var appearanceComponent))
+        {
+            appearanceComponent.SetData(DoorVisuals.EmergencyLights, component.EmergencyAccess);
+        }
+    }
+
+    public void ToggleEmergencyAccess(SharedAirlockComponent component)
+    {
+        component.EmergencyAccess = !component.EmergencyAccess;
+        UpdateEmergencyLightStatus(component);
+    }
 }

Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml

@@ -19,6 +19,9 @@
     - state: bolted_unlit
       shader: unshaded
       map: ["enum.DoorVisualLayers.BaseBolted"]
+    - state: emergency_unlit
+      map: ["enum.DoorVisualLayers.BaseEmergencyAccess"]
+      shader: unshaded
     - state: panel_open
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Physics

Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml

@@ -20,6 +20,9 @@
     - state: bolted_unlit
       shader: unshaded
       map: ["enum.DoorVisualLayers.BaseBolted"]
+    - state: emergency_unlit
+      shader: unshaded
+      map: ["enum.DoorVisualLayers.BaseEmergencyAccess"]
     - state: panel_open
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Wires

Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml

@@ -78,6 +78,7 @@
       visuals:
         - type: AirlockVisualizer
           animationTime: 0.6
+          emergencyAccessLayer: false
         - type: WiresVisualizer
     - type: Wires
       BoardName: "Firelock Control"

Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml

@@ -34,6 +34,9 @@
     - state: bolted_unlit
       shader: unshaded
       map: ["enum.DoorVisualLayers.BaseBolted"]
+    - state: emergency_unlit
+      shader: unshaded
+      map: ["enum.DoorVisualLayers.BaseEmergencyAccess"]
     - state: panel_open
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: ApcPowerReceiver
@@ -123,6 +126,9 @@
     - state: bolted_unlit
       shader: unshaded
       map: [ "enum.DoorVisualLayers.BaseBolted" ]
+    - state: emergency_unlit
+      shader: unshaded
+      map: [ "enum.DoorVisualLayers.BaseEmergencyAccess" ]
     - state: panel_open
       map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
       visible: false

Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/meta.json

@@ -181,6 +181,15 @@
     },
     {
       "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
     }
   ]
 }

Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/meta.json

@@ -181,6 +181,15 @@
     },
     {
       "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
     }
   ]
 }

Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/meta.json

@@ -181,6 +181,15 @@
     },
     {
       "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
     }
   ]
 }

Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/meta.json

@@ -181,6 +181,15 @@
     },
     {
       "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
     }
   ]
 }

Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/meta.json

@@ -154,6 +154,15 @@
     },
     {
       "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
     }
   ]
 }

Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/meta.json

@@ -130,6 +130,15 @@
     },
     {
       "name": "welded_open"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
     }
   ]
 }

Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/meta.json

@@ -109,15 +109,6 @@
         ]
       ]
     },
-    {
-      "name": "emergency_unlit",
-      "delays": [
-        [
-          12,
-          12
-        ]
-      ]
-    },
     {
       "name": "open"
     },
@@ -244,6 +235,15 @@
     },
     {
       "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
     }
   ]
 }

Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/meta.json

@@ -181,6 +181,15 @@
     },
     {
       "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
     }
   ]
 }

Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/meta.json

@@ -181,6 +181,15 @@
     },
     {
       "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
     }
   ]
 }

Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/meta.json

@@ -181,6 +181,15 @@
     },
     {
       "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
     }
   ]
 }

Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/meta.json

@@ -181,6 +181,15 @@
     },
     {
       "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
     }
   ]
 }

Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/meta.json

@@ -181,6 +181,15 @@
     },
     {
       "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
     }
   ]
 }

Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/meta.json

@@ -181,6 +181,15 @@
     },
     {
       "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
     }
   ]
 }

Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/meta.json

@@ -181,6 +181,15 @@
     },
     {
       "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
     }
   ]
 }

Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/meta.json

@@ -154,6 +154,15 @@
     },
     {
       "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
     }
   ]
 }

Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/meta.json

@@ -145,6 +145,15 @@
     },
     {
       "name": "welded_open"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
     }
   ]
 }

Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/meta.json

@@ -181,6 +181,15 @@
     },
     {
       "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
     }
   ]
 }

Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json

@@ -181,6 +181,15 @@
     },
     {
       "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
     }
   ]
 }

Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/meta.json

@@ -181,6 +181,15 @@
     },
     {
       "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
     }
   ]
 }

Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/meta.json

@@ -181,6 +181,15 @@
     },
     {
       "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
     }
   ]
 }

Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/meta.json

@@ -181,6 +181,15 @@
     },
     {
       "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
     }
   ]
 }

Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/meta.json

@@ -129,6 +129,15 @@
     },
     {
       "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
     }
   ]
 }

Resources/Textures/Structures/Doors/Windoors/windoor.rsi/meta.json

@@ -163,6 +163,10 @@
         {
             "name":"secure_underlay",
             "directions":4
+        },
+        {
+            "name": "emergency_unlit",
+            "directions": 4
         }
     ]
 }