Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

5
Content.Server/GameObjects/Components/Doors/AirlockComponent.cs
View File

@@ -18,6 +18,7 @@ using Robust.Shared.GameObjects.Systems;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.ViewVariables;
using static Content.Shared.GameObjects.Components.SharedWiresComponent;
using static Content.Shared.GameObjects.Components.SharedWiresComponent.WiresAction;
using Timer = Robust.Shared.Timers.Timer;
@@ -43,6 +44,7 @@ namespace Content.Server.GameObjects.Components.Doors
/// <summary>
/// True if either power wire was pulsed in the last <see cref="PowerWiresTimeout"/>.
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
private bool PowerWiresPulsed
{
get => _powerWiresPulsed;
@@ -56,6 +58,7 @@ namespace Content.Server.GameObjects.Components.Doors
private bool _boltsDown;
[ViewVariables(VVAccess.ReadWrite)]
private bool BoltsDown
{
get => _boltsDown;
@@ -68,6 +71,7 @@ namespace Content.Server.GameObjects.Components.Doors
private bool _boltLightsWirePulsed = true;
[ViewVariables(VVAccess.ReadWrite)]
private bool BoltLightsVisible
{
get => _boltLightsWirePulsed && BoltsDown && IsPowered() && State == DoorState.Closed;
@@ -80,6 +84,7 @@ namespace Content.Server.GameObjects.Components.Doors
private const float AutoCloseDelayFast = 1;
// True => AutoCloseDelay; False => AutoCloseDelayFast
[ViewVariables(VVAccess.ReadWrite)]
private bool NormalCloseSpeed
{
get => CloseSpeed == AutoCloseDelay;

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)