Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into 20-10-30-admins

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-11-02 00:24:15 +01:00
parent 6980ff84b0 f58a951701
commit c9236d88ac
17 changed files with 137 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/GameObjects/Components/Power/SharedPowerCell.cs
View File

@@ -3,6 +3,11 @@ using Robust.Shared.Serialization;
namespace Content.Shared.GameObjects.Components.Power
{
public static class SharedPowerCell
{
public const int PowerCellVisualsLevels = 4;
}
[Serializable, NetSerializable]
public enum PowerCellVisuals
{

11
Content.Shared/GameObjects/Components/SharedHandheldLightComponent.cs
View File

@@ -11,18 +11,17 @@ namespace Content.Shared.GameObjects.Components
protected abstract bool HasCell { get; }
protected const int StatusLevels = 6;
[Serializable, NetSerializable]
protected sealed class HandheldLightComponentState : ComponentState
{
public HandheldLightComponentState(float? charge, bool hasCell) : base(ContentNetIDs.HANDHELD_LIGHT)
public byte? Charge { get; }
public HandheldLightComponentState(byte? charge) : base(ContentNetIDs.HANDHELD_LIGHT)
{
Charge = charge;
HasCell = hasCell;
}
public float? Charge { get; }
public bool HasCell { get; }
}
}