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

Merge branch 'master' into 2020-08-19-firelocks

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-09-08 15:21:58 +02:00
committed by GitHub
parent 511147f299 5120627ca2
commit cca740eb2a
28 changed files with 84 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs
View File

@@ -37,6 +37,7 @@ namespace Content.Server.GameObjects.Components.Doors
{
public override string Name => "Door";
[ViewVariables]
private DoorState _state = DoorState.Closed;
public virtual DoorState State
@@ -46,8 +47,10 @@ namespace Content.Server.GameObjects.Components.Doors
}
protected float OpenTimeCounter;
[ViewVariables(VVAccess.ReadWrite)]
protected bool AutoClose = true;
protected const float AutoCloseDelay = 5;
[ViewVariables(VVAccess.ReadWrite)]
protected float CloseSpeed = AutoCloseDelay;
private CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
@@ -60,13 +63,14 @@ namespace Content.Server.GameObjects.Components.Doors
private const int DoorCrushDamage = 15;
private const float DoorStunTime = 5f;
[ViewVariables(VVAccess.ReadWrite)]
protected bool Safety = true;
[ViewVariables] private bool _occludes;
[ViewVariables(VVAccess.ReadWrite)] private bool _occludes;
public bool Occludes => _occludes;
[ViewVariables]
[ViewVariables(VVAccess.ReadWrite)]
public bool IsWeldedShut
{
get => _isWeldedShut;
@@ -84,6 +88,8 @@ namespace Content.Server.GameObjects.Components.Doors
private bool _isWeldedShut;
private bool _canWeldShut = true;
[ViewVariables(VVAccess.ReadWrite)]
private bool _canCrush = true;
public override void ExposeData(ObjectSerializer serializer)