Merge branch 'master' of https://github.com/space-wizards/space-station-14

Content.Shared/GameObjects/Components/SharedComputerComponent.cs

@@ -0,0 +1,21 @@
+using System;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.GameObjects.Components
+{
+    public class SharedComputerComponent : Component
+    {
+        public override string Name => "Computer";
+    }
+
+    [Serializable, NetSerializable]
+    public enum ComputerVisuals
+    {
+        // Bool
+        Powered,
+
+        // Bool
+        Broken
+    }
+}

Content.Shared/GameObjects/Components/VendingMachines/SharedVendingMachineComponent.cs

@@ -0,0 +1,78 @@
+using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects.Components.UserInterface;
+using Robust.Shared.IoC;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+
+namespace Content.Shared.GameObjects.Components.VendingMachines
+{
+    public class SharedVendingMachineComponent : Component
+    {
+        public override string Name => "VendingMachine";
+        public override uint? NetID => ContentNetIDs.VENDING_MACHINE;
+
+        public List<VendingMachineInventoryEntry> Inventory = new List<VendingMachineInventoryEntry>();
+
+        [Serializable, NetSerializable]
+        public enum VendingMachineVisuals
+        {
+            VisualState,
+        }
+
+        [Serializable, NetSerializable]
+        public enum VendingMachineVisualState
+        {
+            Normal,
+            Off,
+            Broken,
+            Eject,
+            Deny,
+        }
+
+        [Serializable, NetSerializable]
+        public class VendingMachineEjectMessage : BoundUserInterfaceMessage
+        {
+            public readonly string ID;
+            public VendingMachineEjectMessage(string id)
+            {
+                ID = id;
+            }
+        }
+
+        [Serializable, NetSerializable]
+        public enum VendingMachineUiKey
+        {
+            Key,
+        }
+
+        [Serializable, NetSerializable]
+        public class InventorySyncRequestMessage : BoundUserInterfaceMessage
+        {
+        }
+
+        [Serializable, NetSerializable]
+        public class VendingMachineInventoryMessage : BoundUserInterfaceMessage
+        {
+            public readonly List<VendingMachineInventoryEntry> Inventory;
+            public VendingMachineInventoryMessage(List<VendingMachineInventoryEntry> inventory)
+            {
+                Inventory = inventory;
+            }
+        }
+
+        [Serializable, NetSerializable]
+        public class VendingMachineInventoryEntry
+        {
+            public string ID;
+            public uint Amount;
+            public VendingMachineInventoryEntry(string id, uint amount)
+            {
+                ID = id;
+                Amount = amount;
+            }
+        }
+    }
+}

Content.Shared/GameObjects/ContentNetIDs.cs

@@ -23,5 +23,6 @@
         public const uint LATHE_DATABASE = 1017;
         public const uint MATERIAL_STORAGE = 1018;
         public const uint HAND_TELEPORTER = 1019;
+        public const uint VENDING_MACHINE = 1020;
     }
 }

Content.Shared/GameObjects/Verb.cs

@@ -114,7 +114,7 @@ namespace Content.Shared.GameObjects
         // This works for now though.
         public static IEnumerable<(IComponent, Verb)> GetVerbs(IEntity entity)
         {
-            foreach (var component in entity.GetComponentInstances())
+            foreach (var component in entity.GetAllComponents())
             {
                 var type = component.GetType();
                 foreach (var nestedType in type.GetNestedTypes(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static))