Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "FireLock improve" #1003

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions Content.Server/Doors/Systems/FirelockSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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))
Expand All @@ -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
}
}
}
Expand All @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
thresholds:
- trigger:
!type:DamageTrigger
damage: 300 # Sunrise-edit
damage: 500
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
Expand Down
Loading