diff --git a/Content.Benchmarks/ColorInterpolateBenchmark.cs b/Content.Benchmarks/ColorInterpolateBenchmark.cs
new file mode 100644
index 0000000000..1330549b8a
--- /dev/null
+++ b/Content.Benchmarks/ColorInterpolateBenchmark.cs
@@ -0,0 +1,152 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using BenchmarkDotNet.Attributes;
+using Robust.Shared.Maths;
+using SysVector4 = System.Numerics.Vector4;
+
+namespace Content.Benchmarks
+{
+    public class ColorInterpolateBenchmark
+    {
+        private readonly List<(Color, Color)> _colors = new List<(Color, Color)>();
+
+        [Params(100)] public int N { get; set; }
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            var random = new Random(3005);
+
+            for (var i = 0; i < N; i++)
+            {
+                var r1 = random.NextFloat();
+                var g1 = random.NextFloat();
+                var b1 = random.NextFloat();
+                var a1 = random.NextFloat();
+
+                var r2 = random.NextFloat();
+                var g2 = random.NextFloat();
+                var b2 = random.NextFloat();
+                var a2 = random.NextFloat();
+
+                _colors.Add((new Color(r1, g1, b1, a1), new Color(r2, g2, b2, a2)));
+            }
+        }
+
+        [Benchmark]
+        public void BenchSimple()
+        {
+            foreach (var (a, b) in _colors)
+            {
+                InterpolateSimple(a, b, 0.5f);
+            }
+        }
+
+        //[Benchmark]
+        public void BenchSysVector4()
+        {
+            foreach (var (a, b) in _colors)
+            {
+                InterpolateSysVector4(a, b, 0.5f);
+            }
+        }
+
+        //[Benchmark]
+        public void BenchSysVector4Blit()
+        {
+            foreach (var (a, b) in _colors)
+            {
+                InterpolateSysVector4Blit(a, b, 0.5f);
+            }
+        }
+
+        //[Benchmark]
+        public void BenchSysVector4BlitNoException()
+        {
+            foreach (var (a, b) in _colors)
+            {
+                InterpolateSysVector4BlitNoException(a, b, 0.5f);
+            }
+        }
+
+        [Benchmark]
+        public void BenchSysVector4AsRefNoException()
+        {
+            foreach (var (a, b) in _colors)
+            {
+                InterpolateSysVector4BlitNoExceptionAsRef(a, b, 0.5f);
+            }
+        }
+
+        public static Color InterpolateSimple(Color endPoint1, Color endPoint2, float lambda)
+        {
+            if (lambda < 0 || lambda > 1)
+                throw new ArgumentOutOfRangeException(nameof(lambda));
+            return new Color(
+                endPoint1.R * lambda + endPoint2.R * (1 - lambda),
+                endPoint1.G * lambda + endPoint2.G * (1 - lambda),
+                endPoint1.B * lambda + endPoint2.B * (1 - lambda),
+                endPoint1.A * lambda + endPoint2.A * (1 - lambda)
+            );
+        }
+
+        public static Color InterpolateSysVector4(Color endPoint1, Color endPoint2, float lambda)
+        {
+            if (lambda < 0 || lambda > 1)
+                throw new ArgumentOutOfRangeException(nameof(lambda));
+
+            var vec1 = new SysVector4(endPoint1.R, endPoint1.G, endPoint1.B, endPoint1.A);
+            var vec2 = new SysVector4(endPoint2.R, endPoint2.G, endPoint2.B, endPoint2.A);
+
+            var res = SysVector4.Lerp(vec1, vec2, 1 - lambda);
+
+            return new Color(
+                res.X, res.Y, res.Z, res.W);
+        }
+
+        public static unsafe Color InterpolateSysVector4Blit(in Color endPoint1, in Color endPoint2, float lambda)
+        {
+            if (lambda < 0 || lambda > 1)
+                throw new ArgumentOutOfRangeException(nameof(lambda));
+
+
+            fixed (Color* p1 = &endPoint1)
+            fixed (Color* p2 = &endPoint2)
+            {
+                var vp1 = (SysVector4*) p1;
+                var vp2 = (SysVector4*) p2;
+
+                var res = SysVector4.Lerp(*vp1, *vp2, 1 - lambda);
+
+                return *(Color*) (&res);
+            }
+        }
+
+        public static unsafe Color InterpolateSysVector4BlitNoException(in Color endPoint1, in Color endPoint2,
+            float lambda)
+        {
+            fixed (Color* p1 = &endPoint1)
+            fixed (Color* p2 = &endPoint2)
+            {
+                var vp1 = (SysVector4*) p1;
+                var vp2 = (SysVector4*) p2;
+
+                var res = SysVector4.Lerp(*vp2, *vp1, lambda);
+
+                return *(Color*) (&res);
+            }
+        }
+
+        public static unsafe Color InterpolateSysVector4BlitNoExceptionAsRef(in Color endPoint1, in Color endPoint2,
+            float lambda)
+        {
+            ref var sv1 = ref Unsafe.As<Color, SysVector4>(ref Unsafe.AsRef(endPoint1));
+            ref var sv2 = ref Unsafe.As<Color, SysVector4>(ref Unsafe.AsRef(endPoint2));
+
+            var res = SysVector4.Lerp(sv2, sv1, lambda);
+
+            return Unsafe.As<SysVector4, Color>(ref res);
+        }
+    }
+}
diff --git a/Content.Benchmarks/Content.Benchmarks.csproj b/Content.Benchmarks/Content.Benchmarks.csproj
index 2eac972e8f..175bd79fb9 100644
--- a/Content.Benchmarks/Content.Benchmarks.csproj
+++ b/Content.Benchmarks/Content.Benchmarks.csproj
@@ -8,6 +8,8 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <Platforms>x64</Platforms>
     <OutputType>Exe</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>7.3</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
diff --git a/Content.Benchmarks/Program.cs b/Content.Benchmarks/Program.cs
index b794297830..741a4efb33 100644
--- a/Content.Benchmarks/Program.cs
+++ b/Content.Benchmarks/Program.cs
@@ -1,9 +1,8 @@
-using BenchmarkDotNet.Configs;
-using BenchmarkDotNet.Running;
+using BenchmarkDotNet.Running;
 
 namespace Content.Benchmarks
 {
-    internal class Program
+    internal static class Program
     {
         public static void Main(string[] args)
         {
diff --git a/Content.Client/Parallax/ParallaxGenerator.cs b/Content.Client/Parallax/ParallaxGenerator.cs
index 88b7616f13..a42cf44a04 100644
--- a/Content.Client/Parallax/ParallaxGenerator.cs
+++ b/Content.Client/Parallax/ParallaxGenerator.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Globalization;
 using Nett;
 using SixLabors.ImageSharp;
@@ -7,9 +8,9 @@ using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 using Robust.Client.Utility;
 using Robust.Shared.Interfaces.Log;
-using Robust.Shared.Log;
 using Robust.Shared.Maths;
 using Robust.Shared.Noise;
+using SixLabors.ImageSharp.Advanced;
 using BlendFactor = Robust.Shared.Maths.Color.BlendFactor;
 
 namespace Content.Client.Parallax
@@ -24,6 +25,9 @@ namespace Content.Client.Parallax
             var generator = new ParallaxGenerator();
             generator._loadConfig(config);
 
+            sawmill.Debug("Timing start!");
+            var sw = new Stopwatch();
+            sw.Start();
             var image = new Image<Rgba32>(Configuration.Default, size.Width, size.Height, Rgba32.Black);
             var count = 0;
             foreach (var layer in generator.Layers)
@@ -32,6 +36,9 @@ namespace Content.Client.Parallax
                 sawmill.Debug("Layer {0} done!", count++);
             }
 
+            sw.Stop();
+            sawmill.Debug("Total time: {0}", sw.Elapsed.TotalSeconds);
+
             return image;
         }
 
@@ -69,12 +76,12 @@ namespace Content.Client.Parallax
             private readonly Color OuterColor = Color.Black;
             private readonly NoiseGenerator.NoiseType NoiseType = NoiseGenerator.NoiseType.Fbm;
             private readonly uint Seed = 1234;
-            private readonly double Persistence = 0.5;
-            private readonly double Lacunarity = Math.PI * 2 / 3;
-            private readonly double Frequency = 1;
+            private readonly float Persistence = 0.5f;
+            private readonly float Lacunarity = (float) (Math.PI * 2 / 3);
+            private readonly float Frequency = 1;
             private readonly uint Octaves = 3;
-            private readonly double Threshold;
-            private readonly double Power = 1;
+            private readonly float Threshold;
+            private readonly float Power = 1;
             private readonly BlendFactor SrcFactor = BlendFactor.One;
             private readonly BlendFactor DstFactor = BlendFactor.One;
 
@@ -97,17 +104,17 @@ namespace Content.Client.Parallax
 
                 if (table.TryGetValue("persistence", out tomlObject))
                 {
-                    Persistence = double.Parse(tomlObject.Get<string>(), CultureInfo.InvariantCulture);
+                    Persistence = float.Parse(tomlObject.Get<string>(), CultureInfo.InvariantCulture);
                 }
 
                 if (table.TryGetValue("lacunarity", out tomlObject))
                 {
-                    Lacunarity = double.Parse(tomlObject.Get<string>(), CultureInfo.InvariantCulture);
+                    Lacunarity = float.Parse(tomlObject.Get<string>(), CultureInfo.InvariantCulture);
                 }
 
                 if (table.TryGetValue("frequency", out tomlObject))
                 {
-                    Frequency = double.Parse(tomlObject.Get<string>(), CultureInfo.InvariantCulture);
+                    Frequency = float.Parse(tomlObject.Get<string>(), CultureInfo.InvariantCulture);
                 }
 
                 if (table.TryGetValue("octaves", out tomlObject))
@@ -117,7 +124,7 @@ namespace Content.Client.Parallax
 
                 if (table.TryGetValue("threshold", out tomlObject))
                 {
-                    Threshold = double.Parse(tomlObject.Get<string>(), CultureInfo.InvariantCulture);
+                    Threshold = float.Parse(tomlObject.Get<string>(), CultureInfo.InvariantCulture);
                 }
 
                 if (table.TryGetValue("sourcefactor", out tomlObject))
@@ -132,7 +139,7 @@ namespace Content.Client.Parallax
 
                 if (table.TryGetValue("power", out tomlObject))
                 {
-                    Power = double.Parse(tomlObject.Get<string>(), CultureInfo.InvariantCulture);
+                    Power = float.Parse(tomlObject.Get<string>(), CultureInfo.InvariantCulture);
                 }
 
                 if (table.TryGetValue("noise_type", out tomlObject))
@@ -163,9 +170,12 @@ namespace Content.Client.Parallax
                 noise.SetPeriodY(bitmap.Height);
                 var threshVal = 1 / (1 - Threshold);
                 var powFactor = 1 / Power;
-                for (var x = 0; x < bitmap.Width; x++)
+
+                var span = bitmap.GetPixelSpan();
+
+                for (var y = 0; y < bitmap.Height; y++)
                 {
-                    for (var y = 0; y < bitmap.Height; y++)
+                    for (var x = 0; x < bitmap.Width; x++)
                     {
                         // Do noise calculations.
                         var noiseVal = Math.Min(1, Math.Max(0, (noise.GetNoiseTiled(x, y) + 1) / 2));
@@ -173,15 +183,16 @@ namespace Content.Client.Parallax
                         // Threshold
                         noiseVal = Math.Max(0, noiseVal - Threshold);
                         noiseVal *= threshVal;
-                        noiseVal = Math.Pow(noiseVal, powFactor);
+                        noiseVal = (float) Math.Pow(noiseVal, powFactor);
 
                         // Get colors based on noise values.
-                        var srcColor = Color.InterpolateBetween(InnerColor, OuterColor, (float) noiseVal)
-                            .WithAlpha((float) noiseVal);
+                        var srcColor = Color.InterpolateBetween(OuterColor, InnerColor, noiseVal)
+                            .WithAlpha(noiseVal);
 
                         // Apply blending factors & write back.
-                        var dstColor = bitmap[x, y].ConvertImgSharp();
-                        bitmap[x, y] = Color.Blend(dstColor, srcColor, DstFactor, SrcFactor).ConvertImgSharp();
+                        var i = y * bitmap.Width + x;
+                        var dstColor = span[i].ConvertImgSharp();
+                        span[i] = Color.Blend(dstColor, srcColor, DstFactor, SrcFactor).ConvertImgSharp();
                     }
                 }
             }
@@ -202,13 +213,13 @@ namespace Content.Client.Parallax
             private readonly bool Masked;
             private readonly NoiseGenerator.NoiseType MaskNoiseType = NoiseGenerator.NoiseType.Fbm;
             private readonly uint MaskSeed = 1234;
-            private readonly double MaskPersistence = 0.5;
-            private readonly double MaskLacunarity = Math.PI * 2 / 3;
-            private readonly double MaskFrequency = 1;
+            private readonly float MaskPersistence = 0.5f;
+            private readonly float MaskLacunarity = (float) Math.PI * 2 / 3;
+            private readonly float MaskFrequency = 1;
             private readonly uint MaskOctaves = 3;
-            private readonly double MaskThreshold;
+            private readonly float MaskThreshold;
             private readonly int PointSize = 1;
-            private readonly double MaskPower = 1;
+            private readonly float MaskPower = 1;
 
 
             public LayerPoints(TomlTable table)
@@ -261,17 +272,17 @@ namespace Content.Client.Parallax
 
                 if (table.TryGetValue("maskpersistence", out tomlObject))
                 {
-                    MaskPersistence = double.Parse(tomlObject.Get<string>(), CultureInfo.InvariantCulture);
+                    MaskPersistence = float.Parse(tomlObject.Get<string>(), CultureInfo.InvariantCulture);
                 }
 
                 if (table.TryGetValue("masklacunarity", out tomlObject))
                 {
-                    MaskLacunarity = double.Parse(tomlObject.Get<string>(), CultureInfo.InvariantCulture);
+                    MaskLacunarity = float.Parse(tomlObject.Get<string>(), CultureInfo.InvariantCulture);
                 }
 
                 if (table.TryGetValue("maskfrequency", out tomlObject))
                 {
-                    MaskFrequency = double.Parse(tomlObject.Get<string>(), CultureInfo.InvariantCulture);
+                    MaskFrequency = float.Parse(tomlObject.Get<string>(), CultureInfo.InvariantCulture);
                 }
 
                 if (table.TryGetValue("maskoctaves", out tomlObject))
@@ -281,7 +292,7 @@ namespace Content.Client.Parallax
 
                 if (table.TryGetValue("maskthreshold", out tomlObject))
                 {
-                    MaskThreshold = double.Parse(tomlObject.Get<string>(), CultureInfo.InvariantCulture);
+                    MaskThreshold = float.Parse(tomlObject.Get<string>(), CultureInfo.InvariantCulture);
                 }
 
                 if (table.TryGetValue("masknoise_type", out tomlObject))
@@ -301,7 +312,7 @@ namespace Content.Client.Parallax
 
                 if (table.TryGetValue("maskpower", out tomlObject))
                 {
-                    MaskPower = double.Parse(tomlObject.Get<string>(), CultureInfo.InvariantCulture);
+                    MaskPower = float.Parse(tomlObject.Get<string>(), CultureInfo.InvariantCulture);
                 }
             }
 
@@ -319,14 +330,22 @@ namespace Content.Client.Parallax
                     GenPoints(buffer);
                 }
 
