diff --git a/Content.Server/Content.Server.csproj b/Content.Server/Content.Server.csproj
index 9e25ed3229..6432c0902a 100644
--- a/Content.Server/Content.Server.csproj
+++ b/Content.Server/Content.Server.csproj
@@ -147,5 +147,7 @@
+
+
\ No newline at end of file
diff --git a/Content.Server/EntryPoint.cs b/Content.Server/EntryPoint.cs
index 84ac78490a..1a688822b9 100644
--- a/Content.Server/EntryPoint.cs
+++ b/Content.Server/EntryPoint.cs
@@ -25,6 +25,7 @@ using Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan;
using Content.Server.GameObjects.Components.Weapon.Ranged.Projectile;
using Content.Server.GameObjects.Components.Projectiles;
using Content.Server.GameObjects.Components.Weapon.Melee;
+using Content.Server.GameObjects.Components.Materials;
namespace Content.Server
{
@@ -93,6 +94,7 @@ namespace Content.Server
factory.Register();
factory.Register();
factory.Register();
+ factory.Register();
}
///
diff --git a/Content.Server/GameObjects/Components/Materials/MaterialComponent.cs b/Content.Server/GameObjects/Components/Materials/MaterialComponent.cs
new file mode 100644
index 0000000000..12400e8a4b
--- /dev/null
+++ b/Content.Server/GameObjects/Components/Materials/MaterialComponent.cs
@@ -0,0 +1,81 @@
+using System.Collections.Generic;
+using Content.Server.Materials;
+using SS14.Shared.GameObjects;
+using SS14.Shared.Interfaces.Reflection;
+using SS14.Shared.Interfaces.Serialization;
+using SS14.Shared.IoC;
+using SS14.Shared.Prototypes;
+using SS14.Shared.Serialization;
+using SS14.Shared.Utility;
+
+namespace Content.Server.GameObjects.Components.Materials
+{
+ ///
+ /// Component to store data such as "this object is made out of steel".
+ /// This is not a storage system for say smelteries.
+ ///
+ public class MaterialComponent : Component
+ {
+ public const string SerializationCache = "mat";
+ public override string Name => "Material";
+
+ Dictionary