tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removes componentdependencies (#6160)

Browse Source
This commit is contained in:
Paul Ritter
2022-01-15 03:26:37 +01:00
committed by GitHub
parent 46405ec165
commit 9e1607722d
33 changed files with 257 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Doors/Systems/FirelockSystem.cs
View File

@@ -50,7 +50,7 @@ namespace Content.Server.Doors.Systems
private void OnBeforeDoorPry(EntityUid uid, FirelockComponent component, BeforeDoorPryEvent args)
{
if (component.DoorComponent == null || component.DoorComponent.State != SharedDoorComponent.DoorState.Closed)
if (!TryComp<ServerDoorComponent>(uid, out var doorComponent) || doorComponent.State != SharedDoorComponent.DoorState.Closed)
{
return;
}
@@ -81,12 +81,12 @@ namespace Content.Server.Doors.Systems
private void OnAtmosAlarm(EntityUid uid, FirelockComponent component, AtmosMonitorAlarmEvent args)
{
if (component.DoorComponent == null) return;
if (!TryComp<ServerDoorComponent>(uid, out var doorComponent)) return;
if (args.HighestNetworkType == AtmosMonitorAlarmType.Normal)
{
if (component.DoorComponent.State == SharedDoorComponent.DoorState.Closed)
component.DoorComponent.Open();
if (doorComponent.State == SharedDoorComponent.DoorState.Closed)
doorComponent.Open();
}
else if (args.HighestNetworkType == AtmosMonitorAlarmType.Danger)
{