-                for (var x = 0; x < bitmap.Width; x++)
-                {
-                    for (var y = 0; y < bitmap.Height; y++)
-                    {
-                        var dstColor = bitmap[x, y].ConvertImgSharp();
-                        var srcColor = buffer[x, y].ConvertImgSharp();
+                var srcSpan = buffer.GetPixelSpan();
+                var dstSpan = bitmap.GetPixelSpan();
 
-                        bitmap[x, y] = Color.Blend(dstColor, srcColor, DstFactor, SrcFactor).ConvertImgSharp();
+                var width = bitmap.Width;
+                var height = bitmap.Height;
+
+                for (var y = 0; y < height; y++)
+                {
+                    for (var x = 0; x < width; x++)
+                    {
+                        var i = y * width + x;
+
+                        var dstColor = dstSpan[i].ConvertImgSharp();
+                        var srcColor = srcSpan[i].ConvertImgSharp();
+
+                        dstSpan[i] = Color.Blend(dstColor, srcColor, DstFactor, SrcFactor).ConvertImgSharp();
                     }
                 }
             }
@@ -335,28 +354,30 @@ namespace Content.Client.Parallax
             {
                 var o = PointSize - 1;
                 var random = new Random(Seed);
+                var span = buffer.GetPixelSpan();
+
                 for (var i = 0; i < PointCount; i++)
                 {
-                    var relX = random.NextDouble();
-                    var relY = random.NextDouble();
+                    var x = random.Next(0, buffer.Width);
+                    var y = random.Next(0, buffer.Height);
 
-                    var x = (int) (relX * buffer.Width);
-                    var y = (int) (relY * buffer.Height);
+                    var dist = random.NextFloat();
 
-                    var dist = random.NextDouble();
-
-                    for (var ox = x - o; ox <= x + o; ox++)
+                    for (var oy = y - o; oy <= y + o; oy++)
                     {
-                        for (var oy = y - o; oy <= y + o; oy++)
+                        for (var ox = x - o; ox <= x + o; ox++)
                         {
-                            var color = Color.InterpolateBetween(FarColor, CloseColor, (float) dist).ConvertImgSharp();
-                            buffer[MathHelper.Mod(ox, buffer.Width), MathHelper.Mod(oy, buffer.Width)] = color;
+                            var ix = MathHelper.Mod(ox, buffer.Width);
+                            var iy = MathHelper.Mod(oy, buffer.Height);
+
+                            var color = Color.InterpolateBetween(FarColor, CloseColor, dist).ConvertImgSharp();
+                            span[iy * buffer.Width + ix] = color;
                         }
                     }
                 }
             }
 
-            void GenPointsMasked(Image<Rgba32> buffer)
+            private void GenPointsMasked(Image<Rgba32> buffer)
             {
                 var o = PointSize - 1;
                 var random = new Random(Seed);
@@ -375,22 +396,21 @@ namespace Content.Client.Parallax
                 const int maxPointAttemptCount = 9999;
                 var pointAttemptCount = 0;
 
+                var span = buffer.GetPixelSpan();
+
                 for (var i = 0; i < PointCount; i++)
                 {
-                    var relX = random.NextDouble();
-                    var relY = random.NextDouble();
-
-                    var x = (int) (relX * buffer.Width);
-                    var y = (int) (relY * buffer.Height);
+                    var x = random.Next(0, buffer.Width);
+                    var y = random.Next(0, buffer.Height);
 
                     // Grab noise at this point.
                     var noiseVal = Math.Min(1, Math.Max(0, (noise.GetNoiseTiled(x, y) + 1) / 2));
                     // Threshold
                     noiseVal = Math.Max(0, noiseVal - MaskThreshold);
                     noiseVal *= threshVal;
-                    noiseVal = Math.Pow(noiseVal, powFactor);
+                    noiseVal = (float) Math.Pow(noiseVal, powFactor);
 
-                    var randomThresh = random.NextDouble();
+                    var randomThresh = random.NextFloat();
                     if (randomThresh > noiseVal)
                     {
                         if (++pointAttemptCount <= maxPointAttemptCount)
@@ -401,14 +421,17 @@ namespace Content.Client.Parallax
                         continue;
                     }
 
-                    var dist = random.NextDouble();
+                    var dist = random.NextFloat();
 
-                    for (var ox = x - o; ox <= x + o; ox++)
+                    for (var oy = y - o; oy <= y + o; oy++)
                     {
-                        for (var oy = y - o; oy <= y + o; oy++)
+                        for (var ox = x - o; ox <= x + o; ox++)
                         {
-                            var color = Color.InterpolateBetween(FarColor, CloseColor, (float) dist).ConvertImgSharp();
-                            buffer[MathHelper.Mod(ox, buffer.Width), MathHelper.Mod(oy, buffer.Height)] = color;
+                            var ix = MathHelper.Mod(ox, buffer.Width);
+                            var iy = MathHelper.Mod(oy, buffer.Height);
+
+                            var color = Color.InterpolateBetween(FarColor, CloseColor, dist).ConvertImgSharp();
+                            span[iy * buffer.Width + ix] = color;
                         }
                     }
                 }
diff --git a/Content.IntegrationTests/Content.IntegrationTests.csproj b/Content.IntegrationTests/Content.IntegrationTests.csproj
index 07fe461c33..3aab81464b 100644
--- a/Content.IntegrationTests/Content.IntegrationTests.csproj
+++ b/Content.IntegrationTests/Content.IntegrationTests.csproj
@@ -29,5 +29,5 @@
   <PropertyGroup>
     <RobustToolsPath>..\RobustToolbox\Tools\</RobustToolsPath>
   </PropertyGroup>
-  <Target Name="RobustAfterBuild" DependsOnTargets="CopySS14Noise;CopyMiscDependencies;CopySwnfd" AfterTargets="Build" />
+  <Target Name="RobustAfterBuild" DependsOnTargets="CopyMiscDependencies;CopySwnfd" AfterTargets="Build" />
 </Project>
diff --git a/Content.Server/AI/AimShootLifeProcessor.cs b/Content.Server/AI/AimShootLifeProcessor.cs
index 6d0c165e76..83dc4ad1ad 100644
--- a/Content.Server/AI/AimShootLifeProcessor.cs
+++ b/Content.Server/AI/AimShootLifeProcessor.cs
@@ -20,9 +20,11 @@ namespace Content.Server.AI
     [AiLogicProcessor("AimShootLife")]
     class AimShootLifeProcessor : AiLogicProcessor
     {
-        private readonly IPhysicsManager _physMan;
-        private readonly IServerEntityManager _entMan;
-        private readonly IGameTiming _timeMan;
+#pragma warning disable 649
+        [Dependency] private readonly IPhysicsManager _physMan;
+        [Dependency] private readonly IServerEntityManager _entMan;
+        [Dependency] private readonly IGameTiming _timeMan;
+#pragma warning restore 649
 
         private readonly List<IEntity> _workList = new List<IEntity>();
 
@@ -32,16 +34,6 @@ namespace Content.Server.AI
 
         private IEntity _curTarget;
 
-        /// <summary>
-        ///     Creates an instance of this LogicProcessor.
-        /// </summary>
-        public AimShootLifeProcessor()
-        {
-            _physMan = IoCManager.Resolve<IPhysicsManager>();
-            _entMan = IoCManager.Resolve<IServerEntityManager>();
-            _timeMan = IoCManager.Resolve<IGameTiming>();
-        }
-
         /// <inheritdoc />
         public override void Update(float frameTime)
         {
diff --git a/Content.Server/AI/StaticBarkerProcessor.cs b/Content.Server/AI/StaticBarkerProcessor.cs
new file mode 100644
index 0000000000..1b85350810
--- /dev/null
+++ b/Content.Server/AI/StaticBarkerProcessor.cs
@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Content.Server.Interfaces.Chat;
+using JetBrains.Annotations;
+using Robust.Server.AI;
+using Robust.Shared.Interfaces.Timing;
+using Robust.Shared.IoC;
+using Robust.Shared.Utility;
+
+namespace Content.Server.AI
+{
+    /// <summary>
+    /// Designed for a a stationary entity that regularly advertises things (vending machine).
+    /// </summary>
+    [AiLogicProcessor("StaticBarker")]
+    class StaticBarkerProcessor : AiLogicProcessor
+    {
+#pragma warning disable 649
+        [Dependency] private readonly IGameTiming _timeMan;
+        [Dependency] private readonly IChatManager _chatMan;
+#pragma warning restore 649
+
+        private static readonly TimeSpan MinimumDelay = TimeSpan.FromSeconds(15);
+        private TimeSpan _nextBark;
+
+
+        private static List<string> slogans = new List<string>
+        {
+            "Come try my great products today!",
+            "More value for the way you live.",
+            "Quality you'd expect at prices you wouldn't.",
+            "The right stuff. The right price.",
+        };
+
+        public override void Update(float frameTime)
+        {
+            if(_timeMan.CurTime < _nextBark)
+                return;
+            
+            var rngState = GenSeed();
+            _nextBark = _timeMan.CurTime + MinimumDelay + TimeSpan.FromSeconds(Random01(ref rngState) * 10);
+
+            var pick = (int)Math.Round(Random01(ref rngState) * (slogans.Count - 1));
+            _chatMan.EntitySay(SelfEntity, slogans[pick]);
+        }
+
+        private uint GenSeed()
+        {
+            return RotateRight((uint)_timeMan.CurTick.GetHashCode(), 11) ^ (uint)SelfEntity.Uid.GetHashCode();
+        }
+
+        private uint RotateRight(uint n, int s)
+        {
+            return (n << (32 - s)) | (n >> s);
+        }
+
+        private float Random01(ref uint state)
+        {
+            DebugTools.Assert(state != 0);
+
+            //xorshift32
+            state ^= state << 13;
+            state ^= state >> 17;
+            state ^= state << 5;
+            return state / (float)uint.MaxValue;
+        }
+    }
+}
diff --git a/Content.Server/AI/WanderProcessor.cs b/Content.Server/AI/WanderProcessor.cs
new file mode 100644
index 0000000000..c766446e53
--- /dev/null
+++ b/Content.Server/AI/WanderProcessor.cs
@@ -0,0 +1,249 @@
+using System;
+using System.Collections.Generic;
+using Content.Server.GameObjects.Components.Movement;
+using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.Chat;
+using Content.Shared.Physics;
+using Robust.Server.AI;
+using Robust.Server.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.Interfaces.Physics;
+using Robust.Shared.Interfaces.Timing;
+using Robust.Shared.IoC;
+using Robust.Shared.Maths;
+using Robust.Shared.Utility;
+
+namespace Content.Server.AI
+{
+    /// <summary>
+    ///     Designed to control a mob. The mob will wander around, then idle at a the destination for awhile.
+    /// </summary>
+    [AiLogicProcessor("Wander")]
+    class WanderProcessor : AiLogicProcessor
+    {
+#pragma warning disable 649
+        [Dependency] private readonly IPhysicsManager _physMan;
+        [Dependency] private readonly IServerEntityManager _entMan;
+        [Dependency] private readonly IGameTiming _timeMan;
+        [Dependency] private readonly IEntitySystemManager _entSysMan;
+        [Dependency] private readonly IChatManager _chatMan;
+#pragma warning restore 649
+
+        private static readonly TimeSpan IdleTimeSpan = TimeSpan.FromSeconds(1);
+        private static readonly TimeSpan WalkingTimeout = TimeSpan.FromSeconds(3);
+        private static readonly TimeSpan DisabledTimeout = TimeSpan.FromSeconds(10);
+
+        private static List<string> _normalAssistantConversation = new List<string>
+        {
+            "stat me",
+            "roll it easy!",
+            "waaaaaagh!!!",
+            "red wonz go fasta",
+            "FOR TEH EMPRAH",
+            "lol2cat",
+            "dem dwarfs man, dem dwarfs",
+            "SPESS MAHREENS",
+            "hwee did eet fhor khayosss",
+            "lifelike texture ;_;",
+            "luv can bloooom",
+            "PACKETS!!!",
+            "SARAH HALE DID IT!!!",
+            "Don't tell Chase",
+            "not so tough now huh",
+            "WERE NOT BAY!!",
+            "IF YOU DONT LIKE THE CYBORGS OR SLIMES WHY DONT YU O JUST MAKE YORE OWN!",
+            "DONT TALK TO ME ABOUT BALANCE!!!!",
+            "YOU AR JUS LAZY AND DUMB JAMITORS AND SERVICE ROLLS",
+            "BLAME HOSHI!!!",
+            "ARRPEE IZ DED!!!",
+            "THERE ALL JUS MEATAFRIENDS!",
+            "SOTP MESING WITH THE ROUNS SHITMAN!!!",
+            "SKELINGTON IS 4 SHITERS!",
+            "MOMMSI R THE WURST SCUM!!",
+            "How do we engiener=",
+            "try to live freely and automatically good bye",
+            "why woud i take a pin pointner??",
+            "How do I set up the. SHow do I set u p the Singu. how I the scrungularity????",
+        };
+
+        private const float MaxWalkDistance = 3; // meters
+        private const float AdditionalIdleTime = 2; // 0 to this many more seconds
+
+        private FsmState _CurrentState;
+        private TimeSpan _startStateTime;
+        private Vector2 _walkTargetPos;
+
+        public override void Update(float frameTime)
+        {
+            if (SelfEntity == null)
+                return;
+
+            ProcessState();
+        }
+
+        private void ProcessState()
+        {
+            switch (_CurrentState)
+            {
+                case FsmState.None:
+                    _CurrentState = FsmState.Idle;
+                    break;
+                case FsmState.Idle:
+                    IdleState();
+                    break;
+                case FsmState.Walking:
+                    WalkingState();
+                    break;
+                case FsmState.Disabled:
+                    DisabledState();
+                    break;
+            }
+        }
+
+        private void IdlePositiveEdge(ref uint rngState)
+        {
+            _startStateTime = _timeMan.CurTime + IdleTimeSpan + TimeSpan.FromSeconds(Random01(ref rngState) * AdditionalIdleTime);
+            _CurrentState = FsmState.Idle;
+
+            EmitProfanity(ref rngState);
+        }
+
+        private void IdleState()
+        {
+            if (!ActionBlockerSystem.CanMove(SelfEntity))
+            {
+                DisabledPositiveEdge();
+                return;
+            }
+
+            if (_timeMan.CurTime < _startStateTime + IdleTimeSpan)
+                return;
+
+            var entWorldPos = SelfEntity.Transform.WorldPosition;
+
+            if (SelfEntity.TryGetComponent<BoundingBoxComponent>(out var bounds))
+                entWorldPos = bounds.WorldAABB.Center;
+
+            var rngState = GenSeed();
+            for (var i = 0; i < 3; i++) // you get 3 chances to find a place to walk
+            {
+                var dir = new Vector2(Random01(ref rngState) * 2 - 1, Random01(ref rngState) *2 -1);
+                var ray = new Ray(entWorldPos, dir, (int) CollisionGroup.Grid);
+                var rayResult = _physMan.IntersectRay(ray, MaxWalkDistance, SelfEntity);
+
+                if (rayResult.DidHitObject && rayResult.Distance > 1) // hit an impassable object
+                {
+                    // set the new position back from the wall a bit
+                    _walkTargetPos = entWorldPos + dir * (rayResult.Distance - 0.5f);
+                    WalkingPositiveEdge();
+                    return;
+                }
+
+                if (!rayResult.DidHitObject) // hit nothing (path clear)
+                {
+                    _walkTargetPos = dir * MaxWalkDistance;
+                    WalkingPositiveEdge();
+                    return;
+                }
+            }
+
+            // can't find clear spot, do nothing, sleep longer
+            _startStateTime = _timeMan.CurTime;
+        }
+
+        private void WalkingPositiveEdge()
+        {
+            _startStateTime = _timeMan.CurTime;
+            _CurrentState = FsmState.Walking;
+        }
+
+        private void WalkingState()
+        {
+            var rngState = GenSeed();
+            if (_timeMan.CurTime > _startStateTime + WalkingTimeout) // walked too long, go idle
+            {
+                IdlePositiveEdge(ref rngState);
+                return;
+            }
+
+            var targetDiff = _walkTargetPos - SelfEntity.Transform.WorldPosition;
+
+            if (targetDiff.LengthSquared < 0.1) // close enough
+            {
+                // stop walking
+                if (SelfEntity.TryGetComponent<AiControllerComponent>(out var mover))
+                {
+                    mover.VelocityDir = Vector2.Zero;
+                }
+
+                IdlePositiveEdge(ref rngState);
+                return;
+            }
+
+            // continue walking
+            if (SelfEntity.TryGetComponent<AiControllerComponent>(out var moverTwo))
+            {
+                moverTwo.VelocityDir = targetDiff.Normalized;
+            }
+        }
+
+        private void DisabledPositiveEdge()
+        {
+            _startStateTime = _timeMan.CurTime;
+            _CurrentState = FsmState.Disabled;
+        }
+
+        private void DisabledState()
+        {
+            if(_timeMan.CurTime < _startStateTime + DisabledTimeout)
+                return;
+
+            if (ActionBlockerSystem.CanMove(SelfEntity))
+            {
+                var rngState = GenSeed();
+                IdlePositiveEdge(ref rngState);
+            }
+            else
+                DisabledPositiveEdge();
+        }
+
+        private void EmitProfanity(ref uint rngState)
+        {
+            if(Random01(ref rngState) < 0.5f)
+                return;
+
+            var pick = (int) Math.Round(Random01(ref rngState) * (_normalAssistantConversation.Count - 1));
+            _chatMan.EntitySay(SelfEntity, _normalAssistantConversation[pick]);
+        }
+
+        private uint GenSeed()
+        {
+            return RotateRight((uint)_timeMan.CurTick.GetHashCode(), 11) ^ (uint)SelfEntity.Uid.GetHashCode();
+        }
+
+        private uint RotateRight(uint n, int s)
+        {
+            return (n << (32 - s)) | (n >> s);
+        }
+
+        private float Random01(ref uint state)
+        {
+            DebugTools.Assert(state != 0);
+
+            //xorshift32
+            state ^= state << 13;
+            state ^= state >> 17;
+            state ^= state << 5;
+            return state / (float)uint.MaxValue;
+        }
+
+        private enum FsmState
+        {
+            None,
+            Idle,
+            Walking,
+            Disabled
+        }
+    }
+}
diff --git a/Content.Server/GameObjects/Components/Movement/AiControllerComponent.cs b/Content.Server/GameObjects/Components/Movement/AiControllerComponent.cs
index 686b097f46..06ccbc734d 100644
--- a/Content.Server/GameObjects/Components/Movement/AiControllerComponent.cs
+++ b/Content.Server/GameObjects/Components/Movement/AiControllerComponent.cs
@@ -1,11 +1,15 @@
 using Content.Server.Interfaces.GameObjects.Components.Movement;
 using Robust.Server.AI;
+using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.Movement
 {
-    [RegisterComponent]
+    [RegisterComponent, ComponentReference(typeof(IMoverComponent))]
     public class AiControllerComponent : Component, IMoverComponent
     {
         private string _logicName;
@@ -13,15 +17,37 @@ namespace Content.Server.GameObjects.Components.Movement
 
         public override string Name => "AiController";
 
-        public string LogicName => _logicName;
+        [ViewVariables(VVAccess.ReadWrite)]
+        public string LogicName
+        {
+            get => _logicName;
+            set
+            {
+                _logicName = value;
+                Processor = null;
+            }
+        }
+
         public AiLogicProcessor Processor { get; set; }
 
+        [ViewVariables(VVAccess.ReadWrite)]
         public float VisionRadius
         {
             get => _visionRadius;
             set => _visionRadius = value;
         }
 
+        /// <inheritdoc />
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            // This component requires a physics component.
+            if (!Owner.HasComponent<PhysicsComponent>())
+                Owner.AddComponent<PhysicsComponent>();
+        }
+
+        /// <inheritdoc />
         public override void ExposeData(ObjectSerializer serializer)
         {
             base.ExposeData(serializer);
@@ -29,5 +55,34 @@ namespace Content.Server.GameObjects.Components.Movement
             serializer.DataField(ref _logicName, "logic", null);
             serializer.DataField(ref _visionRadius, "vision", 8.0f);
         }
+
+        /// <summary>
+        ///     Movement speed (m/s) that the entity walks.
+        /// </summary>
+        [ViewVariables(VVAccess.ReadWrite)]
+        public float WalkMoveSpeed { get; set; } = 4.0f;
+
+        /// <summary>
+        ///     Movement speed (m/s) that the entity sprints.
+        /// </summary>
+        [ViewVariables(VVAccess.ReadWrite)]
+        public float SprintMoveSpeed { get; set; } = 10.0f;
+
+        /// <summary>
+        ///     Is the entity Sprinting (running)?
+        /// </summary>
+        [ViewVariables]
+        public bool Sprinting { get; set; }
+
+        /// <summary>
+        ///     Calculated linear velocity direction of the entity.
+        /// </summary>
+        [ViewVariables]
+        public Vector2 VelocityDir { get; set; }
+
+        public GridCoordinates LastPosition { get; set; }
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        public float StepSoundDistance { get; set; }
     }
 }
diff --git a/Content.Server/GameObjects/EntitySystems/AiSystem.cs b/Content.Server/GameObjects/EntitySystems/AiSystem.cs
index 40db41a3d1..3ccf140d3e 100644
--- a/Content.Server/GameObjects/EntitySystems/AiSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/AiSystem.cs
@@ -1,10 +1,14 @@
 using System;
 using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Movement;
+using Content.Server.Interfaces.GameObjects.Components.Movement;
 using Robust.Server.AI;
+using Robust.Server.Interfaces.Console;
+using Robust.Server.Interfaces.Player;
 using Robust.Server.Interfaces.Timing;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Reflection;
 using Robust.Shared.IoC;
 
@@ -12,17 +16,23 @@ namespace Content.Server.GameObjects.EntitySystems
 {
     internal class AiSystem : EntitySystem
     {
-        private readonly Dictionary<string, Type> _processorTypes = new Dictionary<string, Type>();
-        private IPauseManager _pauseManager;
+#pragma warning disable 649
+        [Dependency] private readonly IPauseManager _pauseManager;
+        [Dependency] private readonly IDynamicTypeFactory _typeFactory;
+        [Dependency] private readonly IReflectionManager _reflectionManager;
+#pragma warning restore 649
 
-        public AiSystem()
+        private readonly Dictionary<string, Type> _processorTypes = new Dictionary<string, Type>();
+
+        /// <inheritdoc />
+        public override void Initialize()
         {
+            base.Initialize();
+
             // register entity query
             EntityQuery = new TypeEntityQuery(typeof(AiControllerComponent));
-            _pauseManager = IoCManager.Resolve<IPauseManager>();
 
-            var reflectionMan = IoCManager.Resolve<IReflectionManager>();
-            var processors = reflectionMan.GetAllChildren<AiLogicProcessor>();
+            var processors = _reflectionManager.GetAllChildren<AiLogicProcessor>();
             foreach (var processor in processors)
             {
                 var att = (AiLogicProcessorAttribute)Attribute.GetCustomAttribute(processor, typeof(AiLogicProcessorAttribute));
@@ -33,6 +43,7 @@ namespace Content.Server.GameObjects.EntitySystems
             }
         }
 
+        /// <inheritdoc />
         public override void Update(float frameTime)
         {
             var entities = EntityManager.GetEntities(EntityQuery);
@@ -61,11 +72,45 @@ namespace Content.Server.GameObjects.EntitySystems
         {
             if (_processorTypes.TryGetValue(name, out var type))
             {
-                return (AiLogicProcessor)Activator.CreateInstance(type);
+                return (AiLogicProcessor)_typeFactory.CreateInstance(type);
             }
 
             // processor needs to inherit AiLogicProcessor, and needs an AiLogicProcessorAttribute to define the YAML name
             throw new ArgumentException($"Processor type {name} could not be found.", nameof(name));
         }
+
+        private class AddAiCommand : IClientCommand
+        {
+            public string Command => "addai";
+            public string Description => "Add an ai component with a given processor to an entity.";
+            public string Help => "addai <processorId> <entityId>";
+            public void Execute(IConsoleShell shell, IPlayerSession player, string[] args)
+            {
+                if(args.Length != 2)
+                {
+                    shell.SendText(player, "Wrong number of args.");
+                    return;
+                }
+
+                var processorId = args[0];
+                var entId = new EntityUid(int.Parse(args[1]));
+                var ent = IoCManager.Resolve<IEntityManager>().GetEntity(entId);
+
+                if (ent.HasComponent<AiControllerComponent>())
+                {
+                    shell.SendText(player, "Entity already has an AI component.");
+                    return;
+                }
+
+                if (ent.HasComponent<IMoverComponent>())
+                {
+                    ent.RemoveComponent<IMoverComponent>();
+                }
+
+                var comp = ent.AddComponent<AiControllerComponent>();
+                comp.LogicName = processorId;
+                shell.SendText(player, "AI component added.");
+            }
+        }
     }
 }
diff --git a/Content.Server/GameObjects/EntitySystems/MoverSystem.cs b/Content.Server/GameObjects/EntitySystems/MoverSystem.cs
index 9d6dfafc6c..ef0faabec0 100644
--- a/Content.Server/GameObjects/EntitySystems/MoverSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/MoverSystem.cs
@@ -23,6 +23,7 @@ using Robust.Shared.Players;
 using Robust.Shared.Prototypes;
 using Content.Server.GameObjects.Components.Sound;
 using Content.Shared.GameObjects.Components.Inventory;
+using Robust.Shared.Log;
 
 namespace Content.Server.GameObjects.EntitySystems
 {
@@ -45,7 +46,7 @@ namespace Content.Server.GameObjects.EntitySystems
         /// <inheritdoc />
         public override void Initialize()
         {
-            EntityQuery = new TypeEntityQuery(typeof(PlayerInputMoverComponent));
+            EntityQuery = new TypeEntityQuery(typeof(IMoverComponent));
             
             var moveUpCmdHandler = InputCmdHandler.FromDelegate(
                 session => HandleDirChange(session, Direction.North, true),
@@ -116,14 +117,14 @@ namespace Content.Server.GameObjects.EntitySystems
                 {
                     continue;
                 }
-                var mover = entity.GetComponent<PlayerInputMoverComponent>();
+                var mover = entity.GetComponent<IMoverComponent>();
                 var physics = entity.GetComponent<PhysicsComponent>();
 
                 UpdateKinematics(entity.Transform, mover, physics);
             }
         }
 
-        private void UpdateKinematics(ITransformComponent transform, PlayerInputMoverComponent mover, PhysicsComponent physics)
+        private void UpdateKinematics(ITransformComponent transform, IMoverComponent mover, PhysicsComponent physics)
         {
             if (mover.VelocityDir.LengthSquared < 0.001 || !ActionBlockerSystem.CanMove(mover.Owner))
             {
@@ -234,9 +235,17 @@ namespace Content.Server.GameObjects.EntitySystems
             }
 
             // Ok well we know the position of the
-            var soundCollection = _prototypeManager.Index<SoundCollectionPrototype>(soundCollectionName);
-            var file = _footstepRandom.Pick(soundCollection.PickFiles);
-            _audioSystem.Play(file, coordinates);
+            try
+            {
+                var soundCollection = _prototypeManager.Index<SoundCollectionPrototype>(soundCollectionName);
+                var file = _footstepRandom.Pick(soundCollection.PickFiles);
+                _audioSystem.Play(file, coordinates);
+            }
+            catch (UnknownPrototypeException)
+            {
+                // Shouldn't crash over a sound
+                Logger.ErrorS("sound", $"Unable to find sound collection for {soundCollectionName}");
+            }
         }
     }
 }
diff --git a/Content.Server/Interfaces/GameObjects/Components/Movement/IMoverComponent.cs b/Content.Server/Interfaces/GameObjects/Components/Movement/IMoverComponent.cs
index f804144fcb..a8b902f26c 100644
--- a/Content.Server/Interfaces/GameObjects/Components/Movement/IMoverComponent.cs
+++ b/Content.Server/Interfaces/GameObjects/Components/Movement/IMoverComponent.cs
@@ -1,4 +1,6 @@
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
 
 namespace Content.Server.Interfaces.GameObjects.Components.Movement
 {
@@ -6,6 +8,28 @@ namespace Content.Server.Interfaces.GameObjects.Components.Movement
     // There can only be one.
     public interface IMoverComponent : IComponent
     {
+        /// <summary>
+        ///     Movement speed (m/s) that the entity walks.
+        /// </summary>
+        float WalkMoveSpeed { get; set; }
 
+        /// <summary>
+        ///     Movement speed (m/s) that the entity sprints.
+        /// </summary>
+        float SprintMoveSpeed { get; set; }
+
+        /// <summary>
+        ///     Is the entity Sprinting (running)?
+        /// </summary>
+        bool Sprinting { get; set; }
+
+        /// <summary>
+        ///     Calculated linear velocity direction of the entity.
+        /// </summary>
+        Vector2 VelocityDir { get; }
+
+        GridCoordinates LastPosition { get; set; }
+
+        float StepSoundDistance { get; set; }
     }
 }
diff --git a/Resources/Audio/effects/footsteps/carpet1.ogg b/Resources/Audio/effects/footsteps/carpet1.ogg
new file mode 100644
index 0000000000..2735a9bf3d
Binary files /dev/null and b/Resources/Audio/effects/footsteps/carpet1.ogg differ
diff --git a/Resources/Audio/effects/footsteps/carpet2.ogg b/Resources/Audio/effects/footsteps/carpet2.ogg
new file mode 100644
index 0000000000..07e5f2320a
Binary files /dev/null and b/Resources/Audio/effects/footsteps/carpet2.ogg differ
diff --git a/Resources/Audio/effects/footsteps/carpet3.ogg b/Resources/Audio/effects/footsteps/carpet3.ogg
new file mode 100644
index 0000000000..edb0193f6e
Binary files /dev/null and b/Resources/Audio/effects/footsteps/carpet3.ogg differ
diff --git a/Resources/Audio/effects/footsteps/carpet4.ogg b/Resources/Audio/effects/footsteps/carpet4.ogg
new file mode 100644
index 0000000000..c9598e2b73
Binary files /dev/null and b/Resources/Audio/effects/footsteps/carpet4.ogg differ
diff --git a/Resources/Audio/effects/footsteps/carpet5.ogg b/Resources/Audio/effects/footsteps/carpet5.ogg
new file mode 100644
index 0000000000..076818323a
Binary files /dev/null and b/Resources/Audio/effects/footsteps/carpet5.ogg differ
diff --git a/Resources/Audio/effects/footsteps/hull1.ogg b/Resources/Audio/effects/footsteps/hull1.ogg
new file mode 100644
index 0000000000..615df6c550
Binary files /dev/null and b/Resources/Audio/effects/footsteps/hull1.ogg differ
diff --git a/Resources/Audio/effects/footsteps/hull2.ogg b/Resources/Audio/effects/footsteps/hull2.ogg
new file mode 100644
index 0000000000..3aecb743f7
Binary files /dev/null and b/Resources/Audio/effects/footsteps/hull2.ogg differ
diff --git a/Resources/Audio/effects/footsteps/hull3.ogg b/Resources/Audio/effects/footsteps/hull3.ogg
new file mode 100644
index 0000000000..03339131f6
Binary files /dev/null and b/Resources/Audio/effects/footsteps/hull3.ogg differ
diff --git a/Resources/Audio/effects/footsteps/hull4.ogg b/Resources/Audio/effects/footsteps/hull4.ogg
new file mode 100644
index 0000000000..2fba89d318
Binary files /dev/null and b/Resources/Audio/effects/footsteps/hull4.ogg differ
diff --git a/Resources/Audio/effects/footsteps/hull5.ogg b/Resources/Audio/effects/footsteps/hull5.ogg
new file mode 100644
index 0000000000..10c5912b97
Binary files /dev/null and b/Resources/Audio/effects/footsteps/hull5.ogg differ
diff --git a/Resources/Audio/effects/footsteps/tile1.wav b/Resources/Audio/effects/footsteps/tile1.wav
new file mode 100644
index 0000000000..4b2c672890
Binary files /dev/null and b/Resources/Audio/effects/footsteps/tile1.wav differ
diff --git a/Resources/Audio/effects/footsteps/tile2.wav b/Resources/Audio/effects/footsteps/tile2.wav
new file mode 100644
index 0000000000..a0b0a64f1b
Binary files /dev/null and b/Resources/Audio/effects/footsteps/tile2.wav differ
diff --git a/Resources/Audio/effects/footsteps/tile3.wav b/Resources/Audio/effects/footsteps/tile3.wav
new file mode 100644
index 0000000000..4455538ca9
Binary files /dev/null and b/Resources/Audio/effects/footsteps/tile3.wav differ
diff --git a/Resources/Audio/effects/footsteps/tile4.wav b/Resources/Audio/effects/footsteps/tile4.wav
new file mode 100644
index 0000000000..830fac36fa
Binary files /dev/null and b/Resources/Audio/effects/footsteps/tile4.wav differ
diff --git a/Resources/Maps/stationstation.yml b/Resources/Maps/stationstation.yml
index 69bf08f6c3..ae95e48979 100644
--- a/Resources/Maps/stationstation.yml
+++ b/Resources/Maps/stationstation.yml
@@ -5,7 +5,7 @@ meta:
   postmapinit: false
 tilemap:
   0: space
-  1: floor
+  1: floor_steel
   2: floor_techmaint
   3: floor_white
   4: plating
@@ -99,112 +99,112 @@ entities:
     pos: 1.412994,7.507263
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 9
   components:
   - grid: 0
     pos: -7.5,0.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 10
   components:
   - grid: 0
     pos: -7.5,-0.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 11
   components:
   - grid: 0
     pos: -7.5,-1.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 12
   components:
   - grid: 0
     pos: -7.5,-2.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 13
   components:
   - grid: 0
     pos: -7.5,-3.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 14
   components:
   - grid: 0
     pos: 0.5,-14.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 15
   components:
   - grid: 0
     pos: -0.5,-14.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 16
   components:
   - grid: 0
     pos: 3.5,-14.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 17
   components:
   - grid: 0
     pos: 4.5,-14.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 18
   components:
   - grid: 0
     pos: -7.5,-10.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 19
   components:
   - grid: 0
     pos: -7.5,-11.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 20
   components:
   - grid: 0
     pos: -7.5,-12.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 21
   components:
   - grid: 0
     pos: -7.5,-13.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 22
   components:
   - grid: 0
     pos: 2.5,-14.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 23
   components:
   - grid: 0
     pos: 1.5,-14.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 24
   components:
   - grid: 0
@@ -271,266 +271,266 @@ entities:
     pos: -6.5,-11.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 31
   components:
   - grid: 0
     pos: -7.5,-9.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 32
   components:
   - grid: 0
     pos: -10.5,-7.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 33
   components:
   - grid: 0
     pos: -10.5,-6.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 34
   components:
   - grid: 0
     pos: -10.5,-5.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 35
   components:
   - grid: 0
     pos: -10.5,-4.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 36
   components:
   - grid: 0
     pos: -10.5,-3.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 37
   components:
   - grid: 0
     pos: -10.5,-2.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 38
   components:
   - grid: 0
     pos: -10.5,-1.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 39
   components:
   - grid: 0
     pos: -3.5,-14.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 40
   components:
   - grid: 0
     pos: 1.5,-4.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 41
   components:
   - grid: 0
     pos: 0.5,-4.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 42
   components:
   - grid: 0
     pos: -0.5,-4.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 43
   components:
   - grid: 0
     pos: -1.5,-4.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 44
   components:
   - grid: 0
     pos: -2.5,-4.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 45
   components:
   - grid: 0
     pos: -3.5,-4.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 46
   components:
   - grid: 0
     pos: -4.5,-4.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 47
   components:
   - grid: 0
     pos: -5.5,-4.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 48
   components:
   - grid: 0
     pos: -6.5,-4.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 49
   components:
   - grid: 0
     pos: 4.5,-4.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 50
   components:
   - grid: 0
     pos: 5.5,-4.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 51
   components:
   - grid: 0
     pos: 6.5,-4.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 52
   components:
   - grid: 0
     pos: -7.5,-14.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 53
   components:
   - grid: 0
     pos: -2.5,-14.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 54
   components:
   - grid: 0
     pos: -6.5,-14.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 55
   components:
   - grid: 0
     pos: -5.5,-14.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 56
   components:
   - grid: 0
     pos: -4.5,-14.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 57
   components:
   - grid: 0
     pos: 6.5,-10.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 58
   components:
   - grid: 0
     pos: 6.5,-11.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 59
   components:
   - grid: 0
     pos: 6.5,-12.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 60
   components:
   - grid: 0
     pos: 6.5,-13.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 61
   components:
   - grid: 0
     pos: 6.5,-14.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 62
   components:
   - grid: 0
     pos: 5.5,-14.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 63
   components:
   - grid: 0
     pos: -7.5,-8.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 64
   components:
   - grid: 0
     pos: -7.5,-7.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 65
   components:
   - grid: 0
     pos: -8.5,-8.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 66
   components:
   - grid: 0
     pos: -9.5,-8.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 67
   components:
   - grid: 0
     pos: -10.5,-8.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 68
   components:
   - grid: 0
@@ -551,28 +551,28 @@ entities:
     pos: -8.5,-6.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 71
   components:
   - grid: 0
     pos: 5.5,-7.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 72
   components:
   - grid: 0
     pos: 5.5,-9.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 73
   components:
   - grid: 0
     pos: 6.5,-9.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 74
   components:
   - grid: 0
@@ -595,7 +595,7 @@ entities:
     type: Transform
   - load: 120
     type: PowerProvider
-- type: wall
+- type: solid_wall
   uid: 77
   components:
   - grid: 0
@@ -637,14 +637,14 @@ entities:
     pos: 2.5,-4.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 83
   components:
   - grid: 0
     pos: 6.5,-6.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 84
   components:
   - grid: 0
@@ -1068,7 +1068,7 @@ entities:
     pos: -0.5,-10.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 143
   components:
   - grid: 0
@@ -1593,14 +1593,14 @@ entities:
     pos: -9.5,1.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 229
   components:
   - grid: 0
     pos: -10.5,-0.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 230
   components:
   - grid: 0
@@ -1983,7 +1983,7 @@ entities:
     type: Transform
   - load: 280
     type: PowerProvider
-- type: wall
+- type: solid_wall
   uid: 277
   components:
   - grid: 0
@@ -2146,287 +2146,287 @@ entities:
     pos: -1.94591,7.485576
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 381
   components:
   - grid: 0
     pos: -10.5,1.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 382
   components:
   - grid: 0
     pos: -11.5,4.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 383
   components:
   - grid: 0
     pos: -10.5,4.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 384
   components:
   - grid: 0
     pos: -9.5,4.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 385
   components:
   - grid: 0
     pos: -8.5,4.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 386
   components:
   - grid: 0
     pos: -7.5,4.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 387
   components:
   - grid: 0
     pos: -8.5,1.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 388
   components:
   - grid: 0
     pos: -5.5,1.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 389
   components:
   - grid: 0
     pos: -6.5,1.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 390
   components:
   - grid: 0
     pos: -7.5,1.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 391
   components:
   - grid: 0
     pos: -0.5,1.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 392
   components:
   - grid: 0
     pos: 0.5,1.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 393
   components:
   - grid: 0
     pos: 1.5,1.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 394
   components:
   - grid: 0
     pos: 1.5,0.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 395
   components:
   - grid: 0
     pos: 1.5,-3.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 396
   components:
   - grid: 0
     pos: 4.5,-3.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 397
   components:
   - grid: 0
     pos: 4.5,-2.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 398
   components:
   - grid: 0
     pos: 4.5,-1.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 399
   components:
   - grid: 0
     pos: 4.5,-0.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 400
   components:
   - grid: 0
     pos: 4.5,0.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 401
   components:
   - grid: 0
     pos: 4.5,1.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 402
   components:
   - grid: 0
     pos: 4.5,2.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 403
   components:
   - grid: 0
     pos: 4.5,3.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 404
   components:
   - grid: 0
     pos: 4.5,4.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 405
   components:
   - grid: 0
     pos: 4.5,5.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 406
   components:
   - grid: 0
     pos: 4.5,6.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 407
   components:
   - grid: 0
     pos: 4.5,7.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 408
   components:
   - grid: 0
     pos: 4.5,8.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 409
   components:
   - grid: 0
     pos: 1.5,8.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 410
   components:
   - grid: 0
     pos: 0.5,8.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 411
   components:
   - grid: 0
     pos: -0.5,8.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 412
   components:
   - grid: 0
     pos: -1.5,8.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 413
   components:
   - grid: 0
     pos: -2.5,8.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 414
   components:
   - grid: 0
     pos: -3.5,8.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 415
   components:
   - grid: 0
     pos: -4.5,8.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 416
   components:
   - grid: 0
     pos: -5.5,8.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 417
   components:
   - grid: 0
     pos: -6.5,8.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 418
   components:
   - grid: 0
     pos: -7.5,8.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 419
   components:
   - grid: 0
     pos: -7.5,7.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 420
   components:
   - grid: 0
     pos: -7.5,6.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: wall
+- type: solid_wall
   uid: 421
   components:
   - grid: 0
diff --git a/Resources/Prototypes/Entities/buildings/turret.yml b/Resources/Prototypes/Entities/buildings/turret.yml
index a0927b3aa9..9228c1d6d5 100644
--- a/Resources/Prototypes/Entities/buildings/turret.yml
+++ b/Resources/Prototypes/Entities/buildings/turret.yml
@@ -16,6 +16,7 @@
   - type: Sprite
     drawdepth: WallMountedItems
     texture: Buildings/TurrTop.png
+    directional: false
   - type: AiController
     logic: AimShootLife
     vision: 6.0
@@ -29,6 +30,7 @@
   - type: Sprite
     drawdepth: WallMountedItems
     texture: Buildings/TurrLamp.png
+    directional: false
   - type: AiController
     logic: AimShootLife
     vision: 6.0
diff --git a/Resources/Prototypes/Entities/buildings/walls.yml b/Resources/Prototypes/Entities/buildings/walls.yml
index 1d76d42830..824081eb6f 100644
--- a/Resources/Prototypes/Entities/buildings/walls.yml
+++ b/Resources/Prototypes/Entities/buildings/walls.yml
@@ -1,18 +1,13 @@
 - type: entity
-  id: wall
-  name: Wall
+  id: base_wall
+  name: BaseWall
   components:
   - type: Clickable
   - type: Sprite
     netsync: false
-    color: "#71797a"
     drawdepth: Walls
-    sprite: Buildings/wall.rsi
-
   - type: Icon
-    sprite: Buildings/wall.rsi
     state: full
-
   - type: BoundingBox
   - type: Collidable
   - type: Damageable
@@ -28,7 +23,298 @@
   - type: IconSmooth
     key: walls
     base: solid
-
   placement:
     snap:
     - Wall
+
+- type: entity
+  id: brick_wall
+  name: Brick wall
+  parent: base_wall
+  components:
+  - type: Sprite
+    sprite: Buildings/Walls/brick.rsi
+  - type: Icon
+    sprite: Buildings/Walls/brick.rsi
+  - type: Destructible
+    thresholdvalue: 100
+    spawnondestroy: girder
+  - type: IconSmooth
+    key: walls. Seriously, just a wall. Nothing extraordinary here.
+    base: brick
+
+- type: entity
+  id: clock_wall
+  name: Clock wall
+  parent: base_wall
+  components:
+  - type: Sprite
+    sprite: Buildings/Walls/clock.rsi
+  - type: Icon
+    sprite: Buildings/Walls/clock.rsi
+  - type: Destructible
+    thresholdvalue: 100
+    spawnondestroy: girder
+  - type: IconSmooth
+    key: walls. Seriously, just a wall. Nothing extraordinary here.
+    base: clock
+
+- type: entity
+  id: clown_wall
+  name: Clown wall
+  parent: base_wall
+  components:
+  - type: Sprite
+    sprite: Buildings/Walls/clown.rsi
+  - type: Icon
+    sprite: Buildings/Walls/clown.rsi
+  - type: Destructible
+    thresholdvalue: 100
+    spawnondestroy: girder
+  - type: IconSmooth
+    key: walls. Seriously, just a wall. Nothing extraordinary here.
+    base: clown
+
+
+- type: entity
+  id: cult_wall
+  name: Cult wall
+  parent: base_wall
+  components:
+  - type: Sprite
+    sprite: Buildings/Walls/cult.rsi
+  - type: Icon
+    sprite: Buildings/Walls/cult.rsi
+  - type: Destructible
+    thresholdvalue: 100
+    spawnondestroy: girder
+  - type: IconSmooth
+    key: walls. Seriously, just a wall. Nothing extraordinary here.
+    base: cult
+
+- type: entity
+  id: debug_wall
+  name: Debug wall
+  parent: base_wall
+  components:
+  - type: Sprite
+    sprite: Buildings/Walls/debug.rsi
+  - type: Icon
+    sprite: Buildings/Walls/debug.rsi
+  - type: Destructible
+    thresholdvalue: 100
+    spawnondestroy: girder
+  - type: IconSmooth
+    key: walls. Seriously, just a wall. Nothing extraordinary here.
+    base: debug
+
+- type: entity
+  id: diamond_wall
+  name: Diamond wall
+  parent: base_wall
+  components:
+  - type: Sprite
+    sprite: Buildings/Walls/diamond.rsi
+  - type: Icon
+    sprite: Buildings/Walls/diamond.rsi
+  - type: Destructible
+    thresholdvalue: 100
+    spawnondestroy: girder
+  - type: IconSmooth
+    key: walls. Seriously, just a wall. Nothing extraordinary here.
+    base: diamond
+
+
+- type: entity
+  id: gold_wall
+  name: Gold wall
+  parent: base_wall
+  components:
+  - type: Sprite
+    sprite: Buildings/Walls/gold.rsi
+  - type: Icon
+    sprite: Buildings/Walls/gold.rsi
+  - type: Destructible
+    thresholdvalue: 100
+    spawnondestroy: girder
+  - type: IconSmooth
+    key: walls. Seriously, just a wall. Nothing extraordinary here.
+    base: gold
+
+- type: entity
+  id: ice_wall
+  name: Ice wall
+  parent: base_wall
+  components:
+  - type: Sprite
+    sprite: Buildings/Walls/ice.rsi
+  - type: Icon
+    sprite: Buildings/Walls/ice.rsi
+  - type: Destructible
+    thresholdvalue: 100
+    spawnondestroy: girder
+  - type: IconSmooth
+    key: walls. Seriously, just a wall. Nothing extraordinary here.
+    base: ice
+
+- type: entity
+  id: metal_wall
+  name: Metal wall
+  parent: base_wall
+  components:
+  - type: Sprite
+    sprite: Buildings/Walls/metal.rsi
+  - type: Icon
+    sprite: Buildings/Walls/metal.rsi
+  - type: Destructible
+    thresholdvalue: 100
+    spawnondestroy: girder
+  - type: IconSmooth
+    key: walls. Seriously, just a wall. Nothing extraordinary here.
+    base: metal
+
+- type: entity
+  id: plasma_wall
+  name: Plasma wall
+  parent: base_wall
+  components:
+  - type: Sprite
+    sprite: Buildings/Walls/plasma.rsi
+  - type: Icon
+    sprite: Buildings/Walls/plasma.rsi
+  - type: Destructible
+    thresholdvalue: 100
+    spawnondestroy: girder
+  - type: IconSmooth
+    key: walls. Seriously, just a wall. Nothing extraordinary here.
+    base: plasma
+
+- type: entity
+  id: plastic_wall
+  name: Plastic wall
+  parent: base_wall
+  components:
+  - type: Sprite
+    sprite: Buildings/Walls/plastic.rsi
+  - type: Icon
+    sprite: Buildings/Walls/plastic.rsi
+  - type: Destructible
+    thresholdvalue: 100
+    spawnondestroy: girder
+  - type: IconSmooth
+    key: walls. Seriously, just a wall. Nothing extraordinary here.
+    base: plastic
+
+- type: entity
+  id: reinforced_wall
+  name: Reinforced wall
+  parent: base_wall
+  components:
+  - type: Sprite
+    sprite: Buildings/Walls/reinforced.rsi
+  - type: Icon
+    sprite: Buildings/Walls/reinforced.rsi
+  - type: Destructible
+    thresholdvalue: 300
+    spawnondestroy: girder
+  - type: IconSmooth
+    key: walls. Seriously, just a wall. Nothing extraordinary here.
+    base: reinforced
+
+# Riveting
+- type: entity
+  id: riveted_wall
+  name: Riveted wall
+  parent: base_wall
+  components:
+  - type: Sprite
+    sprite: Buildings/Walls/riveted.rsi
+  - type: Icon
+    sprite: Buildings/Walls/riveted.rsi
+  - type: Destructible
+    thresholdvalue: 100
+    spawnondestroy: girder
+  - type: IconSmooth
+    key: walls. Seriously, just a wall. Nothing extraordinary here.
+    base: riveted
+
+- type: entity
+  id: sandstone_wall
+  name: Sandstone wall
+  parent: base_wall
+  components:
+  - type: Sprite
+    sprite: Buildings/Walls/sandstone.rsi
+  - type: Icon
+    sprite: Buildings/Walls/sandstone.rsi
+  - type: Destructible
+    thresholdvalue: 100
+    spawnondestroy: girder
+  - type: IconSmooth
+    key: walls. Seriously, just a wall. Nothing extraordinary here.
+    base: sandstone
+    
+- type: entity
+  id: silver_wall
+  name: Silver wall
+  parent: base_wall
+  components:
+  - type: Sprite
+    sprite: Buildings/Walls/silver.rsi
+  - type: Icon
+    sprite: Buildings/Walls/silver.rsi
+  - type: Destructible
+    thresholdvalue: 100
+    spawnondestroy: girder
+  - type: IconSmooth
+    key: walls. Seriously, just a wall. Nothing extraordinary here.
+    base: silver
+
+- type: entity
+  id: solid_wall
+  name: Solid wall
+  parent: base_wall
+  components:
+  - type: Sprite
+    color: "#71797a"
+    sprite: Buildings/Walls/solid.rsi
+  - type: Icon
+    sprite: Buildings/Walls/solid.rsi
+  - type: Destructible
+    thresholdvalue: 100
+    spawnondestroy: girder
+  - type: IconSmooth
+    key: walls. Seriously, just a wall. Nothing extraordinary here.
+    base: solid
+
+- type: entity
+  id: uranium_wall
+  name: Uranium wall
+  parent: base_wall
+  components:
+  - type: Sprite
+    sprite: Buildings/Walls/uranium.rsi
+  - type: Icon
+    sprite: Buildings/Walls/uranium.rsi
+  - type: Destructible
+    thresholdvalue: 100
+    spawnondestroy: girder
+  - type: IconSmooth
+    key: walls. Seriously, just a wall. Nothing extraordinary here.
+    base: uranium
+    
+- type: entity
+  id: wood_wall
+  name: Wood wall
+  parent: base_wall
+  components:
+  - type: Sprite
+    sprite: Buildings/Walls/wood.rsi
+  - type: Icon
+    sprite: Buildings/Walls/wood.rsi
+  - type: Destructible
+    thresholdvalue: 100
+    spawnondestroy: girder
+  - type: IconSmooth
+    key: walls. Seriously, just a wall. Nothing extraordinary here.
+    base: wood
diff --git a/Resources/Prototypes/Entities/items/clothing/belts.yml b/Resources/Prototypes/Entities/items/clothing/belts.yml
index b023279c80..84cb15b8a0 100644
--- a/Resources/Prototypes/Entities/items/clothing/belts.yml
+++ b/Resources/Prototypes/Entities/items/clothing/belts.yml
@@ -24,3 +24,5 @@
     sprite: Clothing/belt_utility.rsi
   - type: Storage
     Capacity: 30
+
+
diff --git a/Resources/Prototypes/Entities/items/clothing/gloves.yml b/Resources/Prototypes/Entities/items/clothing/gloves.yml
index a47c382c76..af0b3af5a7 100644
--- a/Resources/Prototypes/Entities/items/clothing/gloves.yml
+++ b/Resources/Prototypes/Entities/items/clothing/gloves.yml
@@ -53,4 +53,19 @@
     state: leather
   - type: Clothing
     sprite: Clothing/gloves_leather.rsi
-    HeatResistance: 1500
\ No newline at end of file
+    HeatResistance: 1500
+
+- type: entity
+  parent: GlovesBase
+  id: WhiteGloves
+  name: White Gloves
+  description: These look pretty fancy.
+  components:
+  - type: Sprite
+    sprite: Clothing/gloves_white.rsi
+    state: white
+  - type: Icon
+    sprite: Clothing/gloves_white.rsi
+    state: white
+  - type: Clothing
+    sprite: Clothing/gloves_white.rsi
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/items/clothing/hats.yml b/Resources/Prototypes/Entities/items/clothing/hats.yml
new file mode 100644
index 0000000000..423ed9fde7
--- /dev/null
+++ b/Resources/Prototypes/Entities/items/clothing/hats.yml
@@ -0,0 +1,76 @@
+- type: entity
+  parent: Clothing
+  id: HatBase
+  abstract: true
+  components:
+  - type: Clothing
+    Slots: [helmet]
+
+
+- type: entity
+  parent: HatBase
+  id: HatChef
+  name: Chef's Hat
+  description: It's a hat used by chefs to keep hair out of your food. Judging by the food in the mess, they don't work.
+  components:
+  - type: Sprite
+    sprite: Clothing/chef_hat.rsi
+    state: chef
+  - type: Icon
+    sprite: Clothing/chef_hat.rsi
+    state: chef
+  - type: Clothing
+    sprite: Clothing/chef_hat.rsi
+    Slots:
+      - helmet
+
+- type: entity
+  parent: HatBase
+  id: HatCaptain
+  name: Captain's Hat
+  description: It's good to be king.
+  components:
+  - type: Sprite
+    sprite: Clothing/captain_hat.rsi
+    state: captain
+  - type: Icon
+    sprite: Clothing/captain_hat.rsi
+    state: captain
+  - type: Clothing
+    sprite: Clothing/captain_hat.rsi
+    Slots:
+      - helmet
+
+- type: entity
+  parent: HatBase
+  id: HatHOP
+  name: Head of Personnel's Hat
+  description: Papers, please.
+  components:
+  - type: Sprite
+    sprite: Clothing/hop_hat.rsi
+    state: hop
+  - type: Icon
+    sprite: Clothing/hop_hat.rsi
+    state: hop
+  - type: Clothing
+    sprite: Clothing/hop_hat.rsi
+    Slots:
+      - helmet
+
+- type: entity
+  parent: HatBase
+  id: HatBeret
+  name: Beret
+  description: A beret, an artists favorite headwear.
+  components:
+  - type: Sprite
+    sprite: Clothing/beret.rsi
+    state: beret
+  - type: Icon
+    sprite: Clothing/beret.rsi
+    state: beret
+  - type: Clothing
+    sprite: Clothing/beret.rsi
+    Slots:
+      - helmet           
diff --git a/Resources/Prototypes/Entities/items/clothing/masks.yml b/Resources/Prototypes/Entities/items/clothing/masks.yml
index 9a0c7d2388..37ed00bff3 100644
--- a/Resources/Prototypes/Entities/items/clothing/masks.yml
+++ b/Resources/Prototypes/Entities/items/clothing/masks.yml
@@ -47,4 +47,19 @@
     sprite: Clothing/mask_clown.rsi
     state: icon
   - type: Clothing
-    sprite: Clothing/mask_clown.rsi
\ No newline at end of file
+    sprite: Clothing/mask_clown.rsi
+
+- type: entity
+  parent: MasksBase
+  id: MaskMime
+  name: Mime Mask
+  description: The traditional mime's mask. It has an eerie facial posture.
+  components:
+  - type: Sprite
+    sprite: Clothing/mask_mime.rsi
+    state: mime
+  - type: Icon
+    sprite: Clothing/mask_mime.rsi
+    state: mime
+  - type: Clothing
+    sprite: Clothing/mask_mime.rsi   
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/items/clothing/shoes.yml b/Resources/Prototypes/Entities/items/clothing/shoes.yml
index 59c970247b..a046c1d5c8 100644
--- a/Resources/Prototypes/Entities/items/clothing/shoes.yml
+++ b/Resources/Prototypes/Entities/items/clothing/shoes.yml
@@ -83,3 +83,38 @@
   - type: Sound
   - type: FootstepModifier
     footstepSoundCollection: footstep_heavy
+
+
+- type: entity
+  parent: ShoesBase
+  id: ShoesBrown
+  name: Brown Shoes
+  description: A pair of brown shoes.
+  components:
+  - type: Sprite
+    sprite: Clothing/shoes_brown.rsi
+    state: brown
+
+  - type: Icon
+    sprite: Clothing/shoes_brown.rsi
+    state: brown
+
+  - type: Clothing
+    sprite: Clothing/shoes_brown.rsi
+
+- type: entity
+  parent: ShoesBase
+  id: ShoesMime
+  name: Mime Shoes
+  description: Comfortable-looking shoes.
+  components:
+  - type: Sprite
+    sprite: Clothing/shoes_mime.rsi
+    state: mime
+
+  - type: Icon
+    sprite: Clothing/shoes_mime.rsi
+    state: mime
+
+  - type: Clothing
+    sprite: Clothing/shoes_mime.rsi   
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/items/clothing/suits.yml b/Resources/Prototypes/Entities/items/clothing/suits.yml
index 070bbced28..991628dcfd 100644
--- a/Resources/Prototypes/Entities/items/clothing/suits.yml
+++ b/Resources/Prototypes/Entities/items/clothing/suits.yml
@@ -41,3 +41,35 @@
 
   - type: Clothing
     sprite: Clothing/vest_hazard.rsi
+
+- type: entity
+  parent: SuitBase
+  id: ChefApronClothing
+  name: Chef's Apron
+  description: An apron used by a high class chef.
+  components:
+  - type: Sprite
+    sprite: Clothing/chef_apron.rsi
+    state: apron
+
+  - type: Icon
+    sprite: Clothing/chef_apron.rsi
+    state: apron
+
+  - type: Clothing
+    sprite: Clothing/chef_apron.rsi
+
+- type: entity
+  parent: SuitBase
+  id: BeltSuspenders
+  name: Suspenders
+  description: They suspend the illusion of the mime's play.
+  components:
+  - type: Sprite
+    sprite: Clothing/suspenders.rsi
+    state: suspenders
+  - type: Icon
+    sprite: Clothing/suspenders.rsi
+    state: suspenders
+  - type: Clothing
+    sprite: Clothing/suspenders.rsi
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/items/clothing/uniforms.yml b/Resources/Prototypes/Entities/items/clothing/uniforms.yml
index 160b6844c5..d5986f3ef1 100644
--- a/Resources/Prototypes/Entities/items/clothing/uniforms.yml
+++ b/Resources/Prototypes/Entities/items/clothing/uniforms.yml
@@ -108,3 +108,71 @@
 
   - type: Clothing
     sprite: Clothing/uniform_sec.rsi
+
+- type: entity
+  parent: UniformBase
+  id: UniformChef
+  name: Chef's Uniform
+  description: Can't cook without this.
+  components:
+  - type: Sprite
+    sprite: Clothing/chef_uniform.rsi
+    state: chef
+
+  - type: Icon
+    sprite: Clothing/chef_uniform.rsi
+    state: chef
+
+  - type: Clothing
+    sprite: Clothing/chef_uniform.rsi
+
+- type: entity
+  parent: UniformBase
+  id: UniformCaptain
+  name: Captain's Jumpsuit
+  description: It's a blue jumpsuit with some gold markings denoting the rank of "Captain".
+  components:
+  - type: Sprite
+    sprite: Clothing/captain_uniform.rsi
+    state: captain
+
+  - type: Icon
+    sprite: Clothing/captain_uniform.rsi
+    state: captain
+
+  - type: Clothing
+    sprite: Clothing/captain_uniform.rsi        
+
+- type: entity
+  parent: UniformBase
+  id: UniformHOP
+  name: Head of Personnel's Jumpsuit
+  description: It's a jumpsuit worn by someone who works in the position of "Head of Personnel".
+  components:
+  - type: Sprite
+    sprite: Clothing/hop_jumpsuit.rsi
+    state: hop
+
+  - type: Icon
+    sprite: Clothing/hop_jumpsuit.rsi
+    state: hop
+
+  - type: Clothing
+    sprite: Clothing/hop_jumpsuit.rsi       
+
+- type: entity
+  parent: UniformBase
+  id: UniformMime
+  name: Mime's Outfit
+  description: It's not very colourful.
+  components:
+  - type: Sprite
+    sprite: Clothing/mime_outfit.rsi
+    state: mime
+
+  - type: Icon
+    sprite: Clothing/mime_outfit.rsi
+    state: mime
+
+  - type: Clothing
+    sprite: Clothing/mime_outfit.rsi   
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/items/weapons/kitchen.yml b/Resources/Prototypes/Entities/items/weapons/kitchen.yml
new file mode 100644
index 0000000000..8bdedc6ffe
--- /dev/null
+++ b/Resources/Prototypes/Entities/items/weapons/kitchen.yml
@@ -0,0 +1,20 @@
+- type: entity
+  name: Butcher's Cleaver
+  parent: BaseItem
+  id: ButchCleaver
+  desc: A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products.
+  components:
+  - type: Sprite
+    sprite: Objects/items/cleaver.rsi
+    size: 4
+    state: butch
+
+  - type: Icon
+    sprite: Objects/items/cleaver.rsi
+    state: butch
+
+  - type: MeleeWeapon
+  - type: Item
+    Size: 10
+    sprite: Objects/items/cleaver.rsi
+    prefix: inhand
diff --git a/Resources/Prototypes/SoundCollections/footsteps.yml b/Resources/Prototypes/SoundCollections/footsteps.yml
index e58763a3db..39a7eaabac 100644
--- a/Resources/Prototypes/SoundCollections/footsteps.yml
+++ b/Resources/Prototypes/SoundCollections/footsteps.yml
@@ -1,3 +1,12 @@
+- type: sound_collection
+  id: footstep_carpet
+  files:
+  - /Audio/effects/footsteps/carpet1.ogg
+  - /Audio/effects/footsteps/carpet2.ogg
+  - /Audio/effects/footsteps/carpet3.ogg
+  - /Audio/effects/footsteps/carpet4.ogg
+  - /Audio/effects/footsteps/carpet5.ogg
+
 - type: sound_collection
   id: footstep_catwalk
   files:
@@ -16,6 +25,15 @@
   - /Audio/effects/footsteps/floor4.ogg
   - /Audio/effects/footsteps/floor5.ogg
 
+- type: sound_collection
+  id: footstep_hull
+  files:
+  - /Audio/effects/footsteps/hull1.ogg
+  - /Audio/effects/footsteps/hull2.ogg
+  - /Audio/effects/footsteps/hull3.ogg
+  - /Audio/effects/footsteps/hull4.ogg
+  - /Audio/effects/footsteps/hull5.ogg
+
 - type: sound_collection
   id: footstep_plating
   files:
@@ -25,6 +43,15 @@
   - /Audio/effects/footsteps/plating4.ogg
   - /Audio/effects/footsteps/plating5.ogg
 
+- type: sound_collection
+  id: footstep_tile
+  files:
+  - /Audio/effects/footsteps/tile1.ogg
+  - /Audio/effects/footsteps/tile2.ogg
+  - /Audio/effects/footsteps/tile3.ogg
+  - /Audio/effects/footsteps/tile4.ogg
+  - /Audio/effects/footsteps/tile5.ogg
+
 - type: sound_collection
   id: footstep_clown
   files:
diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
index 01c70a6317..e4ea1876dd 100644
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -1,7 +1,17 @@
 - type: tile
-  name: floor
-  display_name: Floor
-  texture: "floor_steel"
+  name: floor_carpet
+  display_name: Carpet
+  texture: "carpet"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_carpet
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  name: floor_dark
+  display_name: Dark floor
+  texture: "dark"
   is_subfloor: false
   can_crowbar: true
   footstep_sounds: footstep_floor
@@ -9,21 +19,131 @@
   subfloor: plating
 
 - type: tile
-  name: floor_white
-  display_name: White Floor
-  texture: "floor_white"
+  name: floor_elevator_shaft
+  display_name: Elevator shaft
+  texture: "elevator_shaft"
   is_subfloor: false
   can_crowbar: true
   footstep_sounds: footstep_floor
-  friction: 0.1
-  subfloor: underplating
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  name: floor_freezer
+  display_name: Freezer
+  texture: "freezer"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_floor
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  name: floor_hydro
+  display_name: Hydro floor
+  texture: "hydro"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_floor
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  name: floor_green_circuit
+  display_name: Green circuit floor
+  texture: "green_circuit"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_floor
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  name: floor_lino
+  display_name: Linoleum floor
+  texture: "lino"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_floor
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  name: floor_mono
+  display_name: Mono floor
+  texture: "mono"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_floor
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  name: floor_reinforced
+  display_name: Reinforced floor
+  texture: "reinforced"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_floor
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  name: floor_rock_vault
+  display_name: Rock vault floor
+  texture: "rock_vault"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_floor
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  name: floor_showroom
+  display_name: Showroom floor
+  texture: "showroom"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_floor
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  name: floor_steel
+  display_name: Steel floor
+  texture: "steel"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_floor
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  name: floor_steel_dirty
+  display_name: Dirty steel floor
+  texture: "steel_dirty"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_floor
+  friction: 0.35
+  subfloor: plating
 
 - type: tile
   name: floor_techmaint
   display_name: Techmaint Floor
-  texture: "floor_techmaint"
+  texture: "tech_maint"
   is_subfloor: false
   can_crowbar: true
   footstep_sounds: footstep_floor
   friction: 0.5
   subfloor: underplating
+
+- type: tile
+  name: floor_white
+  display_name: White Floor
+  texture: "white"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_floor
+  friction: 0.1
+  subfloor: underplating
diff --git a/Resources/Prototypes/Tiles/floors/hull/hull.yml b/Resources/Prototypes/Tiles/floors/hull/hull.yml
new file mode 100644
index 0000000000..6c259260c1
--- /dev/null
+++ b/Resources/Prototypes/Tiles/floors/hull/hull.yml
@@ -0,0 +1,397 @@
+# TODO: Change code to avoid the DRY
+
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center0
+  display_name: Hull Center 0
+  texture: "Hull/hullcenter0"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center1
+  display_name: Hull Center 1
+  texture: "Hull/hullcenter1"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center2
+  display_name: Hull Center 2
+  texture: "Hull/hullcenter2"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center3
+  display_name: Hull Center 3
+  texture: "Hull/hullcenter3"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center4
+  display_name: Hull Center 4
+  texture: "Hull/hullcenter4"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center5
+  display_name: Hull Center 5
+  texture: "Hull/hullcenter5"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center6
+  display_name: Hull Center 6
+  texture: "Hull/hullcenter6"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center7
+  display_name: Hull Center 7
+  texture: "Hull/hullcenter7"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center8
+  display_name: Hull Center 8
+  texture: "Hull/hullcenter8"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center9
+  display_name: Hull Center 9
+  texture: "Hull/hullcenter9"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center10
+  display_name: Hull Center 10
+  texture: "Hull/hullcenter10"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center11
+  display_name: Hull Center 11
+  texture: "Hull/hullcenter11"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center12
+  display_name: Hull Center 12
+  texture: "Hull/hullcenter12"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center13
+  display_name: Hull Center 13
+  texture: "Hull/hullcenter13"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center14
+  display_name: Hull Center 14
+  texture: "Hull/hullcenter14"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center15
+  display_name: Hull Center 15
+  texture: "Hull/hullcenter15"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center16
+  display_name: Hull Center 16
+  texture: "Hull/hullcenter16"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center17
+  display_name: Hull Center 17
+  texture: "Hull/hullcenter17"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center18
+  display_name: Hull Center 18
+  texture: "Hull/hullcenter18"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center19
+  display_name: Hull Center 19
+  texture: "Hull/hullcenter19"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center20
+  display_name: Hull Center 20
+  texture: "Hull/hullcenter20"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center21
+  display_name: Hull Center 21
+  texture: "Hull/hullcenter21"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center22
+  display_name: Hull Center 22
+  texture: "Hull/hullcenter22"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center23
+  display_name: Hull Center 23
+  texture: "Hull/hullcenter23"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center24
+  display_name: Hull Center 24
+  texture: "Hull/hullcenter24"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center25
+  display_name: Hull Center 25
+  texture: "Hull/hullcenter25"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+  
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center26
+  display_name: Hull Center 26
+  texture: "Hull/hullcenter26"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+  
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center27
+  display_name: Hull Center 27
+  texture: "Hull/hullcenter27"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+  
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center28
+  display_name: Hull Center 28
+  texture: "Hull/hullcenter28"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+  
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center29
+  display_name: Hull Center 29
+  texture: "Hull/hullcenter29"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center30
+  display_name: Hull Center 30
+  texture: "Hull/hullcenter30"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+  
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center31
+  display_name: Hull Center 31
+  texture: "Hull/hullcenter31"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+  
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center32
+  display_name: Hull Center 32
+  texture: "Hull/hullcenter32"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+  
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center33
+  display_name: Hull Center 33
+  texture: "Hull/hullcenter33"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+  
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center34
+  display_name: Hull Center 34
+  texture: "Hull/hullcenter34"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
+  
+- type: tile
+  parent: floor_hull_base
+  name: floor_hull_center35
+  display_name: Hull Center 35
+  texture: "Hull/hullcenter35"
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_hull
+  friction: 0.35
+  subfloor: plating
\ No newline at end of file
diff --git a/Resources/Textures/Buildings/Walls/brick.rsi/brick0.png b/Resources/Textures/Buildings/Walls/brick.rsi/brick0.png
new file mode 100644
index 0000000000..f35146394a
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/brick.rsi/brick0.png differ
diff --git a/Resources/Textures/Buildings/Walls/brick.rsi/brick1.png b/Resources/Textures/Buildings/Walls/brick.rsi/brick1.png
new file mode 100644
index 0000000000..e6733218f6
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/brick.rsi/brick1.png differ
diff --git a/Resources/Textures/Buildings/Walls/brick.rsi/brick2.png b/Resources/Textures/Buildings/Walls/brick.rsi/brick2.png
new file mode 100644
index 0000000000..f35146394a
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/brick.rsi/brick2.png differ
diff --git a/Resources/Textures/Buildings/Walls/brick.rsi/brick3.png b/Resources/Textures/Buildings/Walls/brick.rsi/brick3.png
new file mode 100644
index 0000000000..e6733218f6
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/brick.rsi/brick3.png differ
diff --git a/Resources/Textures/Buildings/Walls/brick.rsi/brick4.png b/Resources/Textures/Buildings/Walls/brick.rsi/brick4.png
new file mode 100644
index 0000000000..893c538db9
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/brick.rsi/brick4.png differ
diff --git a/Resources/Textures/Buildings/Walls/brick.rsi/brick5.png b/Resources/Textures/Buildings/Walls/brick.rsi/brick5.png
new file mode 100644
index 0000000000..a53325619a
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/brick.rsi/brick5.png differ
diff --git a/Resources/Textures/Buildings/Walls/brick.rsi/brick6.png b/Resources/Textures/Buildings/Walls/brick.rsi/brick6.png
new file mode 100644
index 0000000000..893c538db9
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/brick.rsi/brick6.png differ
diff --git a/Resources/Textures/Buildings/Walls/brick.rsi/brick7.png b/Resources/Textures/Buildings/Walls/brick.rsi/brick7.png
new file mode 100644
index 0000000000..a53325619a
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/brick.rsi/brick7.png differ
diff --git a/Resources/Textures/Buildings/Walls/brick.rsi/full.png b/Resources/Textures/Buildings/Walls/brick.rsi/full.png
new file mode 100644
index 0000000000..02d5ea0bed
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/brick.rsi/full.png differ
diff --git a/Resources/Textures/Buildings/Walls/brick.rsi/meta.json b/Resources/Textures/Buildings/Walls/brick.rsi/meta.json
new file mode 100644
index 0000000000..1a33360c7f
--- /dev/null
+++ b/Resources/Textures/Buildings/Walls/brick.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi", "states": [{"name": "brick0", "directions": 4}, {"name": "brick1", "directions": 4}, {"name": "brick2", "directions": 4}, {"name": "brick3", "directions": 4}, {"name": "brick4", "directions": 4}, {"name": "brick5", "directions": 4}, {"name": "brick6", "directions": 4}, {"name": "brick7", "directions": 4}, {"name": "full", "directions": 1}]}
\ No newline at end of file
diff --git a/Resources/Textures/Buildings/Walls/clock.rsi/clock0.png b/Resources/Textures/Buildings/Walls/clock.rsi/clock0.png
new file mode 100644
index 0000000000..fb72d3a1f4
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/clock.rsi/clock0.png differ
diff --git a/Resources/Textures/Buildings/Walls/clock.rsi/clock1.png b/Resources/Textures/Buildings/Walls/clock.rsi/clock1.png
new file mode 100644
index 0000000000..626b446736
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/clock.rsi/clock1.png differ
diff --git a/Resources/Textures/Buildings/Walls/clock.rsi/clock2.png b/Resources/Textures/Buildings/Walls/clock.rsi/clock2.png
new file mode 100644
index 0000000000..fb72d3a1f4
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/clock.rsi/clock2.png differ
diff --git a/Resources/Textures/Buildings/Walls/clock.rsi/clock3.png b/Resources/Textures/Buildings/Walls/clock.rsi/clock3.png
new file mode 100644
index 0000000000..626b446736
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/clock.rsi/clock3.png differ
diff --git a/Resources/Textures/Buildings/Walls/clock.rsi/clock4.png b/Resources/Textures/Buildings/Walls/clock.rsi/clock4.png
new file mode 100644
index 0000000000..16598b39f1
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/clock.rsi/clock4.png differ
diff --git a/Resources/Textures/Buildings/Walls/clock.rsi/clock5.png b/Resources/Textures/Buildings/Walls/clock.rsi/clock5.png
new file mode 100644
index 0000000000..de9c4642df
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/clock.rsi/clock5.png differ
diff --git a/Resources/Textures/Buildings/Walls/clock.rsi/clock6.png b/Resources/Textures/Buildings/Walls/clock.rsi/clock6.png
new file mode 100644
index 0000000000..16598b39f1
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/clock.rsi/clock6.png differ
diff --git a/Resources/Textures/Buildings/Walls/clock.rsi/clock7.png b/Resources/Textures/Buildings/Walls/clock.rsi/clock7.png
new file mode 100644
index 0000000000..de9c4642df
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/clock.rsi/clock7.png differ
diff --git a/Resources/Textures/Buildings/Walls/clock.rsi/full.png b/Resources/Textures/Buildings/Walls/clock.rsi/full.png
new file mode 100644
index 0000000000..6768f805bb
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/clock.rsi/full.png differ
diff --git a/Resources/Textures/Buildings/Walls/clock.rsi/meta.json b/Resources/Textures/Buildings/Walls/clock.rsi/meta.json
new file mode 100644
index 0000000000..0aa0c078c2
--- /dev/null
+++ b/Resources/Textures/Buildings/Walls/clock.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi", "states": [{"name": "clock0", "directions": 4}, {"name": "clock1", "directions": 4}, {"name": "clock2", "directions": 4}, {"name": "clock3", "directions": 4}, {"name": "clock4", "directions": 4}, {"name": "clock5", "directions": 4}, {"name": "clock6", "directions": 4}, {"name": "clock7", "directions": 4}, {"name": "full", "directions": 1}]}
\ No newline at end of file
diff --git a/Resources/Textures/Buildings/Walls/clown.rsi/clown0.png b/Resources/Textures/Buildings/Walls/clown.rsi/clown0.png
new file mode 100644
index 0000000000..cb3cbaad7d
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/clown.rsi/clown0.png differ
diff --git a/Resources/Textures/Buildings/Walls/clown.rsi/clown1.png b/Resources/Textures/Buildings/Walls/clown.rsi/clown1.png
new file mode 100644
index 0000000000..8d88aba2dc
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/clown.rsi/clown1.png differ
diff --git a/Resources/Textures/Buildings/Walls/clown.rsi/clown2.png b/Resources/Textures/Buildings/Walls/clown.rsi/clown2.png
new file mode 100644
index 0000000000..cb3cbaad7d
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/clown.rsi/clown2.png differ
diff --git a/Resources/Textures/Buildings/Walls/clown.rsi/clown3.png b/Resources/Textures/Buildings/Walls/clown.rsi/clown3.png
new file mode 100644
index 0000000000..8d88aba2dc
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/clown.rsi/clown3.png differ
diff --git a/Resources/Textures/Buildings/Walls/clown.rsi/clown4.png b/Resources/Textures/Buildings/Walls/clown.rsi/clown4.png
new file mode 100644
index 0000000000..fd1fd83df6
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/clown.rsi/clown4.png differ
diff --git a/Resources/Textures/Buildings/Walls/clown.rsi/clown5.png b/Resources/Textures/Buildings/Walls/clown.rsi/clown5.png
new file mode 100644
index 0000000000..a92f1576cf
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/clown.rsi/clown5.png differ
diff --git a/Resources/Textures/Buildings/Walls/clown.rsi/clown6.png b/Resources/Textures/Buildings/Walls/clown.rsi/clown6.png
new file mode 100644
index 0000000000..fd1fd83df6
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/clown.rsi/clown6.png differ
diff --git a/Resources/Textures/Buildings/Walls/clown.rsi/clown7.png b/Resources/Textures/Buildings/Walls/clown.rsi/clown7.png
new file mode 100644
index 0000000000..a92f1576cf
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/clown.rsi/clown7.png differ
diff --git a/Resources/Textures/Buildings/Walls/clown.rsi/full.png b/Resources/Textures/Buildings/Walls/clown.rsi/full.png
new file mode 100644
index 0000000000..8ac7c2f578
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/clown.rsi/full.png differ
diff --git a/Resources/Textures/Buildings/Walls/clown.rsi/meta.json b/Resources/Textures/Buildings/Walls/clown.rsi/meta.json
new file mode 100644
index 0000000000..17dfe65e71
--- /dev/null
+++ b/Resources/Textures/Buildings/Walls/clown.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi", "states": [{"name": "clown0", "directions": 4}, {"name": "clown1", "directions": 4}, {"name": "clown2", "directions": 4}, {"name": "clown3", "directions": 4}, {"name": "clown4", "directions": 4}, {"name": "clown5", "directions": 4}, {"name": "clown6", "directions": 4}, {"name": "clown7", "directions": 4}, {"name": "full", "directions": 1}]}
\ No newline at end of file
diff --git a/Resources/Textures/Buildings/Walls/cult.rsi/cult0.png b/Resources/Textures/Buildings/Walls/cult.rsi/cult0.png
new file mode 100644
index 0000000000..72e3288c59
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/cult.rsi/cult0.png differ
diff --git a/Resources/Textures/Buildings/Walls/cult.rsi/cult1.png b/Resources/Textures/Buildings/Walls/cult.rsi/cult1.png
new file mode 100644
index 0000000000..011fdaa492
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/cult.rsi/cult1.png differ
diff --git a/Resources/Textures/Buildings/Walls/cult.rsi/cult2.png b/Resources/Textures/Buildings/Walls/cult.rsi/cult2.png
new file mode 100644
index 0000000000..72e3288c59
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/cult.rsi/cult2.png differ
diff --git a/Resources/Textures/Buildings/Walls/cult.rsi/cult3.png b/Resources/Textures/Buildings/Walls/cult.rsi/cult3.png
new file mode 100644
index 0000000000..011fdaa492
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/cult.rsi/cult3.png differ
diff --git a/Resources/Textures/Buildings/Walls/cult.rsi/cult4.png b/Resources/Textures/Buildings/Walls/cult.rsi/cult4.png
new file mode 100644
index 0000000000..ece15c37df
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/cult.rsi/cult4.png differ
diff --git a/Resources/Textures/Buildings/Walls/cult.rsi/cult5.png b/Resources/Textures/Buildings/Walls/cult.rsi/cult5.png
new file mode 100644
index 0000000000..10582d6eae
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/cult.rsi/cult5.png differ
diff --git a/Resources/Textures/Buildings/Walls/cult.rsi/cult6.png b/Resources/Textures/Buildings/Walls/cult.rsi/cult6.png
new file mode 100644
index 0000000000..ece15c37df
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/cult.rsi/cult6.png differ
diff --git a/Resources/Textures/Buildings/Walls/cult.rsi/cult7.png b/Resources/Textures/Buildings/Walls/cult.rsi/cult7.png
new file mode 100644
index 0000000000..10582d6eae
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/cult.rsi/cult7.png differ
diff --git a/Resources/Textures/Buildings/Walls/cult.rsi/full.png b/Resources/Textures/Buildings/Walls/cult.rsi/full.png
new file mode 100644
index 0000000000..4c99a37c8e
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/cult.rsi/full.png differ
diff --git a/Resources/Textures/Buildings/Walls/cult.rsi/meta.json b/Resources/Textures/Buildings/Walls/cult.rsi/meta.json
new file mode 100644
index 0000000000..0c565d83ab
--- /dev/null
+++ b/Resources/Textures/Buildings/Walls/cult.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi", "states": [{"name": "cult0", "directions": 4}, {"name": "cult1", "directions": 4}, {"name": "cult2", "directions": 4}, {"name": "cult3", "directions": 4}, {"name": "cult4", "directions": 4}, {"name": "cult5", "directions": 4}, {"name": "cult6", "directions": 4}, {"name": "cult7", "directions": 4}, {"name": "full", "directions": 1}]}
\ No newline at end of file
diff --git a/Resources/Textures/Buildings/Walls/debug.rsi/debug0.png b/Resources/Textures/Buildings/Walls/debug.rsi/debug0.png
new file mode 100644
index 0000000000..ef7705acc9
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/debug.rsi/debug0.png differ
diff --git a/Resources/Textures/Buildings/Walls/debug.rsi/debug1.png b/Resources/Textures/Buildings/Walls/debug.rsi/debug1.png
new file mode 100644
index 0000000000..6ae3cea501
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/debug.rsi/debug1.png differ
diff --git a/Resources/Textures/Buildings/Walls/debug.rsi/debug2.png b/Resources/Textures/Buildings/Walls/debug.rsi/debug2.png
new file mode 100644
index 0000000000..ac813c7b1d
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/debug.rsi/debug2.png differ
diff --git a/Resources/Textures/Buildings/Walls/debug.rsi/debug3.png b/Resources/Textures/Buildings/Walls/debug.rsi/debug3.png
new file mode 100644
index 0000000000..ea64baa564
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/debug.rsi/debug3.png differ
diff --git a/Resources/Textures/Buildings/Walls/debug.rsi/debug4.png b/Resources/Textures/Buildings/Walls/debug.rsi/debug4.png
new file mode 100644
index 0000000000..8c0e0c8e5e
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/debug.rsi/debug4.png differ
diff --git a/Resources/Textures/Buildings/Walls/debug.rsi/debug5.png b/Resources/Textures/Buildings/Walls/debug.rsi/debug5.png
new file mode 100644
index 0000000000..ad20303b07
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/debug.rsi/debug5.png differ
diff --git a/Resources/Textures/Buildings/Walls/debug.rsi/debug6.png b/Resources/Textures/Buildings/Walls/debug.rsi/debug6.png
new file mode 100644
index 0000000000..b9be376fd5
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/debug.rsi/debug6.png differ
diff --git a/Resources/Textures/Buildings/Walls/debug.rsi/debug7.png b/Resources/Textures/Buildings/Walls/debug.rsi/debug7.png
new file mode 100644
index 0000000000..45165b75d5
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/debug.rsi/debug7.png differ
diff --git a/Resources/Textures/Buildings/wall.rsi/full.png b/Resources/Textures/Buildings/Walls/debug.rsi/full.png
similarity index 100%
rename from Resources/Textures/Buildings/wall.rsi/full.png
rename to Resources/Textures/Buildings/Walls/debug.rsi/full.png
diff --git a/Resources/Textures/Buildings/Walls/debug.rsi/meta.json b/Resources/Textures/Buildings/Walls/debug.rsi/meta.json
new file mode 100644
index 0000000000..113fe1aa0e
--- /dev/null
+++ b/Resources/Textures/Buildings/Walls/debug.rsi/meta.json
@@ -0,0 +1,65 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/c34c1b30abf18aa552e19294523924c39e5ea127/icons/turf/wall_masks.dmi and modified.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "full",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "debug0",
+            "select": [],
+            "flags": {},
+            "directions": 4
+        },
+        {
+            "name": "debug1",
+            "select": [],
+            "flags": {},
+            "directions": 4
+        },
+        {
+            "name": "debug2",
+            "select": [],
+            "flags": {},
+            "directions": 4
+        },
+        {
+            "name": "debug3",
+            "select": [],
+            "flags": {},
+            "directions": 4
+        },
+        {
+            "name": "debug4",
+            "select": [],
+            "flags": {},
+            "directions": 4
+        },
+        {
+            "name": "debug5",
+            "select": [],
+            "flags": {},
+            "directions": 4
+        },
+        {
+            "name": "debug6",
+            "select": [],
+            "flags": {},
+            "directions": 4
+        },
+        {
+            "name": "debug7",
+            "select": [],
+            "flags": {},
+            "directions": 4
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Buildings/Walls/diamond.rsi/diamond0.png b/Resources/Textures/Buildings/Walls/diamond.rsi/diamond0.png
new file mode 100644
index 0000000000..474375acf9
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/diamond.rsi/diamond0.png differ
diff --git a/Resources/Textures/Buildings/Walls/diamond.rsi/diamond1.png b/Resources/Textures/Buildings/Walls/diamond.rsi/diamond1.png
new file mode 100644
index 0000000000..3abfa69146
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/diamond.rsi/diamond1.png differ
diff --git a/Resources/Textures/Buildings/Walls/diamond.rsi/diamond2.png b/Resources/Textures/Buildings/Walls/diamond.rsi/diamond2.png
new file mode 100644
index 0000000000..474375acf9
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/diamond.rsi/diamond2.png differ
diff --git a/Resources/Textures/Buildings/Walls/diamond.rsi/diamond3.png b/Resources/Textures/Buildings/Walls/diamond.rsi/diamond3.png
new file mode 100644
index 0000000000..3abfa69146
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/diamond.rsi/diamond3.png differ
diff --git a/Resources/Textures/Buildings/Walls/diamond.rsi/diamond4.png b/Resources/Textures/Buildings/Walls/diamond.rsi/diamond4.png
new file mode 100644
index 0000000000..c46db2caa1
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/diamond.rsi/diamond4.png differ
diff --git a/Resources/Textures/Buildings/Walls/diamond.rsi/diamond5.png b/Resources/Textures/Buildings/Walls/diamond.rsi/diamond5.png
new file mode 100644
index 0000000000..61c8fd15ca
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/diamond.rsi/diamond5.png differ
diff --git a/Resources/Textures/Buildings/Walls/diamond.rsi/diamond6.png b/Resources/Textures/Buildings/Walls/diamond.rsi/diamond6.png
new file mode 100644
index 0000000000..c46db2caa1
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/diamond.rsi/diamond6.png differ
diff --git a/Resources/Textures/Buildings/Walls/diamond.rsi/diamond7.png b/Resources/Textures/Buildings/Walls/diamond.rsi/diamond7.png
new file mode 100644
index 0000000000..61c8fd15ca
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/diamond.rsi/diamond7.png differ
diff --git a/Resources/Textures/Buildings/Walls/diamond.rsi/full.png b/Resources/Textures/Buildings/Walls/diamond.rsi/full.png
new file mode 100644
index 0000000000..40091d5abb
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/diamond.rsi/full.png differ
diff --git a/Resources/Textures/Buildings/Walls/diamond.rsi/meta.json b/Resources/Textures/Buildings/Walls/diamond.rsi/meta.json
new file mode 100644
index 0000000000..a905a0404d
--- /dev/null
+++ b/Resources/Textures/Buildings/Walls/diamond.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi", "states": [{"name": "diamond0", "directions": 4}, {"name": "diamond1", "directions": 4}, {"name": "diamond2", "directions": 4}, {"name": "diamond3", "directions": 4}, {"name": "diamond4", "directions": 4}, {"name": "diamond5", "directions": 4}, {"name": "diamond6", "directions": 4}, {"name": "diamond7", "directions": 4}, {"name": "full", "directions": 1}]}
\ No newline at end of file
diff --git a/Resources/Textures/Buildings/Walls/gold.rsi/full.png b/Resources/Textures/Buildings/Walls/gold.rsi/full.png
new file mode 100644
index 0000000000..86126de328
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/gold.rsi/full.png differ
diff --git a/Resources/Textures/Buildings/Walls/gold.rsi/gold0.png b/Resources/Textures/Buildings/Walls/gold.rsi/gold0.png
new file mode 100644
index 0000000000..d6942600d9
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/gold.rsi/gold0.png differ
diff --git a/Resources/Textures/Buildings/Walls/gold.rsi/gold1.png b/Resources/Textures/Buildings/Walls/gold.rsi/gold1.png
new file mode 100644
index 0000000000..e89c521338
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/gold.rsi/gold1.png differ
diff --git a/Resources/Textures/Buildings/Walls/gold.rsi/gold2.png b/Resources/Textures/Buildings/Walls/gold.rsi/gold2.png
new file mode 100644
index 0000000000..d6942600d9
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/gold.rsi/gold2.png differ
diff --git a/Resources/Textures/Buildings/Walls/gold.rsi/gold3.png b/Resources/Textures/Buildings/Walls/gold.rsi/gold3.png
new file mode 100644
index 0000000000..e89c521338
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/gold.rsi/gold3.png differ
diff --git a/Resources/Textures/Buildings/Walls/gold.rsi/gold4.png b/Resources/Textures/Buildings/Walls/gold.rsi/gold4.png
new file mode 100644
index 0000000000..c54d8dfd30
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/gold.rsi/gold4.png differ
diff --git a/Resources/Textures/Buildings/Walls/gold.rsi/gold5.png b/Resources/Textures/Buildings/Walls/gold.rsi/gold5.png
new file mode 100644
index 0000000000..bcb568d5ce
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/gold.rsi/gold5.png differ
diff --git a/Resources/Textures/Buildings/Walls/gold.rsi/gold6.png b/Resources/Textures/Buildings/Walls/gold.rsi/gold6.png
new file mode 100644
index 0000000000..c54d8dfd30
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/gold.rsi/gold6.png differ
diff --git a/Resources/Textures/Buildings/Walls/gold.rsi/gold7.png b/Resources/Textures/Buildings/Walls/gold.rsi/gold7.png
new file mode 100644
index 0000000000..bcb568d5ce
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/gold.rsi/gold7.png differ
diff --git a/Resources/Textures/Buildings/Walls/gold.rsi/meta.json b/Resources/Textures/Buildings/Walls/gold.rsi/meta.json
new file mode 100644
index 0000000000..429e3abcdc
--- /dev/null
+++ b/Resources/Textures/Buildings/Walls/gold.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi", "states": [{"name": "full", "directions": 1}, {"name": "gold0", "directions": 4}, {"name": "gold1", "directions": 4}, {"name": "gold2", "directions": 4}, {"name": "gold3", "directions": 4}, {"name": "gold4", "directions": 4}, {"name": "gold5", "directions": 4}, {"name": "gold6", "directions": 4}, {"name": "gold7", "directions": 4}]}
\ No newline at end of file
diff --git a/Resources/Textures/Buildings/Walls/ice.rsi/full.png b/Resources/Textures/Buildings/Walls/ice.rsi/full.png
new file mode 100644
index 0000000000..48efc7d747
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/ice.rsi/full.png differ
diff --git a/Resources/Textures/Buildings/Walls/ice.rsi/ice0.png b/Resources/Textures/Buildings/Walls/ice.rsi/ice0.png
new file mode 100644
index 0000000000..37c4df3c44
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/ice.rsi/ice0.png differ
diff --git a/Resources/Textures/Buildings/Walls/ice.rsi/ice1.png b/Resources/Textures/Buildings/Walls/ice.rsi/ice1.png
new file mode 100644
index 0000000000..d42c325e63
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/ice.rsi/ice1.png differ
diff --git a/Resources/Textures/Buildings/Walls/ice.rsi/ice2.png b/Resources/Textures/Buildings/Walls/ice.rsi/ice2.png
new file mode 100644
index 0000000000..37c4df3c44
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/ice.rsi/ice2.png differ
diff --git a/Resources/Textures/Buildings/Walls/ice.rsi/ice3.png b/Resources/Textures/Buildings/Walls/ice.rsi/ice3.png
new file mode 100644
index 0000000000..d42c325e63
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/ice.rsi/ice3.png differ
diff --git a/Resources/Textures/Buildings/Walls/ice.rsi/ice4.png b/Resources/Textures/Buildings/Walls/ice.rsi/ice4.png
new file mode 100644
index 0000000000..a9991f30f1
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/ice.rsi/ice4.png differ
diff --git a/Resources/Textures/Buildings/Walls/ice.rsi/ice5.png b/Resources/Textures/Buildings/Walls/ice.rsi/ice5.png
new file mode 100644
index 0000000000..03173523d5
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/ice.rsi/ice5.png differ
diff --git a/Resources/Textures/Buildings/Walls/ice.rsi/ice6.png b/Resources/Textures/Buildings/Walls/ice.rsi/ice6.png
new file mode 100644
index 0000000000..a9991f30f1
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/ice.rsi/ice6.png differ
diff --git a/Resources/Textures/Buildings/Walls/ice.rsi/ice7.png b/Resources/Textures/Buildings/Walls/ice.rsi/ice7.png
new file mode 100644
index 0000000000..03173523d5
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/ice.rsi/ice7.png differ
diff --git a/Resources/Textures/Buildings/Walls/ice.rsi/meta.json b/Resources/Textures/Buildings/Walls/ice.rsi/meta.json
new file mode 100644
index 0000000000..79f62a8372
--- /dev/null
+++ b/Resources/Textures/Buildings/Walls/ice.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi", "states": [{"name": "full", "directions": 1}, {"name": "ice0", "directions": 4}, {"name": "ice1", "directions": 4}, {"name": "ice2", "directions": 4}, {"name": "ice3", "directions": 4}, {"name": "ice4", "directions": 4}, {"name": "ice5", "directions": 4}, {"name": "ice6", "directions": 4}, {"name": "ice7", "directions": 4}]}
\ No newline at end of file
diff --git a/Resources/Textures/Buildings/Walls/metal.rsi/full.png b/Resources/Textures/Buildings/Walls/metal.rsi/full.png
new file mode 100644
index 0000000000..02ae3ff3cc
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/metal.rsi/full.png differ
diff --git a/Resources/Textures/Buildings/Walls/metal.rsi/meta.json b/Resources/Textures/Buildings/Walls/metal.rsi/meta.json
new file mode 100644
index 0000000000..4b06198d67
--- /dev/null
+++ b/Resources/Textures/Buildings/Walls/metal.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi", "states": [{"name": "full", "directions": 1}, {"name": "metal0", "directions": 4}, {"name": "metal1", "directions": 4}, {"name": "metal2", "directions": 4}, {"name": "metal3", "directions": 4}, {"name": "metal4", "directions": 4}, {"name": "metal5", "directions": 4}, {"name": "metal6", "directions": 4}, {"name": "metal7", "directions": 4}]}
\ No newline at end of file
diff --git a/Resources/Textures/Buildings/Walls/metal.rsi/metal0.png b/Resources/Textures/Buildings/Walls/metal.rsi/metal0.png
new file mode 100644
index 0000000000..fe570c054f
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/metal.rsi/metal0.png differ
diff --git a/Resources/Textures/Buildings/Walls/metal.rsi/metal1.png b/Resources/Textures/Buildings/Walls/metal.rsi/metal1.png
new file mode 100644
index 0000000000..4374ed1e10
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/metal.rsi/metal1.png differ
diff --git a/Resources/Textures/Buildings/Walls/metal.rsi/metal2.png b/Resources/Textures/Buildings/Walls/metal.rsi/metal2.png
new file mode 100644
index 0000000000..fe570c054f
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/metal.rsi/metal2.png differ
diff --git a/Resources/Textures/Buildings/Walls/metal.rsi/metal3.png b/Resources/Textures/Buildings/Walls/metal.rsi/metal3.png
new file mode 100644
index 0000000000..4374ed1e10
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/metal.rsi/metal3.png differ
diff --git a/Resources/Textures/Buildings/Walls/metal.rsi/metal4.png b/Resources/Textures/Buildings/Walls/metal.rsi/metal4.png
new file mode 100644
index 0000000000..95e4089479
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/metal.rsi/metal4.png differ
diff --git a/Resources/Textures/Buildings/Walls/metal.rsi/metal5.png b/Resources/Textures/Buildings/Walls/metal.rsi/metal5.png
new file mode 100644
index 0000000000..d4f50d419f
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/metal.rsi/metal5.png differ
diff --git a/Resources/Textures/Buildings/Walls/metal.rsi/metal6.png b/Resources/Textures/Buildings/Walls/metal.rsi/metal6.png
new file mode 100644
index 0000000000..95e4089479
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/metal.rsi/metal6.png differ
diff --git a/Resources/Textures/Buildings/Walls/metal.rsi/metal7.png b/Resources/Textures/Buildings/Walls/metal.rsi/metal7.png
new file mode 100644
index 0000000000..d4f50d419f
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/metal.rsi/metal7.png differ
diff --git a/Resources/Textures/Buildings/Walls/plasma.rsi/full.png b/Resources/Textures/Buildings/Walls/plasma.rsi/full.png
new file mode 100644
index 0000000000..3517e38193
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/plasma.rsi/full.png differ
diff --git a/Resources/Textures/Buildings/Walls/plasma.rsi/meta.json b/Resources/Textures/Buildings/Walls/plasma.rsi/meta.json
new file mode 100644
index 0000000000..805413eed4
--- /dev/null
+++ b/Resources/Textures/Buildings/Walls/plasma.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi", "states": [{"name": "full", "directions": 1}, {"name": "plasma0", "directions": 4}, {"name": "plasma1", "directions": 4}, {"name": "plasma2", "directions": 4}, {"name": "plasma3", "directions": 4}, {"name": "plasma4", "directions": 4}, {"name": "plasma5", "directions": 4}, {"name": "plasma6", "directions": 4}, {"name": "plasma7", "directions": 4}]}
\ No newline at end of file
diff --git a/Resources/Textures/Buildings/Walls/plasma.rsi/plasma0.png b/Resources/Textures/Buildings/Walls/plasma.rsi/plasma0.png
new file mode 100644
index 0000000000..3937fa9a89
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/plasma.rsi/plasma0.png differ
diff --git a/Resources/Textures/Buildings/Walls/plasma.rsi/plasma1.png b/Resources/Textures/Buildings/Walls/plasma.rsi/plasma1.png
new file mode 100644
index 0000000000..113b26fe25
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/plasma.rsi/plasma1.png differ
diff --git a/Resources/Textures/Buildings/Walls/plasma.rsi/plasma2.png b/Resources/Textures/Buildings/Walls/plasma.rsi/plasma2.png
new file mode 100644
index 0000000000..3937fa9a89
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/plasma.rsi/plasma2.png differ
diff --git a/Resources/Textures/Buildings/Walls/plasma.rsi/plasma3.png b/Resources/Textures/Buildings/Walls/plasma.rsi/plasma3.png
new file mode 100644
index 0000000000..113b26fe25
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/plasma.rsi/plasma3.png differ
diff --git a/Resources/Textures/Buildings/Walls/plasma.rsi/plasma4.png b/Resources/Textures/Buildings/Walls/plasma.rsi/plasma4.png
new file mode 100644
index 0000000000..aed36f203d
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/plasma.rsi/plasma4.png differ
diff --git a/Resources/Textures/Buildings/Walls/plasma.rsi/plasma5.png b/Resources/Textures/Buildings/Walls/plasma.rsi/plasma5.png
new file mode 100644
index 0000000000..77eb0dfa5d
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/plasma.rsi/plasma5.png differ
diff --git a/Resources/Textures/Buildings/Walls/plasma.rsi/plasma6.png b/Resources/Textures/Buildings/Walls/plasma.rsi/plasma6.png
new file mode 100644
index 0000000000..aed36f203d
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/plasma.rsi/plasma6.png differ
diff --git a/Resources/Textures/Buildings/Walls/plasma.rsi/plasma7.png b/Resources/Textures/Buildings/Walls/plasma.rsi/plasma7.png
new file mode 100644
index 0000000000..77eb0dfa5d
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/plasma.rsi/plasma7.png differ
diff --git a/Resources/Textures/Buildings/Walls/plastic.rsi/full.png b/Resources/Textures/Buildings/Walls/plastic.rsi/full.png
new file mode 100644
index 0000000000..e57ccc16fe
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/plastic.rsi/full.png differ
diff --git a/Resources/Textures/Buildings/Walls/plastic.rsi/meta.json b/Resources/Textures/Buildings/Walls/plastic.rsi/meta.json
new file mode 100644
index 0000000000..9825703a45
--- /dev/null
+++ b/Resources/Textures/Buildings/Walls/plastic.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi", "states": [{"name": "full", "directions": 1}, {"name": "plastic0", "directions": 4}, {"name": "plastic1", "directions": 4}, {"name": "plastic2", "directions": 4}, {"name": "plastic3", "directions": 4}, {"name": "plastic4", "directions": 4}, {"name": "plastic5", "directions": 4}, {"name": "plastic6", "directions": 4}, {"name": "plastic7", "directions": 4}]}
\ No newline at end of file
diff --git a/Resources/Textures/Buildings/Walls/plastic.rsi/plastic0.png b/Resources/Textures/Buildings/Walls/plastic.rsi/plastic0.png
new file mode 100644
index 0000000000..d352fa78c7
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/plastic.rsi/plastic0.png differ
diff --git a/Resources/Textures/Buildings/Walls/plastic.rsi/plastic1.png b/Resources/Textures/Buildings/Walls/plastic.rsi/plastic1.png
new file mode 100644
index 0000000000..e4136654b4
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/plastic.rsi/plastic1.png differ
diff --git a/Resources/Textures/Buildings/Walls/plastic.rsi/plastic2.png b/Resources/Textures/Buildings/Walls/plastic.rsi/plastic2.png
new file mode 100644
index 0000000000..d352fa78c7
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/plastic.rsi/plastic2.png differ
diff --git a/Resources/Textures/Buildings/Walls/plastic.rsi/plastic3.png b/Resources/Textures/Buildings/Walls/plastic.rsi/plastic3.png
new file mode 100644
index 0000000000..e4136654b4
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/plastic.rsi/plastic3.png differ
diff --git a/Resources/Textures/Buildings/Walls/plastic.rsi/plastic4.png b/Resources/Textures/Buildings/Walls/plastic.rsi/plastic4.png
new file mode 100644
index 0000000000..f1a6180749
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/plastic.rsi/plastic4.png differ
diff --git a/Resources/Textures/Buildings/Walls/plastic.rsi/plastic5.png b/Resources/Textures/Buildings/Walls/plastic.rsi/plastic5.png
new file mode 100644
index 0000000000..32d398d163
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/plastic.rsi/plastic5.png differ
diff --git a/Resources/Textures/Buildings/Walls/plastic.rsi/plastic6.png b/Resources/Textures/Buildings/Walls/plastic.rsi/plastic6.png
new file mode 100644
index 0000000000..f1a6180749
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/plastic.rsi/plastic6.png differ
diff --git a/Resources/Textures/Buildings/Walls/plastic.rsi/plastic7.png b/Resources/Textures/Buildings/Walls/plastic.rsi/plastic7.png
new file mode 100644
index 0000000000..32d398d163
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/plastic.rsi/plastic7.png differ
diff --git a/Resources/Textures/Buildings/Walls/reinforced.rsi/full.png b/Resources/Textures/Buildings/Walls/reinforced.rsi/full.png
new file mode 100644
index 0000000000..80afd7a640
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/reinforced.rsi/full.png differ
diff --git a/Resources/Textures/Buildings/Walls/reinforced.rsi/meta.json b/Resources/Textures/Buildings/Walls/reinforced.rsi/meta.json
new file mode 100644
index 0000000000..31a5ab6a9f
--- /dev/null
+++ b/Resources/Textures/Buildings/Walls/reinforced.rsi/meta.json
@@ -0,0 +1,47 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi",
+    "states": [
+        {
+            "name": "full",
+            "directions": 1
+        },
+        {
+            "name": "reinforced0",
+            "directions": 4
+        },
+        {
+            "name": "reinforced1",
+            "directions": 4
+        },
+        {
+            "name": "reinforced2",
+            "directions": 4
+        },
+        {
+            "name": "reinforced3",
+            "directions": 4
+        },
+        {
+            "name": "reinforced4",
+            "directions": 4
+        },
+        {
+            "name": "reinforced5",
+            "directions": 4
+        },
+        {
+            "name": "reinforced6",
+            "directions": 4
+        },
+        {
+            "name": "reinforced7",
+            "directions": 4
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced0.png b/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced0.png
new file mode 100644
index 0000000000..b2a009861b
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced0.png differ
diff --git a/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced1.png b/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced1.png
new file mode 100644
index 0000000000..dd7af70642
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced1.png differ
diff --git a/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced2.png b/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced2.png
new file mode 100644
index 0000000000..b2a009861b
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced2.png differ
diff --git a/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced3.png b/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced3.png
new file mode 100644
index 0000000000..dd7af70642
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced3.png differ
diff --git a/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced4.png b/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced4.png
new file mode 100644
index 0000000000..2f2c404b19
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced4.png differ
diff --git a/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced5.png b/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced5.png
new file mode 100644
index 0000000000..7f933a86c7
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced5.png differ
diff --git a/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced6.png b/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced6.png
new file mode 100644
index 0000000000..2f2c404b19
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced6.png differ
diff --git a/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced7.png b/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced7.png
new file mode 100644
index 0000000000..7f933a86c7
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced7.png differ
diff --git a/Resources/Textures/Buildings/Walls/riveted.rsi/full.png b/Resources/Textures/Buildings/Walls/riveted.rsi/full.png
new file mode 100644
index 0000000000..e8b5a056a5
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/riveted.rsi/full.png differ
diff --git a/Resources/Textures/Buildings/Walls/riveted.rsi/meta.json b/Resources/Textures/Buildings/Walls/riveted.rsi/meta.json
new file mode 100644
index 0000000000..9c917dfecb
--- /dev/null
+++ b/Resources/Textures/Buildings/Walls/riveted.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi", "states": [{"name": "full", "directions": 1}, {"name": "riveted0", "directions": 4}, {"name": "riveted1", "directions": 4}, {"name": "riveted2", "directions": 4}, {"name": "riveted3", "directions": 4}, {"name": "riveted4", "directions": 4}, {"name": "riveted5", "directions": 4}, {"name": "riveted6", "directions": 4}, {"name": "riveted7", "directions": 4}]}
\ No newline at end of file
diff --git a/Resources/Textures/Buildings/Walls/riveted.rsi/riveted0.png b/Resources/Textures/Buildings/Walls/riveted.rsi/riveted0.png
new file mode 100644
index 0000000000..03d03fb7a7
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/riveted.rsi/riveted0.png differ
diff --git a/Resources/Textures/Buildings/Walls/riveted.rsi/riveted1.png b/Resources/Textures/Buildings/Walls/riveted.rsi/riveted1.png
new file mode 100644
index 0000000000..8a3db62a52
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/riveted.rsi/riveted1.png differ
diff --git a/Resources/Textures/Buildings/Walls/riveted.rsi/riveted2.png b/Resources/Textures/Buildings/Walls/riveted.rsi/riveted2.png
new file mode 100644
index 0000000000..03d03fb7a7
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/riveted.rsi/riveted2.png differ
diff --git a/Resources/Textures/Buildings/Walls/riveted.rsi/riveted3.png b/Resources/Textures/Buildings/Walls/riveted.rsi/riveted3.png
new file mode 100644
index 0000000000..8a3db62a52
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/riveted.rsi/riveted3.png differ
diff --git a/Resources/Textures/Buildings/Walls/riveted.rsi/riveted4.png b/Resources/Textures/Buildings/Walls/riveted.rsi/riveted4.png
new file mode 100644
index 0000000000..6823f9a1db
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/riveted.rsi/riveted4.png differ
diff --git a/Resources/Textures/Buildings/Walls/riveted.rsi/riveted5.png b/Resources/Textures/Buildings/Walls/riveted.rsi/riveted5.png
new file mode 100644
index 0000000000..c3495ae1fc
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/riveted.rsi/riveted5.png differ
diff --git a/Resources/Textures/Buildings/Walls/riveted.rsi/riveted6.png b/Resources/Textures/Buildings/Walls/riveted.rsi/riveted6.png
new file mode 100644
index 0000000000..6823f9a1db
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/riveted.rsi/riveted6.png differ
diff --git a/Resources/Textures/Buildings/Walls/riveted.rsi/riveted7.png b/Resources/Textures/Buildings/Walls/riveted.rsi/riveted7.png
new file mode 100644
index 0000000000..c3495ae1fc
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/riveted.rsi/riveted7.png differ
diff --git a/Resources/Textures/Buildings/Walls/sandstone.rsi/full.png b/Resources/Textures/Buildings/Walls/sandstone.rsi/full.png
new file mode 100644
index 0000000000..10073074be
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/sandstone.rsi/full.png differ
diff --git a/Resources/Textures/Buildings/Walls/sandstone.rsi/meta.json b/Resources/Textures/Buildings/Walls/sandstone.rsi/meta.json
new file mode 100644
index 0000000000..8c0ac19002
--- /dev/null
+++ b/Resources/Textures/Buildings/Walls/sandstone.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi", "states": [{"name": "full", "directions": 1}, {"name": "sandstone0", "directions": 4}, {"name": "sandstone1", "directions": 4}, {"name": "sandstone2", "directions": 4}, {"name": "sandstone3", "directions": 4}, {"name": "sandstone4", "directions": 4}, {"name": "sandstone5", "directions": 4}, {"name": "sandstone6", "directions": 4}, {"name": "sandstone7", "directions": 4}]}
\ No newline at end of file
diff --git a/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone0.png b/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone0.png
new file mode 100644
index 0000000000..ce844ee24e
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone0.png differ
diff --git a/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone1.png b/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone1.png
new file mode 100644
index 0000000000..398fd7bbbc
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone1.png differ
diff --git a/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone2.png b/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone2.png
new file mode 100644
index 0000000000..ce844ee24e
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone2.png differ
diff --git a/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone3.png b/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone3.png
new file mode 100644
index 0000000000..398fd7bbbc
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone3.png differ
diff --git a/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone4.png b/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone4.png
new file mode 100644
index 0000000000..e73c84e1d6
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone4.png differ
diff --git a/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone5.png b/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone5.png
new file mode 100644
index 0000000000..a93d3e403c
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone5.png differ
diff --git a/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone6.png b/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone6.png
new file mode 100644
index 0000000000..e73c84e1d6
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone6.png differ
diff --git a/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone7.png b/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone7.png
new file mode 100644
index 0000000000..a93d3e403c
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone7.png differ
diff --git a/Resources/Textures/Buildings/Walls/silver.rsi/full.png b/Resources/Textures/Buildings/Walls/silver.rsi/full.png
new file mode 100644
index 0000000000..5a62346f2c
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/silver.rsi/full.png differ
diff --git a/Resources/Textures/Buildings/Walls/silver.rsi/meta.json b/Resources/Textures/Buildings/Walls/silver.rsi/meta.json
new file mode 100644
index 0000000000..b0c0c4f600
--- /dev/null
+++ b/Resources/Textures/Buildings/Walls/silver.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi", "states": [{"name": "full", "directions": 1}, {"name": "silver0", "directions": 4}, {"name": "silver1", "directions": 4}, {"name": "silver2", "directions": 4}, {"name": "silver3", "directions": 4}, {"name": "silver4", "directions": 4}, {"name": "silver5", "directions": 4}, {"name": "silver6", "directions": 4}, {"name": "silver7", "directions": 4}]}
\ No newline at end of file
diff --git a/Resources/Textures/Buildings/Walls/silver.rsi/silver0.png b/Resources/Textures/Buildings/Walls/silver.rsi/silver0.png
new file mode 100644
index 0000000000..61233d77ec
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/silver.rsi/silver0.png differ
diff --git a/Resources/Textures/Buildings/Walls/silver.rsi/silver1.png b/Resources/Textures/Buildings/Walls/silver.rsi/silver1.png
new file mode 100644
index 0000000000..c44cdb96eb
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/silver.rsi/silver1.png differ
diff --git a/Resources/Textures/Buildings/Walls/silver.rsi/silver2.png b/Resources/Textures/Buildings/Walls/silver.rsi/silver2.png
new file mode 100644
index 0000000000..61233d77ec
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/silver.rsi/silver2.png differ
diff --git a/Resources/Textures/Buildings/Walls/silver.rsi/silver3.png b/Resources/Textures/Buildings/Walls/silver.rsi/silver3.png
new file mode 100644
index 0000000000..c44cdb96eb
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/silver.rsi/silver3.png differ
diff --git a/Resources/Textures/Buildings/Walls/silver.rsi/silver4.png b/Resources/Textures/Buildings/Walls/silver.rsi/silver4.png
new file mode 100644
index 0000000000..91a8c56dda
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/silver.rsi/silver4.png differ
diff --git a/Resources/Textures/Buildings/Walls/silver.rsi/silver5.png b/Resources/Textures/Buildings/Walls/silver.rsi/silver5.png
new file mode 100644
index 0000000000..5f33b88dd9
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/silver.rsi/silver5.png differ
diff --git a/Resources/Textures/Buildings/Walls/silver.rsi/silver6.png b/Resources/Textures/Buildings/Walls/silver.rsi/silver6.png
new file mode 100644
index 0000000000..91a8c56dda
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/silver.rsi/silver6.png differ
diff --git a/Resources/Textures/Buildings/Walls/silver.rsi/silver7.png b/Resources/Textures/Buildings/Walls/silver.rsi/silver7.png
new file mode 100644
index 0000000000..5f33b88dd9
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/silver.rsi/silver7.png differ
diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/full.png b/Resources/Textures/Buildings/Walls/solid.rsi/full.png
new file mode 100644
index 0000000000..ff0bdc22d7
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/solid.rsi/full.png differ
diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/meta.json b/Resources/Textures/Buildings/Walls/solid.rsi/meta.json
new file mode 100644
index 0000000000..1a680b0803
--- /dev/null
+++ b/Resources/Textures/Buildings/Walls/solid.rsi/meta.json
@@ -0,0 +1,65 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/c34c1b30abf18aa552e19294523924c39e5ea127/icons/turf/wall_masks.dmi and modified.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "full",
+            "select": [],
+            "flags": {},
+            "directions": 1
+        },
+        {
+            "name": "solid0",
+            "select": [],
+            "flags": {},
+            "directions": 4
+        },
+        {
+            "name": "solid1",
+            "select": [],
+            "flags": {},
+            "directions": 4
+        },
+        {
+            "name": "solid2",
+            "select": [],
+            "flags": {},
+            "directions": 4
+        },
+        {
+            "name": "solid3",
+            "select": [],
+            "flags": {},
+            "directions": 4
+        },
+        {
+            "name": "solid4",
+            "select": [],
+            "flags": {},
+            "directions": 4
+        },
+        {
+            "name": "solid5",
+            "select": [],
+            "flags": {},
+            "directions": 4
+        },
+        {
+            "name": "solid6",
+            "select": [],
+            "flags": {},
+            "directions": 4
+        },
+        {
+            "name": "solid7",
+            "select": [],
+            "flags": {},
+            "directions": 4
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Buildings/wall.rsi/solid0.png b/Resources/Textures/Buildings/Walls/solid.rsi/solid0.png
similarity index 100%
rename from Resources/Textures/Buildings/wall.rsi/solid0.png
rename to Resources/Textures/Buildings/Walls/solid.rsi/solid0.png
diff --git a/Resources/Textures/Buildings/wall.rsi/solid1.png b/Resources/Textures/Buildings/Walls/solid.rsi/solid1.png
similarity index 100%
rename from Resources/Textures/Buildings/wall.rsi/solid1.png
rename to Resources/Textures/Buildings/Walls/solid.rsi/solid1.png
diff --git a/Resources/Textures/Buildings/wall.rsi/solid2.png b/Resources/Textures/Buildings/Walls/solid.rsi/solid2.png
similarity index 100%
rename from Resources/Textures/Buildings/wall.rsi/solid2.png
rename to Resources/Textures/Buildings/Walls/solid.rsi/solid2.png
diff --git a/Resources/Textures/Buildings/wall.rsi/solid3.png b/Resources/Textures/Buildings/Walls/solid.rsi/solid3.png
similarity index 100%
rename from Resources/Textures/Buildings/wall.rsi/solid3.png
rename to Resources/Textures/Buildings/Walls/solid.rsi/solid3.png
diff --git a/Resources/Textures/Buildings/wall.rsi/solid4.png b/Resources/Textures/Buildings/Walls/solid.rsi/solid4.png
similarity index 100%
rename from Resources/Textures/Buildings/wall.rsi/solid4.png
rename to Resources/Textures/Buildings/Walls/solid.rsi/solid4.png
diff --git a/Resources/Textures/Buildings/wall.rsi/solid5.png b/Resources/Textures/Buildings/Walls/solid.rsi/solid5.png
similarity index 100%
rename from Resources/Textures/Buildings/wall.rsi/solid5.png
rename to Resources/Textures/Buildings/Walls/solid.rsi/solid5.png
diff --git a/Resources/Textures/Buildings/wall.rsi/solid6.png b/Resources/Textures/Buildings/Walls/solid.rsi/solid6.png
similarity index 100%
rename from Resources/Textures/Buildings/wall.rsi/solid6.png
rename to Resources/Textures/Buildings/Walls/solid.rsi/solid6.png
diff --git a/Resources/Textures/Buildings/wall.rsi/solid7.png b/Resources/Textures/Buildings/Walls/solid.rsi/solid7.png
similarity index 100%
rename from Resources/Textures/Buildings/wall.rsi/solid7.png
rename to Resources/Textures/Buildings/Walls/solid.rsi/solid7.png
diff --git a/Resources/Textures/Buildings/Walls/uranium.rsi/full.png b/Resources/Textures/Buildings/Walls/uranium.rsi/full.png
new file mode 100644
index 0000000000..91038590fc
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/uranium.rsi/full.png differ
diff --git a/Resources/Textures/Buildings/Walls/uranium.rsi/meta.json b/Resources/Textures/Buildings/Walls/uranium.rsi/meta.json
new file mode 100644
index 0000000000..05e28fa50f
--- /dev/null
+++ b/Resources/Textures/Buildings/Walls/uranium.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi", "states": [{"name": "full", "directions": 1}, {"name": "uranium0", "directions": 4}, {"name": "uranium1", "directions": 4}, {"name": "uranium2", "directions": 4}, {"name": "uranium3", "directions": 4}, {"name": "uranium4", "directions": 4}, {"name": "uranium5", "directions": 4}, {"name": "uranium6", "directions": 4}, {"name": "uranium7", "directions": 4}]}
\ No newline at end of file
diff --git a/Resources/Textures/Buildings/Walls/uranium.rsi/uranium0.png b/Resources/Textures/Buildings/Walls/uranium.rsi/uranium0.png
new file mode 100644
index 0000000000..1eb151b113
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/uranium.rsi/uranium0.png differ
diff --git a/Resources/Textures/Buildings/Walls/uranium.rsi/uranium1.png b/Resources/Textures/Buildings/Walls/uranium.rsi/uranium1.png
new file mode 100644
index 0000000000..919fa3bf56
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/uranium.rsi/uranium1.png differ
diff --git a/Resources/Textures/Buildings/Walls/uranium.rsi/uranium2.png b/Resources/Textures/Buildings/Walls/uranium.rsi/uranium2.png
new file mode 100644
index 0000000000..1eb151b113
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/uranium.rsi/uranium2.png differ
diff --git a/Resources/Textures/Buildings/Walls/uranium.rsi/uranium3.png b/Resources/Textures/Buildings/Walls/uranium.rsi/uranium3.png
new file mode 100644
index 0000000000..919fa3bf56
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/uranium.rsi/uranium3.png differ
diff --git a/Resources/Textures/Buildings/Walls/uranium.rsi/uranium4.png b/Resources/Textures/Buildings/Walls/uranium.rsi/uranium4.png
new file mode 100644
index 0000000000..2c722ecf7a
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/uranium.rsi/uranium4.png differ
diff --git a/Resources/Textures/Buildings/Walls/uranium.rsi/uranium5.png b/Resources/Textures/Buildings/Walls/uranium.rsi/uranium5.png
new file mode 100644
index 0000000000..b37b0dcd2a
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/uranium.rsi/uranium5.png differ
diff --git a/Resources/Textures/Buildings/Walls/uranium.rsi/uranium6.png b/Resources/Textures/Buildings/Walls/uranium.rsi/uranium6.png
new file mode 100644
index 0000000000..2c722ecf7a
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/uranium.rsi/uranium6.png differ
diff --git a/Resources/Textures/Buildings/Walls/uranium.rsi/uranium7.png b/Resources/Textures/Buildings/Walls/uranium.rsi/uranium7.png
new file mode 100644
index 0000000000..b37b0dcd2a
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/uranium.rsi/uranium7.png differ
diff --git a/Resources/Textures/Buildings/Walls/wood.rsi/full.png b/Resources/Textures/Buildings/Walls/wood.rsi/full.png
new file mode 100644
index 0000000000..c1d1c6ea03
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/wood.rsi/full.png differ
diff --git a/Resources/Textures/Buildings/Walls/wood.rsi/meta.json b/Resources/Textures/Buildings/Walls/wood.rsi/meta.json
new file mode 100644
index 0000000000..2041d1e90d
--- /dev/null
+++ b/Resources/Textures/Buildings/Walls/wood.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi", "states": [{"name": "full", "directions": 1}, {"name": "wood0", "directions": 4}, {"name": "wood1", "directions": 4}, {"name": "wood2", "directions": 4}, {"name": "wood3", "directions": 4}, {"name": "wood4", "directions": 4}, {"name": "wood5", "directions": 4}, {"name": "wood6", "directions": 4}, {"name": "wood7", "directions": 4}]}
\ No newline at end of file
diff --git a/Resources/Textures/Buildings/Walls/wood.rsi/wood0.png b/Resources/Textures/Buildings/Walls/wood.rsi/wood0.png
new file mode 100644
index 0000000000..3909f61bd6
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/wood.rsi/wood0.png differ
diff --git a/Resources/Textures/Buildings/Walls/wood.rsi/wood1.png b/Resources/Textures/Buildings/Walls/wood.rsi/wood1.png
new file mode 100644
index 0000000000..e83f04687d
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/wood.rsi/wood1.png differ
diff --git a/Resources/Textures/Buildings/Walls/wood.rsi/wood2.png b/Resources/Textures/Buildings/Walls/wood.rsi/wood2.png
new file mode 100644
index 0000000000..3909f61bd6
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/wood.rsi/wood2.png differ
diff --git a/Resources/Textures/Buildings/Walls/wood.rsi/wood3.png b/Resources/Textures/Buildings/Walls/wood.rsi/wood3.png
new file mode 100644
index 0000000000..e83f04687d
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/wood.rsi/wood3.png differ
diff --git a/Resources/Textures/Buildings/Walls/wood.rsi/wood4.png b/Resources/Textures/Buildings/Walls/wood.rsi/wood4.png
new file mode 100644
index 0000000000..66c0976064
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/wood.rsi/wood4.png differ
diff --git a/Resources/Textures/Buildings/Walls/wood.rsi/wood5.png b/Resources/Textures/Buildings/Walls/wood.rsi/wood5.png
new file mode 100644
index 0000000000..2bf0e04de3
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/wood.rsi/wood5.png differ
diff --git a/Resources/Textures/Buildings/Walls/wood.rsi/wood6.png b/Resources/Textures/Buildings/Walls/wood.rsi/wood6.png
new file mode 100644
index 0000000000..66c0976064
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/wood.rsi/wood6.png differ
diff --git a/Resources/Textures/Buildings/Walls/wood.rsi/wood7.png b/Resources/Textures/Buildings/Walls/wood.rsi/wood7.png
new file mode 100644
index 0000000000..2bf0e04de3
Binary files /dev/null and b/Resources/Textures/Buildings/Walls/wood.rsi/wood7.png differ
diff --git a/Resources/Textures/Buildings/wall.rsi/meta.json b/Resources/Textures/Buildings/wall.rsi/meta.json
deleted file mode 100644
index e9a4e8c52a..0000000000
--- a/Resources/Textures/Buildings/wall.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version":1,"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/c34c1b30abf18aa552e19294523924c39e5ea127/icons/turf/wall_masks.dmi and modified.","size":{"x":32,"y":32},"states":[{"name":"full","select":[],"flags":{},"directions":1},{"name":"solid0","select":[],"flags":{},"directions":4},{"name":"solid1","select":[],"flags":{},"directions":4},{"name":"solid2","select":[],"flags":{},"directions":4},{"name":"solid3","select":[],"flags":{},"directions":4},{"name":"solid4","select":[],"flags":{},"directions":4},{"name":"solid5","select":[],"flags":{},"directions":4},{"name":"solid6","select":[],"flags":{},"directions":4},{"name":"solid7","select":[],"flags":{},"directions":4}]}
diff --git a/Resources/Textures/Clothing/beret.rsi/beret.png b/Resources/Textures/Clothing/beret.rsi/beret.png
new file mode 100644
index 0000000000..feac165f6d
Binary files /dev/null and b/Resources/Textures/Clothing/beret.rsi/beret.png differ
diff --git a/Resources/Textures/Clothing/beret.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/beret.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..2918a7d0b3
Binary files /dev/null and b/Resources/Textures/Clothing/beret.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/beret.rsi/meta.json b/Resources/Textures/Clothing/beret.rsi/meta.json
new file mode 100644
index 0000000000..831fc7e571
--- /dev/null
+++ b/Resources/Textures/Clothing/beret.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/tree/Bleeding-Edge/icons",
+    "states": [
+        {
+            "name": "equipped-HELMET",
+            "directions": 4,
+            "delays": [
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ]
+            ]
+        },
+        {
+            "name": "beret",
+            "directions": 1,
+            "delays": [ [ 1.0 ] ]
+        }		
+    ]
+}
diff --git a/Resources/Textures/Clothing/captain_hat.rsi/captain.png b/Resources/Textures/Clothing/captain_hat.rsi/captain.png
new file mode 100644
index 0000000000..c546f5370b
Binary files /dev/null and b/Resources/Textures/Clothing/captain_hat.rsi/captain.png differ
diff --git a/Resources/Textures/Clothing/captain_hat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/captain_hat.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..93a7d44571
Binary files /dev/null and b/Resources/Textures/Clothing/captain_hat.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/captain_hat.rsi/meta.json b/Resources/Textures/Clothing/captain_hat.rsi/meta.json
new file mode 100644
index 0000000000..5bdf16c43d
--- /dev/null
+++ b/Resources/Textures/Clothing/captain_hat.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5",
+    "states": [
+        {
+            "name": "equipped-HELMET",
+            "directions": 4,
+            "delays": [
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ]
+            ]
+        },
+        {
+            "name": "captain",
+            "directions": 1,
+            "delays": [ [ 1.0 ] ]
+        }		
+    ]
+}
diff --git a/Resources/Textures/Clothing/captain_uniform.rsi/captain.png b/Resources/Textures/Clothing/captain_uniform.rsi/captain.png
new file mode 100644
index 0000000000..153195f561
Binary files /dev/null and b/Resources/Textures/Clothing/captain_uniform.rsi/captain.png differ
diff --git a/Resources/Textures/Clothing/captain_uniform.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/captain_uniform.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..f64c76e54c
Binary files /dev/null and b/Resources/Textures/Clothing/captain_uniform.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/captain_uniform.rsi/inhand-left.png b/Resources/Textures/Clothing/captain_uniform.rsi/inhand-left.png
new file mode 100644
index 0000000000..c48c84c07f
Binary files /dev/null and b/Resources/Textures/Clothing/captain_uniform.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/captain_uniform.rsi/inhand-right.png b/Resources/Textures/Clothing/captain_uniform.rsi/inhand-right.png
new file mode 100644
index 0000000000..6b5de1dfa5
Binary files /dev/null and b/Resources/Textures/Clothing/captain_uniform.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/captain_uniform.rsi/meta.json b/Resources/Textures/Clothing/captain_uniform.rsi/meta.json
new file mode 100644
index 0000000000..dd23dd26be
--- /dev/null
+++ b/Resources/Textures/Clothing/captain_uniform.rsi/meta.json
@@ -0,0 +1,74 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5",
+    "states": [
+        {
+            "name": "equipped-INNERCLOTHING",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "captain",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/chef_apron.rsi/apron.png b/Resources/Textures/Clothing/chef_apron.rsi/apron.png
new file mode 100644
index 0000000000..221b01644e
Binary files /dev/null and b/Resources/Textures/Clothing/chef_apron.rsi/apron.png differ
diff --git a/Resources/Textures/Clothing/chef_apron.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/chef_apron.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..d1c76ba5d3
Binary files /dev/null and b/Resources/Textures/Clothing/chef_apron.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/chef_apron.rsi/inhand-left.png b/Resources/Textures/Clothing/chef_apron.rsi/inhand-left.png
new file mode 100644
index 0000000000..84e5e83e3f
Binary files /dev/null and b/Resources/Textures/Clothing/chef_apron.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/chef_apron.rsi/inhand-right.png b/Resources/Textures/Clothing/chef_apron.rsi/inhand-right.png
new file mode 100644
index 0000000000..69ad696a10
Binary files /dev/null and b/Resources/Textures/Clothing/chef_apron.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/chef_apron.rsi/meta.json b/Resources/Textures/Clothing/chef_apron.rsi/meta.json
new file mode 100644
index 0000000000..0361d4ed6c
--- /dev/null
+++ b/Resources/Textures/Clothing/chef_apron.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", "states": [{"name": "apron", "directions": 1, "delays": [[1.0]]}, {"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
diff --git a/Resources/Textures/Clothing/chef_hat.rsi/chef.png b/Resources/Textures/Clothing/chef_hat.rsi/chef.png
new file mode 100644
index 0000000000..8326e41535
Binary files /dev/null and b/Resources/Textures/Clothing/chef_hat.rsi/chef.png differ
diff --git a/Resources/Textures/Clothing/chef_hat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/chef_hat.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..97b5f391f7
Binary files /dev/null and b/Resources/Textures/Clothing/chef_hat.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/chef_hat.rsi/inhand-left.png b/Resources/Textures/Clothing/chef_hat.rsi/inhand-left.png
new file mode 100644
index 0000000000..c79a39f400
Binary files /dev/null and b/Resources/Textures/Clothing/chef_hat.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/chef_hat.rsi/inhand-right.png b/Resources/Textures/Clothing/chef_hat.rsi/inhand-right.png
new file mode 100644
index 0000000000..a01d406dae
Binary files /dev/null and b/Resources/Textures/Clothing/chef_hat.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/chef_hat.rsi/meta.json b/Resources/Textures/Clothing/chef_hat.rsi/meta.json
new file mode 100644
index 0000000000..01f066139e
--- /dev/null
+++ b/Resources/Textures/Clothing/chef_hat.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5",
+    "states": [
+        {
+            "name": "equipped-HELMET",
+            "directions": 4,
+            "delays": [
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ]
+            ]
+        },
+        {
+            "name": "chef",
+            "directions": 1,
+            "delays": [ [ 1.0 ] ]
+        },
+		{"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}
+    ]
+}
diff --git a/Resources/Textures/Clothing/chef_uniform.rsi/chef.png b/Resources/Textures/Clothing/chef_uniform.rsi/chef.png
new file mode 100644
index 0000000000..cb5599f81c
Binary files /dev/null and b/Resources/Textures/Clothing/chef_uniform.rsi/chef.png differ
diff --git a/Resources/Textures/Clothing/chef_uniform.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/chef_uniform.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..de50443a1b
Binary files /dev/null and b/Resources/Textures/Clothing/chef_uniform.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/chef_uniform.rsi/inhand-left.png b/Resources/Textures/Clothing/chef_uniform.rsi/inhand-left.png
new file mode 100644
index 0000000000..84e5e83e3f
Binary files /dev/null and b/Resources/Textures/Clothing/chef_uniform.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/chef_uniform.rsi/inhand-right.png b/Resources/Textures/Clothing/chef_uniform.rsi/inhand-right.png
new file mode 100644
index 0000000000..69ad696a10
Binary files /dev/null and b/Resources/Textures/Clothing/chef_uniform.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/chef_uniform.rsi/meta.json b/Resources/Textures/Clothing/chef_uniform.rsi/meta.json
new file mode 100644
index 0000000000..2f24b9fc23
--- /dev/null
+++ b/Resources/Textures/Clothing/chef_uniform.rsi/meta.json
@@ -0,0 +1,74 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5",
+    "states": [
+        {
+            "name": "equipped-INNERCLOTHING",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "chef",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/gloves_white.rsi/equipped-HAND.png b/Resources/Textures/Clothing/gloves_white.rsi/equipped-HAND.png
new file mode 100644
index 0000000000..db6ccef964
Binary files /dev/null and b/Resources/Textures/Clothing/gloves_white.rsi/equipped-HAND.png differ
diff --git a/Resources/Textures/Clothing/gloves_white.rsi/meta.json b/Resources/Textures/Clothing/gloves_white.rsi/meta.json
new file mode 100644
index 0000000000..2a3252cfc8
--- /dev/null
+++ b/Resources/Textures/Clothing/gloves_white.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5",
+    "states": [
+	    {
+            "name": "white",
+            "directions": 1,
+            "delays": [ [ 1.0 ] ]
+        },	
+        {
+            "name": "equipped-HAND",
+            "directions": 4,
+            "delays": [
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/gloves_white.rsi/white.png b/Resources/Textures/Clothing/gloves_white.rsi/white.png
new file mode 100644
index 0000000000..4732b24b5b
Binary files /dev/null and b/Resources/Textures/Clothing/gloves_white.rsi/white.png differ
diff --git a/Resources/Textures/Clothing/hop_coat.rsi/equipped-OUTER.png b/Resources/Textures/Clothing/hop_coat.rsi/equipped-OUTER.png
new file mode 100644
index 0000000000..823f77efb1
Binary files /dev/null and b/Resources/Textures/Clothing/hop_coat.rsi/equipped-OUTER.png differ
diff --git a/Resources/Textures/Clothing/hop_hat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/hop_hat.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..866e91981a
Binary files /dev/null and b/Resources/Textures/Clothing/hop_hat.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/hop_hat.rsi/hop.png b/Resources/Textures/Clothing/hop_hat.rsi/hop.png
new file mode 100644
index 0000000000..55e5a58f11
Binary files /dev/null and b/Resources/Textures/Clothing/hop_hat.rsi/hop.png differ
diff --git a/Resources/Textures/Clothing/hop_hat.rsi/meta.json b/Resources/Textures/Clothing/hop_hat.rsi/meta.json
new file mode 100644
index 0000000000..8eb2d55846
--- /dev/null
+++ b/Resources/Textures/Clothing/hop_hat.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/tree/Bleeding-Edge/icons",
+    "states": [
+        {
+            "name": "equipped-HELMET",
+            "directions": 4,
+            "delays": [
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ]
+            ]
+        },
+        {
+            "name": "hop",
+            "directions": 1,
+            "delays": [ [ 1.0 ] ]
+        }		
+    ]
+}
diff --git a/Resources/Textures/Clothing/shoes_brown.rsi/brown.png b/Resources/Textures/Clothing/shoes_brown.rsi/brown.png
new file mode 100644
index 0000000000..13c6a7cdaf
Binary files /dev/null and b/Resources/Textures/Clothing/shoes_brown.rsi/brown.png differ
diff --git a/Resources/Textures/Clothing/shoes_brown.rsi/equipped-FEET.png b/Resources/Textures/Clothing/shoes_brown.rsi/equipped-FEET.png
new file mode 100644
index 0000000000..36572038de
Binary files /dev/null and b/Resources/Textures/Clothing/shoes_brown.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/shoes_brown.rsi/meta.json b/Resources/Textures/Clothing/shoes_brown.rsi/meta.json
new file mode 100644
index 0000000000..d58bf644cd
--- /dev/null
+++ b/Resources/Textures/Clothing/shoes_brown.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/Bleeding-Edge/icons/mob/feet.dmi", "states": [{"name": "brown", "directions": 1, "delays": [[1.0]]}, {"name": "equipped-FEET", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
diff --git a/Resources/Textures/Objects/items/cleaver.rsi/butch.png b/Resources/Textures/Objects/items/cleaver.rsi/butch.png
new file mode 100644
index 0000000000..922bb19c1a
Binary files /dev/null and b/Resources/Textures/Objects/items/cleaver.rsi/butch.png differ
diff --git a/Resources/Textures/Objects/items/cleaver.rsi/inhand-left.png b/Resources/Textures/Objects/items/cleaver.rsi/inhand-left.png
new file mode 100644
index 0000000000..cfd9677f61
Binary files /dev/null and b/Resources/Textures/Objects/items/cleaver.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/items/cleaver.rsi/inhand-right.png b/Resources/Textures/Objects/items/cleaver.rsi/inhand-right.png
new file mode 100644
index 0000000000..37f57e543f
Binary files /dev/null and b/Resources/Textures/Objects/items/cleaver.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/items/cleaver.rsi/meta.json b/Resources/Textures/Objects/items/cleaver.rsi/meta.json
new file mode 100644
index 0000000000..e295b94b1f
--- /dev/null
+++ b/Resources/Textures/Objects/items/cleaver.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "states": [{"name": "butch", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Tiles/Hull/hullcenter0.png b/Resources/Textures/Tiles/Hull/hullcenter0.png
new file mode 100644
index 0000000000..6de58f7b70
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter0.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter1.png b/Resources/Textures/Tiles/Hull/hullcenter1.png
new file mode 100644
index 0000000000..1db1fda3bc
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter1.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter10.png b/Resources/Textures/Tiles/Hull/hullcenter10.png
new file mode 100644
index 0000000000..be18f0a3ef
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter10.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter11.png b/Resources/Textures/Tiles/Hull/hullcenter11.png
new file mode 100644
index 0000000000..f32ceb2fde
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter11.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter12.png b/Resources/Textures/Tiles/Hull/hullcenter12.png
new file mode 100644
index 0000000000..3c827c61bd
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter12.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter13.png b/Resources/Textures/Tiles/Hull/hullcenter13.png
new file mode 100644
index 0000000000..73329c2e41
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter13.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter14.png b/Resources/Textures/Tiles/Hull/hullcenter14.png
new file mode 100644
index 0000000000..afe54afcaa
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter14.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter15.png b/Resources/Textures/Tiles/Hull/hullcenter15.png
new file mode 100644
index 0000000000..6dda5defc2
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter15.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter16.png b/Resources/Textures/Tiles/Hull/hullcenter16.png
new file mode 100644
index 0000000000..1868054bf6
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter16.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter17.png b/Resources/Textures/Tiles/Hull/hullcenter17.png
new file mode 100644
index 0000000000..31b123e640
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter17.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter18.png b/Resources/Textures/Tiles/Hull/hullcenter18.png
new file mode 100644
index 0000000000..589dab0aeb
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter18.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter19.png b/Resources/Textures/Tiles/Hull/hullcenter19.png
new file mode 100644
index 0000000000..17d99efce1
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter19.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter2.png b/Resources/Textures/Tiles/Hull/hullcenter2.png
new file mode 100644
index 0000000000..fe0c414932
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter2.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter20.png b/Resources/Textures/Tiles/Hull/hullcenter20.png
new file mode 100644
index 0000000000..4e556977a1
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter20.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter21.png b/Resources/Textures/Tiles/Hull/hullcenter21.png
new file mode 100644
index 0000000000..add79c50a6
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter21.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter22.png b/Resources/Textures/Tiles/Hull/hullcenter22.png
new file mode 100644
index 0000000000..5670691d42
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter22.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter23.png b/Resources/Textures/Tiles/Hull/hullcenter23.png
new file mode 100644
index 0000000000..e75cf287fb
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter23.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter24.png b/Resources/Textures/Tiles/Hull/hullcenter24.png
new file mode 100644
index 0000000000..b35d097fef
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter24.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter25.png b/Resources/Textures/Tiles/Hull/hullcenter25.png
new file mode 100644
index 0000000000..5bf195431b
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter25.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter26.png b/Resources/Textures/Tiles/Hull/hullcenter26.png
new file mode 100644
index 0000000000..7fb6966be5
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter26.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter27.png b/Resources/Textures/Tiles/Hull/hullcenter27.png
new file mode 100644
index 0000000000..6de58f7b70
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter27.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter28.png b/Resources/Textures/Tiles/Hull/hullcenter28.png
new file mode 100644
index 0000000000..0cb31e7ce7
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter28.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter29.png b/Resources/Textures/Tiles/Hull/hullcenter29.png
new file mode 100644
index 0000000000..ee0a7a3a93
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter29.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter3.png b/Resources/Textures/Tiles/Hull/hullcenter3.png
new file mode 100644
index 0000000000..012dd1ee5a
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter3.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter30.png b/Resources/Textures/Tiles/Hull/hullcenter30.png
new file mode 100644
index 0000000000..828b6f409c
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter30.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter31.png b/Resources/Textures/Tiles/Hull/hullcenter31.png
new file mode 100644
index 0000000000..4d15a45513
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter31.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter32.png b/Resources/Textures/Tiles/Hull/hullcenter32.png
new file mode 100644
index 0000000000..40d655e1d0
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter32.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter33.png b/Resources/Textures/Tiles/Hull/hullcenter33.png
new file mode 100644
index 0000000000..533577ba9d
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter33.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter34.png b/Resources/Textures/Tiles/Hull/hullcenter34.png
new file mode 100644
index 0000000000..88c0b865a2
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter34.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter35.png b/Resources/Textures/Tiles/Hull/hullcenter35.png
new file mode 100644
index 0000000000..b8e0e71f01
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter35.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter4.png b/Resources/Textures/Tiles/Hull/hullcenter4.png
new file mode 100644
index 0000000000..4f3abb4aff
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter4.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter5.png b/Resources/Textures/Tiles/Hull/hullcenter5.png
new file mode 100644
index 0000000000..219ebf713a
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter5.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter6.png b/Resources/Textures/Tiles/Hull/hullcenter6.png
new file mode 100644
index 0000000000..cb30c790c9
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter6.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter7.png b/Resources/Textures/Tiles/Hull/hullcenter7.png
new file mode 100644
index 0000000000..12da87efcc
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter7.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter8.png b/Resources/Textures/Tiles/Hull/hullcenter8.png
new file mode 100644
index 0000000000..9c6d9a9a76
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter8.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter9.png b/Resources/Textures/Tiles/Hull/hullcenter9.png
new file mode 100644
index 0000000000..bfaf65845b
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter9.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter_corners.png b/Resources/Textures/Tiles/Hull/hullcenter_corners.png
new file mode 100644
index 0000000000..facf94ef6b
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter_corners.png differ
diff --git a/Resources/Textures/Tiles/Hull/hullcenter_edges.png b/Resources/Textures/Tiles/Hull/hullcenter_edges.png
new file mode 100644
index 0000000000..1f905a0b04
Binary files /dev/null and b/Resources/Textures/Tiles/Hull/hullcenter_edges.png differ
diff --git a/Resources/Textures/Tiles/asteroid.png b/Resources/Textures/Tiles/asteroid.png
new file mode 100644
index 0000000000..efa1480d21
Binary files /dev/null and b/Resources/Textures/Tiles/asteroid.png differ
diff --git a/Resources/Textures/Tiles/asteroidfloor.png b/Resources/Textures/Tiles/asteroidfloor.png
new file mode 100644
index 0000000000..a8666de5f7
Binary files /dev/null and b/Resources/Textures/Tiles/asteroidfloor.png differ
diff --git a/Resources/Textures/Tiles/carpet.png b/Resources/Textures/Tiles/carpet.png
new file mode 100644
index 0000000000..e6f73cc5c7
Binary files /dev/null and b/Resources/Textures/Tiles/carpet.png differ
diff --git a/Resources/Textures/Tiles/dark.png b/Resources/Textures/Tiles/dark.png
new file mode 100644
index 0000000000..6599d6e771
Binary files /dev/null and b/Resources/Textures/Tiles/dark.png differ
diff --git a/Resources/Textures/Tiles/elevator_shaft.png b/Resources/Textures/Tiles/elevator_shaft.png
new file mode 100644
index 0000000000..6c661fb3eb
Binary files /dev/null and b/Resources/Textures/Tiles/elevator_shaft.png differ
diff --git a/Resources/Textures/Tiles/freezer.png b/Resources/Textures/Tiles/freezer.png
new file mode 100644
index 0000000000..c49c56c784
Binary files /dev/null and b/Resources/Textures/Tiles/freezer.png differ
diff --git a/Resources/Textures/Tiles/green_circuit.png b/Resources/Textures/Tiles/green_circuit.png
new file mode 100644
index 0000000000..27628369aa
Binary files /dev/null and b/Resources/Textures/Tiles/green_circuit.png differ
diff --git a/Resources/Textures/Tiles/hydro.png b/Resources/Textures/Tiles/hydro.png
new file mode 100644
index 0000000000..8c51642057
Binary files /dev/null and b/Resources/Textures/Tiles/hydro.png differ
diff --git a/Resources/Textures/Tiles/lino.png b/Resources/Textures/Tiles/lino.png
new file mode 100644
index 0000000000..7528f1378a
Binary files /dev/null and b/Resources/Textures/Tiles/lino.png differ
diff --git a/Resources/Textures/Tiles/mono.png b/Resources/Textures/Tiles/mono.png
new file mode 100644
index 0000000000..e7107c38e6
Binary files /dev/null and b/Resources/Textures/Tiles/mono.png differ
diff --git a/Resources/Textures/Tiles/reinforced.png b/Resources/Textures/Tiles/reinforced.png
new file mode 100644
index 0000000000..d5fa580013
Binary files /dev/null and b/Resources/Textures/Tiles/reinforced.png differ
diff --git a/Resources/Textures/Tiles/rock_vault.png b/Resources/Textures/Tiles/rock_vault.png
new file mode 100644
index 0000000000..4b05bf4a12
Binary files /dev/null and b/Resources/Textures/Tiles/rock_vault.png differ
diff --git a/Resources/Textures/Tiles/showroom.png b/Resources/Textures/Tiles/showroom.png
new file mode 100644
index 0000000000..0026f2a645
Binary files /dev/null and b/Resources/Textures/Tiles/showroom.png differ
diff --git a/Resources/Textures/Tiles/snow.png b/Resources/Textures/Tiles/snow.png
new file mode 100644
index 0000000000..f4cab8ebf8
Binary files /dev/null and b/Resources/Textures/Tiles/snow.png differ
diff --git a/Resources/Textures/Tiles/floor_steel.png b/Resources/Textures/Tiles/steel.png
similarity index 100%
rename from Resources/Textures/Tiles/floor_steel.png
rename to Resources/Textures/Tiles/steel.png
diff --git a/Resources/Textures/Tiles/steel_dirty.png b/Resources/Textures/Tiles/steel_dirty.png
new file mode 100644
index 0000000000..1e67e947ec
Binary files /dev/null and b/Resources/Textures/Tiles/steel_dirty.png differ
diff --git a/Resources/Textures/Tiles/floor_techmaint.png b/Resources/Textures/Tiles/tech_maint.png
similarity index 100%
rename from Resources/Textures/Tiles/floor_techmaint.png
rename to Resources/Textures/Tiles/tech_maint.png
diff --git a/Resources/Textures/Tiles/floor_white.png b/Resources/Textures/Tiles/white.png
similarity index 100%
rename from Resources/Textures/Tiles/floor_white.png
rename to Resources/Textures/Tiles/white.png
diff --git a/Resources/parallax_config.toml b/Resources/parallax_config.toml
index b0458b29d9..dbb74f9448 100644
--- a/Resources/parallax_config.toml
+++ b/Resources/parallax_config.toml
@@ -2,8 +2,8 @@
 [[layers]]
 type = "noise"
 seed = 7832
-innercolor = "#A020E1"
-outercolor = "#490070"
+innercolor = "#5d1fe1"
+outercolor = "#230070"
 noise_type = "ridged"
 frequency = "4"
 octaves = 8
@@ -77,7 +77,7 @@ maskseed = 3551
 [[layers]]
 type = "points"
 closecolor = "#FFD363"
-count = 100
+count = 30
 seed = 6454
 
 # And their dim edge.
@@ -85,5 +85,5 @@ seed = 6454
 type = "points"
 closecolor = "#43371A"
 pointsize = 2
-count = 100
+count = 30
 seed = 6454
diff --git a/RobustToolbox b/RobustToolbox
index f3f317385a..023a782048 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit f3f317385a542152cf753b5cfc7582e508ec2f57
+Subproject commit 023a782048188af3a81527d76ce38bcd43c94c5a
diff --git a/SS14.Launcher/SS14.Launcher.csproj b/SS14.Launcher/SS14.Launcher.csproj
index e46f2b427c..c6247f8252 100644
--- a/SS14.Launcher/SS14.Launcher.csproj
+++ b/SS14.Launcher/SS14.Launcher.csproj
@@ -26,5 +26,5 @@
   <PropertyGroup>
     <RobustToolsPath>..\RobustToolbox\Tools\</RobustToolsPath>
   </PropertyGroup>
-  <Target Name="RobustAfterBuild" DependsOnTargets="CopySS14Noise;CopyMiscDependencies;CopySwnfd" AfterTargets="Build" />
+  <Target Name="RobustAfterBuild" DependsOnTargets="CopyMiscDependencies;CopySwnfd" AfterTargets="Build" />
 </Project>