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

make crayoncode use the colortype (#7975)

Browse Source
This commit is contained in:
Paul Ritter
2022-05-09 07:16:43 +02:00
committed by GitHub
parent aa61feb85d
commit 005321e484
8 changed files with 21 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Shared/Crayon/SharedCrayonComponent.cs
View File

@@ -1,18 +1,14 @@
using System;
using Robust.Shared.GameObjects;
using Robust.Shared.GameStates;
using Robust.Shared.Maths;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
namespace Content.Shared.Crayon
{
[NetworkedComponent, ComponentProtoName("Crayon")]
[NetworkedComponent, ComponentProtoName("Crayon"), Friend(typeof(SharedCrayonSystem))]
public abstract class SharedCrayonComponent : Component
{
public string SelectedState { get; set; } = string.Empty;
[DataField("color")] public string _color = "white";
[ViewVariables] [DataField("color")] public Color Color;
[Serializable, NetSerializable]
public enum CrayonUiKey : byte
@@ -34,8 +30,8 @@ namespace Content.Shared.Crayon
[Serializable, NetSerializable]
public sealed class CrayonColorMessage : BoundUserInterfaceMessage
{
public readonly string Color;
public CrayonColorMessage(string color)
public readonly Color Color;
public CrayonColorMessage(Color color)
{
Color = color;
}
@@ -51,12 +47,12 @@ namespace Content.Shared.Crayon
[Serializable, NetSerializable]
public sealed class CrayonComponentState : ComponentState
{
public readonly string Color;
public readonly Color Color;
public readonly string State;
public readonly int Charges;
public readonly int Capacity;
public CrayonComponentState(string color, string state, int charges, int capacity)
public CrayonComponentState(Color color, string state, int charges, int capacity)
{
Color = color;
State = state;