Merge remote-tracking branch 'upstream/master' into DecimalReagents

2020-04-05 11:37:03 +02:00
parent 4e0242d47c 45e9be43ef
commit db83789d05
72 changed files with 1486 additions and 276 deletions
--- a/Content.Shared/GameObjects/Components/Power/SharedLatheComponent.cs
+++ b/Content.Shared/GameObjects/Components/Power/SharedLatheComponent.cs
@@ -0,0 +1,14 @@
+using System;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.GameObjects.Components.Power
+{
+    [Serializable, NetSerializable]
+    public enum LatheVisualState
+    {
+        Idle,
+        Producing,
+        InsertingMetal,
+        InsertingGlass
+    }
+}
--- a/Content.Shared/GameObjects/Components/Power/SharedPowerDeviceComponent.cs
+++ b/Content.Shared/GameObjects/Components/Power/SharedPowerDeviceComponent.cs
@@ -6,6 +6,7 @@ namespace Content.Shared.GameObjects.Components.Power
    [Serializable, NetSerializable]
    public enum PowerDeviceVisuals
    {
+        VisualState,
        Powered
    }
 }