Revert "FireLock improve (#999)"

This reverts commit 22ebdda.
space-sunrise · Jan 2, 2025 · 762a0cd · 762a0cd
1 parent bb1c405
commit 762a0cd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 21 deletions.
diff --git a/Content.Server/Doors/Systems/FirelockSystem.cs b/Content.Server/Doors/Systems/FirelockSystem.cs
@@ -21,7 +21,6 @@ public sealed class FirelockSystem : SharedFirelockSystem
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
         [Dependency] private readonly SharedMapSystem _mapping = default!;
         [Dependency] private readonly PointLightSystem _pointLight = default!;
-        [Dependency] private readonly SharedAirlockSystem _airlockSystem = default!; // Sunrise-Edit
 
         private const int UpdateInterval = 30;
         private int _accumulatedTicks;
@@ -56,7 +55,6 @@ public override void Update(float frameTime)
             var appearanceQuery = GetEntityQuery<AppearanceComponent>();
             var xformQuery = GetEntityQuery<TransformComponent>();
             var pointLightQuery = GetEntityQuery<PointLightComponent>();
-            var airlockQuery = GetEntityQuery<AirlockComponent>(); // Sunrise-Edit
 
             var query = EntityQueryEnumerator<FirelockComponent, DoorComponent>();
             while (query.MoveNext(out var uid, out var firelock, out var door))
@@ -83,13 +81,6 @@ public override void Update(float frameTime)
                     {
                         _pointLight.SetEnabled(uid, fire | pressure, pointLight);
                     }
-
-                    // Sunrise-Edit-Start
-                    if (!pressure && !fire && this.IsPowered(uid, EntityManager))
-                    {
-                        _doorSystem.TryOpen(uid);
-                    }
-                    // Sunrise-Edit-End
                 }
             }
         }
@@ -102,17 +93,6 @@ private void OnAtmosAlarm(EntityUid uid, FirelockComponent component, AtmosAlarm
             if (!TryComp<DoorComponent>(uid, out var doorComponent))
                 return;
 
-            // Sunrise-Edit-Start
-            if (TryComp<AirlockComponent>(uid, out var airlockComponent))
-            {
-                if (args.AlarmType == AtmosAlarmType.Danger)
-                {
-                    // Disable emergency access when fire alarm is triggered
-                    _airlockSystem.SetEmergencyAccess((uid, airlockComponent), false);
-                }
-            }
-            // Sunrise-Edit-End
-
             if (args.AlarmType == AtmosAlarmType.Normal)
             {
                 if (doorComponent.State == DoorState.Closed)

diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
@@ -27,7 +27,7 @@
       thresholds:
       - trigger:
           !type:DamageTrigger
-          damage: 300 # Sunrise-edit
+          damage: 500
         behaviors:
         - !type:DoActsBehavior
           acts: ["Destruction"]