diff --git a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
index 5bae35da5ba..8087d1833e6 100644
--- a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
+++ b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Humanoid.Prototypes;
@@ -30,6 +31,15 @@ private void UpdateSprite(HumanoidAppearanceComponent component, SpriteComponent
         UpdateLayers(component, sprite);
         ApplyMarkingSet(component, sprite);
 
+        var speciesPrototype = _prototypeManager.Index(component.Species);
+
+        var height = Math.Clamp(component.Height, speciesPrototype.MinHeight, speciesPrototype.MaxHeight);
+        var width = Math.Clamp(component.Width, speciesPrototype.MinWidth, speciesPrototype.MaxWidth);
+        component.Height = height;
+        component.Width = width;
+
+        sprite.Scale = new Vector2(width, height);
+
         sprite[sprite.LayerMapReserveBlank(HumanoidVisualLayers.Eyes)].Color = component.EyeColor;
     }
 
@@ -194,6 +204,8 @@ public override void LoadProfile(EntityUid uid, HumanoidCharacterProfile profile
         humanoid.Species = profile.Species;
         humanoid.SkinColor = profile.Appearance.SkinColor;
         humanoid.EyeColor = profile.Appearance.EyeColor;
+        humanoid.Height = profile.Height;
+        humanoid.Width = profile.Width;
 
         UpdateSprite(humanoid, Comp<SpriteComponent>(uid));
     }
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
index 38d4a411ff3..e34eb41ef9a 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
@@ -108,6 +108,22 @@
                                     <Label Text="{Loc 'humanoid-profile-editor-spawn-priority-label'}" />
                                     <Control HorizontalExpand="True"/>
                                     <OptionButton Name="CSpawnPriorityButton" HorizontalAlignment="Right" />
+                                </BoxContainer>
+								<!-- Height -->
+                                <BoxContainer HorizontalExpand="True">
+                                    <Label Name="CHeightLabel" MinWidth="110" />
+                                    <Slider Name="CHeightSlider" MinValue="0.5" Value="1" MaxValue="1.5" HorizontalExpand="True" Margin="5 0 5 0" />
+                                    <Button Name="CHeightReset" Text="{Loc 'ui-options-bind-reset'}" />
+                                </BoxContainer>
+                                <!-- Width -->
+                                <BoxContainer HorizontalExpand="True">
+                                    <Label Name="CWidthLabel" MinWidth="110" />
+                                    <Slider Name="CWidthSlider" MinValue="0.5" Value="1" MaxValue="1.5" HorizontalExpand="True" Margin="5 0 5 0" />
+                                    <Button Name="CWidthReset" Text="{Loc 'ui-options-bind-reset'}" />
+                                </BoxContainer>
+                                <!--Weight -->
+                                <BoxContainer HorizontalExpand="True">
+                                    <Label Name="CWeightLabel" />
                                 </BoxContainer>
                             </BoxContainer>
                             <!-- Skin -->
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index fd84b675222..c797f02a754 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -31,6 +31,7 @@
 using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
 using Robust.Shared.Map;
+using Robust.Shared.Physics;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
@@ -81,6 +82,8 @@ public sealed partial class HumanoidProfileEditor : Control
         private SingleMarkingPicker _hairPicker => CHairStylePicker;
         private SingleMarkingPicker _facialHairPicker => CFacialHairPicker;
         private EyeColorPicker _eyesPicker => CEyeColorPicker;
+        private Slider _heightSlider => CHeightSlider;
+        private Slider _widthSlider => CWidthSlider;
 
         private TabContainer _tabContainer => CTabContainer;
         private BoxContainer _jobList => CJobList;
@@ -213,6 +216,82 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
 
             #endregion Species
 
+            #region Height
+
+            var prototype = _speciesList.Find(x => x.ID == Profile?.Species) ?? _speciesList.First();
+
+            _heightSlider.MinValue = prototype.MinHeight;
+            _heightSlider.MaxValue = prototype.MaxHeight;
+            _heightSlider.Value = Profile?.Height ?? prototype.DefaultHeight;
+            var height = MathF.Round(prototype.AverageHeight * _heightSlider.Value);
+            CHeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", (int) height));
+
+            _heightSlider.OnValueChanged += args =>
+            {
+                if (Profile is null)
+                    return;
+
+                prototype = _speciesList.Find(x => x.ID == Profile.Species) ?? _speciesList.First(); // Just in case
+
+                var value = Math.Clamp(args.Value, prototype.MinHeight, prototype.MaxHeight);
+                var height = MathF.Round(prototype.AverageHeight * value);
+                CHeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", (int) height));
+                SetProfileHeight(value);
+                UpdateWeight();
+            };
+
+            CHeightReset.OnPressed += _ =>
+            {
+                _heightSlider.Value = prototype.DefaultHeight;
+                SetProfileHeight(prototype.DefaultHeight);
+                UpdateWeight();
+            };
+
+
+            _widthSlider.MinValue = prototype.MinWidth;
+            _widthSlider.MaxValue = prototype.MaxWidth;
+            _widthSlider.Value = Profile?.Width ?? prototype.DefaultWidth;
+            var width = MathF.Round(prototype.AverageWidth * _widthSlider.Value);
+            CWidthLabel.Text = Loc.GetString("humanoid-profile-editor-width-label", ("width", width));
+
+            _widthSlider.OnValueChanged += args =>
+            {
+                if (Profile is null)
+                    return;
+
+                prototype = _speciesList.Find(x => x.ID == Profile.Species) ?? _speciesList.First(); // Just in case
+
+                var value = Math.Clamp(args.Value, prototype.MinWidth, prototype.MaxWidth);
+                var width = MathF.Round(prototype.AverageWidth * value);
+                CWidthLabel.Text = Loc.GetString("humanoid-profile-editor-width-label", ("width", width));
+                SetProfileWidth(value);
+                UpdateWeight();
+            };
+
+            CWidthReset.OnPressed += _ =>
+            {
+                _widthSlider.Value = prototype.DefaultWidth;
+                SetProfileWidth(prototype.DefaultWidth);
+                UpdateWeight();
+            };
+
+            prototypeManager.Index(prototype.Prototype).TryGetComponent<FixturesComponent>(out var fixture);
+            if (fixture != null)
+            {
+                var radius = fixture.Fixtures["fix1"].Shape.Radius;
+                var density = fixture.Fixtures["fix1"].Density;
+                var avg = (_widthSlider.Value + _heightSlider.Value) / 2;
+                var weight = MathF.Round(MathF.PI * MathF.Pow(radius * avg, 2) * density);
+                CWeightLabel.Text = Loc.GetString("humanoid-profile-editor-weight-label", ("weight", (int) weight));
+            }
+            else
+            {
+                // Whelp, the fixture doesn't exist, guesstimate it instead
+                CWeightLabel.Text = Loc.GetString("humanoid-profile-editor-weight-label", ("weight", (int) 71));
+            }
+
+            #endregion Height
+
             #region Skin
 
 
@@ -877,6 +956,10 @@ private void SetSpecies(string newSpecies)
             OnSkinColorOnValueChanged(); // Species may have special color prefs, make sure to update it.
             CMarkings.SetSpecies(newSpecies); // Repopulate the markings tab as well.
             UpdateSexControls(); // update sex for new species
+            // Changing species provides inaccurate sliders without these
+            UpdateHeightControls();
+            UpdateWidthControls();
+            UpdateWeight();
             RebuildSpriteView(); // they might have different inv so we need a new dummy
             UpdateSpeciesGuidebookIcon();
             IsDirty = true;
@@ -907,6 +990,18 @@ private void SetSpawnPriority(SpawnPriorityPreference newSpawnPriority)
             IsDirty = true;
         }
 
+        private void SetProfileHeight(float height)
+        {
+            Profile = Profile?.WithHeight(height);
+            IsDirty = true;
+        }
+
+        private void SetProfileWidth(float width)
+        {
+            Profile = Profile?.WithWidth(width);
+            IsDirty = true;
+        }
+
         public void Save()
         {
             IsDirty = false;
@@ -1111,6 +1206,56 @@ private void UpdateSpawnPriorityControls()
             _spawnPriorityButton.SelectId((int) Profile.SpawnPriority);
         }
 
+        private void UpdateHeightControls()
+        {
+            if (Profile == null)
+                return;
+
+            var species = _speciesList.Find(x => x.ID == Profile.Species) ?? _speciesList.First();
+
+            _heightSlider.MinValue = species.MinHeight;
+            _heightSlider.Value = Profile.Height;
+            _heightSlider.MaxValue = species.MaxHeight;
+
+            var height = MathF.Round(species.AverageHeight * _heightSlider.Value);
+            CHeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", (int) height));
+        }
+
+        private void UpdateWidthControls()
+        {
+            if (Profile == null)
+                return;
+
+            var species = _speciesList.Find(x => x.ID == Profile.Species) ?? _speciesList.First();
+
+            _widthSlider.MinValue = species.MinWidth;
+            _widthSlider.Value = Profile.Width;
+            _widthSlider.MaxValue = species.MaxWidth;
+
+            var width = MathF.Round(species.AverageWidth * _widthSlider.Value);
+            CWidthLabel.Text = Loc.GetString("humanoid-profile-editor-width-label", ("width", (int) width));
+        }
+
+        private void UpdateWeight()
+        {
+            if (Profile == null)
+                return;
+
+            var species = _speciesList.Find(x => x.ID == Profile.Species) ?? _speciesList.First();
+            _prototypeManager.Index(species.Prototype).TryGetComponent<FixturesComponent>(out var fixture);
+
+            if (fixture != null)
+            {
+                var radius = fixture.Fixtures["fix1"].Shape.Radius;
+                var density = fixture.Fixtures["fix1"].Density;
+                var avg = (Profile.Width + Profile.Height) / 2;
+                var weight = MathF.Round(MathF.PI * MathF.Pow(radius * avg, 2) * density);
+                CWeightLabel.Text = Loc.GetString("humanoid-profile-editor-weight-label", ("weight", (int) weight));
+            }
+
+            _previewSpriteView.InvalidateMeasure();
+        }
+
         private void UpdateHairPickers()
         {
             if (Profile == null)
@@ -1266,6 +1411,9 @@ public void UpdateControls()
             UpdateHairPickers();
             UpdateCMarkingsHair();
             UpdateCMarkingsFacialHair();
+            UpdateHeightControls();
+            UpdateWidthControls();
+            UpdateWeight();
 
             _preferenceUnavailableButton.SelectId((int) Profile.PreferenceUnavailable);
         }
diff --git a/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs b/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
index 035823af430..fed2a9f1716 100644
--- a/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
@@ -66,11 +66,11 @@ public BaseShuttleControl(float minRange, float maxRange, float range) : base(mi
 
     protected void DrawData(DrawingHandleScreen handle, string text)
     {
-        var coordsDimensions = handle.GetDimensions(Font, text, UIScale);
+        var coordsDimensions = handle.GetDimensions(Font, text, 1f);
         const float coordsMargins = 5f;
 
         handle.DrawString(Font,
-            new Vector2(coordsMargins, Height) - new Vector2(0f, coordsDimensions.Y + coordsMargins),
+            new Vector2(coordsMargins, PixelHeight) - new Vector2(0f, coordsDimensions.Y + coordsMargins),
             text,
             Color.FromSrgb(IFFComponent.SelfColor));
     }
diff --git a/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs b/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs
index 2ce1906d3d2..2f35a8dffd7 100644
--- a/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs
@@ -116,7 +116,7 @@ protected override void KeyBindUp(GUIBoundKeyEventArgs args)
 
                 var mapTransform = Matrix3.CreateInverseTransform(Offset, Angle.Zero);
 
-                if (beaconsOnly && TryGetBeacon(_beacons, mapTransform, args.RelativePosition, PixelRect, out var foundBeacon, out _))
+                if (beaconsOnly && TryGetBeacon(_beacons, mapTransform, args.RelativePixelPosition, PixelRect, out var foundBeacon, out _))
                 {
                     RequestBeaconFTL?.Invoke(foundBeacon.Entity, _ftlAngle);
                 }
@@ -206,7 +206,8 @@ private void DrawParallax(DrawingHandleScreen handle)
     private List<IMapObject> GetViewportMapObjects(Matrix3 matty, List<IMapObject> mapObjects)
     {
         var results = new List<IMapObject>();
-        var viewBox = SizeBox.Scale(1.2f);
+        var enlargement = new Vector2i((int) (16 * UIScale), (int) (16 * UIScale));
+        var viewBox = new UIBox2i(Vector2i.Zero - enlargement, PixelSize + enlargement);
 
         foreach (var mapObj in mapObjects)
         {
@@ -398,8 +399,8 @@ protected override void Draw(DrawingHandleScreen handle)
 
             foreach (var (gridUiPos, iffText) in sendStrings)
             {
-                var textWidth = handle.GetDimensions(_font, iffText, UIScale);
-                handle.DrawString(_font, gridUiPos + textWidth with { X = -textWidth.X / 2f }, iffText, adjustedColor);
+                var textWidth = handle.GetDimensions(_font, iffText, 1f);
+                handle.DrawString(_font, gridUiPos + textWidth with { X = -textWidth.X / 2f, Y = textWidth.Y * UIScale }, iffText, adjustedColor);
             }
         }
 
@@ -587,7 +588,7 @@ private bool TryGetBeacon(IEnumerable<IMapObject> mapObjects, Matrix3 mapTransfo
 
             var distance = (localPos - mousePos).Length();
 
-            if (distance > BeaconSnapRange ||
+            if (distance > BeaconSnapRange * UIScale ||
                 distance > nearestValue)
             {
                 continue;
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
index 9e50cab3e10..57d200d96b6 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
@@ -1,4 +1,5 @@
 using System.Numerics;
+using Content.Client.Gameplay;
 using Content.Client.Items;
 using Content.Client.Weapons.Ranged.Components;
 using Content.Shared.Camera;
@@ -12,6 +13,7 @@
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.Player;
+using Robust.Client.State;
 using Robust.Shared.Animations;
 using Robust.Shared.Input;
 using Robust.Shared.Map;
@@ -27,6 +29,7 @@ public sealed partial class GunSystem : SharedGunSystem
     [Dependency] private readonly IEyeManager _eyeManager = default!;
     [Dependency] private readonly IInputManager _inputManager = default!;
     [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IStateManager _state = default!;
     [Dependency] private readonly AnimationPlayerSystem _animPlayer = default!;
     [Dependency] private readonly InputSystem _inputSystem = default!;
     [Dependency] private readonly SharedCameraRecoilSystem _recoil = default!;
@@ -171,10 +174,15 @@ public override void Update(float frameTime)
         // Define target coordinates relative to gun entity, so that network latency on moving grids doesn't fuck up the target location.
         var coordinates = EntityCoordinates.FromMap(entity, mousePos, TransformSystem, EntityManager);
 
+        NetEntity? target = null;
+        if (_state.CurrentState is GameplayStateBase screen)
+            target = GetNetEntity(screen.GetClickedEntity(mousePos));
+
         Log.Debug($"Sending shoot request tick {Timing.CurTick} / {Timing.CurTime}");
 
         EntityManager.RaisePredictiveEvent(new RequestShootEvent
         {
+            Target = target,
             Coordinates = GetNetCoordinates(coordinates),
             Gun = GetNetEntity(gunUid),
         });
diff --git a/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs b/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
index 2845e451470..b4417200242 100644
--- a/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
+++ b/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
@@ -41,6 +41,8 @@ private static HumanoidCharacterProfile CharlieCharlieson()
                 "Charlie Charlieson",
                 "The biggest boy around.",
                 "Human",
+                1,
+                1,
                 21,
                 Sex.Male,
                 Gender.Epicene,
diff --git a/Content.Server.Database/Migrations/Postgres/20240127102028_Height.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240127102028_Height.Designer.cs
new file mode 100644
index 00000000000..6720412dc34
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20240127102028_Height.Designer.cs
@@ -0,0 +1,1372 @@
+// <auto-generated />
+using System;
+using System.Net;
+using System.Text.Json;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    [DbContext(typeof(PostgresServerDbContext))]
+    [Migration("20230711102742_HeightWidth")]
+    partial class HeightWidth
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.4")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("boolean")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<short>("Impact")
+                        .HasColumnType("smallint")
+                        .HasColumnName("impact");
+
+                    b.Property<JsonDocument>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer")
+                        .HasColumnName("type");
+
+                    b.HasKey("Id", "RoundId")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Message")
+                        .HasAnnotation("Npgsql:TsVectorConfig", "english");
+
+                    NpgsqlIndexBuilderExtensions.HasMethod(b.HasIndex("Message"), "GIN");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_log_round_id");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogEntity", b =>
+                {
+                    b.Property<int>("Uid")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("uid");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Uid"));
+
+                    b.Property<int?>("AdminLogId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<int?>("AdminLogRoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_log_round_id");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Uid")
+                        .HasName("PK_admin_log_entity");
+
+                    b.HasIndex("AdminLogId", "AdminLogRoundId")
+                        .HasDatabaseName("IX_admin_log_entity_admin_log_id_admin_log_round_id");
+
+                    b.ToTable("admin_log_entity", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("integer")
+                        .HasColumnName("log_id");
+
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("PlayerUserId", "LogId", "RoundId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("LogId", "RoundId");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_notes_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("ShownToPlayer")
+                        .HasColumnType("boolean")
+                        .HasColumnName("shown_to_player");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("antag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("assigned_user_id_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<IPAddress>("Address")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("smallint")
+                        .HasColumnName("denied");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("time");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("job_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("play_time_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("interval")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("player_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<IPAddress>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<byte[]>("LastSeenHWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("last_seen_hwid");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", null, t =>
+                        {
+                            t.HasCheckConstraint("LastSeenAddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= last_seen_address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("integer")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Age")
+                        .HasColumnType("integer")
+                        .HasColumnName("age");
+
+                    b.Property<string>("Backpack")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("backpack");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("Clothing")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("clothing");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_name");
+
+                    b.Property<float>("Height")
+                        .HasColumnType("real")
+                        .HasColumnName("height");
+
+                    b.Property<float>("Width")
+                        .HasColumnType("real")
+                        .HasColumnName("width");
+
+                    b.Property<JsonDocument>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("integer")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("integer")
+                        .HasColumnName("slot");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<ValueTuple<IPAddress, int>?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("boolean")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("integer")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("integer")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_hit_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_role_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<ValueTuple<IPAddress, int>?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("role_unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("trait_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("integer")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogEntity", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminLog", null)
+                        .WithMany("Entities")
+                        .HasForeignKey("AdminLogId", "AdminLogRoundId")
+                        .HasConstraintName("FK_admin_log_entity_admin_log_admin_log_id_admin_log_round_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("LogId", "RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_log_id_round_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Entities");
+
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/20240127102028_Height.cs b/Content.Server.Database/Migrations/Postgres/20240127102028_Height.cs
new file mode 100644
index 00000000000..35f49bc7413
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20240127102028_Height.cs
@@ -0,0 +1,40 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    /// <inheritdoc />
+    public partial class HeightWidth : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<float>(
+                name: "height",
+                table: "profile",
+                type: "REAL",
+                nullable: false,
+                defaultValue: 1f);
+
+            migrationBuilder.AddColumn<float>(
+                name: "width",
+                table: "profile",
+                type: "REAL",
+                nullable: false,
+                defaultValue: 1f);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "height",
+                table: "profile");
+
+            migrationBuilder.DropColumn(
+                name: "width",
+                table: "profile");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
index 79e478006b0..f6ae50c269f 100644
--- a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
@@ -812,6 +812,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("text")
                         .HasColumnName("hair_name");
 
+					// Parkstation-HeightSlider Start
+                    b.Property<float>("Height")
+                        .HasColumnType("real")
+                        .HasColumnName("height");
+
+                    b.Property<float>("Width")
+                        .HasColumnType("real")
+                        .HasColumnName("width");
+                    // Parkstation-HeightSlider End
+
                     b.Property<JsonDocument>("Markings")
                         .HasColumnType("jsonb")
                         .HasColumnName("markings");
diff --git a/Content.Server.Database/Migrations/Sqlite/20240127102028_Height.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240127102028_Height.Designer.cs
new file mode 100644
index 00000000000..dde6b84e3c9
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240127102028_Height.Designer.cs
@@ -0,0 +1,1304 @@
+// <auto-generated />
+using System;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    [DbContext(typeof(SqliteServerDbContext))]
+    [Migration("20230711102028_HeightWidth")]
+    partial class HeightWidth
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "7.0.4");
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_flag_id");
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<sbyte>("Impact")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("impact");
+
+                    b.Property<string>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("type");
+
+                    b.HasKey("Id", "RoundId")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_log_round_id");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogEntity", b =>
+                {
+                    b.Property<int>("Uid")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("uid");
+
+                    b.Property<int?>("AdminLogId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<int?>("AdminLogRoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_log_round_id");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Uid")
+                        .HasName("PK_admin_log_entity");
+
+                    b.HasIndex("AdminLogId", "AdminLogRoundId")
+                        .HasDatabaseName("IX_admin_log_entity_admin_log_id_admin_log_round_id");
+
+                    b.ToTable("admin_log_entity", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("log_id");
+
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("PlayerUserId", "LogId", "RoundId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("LogId", "RoundId");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_notes_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("ShownToPlayer")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("shown_to_player");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("antag_id");
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("assigned_user_id_id");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_log_id");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("denied");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("job_id");
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("play_time_id");
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("player_id");
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<string>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<byte[]>("LastSeenHWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("last_seen_hwid");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<int>("Age")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("age");
+
+                    b.Property<string>("Backpack")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("backpack");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("Clothing")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("clothing");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_name");
+
+                    b.Property<float>("Height")
+                        .HasColumnType("REAL")
+                        .HasColumnName("height");
+
+                    b.Property<float>("Width")
+                        .HasColumnType("REAL")
+                        .HasColumnName("width");
+
+                    b.Property<byte[]>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("slot");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_hit_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_role_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("role_unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("trait_id");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("BLOB")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogEntity", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminLog", null)
+                        .WithMany("Entities")
+                        .HasForeignKey("AdminLogId", "AdminLogRoundId")
+                        .HasConstraintName("FK_admin_log_entity_admin_log_admin_log_id_admin_log_round_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("LogId", "RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_log_id_round_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Entities");
+
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/20240127102028_Height.cs b/Content.Server.Database/Migrations/Sqlite/20240127102028_Height.cs
new file mode 100644
index 00000000000..f05ad96859d
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240127102028_Height.cs
@@ -0,0 +1,40 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    /// <inheritdoc />
+    public partial class HeightWidth : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<float>(
+                name: "height",
+                table: "profile",
+                type: "REAL",
+                nullable: false,
+                defaultValue: 1f);
+
+            migrationBuilder.AddColumn<float>(
+                name: "width",
+                table: "profile",
+                type: "REAL",
+                nullable: false,
+                defaultValue: 1f);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "height",
+                table: "profile");
+
+            migrationBuilder.DropColumn(
+                name: "width",
+                table: "profile");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
index 89ca243fae6..8aa2e579222 100644
--- a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
@@ -763,6 +763,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("TEXT")
                         .HasColumnName("hair_name");
 
+                    // Parkstation-HeightSlider Start
+                    b.Property<float>("Height")
+                        .HasColumnType("REAL")
+                        .HasColumnName("height");
+
+                    b.Property<float>("Width")
+                        .HasColumnType("REAL")
+                        .HasColumnName("width");
+                    // Parkstation-HeightSlider End
+
                     b.Property<byte[]>("Markings")
                         .HasColumnType("jsonb")
                         .HasColumnName("markings");
diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index eb9581b21e7..dfb584b3f4b 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -338,6 +338,8 @@ public class Profile
         public string Sex { get; set; } = null!;
         public string Gender { get; set; } = null!;
         public string Species { get; set; } = null!;
+        public float Height { get; set; } = 1f;
+        public float Width { get; set; } = 1f;
         [Column(TypeName = "jsonb")] public JsonDocument? Markings { get; set; } = null!;
         public string HairName { get; set; } = null!;
         public string HairColor { get; set; } = null!;
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index 7c9ffe29e80..a550479b30f 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -216,6 +216,8 @@ private static HumanoidCharacterProfile ConvertProfiles(Profile profile)
                 profile.CharacterName,
                 profile.FlavorText,
                 profile.Species,
+                profile.Height,
+                profile.Width,
                 profile.Age,
                 sex,
                 gender,
@@ -257,6 +259,8 @@ private static Profile ConvertProfiles(HumanoidCharacterProfile humanoid, int sl
             profile.Age = humanoid.Age;
             profile.Sex = humanoid.Sex.ToString();
             profile.Gender = humanoid.Gender.ToString();
+            profile.Height = humanoid.Height;
+            profile.Width = humanoid.Width;
             profile.HairName = appearance.HairStyleId;
             profile.HairColor = appearance.HairColor.ToHex();
             profile.FacialHairName = appearance.FacialHairStyleId;
diff --git a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
index a0e9143eda9..326c80617a9 100644
--- a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
+++ b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
@@ -54,6 +54,8 @@ public void CloneAppearance(EntityUid source, EntityUid target, HumanoidAppearan
         targetHumanoid.SkinColor = sourceHumanoid.SkinColor;
         targetHumanoid.EyeColor = sourceHumanoid.EyeColor;
         targetHumanoid.Age = sourceHumanoid.Age;
+        targetHumanoid.Height = sourceHumanoid.Height;
+        targetHumanoid.Width = sourceHumanoid.Width;
         SetSex(target, sourceHumanoid.Sex, false, targetHumanoid);
         targetHumanoid.CustomBaseLayers = new(sourceHumanoid.CustomBaseLayers);
         targetHumanoid.MarkingSet = new(sourceHumanoid.MarkingSet);
diff --git a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
index 36d30f50eee..0243a00c9a7 100644
--- a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
+++ b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
@@ -4,7 +4,9 @@
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
 using Content.Shared.Administration;
+using Content.Shared.CCVar;
 using JetBrains.Annotations;
+using Robust.Shared.Configuration;
 using Robust.Shared.Random;
 using Robust.Shared.Toolshed;
 using Robust.Shared.Utility;
@@ -20,6 +22,7 @@ public sealed class BasicStationEventSchedulerSystem : GameRuleSystem<BasicStati
     {
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly EventManagerSystem _event = default!;
+        [Dependency] private readonly IConfigurationManager _config = default!;
 
         protected override void Ended(EntityUid uid, BasicStationEventSchedulerComponent component, GameRuleComponent gameRule,
             GameRuleEndedEvent args)
@@ -57,8 +60,8 @@ public override void Update(float frameTime)
         /// </summary>
         private void ResetTimer(BasicStationEventSchedulerComponent component)
         {
-            // 5 - 25 minutes. TG does 3-10 but that's pretty frequent
-            component.TimeUntilNextEvent = _random.Next(300, 1500);
+            component.TimeUntilNextEvent = _random.Next(_config.GetCVar(CCVars.GameEventsBasicMinimumTime),
+                _config.GetCVar(CCVars.GameEventsBasicMaximumTime));
         }
     }
 
diff --git a/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs b/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs
index ef3b5cf18a7..53a98e8b762 100644
--- a/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs
+++ b/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs
@@ -70,7 +70,7 @@ private void PickNextEventTime(EntityUid uid, RampingStationEventSchedulerCompon
     {
         var mod = GetChaosModifier(uid, component);
 
-        // 4-12 minutes baseline. Will get faster over time as the chaos mod increases.
-        component.TimeUntilNextEvent = _random.NextFloat(240f / mod, 720f / mod);
+        component.TimeUntilNextEvent = _random.NextFloat(_cfg.GetCVar(CCVars.GameEventsRampingMinimumTime) / mod,
+            _cfg.GetCVar(CCVars.GameEventsRampingMaximumTime)) / mod;
     }
 }
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index b8f8f122111..c0adf730f11 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -280,6 +280,13 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
 
     private void ShootOrThrow(EntityUid uid, Vector2 mapDirection, Vector2 gunVelocity, GunComponent gun, EntityUid gunUid, EntityUid? user)
     {
+        if (gun.Target is { } target && !TerminatingOrDeleted(target))
+        {
+            var targeted = EnsureComp<TargetedProjectileComponent>(uid);
+            targeted.Target = target;
+            Dirty(uid, targeted);
+        }
+
         // Do a throw
         if (!HasComp<ProjectileComponent>(uid))
         {
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index ab36977efbd..7bde756f7c3 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -112,14 +112,14 @@ public static readonly CVarDef<bool>
         ///     Close to how long you expect a round to last, so you'll probably have to tweak this on downstreams.
         /// </summary>
         public static readonly CVarDef<float>
-            EventsRampingAverageEndTime = CVarDef.Create("events.ramping_average_end_time", 40f, CVar.ARCHIVE | CVar.SERVERONLY);
+            EventsRampingAverageEndTime = CVarDef.Create("events.ramping_average_end_time", 120f, CVar.ARCHIVE | CVar.SERVERONLY);
 
         /// <summary>
         ///     Average ending chaos modifier for the ramping event scheduler.
         ///     Max chaos chosen for a round will deviate from this
         /// </summary>
         public static readonly CVarDef<float>
-            EventsRampingAverageChaos = CVarDef.Create("events.ramping_average_chaos", 6f, CVar.ARCHIVE | CVar.SERVERONLY);
+            EventsRampingAverageChaos = CVarDef.Create("events.ramping_average_chaos", 4f, CVar.ARCHIVE | CVar.SERVERONLY);
 
         /*
          * Game
@@ -173,6 +173,33 @@ public static readonly CVarDef<string>
         public static readonly CVarDef<bool>
             GameLobbyEnableWin = CVarDef.Create("game.enablewin", true, CVar.ARCHIVE);
 
+        /// <summary>
+        ///     Minimum time between Basic station events in seconds
+        /// </summary>
+        public static readonly CVarDef<int> // 15 Minutes
+            GameEventsBasicMinimumTime = CVarDef.Create("game.events_basic_minimum_time", 900, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Maximum time between Basic station events in seconds
+        /// </summary>
+        public static readonly CVarDef<int> // 35 Minutes
+            GameEventsBasicMaximumTime = CVarDef.Create("game.events_basic_maximum_time", 2100, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Minimum time between Ramping station events in seconds
+        /// </summary>
+        public static readonly CVarDef<int> // 20 Minutes
+            GameEventsRampingMinimumTime = CVarDef.Create("game.events_ramping_minimum_time", 1200, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Maximum time between Ramping station events in seconds
+        /// </summary>
+        public static readonly CVarDef<int> // 45 Minutes
+            GameEventsRampingMaximumTime = CVarDef.Create("game.events_ramping_maximum_time", 2700, CVar.SERVERONLY);
+
+        /// <summary>
+        ///
+
         /// <summary>
         ///     Controls the maximum number of character slots a player is allowed to have.
         /// </summary>
@@ -2127,6 +2154,18 @@ public static readonly CVarDef<float>
         public static readonly CVarDef<bool> PsionicRollsEnabled =
             CVarDef.Create("psionics.rolls_enabled", true, CVar.SERVERONLY);
 
+        /// <summary>
+        ///     Whether height & width sliders adjust a character's Fixture Component
+        /// </summary>
+        public static readonly CVarDef<bool> HeightAdjustModifiesHitbox =
+            CVarDef.Create("heightadjust.modifies_hitbox", true, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Whether height & width sliders adjust a player's max view distance
+        /// </summary>
+        public static readonly CVarDef<bool> HeightAdjustModifiesZoom =
+            CVarDef.Create("heightadjust.modifies_zoom", true, CVar.SERVERONLY);
+
         /// <summary>
         ///     Enables station goals
         /// </summary>
diff --git a/Content.Shared/Damage/Components/RequireProjectileTargetComponent.cs b/Content.Shared/Damage/Components/RequireProjectileTargetComponent.cs
new file mode 100644
index 00000000000..5bd8292daae
--- /dev/null
+++ b/Content.Shared/Damage/Components/RequireProjectileTargetComponent.cs
@@ -0,0 +1,14 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Damage.Components;
+
+/// <summary>
+/// Prevent the object from getting hit by projetiles unless you target the object.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(RequireProjectileTargetSystem))]
+public sealed partial class RequireProjectileTargetComponent : Component
+{
+    [DataField, AutoNetworkedField]
+    public bool Active = true;
+}
diff --git a/Content.Shared/Damage/Systems/RequireProjectileTargetSystem.cs b/Content.Shared/Damage/Systems/RequireProjectileTargetSystem.cs
new file mode 100644
index 00000000000..79b374a60f3
--- /dev/null
+++ b/Content.Shared/Damage/Systems/RequireProjectileTargetSystem.cs
@@ -0,0 +1,51 @@
+using Content.Shared.Projectiles;
+using Content.Shared.Weapons.Ranged.Components;
+using Content.Shared.Standing;
+using Robust.Shared.Physics.Events;
+
+namespace Content.Shared.Damage.Components;
+
+public sealed class RequireProjectileTargetSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<RequireProjectileTargetComponent, PreventCollideEvent>(PreventCollide);
+        SubscribeLocalEvent<RequireProjectileTargetComponent, StoodEvent>(StandingBulletHit);
+        SubscribeLocalEvent<RequireProjectileTargetComponent, DownedEvent>(LayingBulletPass);
+    }
+
+    private void PreventCollide(Entity<RequireProjectileTargetComponent> ent, ref PreventCollideEvent args)
+    {
+        if (args.Cancelled)
+          return;
+
+        if (!ent.Comp.Active)
+            return;
+
+        var other = args.OtherEntity;
+        if (HasComp<ProjectileComponent>(other) &&
+            CompOrNull<TargetedProjectileComponent>(other)?.Target != ent)
+        {
+            args.Cancelled = true;
+        }
+    }
+
+    private void SetActive(Entity<RequireProjectileTargetComponent> ent, bool value)
+    {
+        if (ent.Comp.Active == value)
+            return;
+
+        ent.Comp.Active = value;
+        Dirty(ent);
+    }
+
+    private void StandingBulletHit(Entity<RequireProjectileTargetComponent> ent, ref StoodEvent args)
+    {
+        SetActive(ent, false);
+    }
+
+    private void LayingBulletPass(Entity<RequireProjectileTargetComponent> ent, ref DownedEvent args)
+    {
+        SetActive(ent, true);
+    }
+}
diff --git a/Content.Shared/HeightAdjust/HeightAdjustSystem.cs b/Content.Shared/HeightAdjust/HeightAdjustSystem.cs
new file mode 100644
index 00000000000..46b2d9b656f
--- /dev/null
+++ b/Content.Shared/HeightAdjust/HeightAdjustSystem.cs
@@ -0,0 +1,80 @@
+using System.Numerics;
+using Content.Shared.CCVar;
+using Content.Shared.Humanoid;
+using Content.Shared.Movement.Components;
+using Content.Shared.Movement.Systems;
+using Robust.Shared.Configuration;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Systems;
+
+namespace Content.Shared.HeightAdjust;
+
+public sealed class HeightAdjustSystem : EntitySystem
+{
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] private readonly SharedContentEyeSystem _eye = default!;
+    [Dependency] private readonly SharedHumanoidAppearanceSystem _appearance = default!;
+    [Dependency] private readonly IConfigurationManager _config = default!;
+
+
+    /// <summary>
+    ///     Changes the density of fixtures and zoom of eyes based on a provided float scale
+    /// </summary>
+    /// <param name="uid">The entity to modify values for</param>
+    /// <param name="scale">The scale to multiply values by</param>
+    /// <returns>True if all operations succeeded</returns>
+    public bool SetScale(EntityUid uid, float scale)
+    {
+        var succeeded = true;
+        if (_config.GetCVar(CCVars.HeightAdjustModifiesZoom) && EntityManager.TryGetComponent<ContentEyeComponent>(uid, out var eye))
+            _eye.SetMaxZoom(uid, eye.MaxZoom * scale);
+        else
+            succeeded = false;
+
+        if (_config.GetCVar(CCVars.HeightAdjustModifiesHitbox) && EntityManager.TryGetComponent<FixturesComponent>(uid, out var fixtures))
+            foreach (var fixture in fixtures.Fixtures)
+                _physics.SetRadius(uid, fixture.Key, fixture.Value, fixture.Value.Shape, MathF.MinMagnitude(fixture.Value.Shape.Radius * scale, 0.49f));
+        else
+            succeeded = false;
+
+        if (EntityManager.HasComponent<HumanoidAppearanceComponent>(uid))
+        {
+            _appearance.SetHeight(uid, scale);
+            _appearance.SetWidth(uid, scale);
+        }
+        else
+            succeeded = false;
+
+        return succeeded;
+    }
+
+    /// <summary>
+    ///     Changes the density of fixtures and zoom of eyes based on a provided Vector2 scale
+    /// </summary>
+    /// <param name="uid">The entity to modify values for</param>
+    /// <param name="scale">The scale to multiply values by</param>
+    /// <returns>True if all operations succeeded</returns>
+    public bool SetScale(EntityUid uid, Vector2 scale)
+    {
+        var succeeded = true;
+        var avg = (scale.X + scale.Y) / 2;
+
+        if (_config.GetCVar(CCVars.HeightAdjustModifiesZoom) && EntityManager.TryGetComponent<ContentEyeComponent>(uid, out var eye))
+            _eye.SetMaxZoom(uid, eye.MaxZoom * avg);
+        else
+            succeeded = false;
+
+        if (_config.GetCVar(CCVars.HeightAdjustModifiesHitbox) && EntityManager.TryGetComponent<FixturesComponent>(uid, out var fixtures))
+            foreach (var fixture in fixtures.Fixtures)
+                _physics.SetRadius(uid, fixture.Key, fixture.Value, fixture.Value.Shape, MathF.MinMagnitude(fixture.Value.Shape.Radius * avg, 0.49f));
+        else
+            succeeded = false;
+
+        if (EntityManager.HasComponent<HumanoidAppearanceComponent>(uid))
+            _appearance.SetScale(uid, scale);
+        else
+            succeeded = false;
+
+        return succeeded;
+    }
+}
diff --git a/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs b/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
index 4785482ada4..c9292337d7d 100644
--- a/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
+++ b/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
@@ -90,6 +90,18 @@ public sealed partial class HumanoidAppearanceComponent : Component
     /// </summary>
     [ViewVariables]
     public HumanoidCharacterProfile? LastProfileLoaded;
+
+    /// <summary>
+    ///     The height of this humanoid.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float Height = 1f;
+
+    /// <summary>
+    ///     The width of this humanoid.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float Width = 1f;
 }
 
 [DataDefinition]
diff --git a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
index 8564ebe8e16..8268d0d7c74 100644
--- a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
+++ b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
@@ -126,6 +126,54 @@ public sealed partial class SpeciesPrototype : IPrototype
     /// </summary>
     [DataField]
     public string GuideBookIcon = "SpeciesInfoDefault";
+
+    /// <summary>
+    ///     The minimum height for this species
+    /// </summary>
+    [DataField]
+    public float MinHeight = 0.75f;
+
+    /// <summary>
+    ///     The default height for this species
+    /// </summary>
+    [DataField]
+    public float DefaultHeight = 1f;
+
+    /// <summary>
+    ///     The maximum height for this species
+    /// </summary>
+    [DataField]
+    public float MaxHeight = 1.25f;
+
+    /// <summary>
+    ///     The minimum width for this species
+    /// </summary>
+    [DataField]
+    public float MinWidth = 0.7f;
+
+    /// <summary>
+    ///     The default width for this species
+    /// </summary>
+    [DataField]
+    public float DefaultWidth = 1f;
+
+    /// <summary>
+    ///     The maximum width for this species
+    /// </summary>
+    [DataField]
+    public float MaxWidth = 1.3f;
+
+    /// <summary>
+    ///     The average height in centimeters for this species, used to calculate player facing height values in UI elements
+    /// </summary>
+    [DataField]
+    public float AverageHeight = 176.1f;
+
+    /// <summary>
+    ///     The average shoulder-to-shoulder width in cm for this species, used to calculate player facing width values in UI elements
+    /// </summary>
+    [DataField]
+    public float AverageWidth = 40f;
 }
 
 public enum SpeciesNaming : byte
diff --git a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
index 4974e283dd5..6062bec8b05 100644
--- a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
+++ b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
@@ -1,8 +1,10 @@
 using System.Linq;
+using System.Numerics;
 using Content.Shared.Decals;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.Preferences;
+using Content.Shared.HeightAdjust;
 using Robust.Shared.GameObjects.Components.Localization;
 using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
@@ -23,6 +25,7 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem
     [Dependency] private readonly INetManager _netManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly MarkingManager _markingManager = default!;
+    [Dependency] private readonly HeightAdjustSystem _heightAdjust = default!;
 
     [ValidatePrototypeId<SpeciesPrototype>]
     public const string DefaultSpecies = "Human";
@@ -248,6 +251,64 @@ public void SetSex(EntityUid uid, Sex sex, bool sync = true, HumanoidAppearanceC
         }
     }
 
+    /// <summary>
+    ///     Set the height of a humanoid mob
+    /// </summary>
+    /// <param name="uid">The humanoid mob's UID</param>
+    /// <param name="height">The height to set the mob to</param>
+    /// <param name="sync">Whether to immediately synchronize this to the humanoid mob, or not</param>
+    /// <param name="humanoid">Humanoid component of the entity</param>
+    public void SetHeight(EntityUid uid, float height, bool sync = true, HumanoidAppearanceComponent? humanoid = null)
+    {
+        if (!Resolve(uid, ref humanoid) || MathHelper.CloseTo(humanoid.Height, height, 0.001f))
+            return;
+
+        var species = _prototypeManager.Index(humanoid.Species);
+        humanoid.Height = Math.Clamp(height, species.MinHeight, species.MaxHeight);
+
+        if (sync)
+            Dirty(humanoid);
+    }
+
+    /// <summary>
+    ///     Set the width of a humanoid mob
+    /// </summary>
+    /// <param name="uid">The humanoid mob's UID</param>
+    /// <param name="width">The width to set the mob to</param>
+    /// <param name="sync">Whether to immediately synchronize this to the humanoid mob, or not</param>
+    /// <param name="humanoid">Humanoid component of the entity</param>
+    public void SetWidth(EntityUid uid, float width, bool sync = true, HumanoidAppearanceComponent? humanoid = null)
+    {
+        if (!Resolve(uid, ref humanoid) || MathHelper.CloseTo(humanoid.Width, width, 0.001f))
+            return;
+
+        var species = _prototypeManager.Index(humanoid.Species);
+        humanoid.Width = Math.Clamp(width, species.MinWidth, species.MaxWidth);
+
+        if (sync)
+            Dirty(humanoid);
+    }
+
+    /// <summary>
+    ///     Set the scale of a humanoid mob
+    /// </summary>
+    /// <param name="uid">The humanoid mob's UID</param>
+    /// <param name="scale">The scale to set the mob to</param>
+    /// <param name="sync">Whether to immediately synchronize this to the humanoid mob, or not</param>
+    /// <param name="humanoid">Humanoid component of the entity</param>
+    public void SetScale(EntityUid uid, Vector2 scale, bool sync = true, HumanoidAppearanceComponent? humanoid = null)
+    {
+        if (!Resolve(uid, ref humanoid))
+            return;
+
+        var species = _prototypeManager.Index(humanoid.Species);
+        humanoid.Height = Math.Clamp(scale.Y, species.MinHeight, species.MaxHeight);
+        humanoid.Width = Math.Clamp(scale.X, species.MinWidth, species.MaxWidth);
+
+        if (sync)
+            Dirty(humanoid);
+    }
+
     /// <summary>
     ///     Loads a humanoid character profile directly onto this humanoid mob.
     /// </summary>
@@ -329,6 +390,8 @@ public virtual void LoadProfile(EntityUid uid, HumanoidCharacterProfile profile,
 
         humanoid.Age = profile.Age;
 
+        _heightAdjust.SetScale(uid, new Vector2(profile.Width, profile.Height));
+
         humanoid.LastProfileLoaded = profile; // DeltaV - let paradox anomaly be cloned
 
         Dirty(humanoid);
diff --git a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
index 0c2fcc05794..08b351e61e8 100644
--- a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
+++ b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
@@ -10,12 +10,15 @@
 using Content.Shared.Mobs.Components;
 using Content.Shared.Movement.Events;
 using Content.Shared.Pointing;
+using Content.Shared.Projectiles;
 using Content.Shared.Pulling.Events;
 using Content.Shared.Speech;
 using Content.Shared.Standing;
 using Content.Shared.Strip.Components;
 using Content.Shared.Throwing;
+using Content.Shared.Weapons.Ranged.Components;
 using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Events;
 
 namespace Content.Shared.Mobs.Systems;
 
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index 8cf504582d4..601a62da894 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -35,6 +35,8 @@ private HumanoidCharacterProfile(
             string name,
             string flavortext,
             string species,
+            float height,
+            float width,
             int age,
             Sex sex,
             Gender gender,
@@ -51,6 +53,8 @@ private HumanoidCharacterProfile(
             Name = name;
             FlavorText = flavortext;
             Species = species;
+            Height = height;
+            Width = width;
             Age = age;
             Sex = sex;
             Gender = gender;
@@ -72,7 +76,7 @@ private HumanoidCharacterProfile(
             List<string> antagPreferences,
             List<string> traitPreferences,
             List<string> loadoutPreferences)
-            : this(other.Name, other.FlavorText, other.Species, other.Age, other.Sex, other.Gender, other.Appearance,
+            : this(other.Name, other.FlavorText, other.Species, other.Height, other.Width, other.Age, other.Sex, other.Gender, other.Appearance,
                 other.Clothing, other.Backpack, other.SpawnPriority, jobPriorities, other.PreferenceUnavailable,
                 antagPreferences, traitPreferences, loadoutPreferences)
         {
@@ -90,6 +94,8 @@ public HumanoidCharacterProfile(
             string name,
             string flavortext,
             string species,
+            float height,
+            float width,
             int age,
             Sex sex,
             Gender gender,
@@ -102,7 +108,7 @@ public HumanoidCharacterProfile(
             IReadOnlyList<string> antagPreferences,
             IReadOnlyList<string> traitPreferences,
             IReadOnlyList<string> loadoutPreferences)
-            : this(name, flavortext, species, age, sex, gender, appearance, clothing, backpack, spawnPriority,
+            : this(name, flavortext, species, height, width, age, sex, gender, appearance, clothing, backpack, spawnPriority,
                 new Dictionary<string, JobPriority>(jobPriorities), preferenceUnavailable,
                 new List<string>(antagPreferences), new List<string>(traitPreferences),
                 new List<string>(loadoutPreferences))
@@ -118,6 +124,8 @@ public HumanoidCharacterProfile() : this(
             "John Doe",
             "",
             SharedHumanoidAppearanceSystem.DefaultSpecies,
+            1f,
+            1f,
             18,
             Sex.Male,
             Gender.Male,
@@ -147,6 +155,8 @@ public static HumanoidCharacterProfile DefaultWithSpecies(string species = Share
                 "John Doe",
                 "",
                 species,
+                1f,
+                1f,
                 18,
                 Sex.Male,
                 Gender.Male,
@@ -186,10 +196,14 @@ public static HumanoidCharacterProfile RandomWithSpecies(string species = Shared
 
             var sex = Sex.Unsexed;
             var age = 18;
+            var height = 1f;
+            var width = 1f;
             if (prototypeManager.TryIndex<SpeciesPrototype>(species, out var speciesPrototype))
             {
                 sex = random.Pick(speciesPrototype.Sexes);
                 age = random.Next(speciesPrototype.MinAge, speciesPrototype.OldAge); // people don't look and keep making 119 year old characters with zero rp, cap it at middle aged
+                height = random.NextFloat(speciesPrototype.MinHeight, speciesPrototype.MaxHeight);
+                width = random.NextFloat(speciesPrototype.MinWidth, speciesPrototype.MaxWidth);
             }
 
             var gender = Gender.Epicene;
@@ -206,7 +220,7 @@ public static HumanoidCharacterProfile RandomWithSpecies(string species = Shared
 
             var name = GetName(species, gender);
 
-            return new HumanoidCharacterProfile(name, "", species, age, sex, gender,
+            return new HumanoidCharacterProfile(name, "", species, height, width, age, sex, gender,
                 HumanoidCharacterAppearance.Random(species, sex), ClothingPreference.Jumpsuit,
                 BackpackPreference.Backpack, SpawnPriorityPreference.None,
                 new Dictionary<string, JobPriority>
@@ -217,8 +231,15 @@ public static HumanoidCharacterProfile RandomWithSpecies(string species = Shared
 
         public string Name { get; private set; }
         public string FlavorText { get; private set; }
+        [DataField("species")]
         public string Species { get; private set; }
 
+        [DataField("height")]
+        public float Height { get; private set; }
+
+        [DataField("width")]
+        public float Width { get; private set; }
+
         [DataField("age")]
         public int Age { get; private set; }
 
@@ -271,6 +292,15 @@ public HumanoidCharacterProfile WithSpecies(string species)
             return new(this) { Species = species };
         }
 
+        public HumanoidCharacterProfile WithHeight(float height)
+        {
+            return new(this) { Height = height };
+        }
+
+        public HumanoidCharacterProfile WithWidth(float width)
+        {
+            return new(this) { Width = width };
+        }
 
         public HumanoidCharacterProfile WithCharacterAppearance(HumanoidCharacterAppearance appearance)
         {
@@ -396,6 +426,8 @@ public bool MemberwiseEquals(ICharacterProfile maybeOther)
             if (maybeOther is not HumanoidCharacterProfile other
                 || Name != other.Name
                 || Age != other.Age
+                || Height != other.Height
+                || Width != other.Width
                 || Sex != other.Sex
                 || Gender != other.Gender
                 || PreferenceUnavailable != other.PreferenceUnavailable
@@ -407,7 +439,6 @@ public bool MemberwiseEquals(ICharacterProfile maybeOther)
                 || !_traitPreferences.SequenceEqual(other._traitPreferences)
                 || !_loadoutPreferences.SequenceEqual(other._loadoutPreferences))
                 return false;
-
             return Appearance.MemberwiseEquals(other.Appearance);
         }
 
@@ -495,6 +526,14 @@ public void EnsureValid(IConfigurationManager configManager, IPrototypeManager p
                 flavortext = FormattedMessage.RemoveMarkup(FlavorText);
             }
 
+            var height = Height;
+            if (speciesPrototype != null)
+                height = Math.Clamp(Height, speciesPrototype.MinHeight, speciesPrototype.MaxHeight);
+
+            var width = Width;
+            if (speciesPrototype != null)
+                width = Math.Clamp(Width, speciesPrototype.MinWidth, speciesPrototype.MaxWidth);
+
             var appearance = HumanoidCharacterAppearance.EnsureValid(Appearance, Species, Sex);
 
             var prefsUnavailableMode = PreferenceUnavailable switch
@@ -584,6 +623,8 @@ public void EnsureValid(IConfigurationManager configManager, IPrototypeManager p
             Name = name;
             FlavorText = flavortext;
             Age = age;
+            Height = height;
+            Width = width;
             Sex = sex;
             Gender = gender;
             Appearance = appearance;
@@ -643,12 +684,16 @@ public override int GetHashCode()
                     Clothing,
                     Backpack
                 ),
-                SpawnPriority,
-                PreferenceUnavailable,
-                _jobPriorities,
-                _antagPreferences,
-                _traitPreferences,
-                _loadoutPreferences
+                HashCode.Combine(
+                    SpawnPriority,
+                    Height,
+                    Width,
+                    PreferenceUnavailable,
+                    _jobPriorities,
+                    _antagPreferences,
+                    _traitPreferences,
+                    _loadoutPreferences
+                )
             );
         }
     }
diff --git a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
index a18aac80abe..ada99801f01 100644
--- a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
@@ -140,6 +140,12 @@ public sealed partial class GunComponent : Component
     [ViewVariables]
     public EntityCoordinates? ShootCoordinates = null;
 
+    /// <summary>
+    /// Who the gun is being requested to shoot at directly.
+    /// </summary>
+    [ViewVariables]
+    public EntityUid? Target = null;
+
     /// <summary>
     ///     The base value for how many shots to fire per burst.
     /// </summary>
diff --git a/Content.Shared/Weapons/Ranged/Components/TargetedProjectileComponent.cs b/Content.Shared/Weapons/Ranged/Components/TargetedProjectileComponent.cs
new file mode 100644
index 00000000000..b804176497d
--- /dev/null
+++ b/Content.Shared/Weapons/Ranged/Components/TargetedProjectileComponent.cs
@@ -0,0 +1,12 @@
+using Content.Shared.Weapons.Ranged.Systems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Weapons.Ranged.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SharedGunSystem))]
+public sealed partial class TargetedProjectileComponent : Component
+{
+    [DataField, AutoNetworkedField]
+    public EntityUid Target;
+}
diff --git a/Content.Shared/Weapons/Ranged/Events/RequestShootEvent.cs b/Content.Shared/Weapons/Ranged/Events/RequestShootEvent.cs
index 21e90b2108b..f5c4dd72b4f 100644
--- a/Content.Shared/Weapons/Ranged/Events/RequestShootEvent.cs
+++ b/Content.Shared/Weapons/Ranged/Events/RequestShootEvent.cs
@@ -11,4 +11,5 @@ public sealed class RequestShootEvent : EntityEventArgs
 {
     public NetEntity Gun;
     public NetCoordinates Coordinates;
+    public NetEntity? Target;
 }
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index d3aee5a48e9..cadb0a4b215 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -139,6 +139,7 @@ private void OnShootRequest(RequestShootEvent msg, EntitySessionEventArgs args)
 
         gun.ShootCoordinates = GetCoordinates(msg.Coordinates);
         Log.Debug($"Set shoot coordinates to {gun.ShootCoordinates}");
+        gun.Target = GetEntity(msg.Target);
         AttemptShoot(user.Value, ent, gun);
     }
 
@@ -200,6 +201,7 @@ private void StopShooting(EntityUid uid, GunComponent gun)
         Log.Debug($"Stopped shooting {ToPrettyString(uid)}");
         gun.ShotCounter = 0;
         gun.ShootCoordinates = null;
+        gun.Target = null;
         Dirty(uid, gun);
     }
 
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 3e7799a745a..3aea1324fe4 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4225,3 +4225,29 @@ Entries:
       message: Added categories for traits
   id: 6127
   time: '2024-06-20T23:39:31.0000000+00:00'
+- author: LovelyLophi
+  changes:
+    - type: Remove
+      message: Removed Wizden patrons
+  id: 6128
+  time: '2024-06-25T19:54:47.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        Harpies remembered that just like moths; they also have wings, and can
+        zoom whenever the gravity turns off.
+  id: 6129
+  time: '2024-06-25T20:19:11.0000000+00:00'
+- author: DEATHB4DEFEAT
+  changes:
+    - type: Tweak
+      message: Mid-round events will occur much less often
+  id: 6130
+  time: '2024-06-25T20:47:09.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: 'Height and Width sliders have been added to character creation. '
+  id: 6131
+  time: '2024-06-27T17:46:51.0000000+00:00'
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index 03d5059e95b..b5381a4ce29 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, Delete69, deltanedas, DeltaV-Bot, DerbyX, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, FoxxoTrystan, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LovelyLophi, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, SignalWalker, SimpleStation14, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, Slava0135, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, Stealthbomber16, stellar-novas, StrawberryMoses, SweptWasTaken, Szunti, TadJohnson00, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Voomra, Vordenburg, vulppine, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
+0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CaasGit, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, Delete69, deltanedas, DeltaV-Bot, DerbyX, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, FoxxoTrystan, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LovelyLophi, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, SignalWalker, SimpleStation14, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, Stealthbomber16, stellar-novas, StrawberryMoses, SweptWasTaken, Szunti, TadJohnson00, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Voomra, Vordenburg, vulppine, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
diff --git a/Resources/Credits/Patrons.yml b/Resources/Credits/Patrons.yml
index ff98e134cec..e6be63f6774 100644
--- a/Resources/Credits/Patrons.yml
+++ b/Resources/Credits/Patrons.yml
@@ -1,58 +1,2 @@
-- Name: "weirdrock"
-  Tier: Captain
-- Name: "Drifter Drifter"
-  Tier: Captain
-- Name: "Bikowu"
-  Tier: Assistant
-- Name: "Hasan al-Binabi"
-  Tier: Central Commander
-- Name: "lleft The Dragon"
-  Tier: Central Commander
-- Name: "Pandaconda"
-  Tier: Assistant
-- Name: "Lazhannya"
-  Tier: Captain
-- Name: "Bonktrauma"
-  Tier: Captain
-- Name: "Haltell"
-  Tier: Captain
-- Name: "Delta.Pizza"
-  Tier: Captain
-- Name: "steph kaus"
-  Tier: Captain
-- Name: "HyperionGM"
-  Tier: Central Commander
-- Name: "MikeAndIkes"
-  Tier: Assistant
-- Name: "Ashley"
-  Tier: Central Commander
-- Name: "mura"
-  Tier: Captain
-- Name: "Adeinitas"
-  Tier: Captain
-- Name: "Shock"
-  Tier: Captain
-- Name: "Dead Rabbit"
-  Tier: Captain
-- Name: "T-Dog"
-  Tier: Captain
-- Name: "oBerry"
-  Tier: Central Commander
-- Name: "Wakefield"
-  Tier: Captain
-- Name: "Hûvy"
-  Tier: Assistant
-- Name: "TheGungeonologist"
-  Tier: Central Commander
-- Name: "Ethan"
-  Tier: Captain
-- Name: "TeeJay Neuroth"
-  Tier: Captain
-- Name: "Neptunia_Counseling"
-  Tier: Central Commander
-- Name: "rosysyntax"
-  Tier: Assistant
-- Name: "Kurzaen"
-  Tier: Captain
-- Name: "tokie"
-  Tier: Central Commander
+#- Name: "nameinquotes"
+#  Tier: teirnotinquotes
diff --git a/Resources/Locale/en-US/advertisements/vending/bay12Vendors.ftl b/Resources/Locale/en-US/advertisements/vending/bay12Vendors.ftl
new file mode 100644
index 00000000000..fbdcfa5a39f
--- /dev/null
+++ b/Resources/Locale/en-US/advertisements/vending/bay12Vendors.ftl
@@ -0,0 +1,23 @@
+advertisement-solsnack-1 = We cut all the red-tape so that you can have diarrhea!
+advertisement-solsnack-2 = Food safety standards are merely a suggestion if you know the right people!
+advertisement-solsnack-3 = Snacks from home, corruption included!
+advertisement-solsnack-4 = A taste of home!
+
+advertisement-weebvend-1 = Konnichiwa gaijin senpai!
+advertisement-weebvend-2 = Notice me senpai!
+advertisement-weebvend-3 = Kawaii-desu!
+
+advertisement-hotfood-1 = Get your stale, crumbling food here! Sol's national dish has never tasted better!
+advertisement-hotfood-2 = If this is the food waiting for you at home, it's no wonder you're hiding here.
+advertisement-hotfood-3 = Solarian food products, served with a side of diarrhea as always!
+advertisement-hotfood-4 = Revenge is a dish best served warm.
+
+advertisement-fitness-1 = SweatMAX, get robust!
+advertisement-fitness-2 = Pain is just weakness leaving the body!
+advertisement-fitness-3 = Run! Your fat is catching up to you!
+advertisement-fitness-4 = Never forget leg day!
+advertisement-fitness-5 = Push out!
+advertisement-fitness-6 = This is the only break you get today.
+advertisement-fitness-7 = Don't cry, sweat!
+advertisement-fitness-8 = Healthy is an outfit that looks good on everybody.
+advertisement-fitness-9 = Want to hide from the Solarian authorities? Don't worry, they don't know what the inside of a gym looks like.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
index 9b8eb74d969..f0ea0a4a721 100644
--- a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
+++ b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
@@ -11,6 +11,9 @@ humanoid-profile-editor-sex-female-text = Female
 humanoid-profile-editor-sex-unsexed-text = None
 humanoid-profile-editor-age-label = Age:
 humanoid-profile-editor-skin-color-label = Skin color:
+humanoid-profile-editor-height-label = Height: {$height}cm
+humanoid-profile-editor-width-label = Width: {$width}cm
+humanoid-profile-editor-weight-label = Weight: {$weight}kg
 humanoid-profile-editor-species-label = Species:
 humanoid-profile-editor-pronouns-label = Pronouns:
 humanoid-profile-editor-pronouns-male-text = He / Him
diff --git a/Resources/Locale/en-US/reagents/bay12reagents.ftl b/Resources/Locale/en-US/reagents/bay12reagents.ftl
new file mode 100644
index 00000000000..7e0e9ccfca9
--- /dev/null
+++ b/Resources/Locale/en-US/reagents/bay12reagents.ftl
@@ -0,0 +1,2 @@
+reagent-name-milk-choco = chocolate milk
+reagent-desc-milk-choco = A milk drink flavored with chocolate.
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/fitness.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/fitness.yml
new file mode 100644
index 00000000000..4e3050c27b5
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/fitness.yml
@@ -0,0 +1,14 @@
+- type: advertisementsPack
+  id: FitnessVendAds
+  advertisements:
+  - advertisement-fitness-1
+  - advertisement-fitness-2
+  - advertisement-fitness-3
+  - advertisement-fitness-4
+  - advertisement-fitness-5
+  - advertisement-fitness-6
+  - advertisement-fitness-7
+  - advertisement-fitness-8
+  - advertisement-fitness-9
+  thankyous:
+  - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/hotfood.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/hotfood.yml
new file mode 100644
index 00000000000..98b017558ef
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/hotfood.yml
@@ -0,0 +1,9 @@
+- type: advertisementsPack
+  id: HotfoodAds
+  advertisements:
+  - advertisement-hotfood-1
+  - advertisement-hotfood-2
+  - advertisement-hotfood-3
+  - advertisement-hotfood-4
+  thankyous:
+  - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/solsnack.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/solsnack.yml
new file mode 100644
index 00000000000..1e0ddddc046
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/solsnack.yml
@@ -0,0 +1,8 @@
+- type: advertisementsPack
+  id: SolsnackAds
+  advertisements:
+  - advertisement-solsnack-1
+  - advertisement-solsnack-2
+  - advertisement-solsnack-3
+  thankyous:
+  - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/weebvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/weebvend.yml
new file mode 100644
index 00000000000..01efe7be696
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/weebvend.yml
@@ -0,0 +1,8 @@
+- type: advertisementsPack
+  id: WeebVendAds
+  advertisements:
+  - advertisement-weebvend-1
+  - advertisement-weebvend-2
+  - advertisement-weebvend-3
+  thankyous:
+  - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/fitness.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/fitness.yml
new file mode 100644
index 00000000000..f0e13aa2780
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/fitness.yml
@@ -0,0 +1,11 @@
+- type: vendingMachineInventory
+  id: FitnessVendInventory
+  startingInventory:
+    FoodSnackProteinbar: 3
+    FoodCondimentPacketProtein: 3
+    DrinkMilkCartonMini: 3
+    DrinkMilkCartonMiniChocolate: 3
+    DrinkWaterBottleFull: 3
+    DrinkFitnessShakerBlack: 2
+    DrinkFitnessShakerRed: 2
+    DrinkFitnessShakerBlue: 2
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/hotfood.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/hotfood.yml
new file mode 100644
index 00000000000..964fa746b33
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/hotfood.yml
@@ -0,0 +1,8 @@
+- type: vendingMachineInventory
+  id: HotfoodInventory
+  startingInventory:
+    FoodSnackAncientBurger: 1
+    FoodSnackAncientPizza: 1
+    FoodSnackAncientFries: 1
+    FoodSnackAncientHotdog: 1
+    FoodSnackAncientTaco: 1
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/solsnack.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/solsnack.yml
new file mode 100644
index 00000000000..5bb5e9e7cf2
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/solsnack.yml
@@ -0,0 +1,13 @@
+- type: vendingMachineInventory
+  id: SolsnackInventory
+  startingInventory:
+    FoodSnackLunacakeWrapped: 3
+    FoodSnackMochicakeWrapped: 3
+    FoodSnackMooncakeWrapped: 3
+    FoodSnackTidegobs: 3
+    FoodSnackSaturnos: 3
+    FoodSnackJoveGello: 3
+    FoodSnackPlutoniumrods: 3
+    FoodSnackMarsFrouka: 3
+    FoodSnackVenusianhotcakes: 3
+    FoodSnackOortrocks: 3
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/weebvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/weebvend.yml
new file mode 100644
index 00000000000..fffe81199a9
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/weebvend.yml
@@ -0,0 +1,8 @@
+- type: vendingMachineInventory
+  id: WeebVendInventory
+  startingInventory:
+    FoodSnackRedalertnuts: 3
+    FoodSnackRicecake: 3
+    FoodSnackPokeysticks: 3
+    FoodSnackChocobanana: 3
+    FoodSnackDango: 3
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
index 0ddce8b0e65..e51ae91d12c 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
@@ -121,6 +121,7 @@
   - type: MovementSpeedModifier
     baseWalkSpeed: 2.5
     baseSprintSpeed: 5.0
+    weightlessAcceleration: 2.5
   - type: Inventory
     speciesId: harpy
     templateId: digitigrade
diff --git a/Resources/Prototypes/DeltaV/Species/harpy.yml b/Resources/Prototypes/DeltaV/Species/harpy.yml
index bcc4dd22c44..384b327ff24 100644
--- a/Resources/Prototypes/DeltaV/Species/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Species/harpy.yml
@@ -7,6 +7,12 @@
   markingLimits: MobHarpyMarkingLimits
   dollPrototype: MobHarpyDummy
   skinColoration: HumanToned
+  minHeight: 0.6
+  defaultHeight: 0.8
+  maxHeight: 1.1
+  minWidth: 0.55
+  defaultWidth: 0.8
+  maxWidth: 1.15
 
 - type: speciesBaseSprites
   id: MobHarpySprites
diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
index 7afc5cddd70..c5395360187 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
@@ -21,7 +21,6 @@
   - type: Sprite
     noRot: true
     drawdepth: Mobs
-    scale: 1, 0.8
   - type: Body
     prototype: Dwarf
     requiredLegs: 2
@@ -64,6 +63,3 @@
   parent: BaseSpeciesDummy
   id: MobDwarfDummy
   noSpawn: true
-  components:
-  - type: Sprite
-    scale: 1, 0.8
diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml
index ac9aabbeadb..d5be77eef1c 100644
--- a/Resources/Prototypes/Entities/Mobs/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/base.yml
@@ -1,4 +1,4 @@
-# The progenitor. This should only container the most basic components possible.
+# The progenitor. This should only container the most basic components possible.
 # Only put things on here if every mob *must* have it. This includes ghosts.
 - type: entity
   save: false
@@ -43,6 +43,8 @@
   - type: MovementSpeedModifier
   - type: Polymorphable
   - type: StatusIcon
+  - type: RequireProjectileTarget
+    active: False
 
 # Used for mobs that have health and can take damage.
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
index 67d79540382..4bdd6245c5d 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
@@ -171,3 +171,47 @@
           Quantity: 100
   - type: Sprite
     sprite: Objects/Consumable/Drinks/oatmilk.rsi
+
+- type: entity
+  parent: DrinkCartonBaseFull
+  id: DrinkCartonBaseSmallFull
+  abstract: true
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 25
+
+- type: entity
+  parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
+  id: DrinkMilkCartonMini
+  name: mini milk
+  description: An opaque white liquid produced by the mammary glands of mammals.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 25
+        reagents:
+        - ReagentId: Milk
+          Quantity: 25
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/milkmini.rsi
+    state: icon
+
+- type: entity
+  parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
+  id: DrinkMilkCartonMiniChocolate
+  name: mini choco milk
+  description: A milk drink flavored with chocolate.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 25
+        reagents:
+        - ReagentId: MilkChoco
+          Quantity: 25
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/milkminichoco.rsi
+    state: icon
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
index 33646b50bbe..0602fcf8f9d 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -2121,3 +2121,62 @@
     - type: Icon
       sprite: Objects/Consumable/Drinks/bloodglass.rsi
       state: icon
+
+- type: entity
+  parent: DrinkBase
+  id: DrinkBasePlastic
+  abstract: true
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 50
+  - type: PhysicalComposition
+    materialComposition:
+      Plastic: 100
+
+- type: entity
+  parent: DrinkBasePlastic
+  id: DrinkFitnessShakerBlack
+  name: fitness shaker
+  description: Big enough to contain enough protein to get perfectly swole. Don't mind the bits.
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/shakerblack.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkFitnessShakerBlack
+  id: DrinkFitnessShakerRed
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/shakerred.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkFitnessShakerBlack
+  id: DrinkFitnessShakerBlue
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/shakerblue.rsi
+    state: icon
+
+- type: reagent
+  id: MilkChoco
+  name: reagent-name-milk-choco
+  group: Drinks
+  desc: reagent-desc-milk-choco
+  physicalDesc: reagent-physical-desc-opaque
+  flavor: chocolate
+  color: "#664300"
+  recognizable: true
+  plantMetabolism:
+    - !type:PlantAdjustNutrition
+      amount: 0.1
+    - !type:PlantAdjustWater
+      amount: 0.9
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 4
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
index 1df6615a9fb..c6c7e5677e5 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -648,3 +648,23 @@
       reagents:
       - ReagentId: CocoaPowder
         Quantity: 2
+
+- type: entity
+  parent: BaseFoodCondimentPacket
+  id: FoodCondimentPacketProtein
+  name: protein powder packet
+  description: Contains 10u of powdered protein. Mix with 20u of water
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 10
+        reagents:
+        - ReagentId: Protein
+          Quantity: 10
+  - type: Icon
+    state: packet-greygoo
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 2
+    fillBaseName: packet-solid-
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
index 8e52630ac87..e88a641c7c0 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -626,3 +626,533 @@
     - Trash
   - type: Sprite
     state: mre-wrapper
+
+# Snacks
+- type: entity
+  parent: FoodSnackBase
+  id: FoodSnackProteinbar
+  name: protein bar
+  description: SwoleMAX brand protein bars, guaranteed to get you feeling perfectly overconfident.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - chalky
+  - type: Sprite
+    sprite: Objects/Consumable/Food/bay_food.rsi
+    state: proteinbar
+  - type: Item
+  - type: Food
+    trash: FoodPacketProteinbarTrash
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 15
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 4
+        - ReagentId: Protein
+          Quantity: 4
+        - ReagentId: CocoaPowder
+          Quantity: 1
+        - ReagentId: Theobromine
+          Quantity: 1
+
+# Sol Vend / Mars Mart
+- type: entity
+  parent: BaseItem
+  id: FoodSnackLunacakeWrapped
+  name: wrapped lunacake
+  description: Now with 20% less lawsuit enabling rhegolith!
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Food/bay_food.rsi
+    state: lunacake_wrapped
+  - type: Item
+    heldPrefix: lunacake_wrapped
+    size: Tiny
+  - type: Tag
+    tags:
+      - FoodSnack
+  - type: SpawnItemsOnUse
+    items:
+      - id: FoodPacketLunacakeTrash
+      - id: FoodSnackLunacake
+    sound:
+      path: /Audio/Effects/unwrap.ogg
+
+- type: entity
+  parent: FoodSnackBase
+  id: FoodSnackLunacake
+  name: lunacake
+  description: Now with 20% less lawsuit enabling rhegolith!
+  components:
+  - type: FlavorProfile
+    flavors:
+      - vanilla
+  - type: Sprite
+    sprite: Objects/Consumable/Food/bay_food.rsi
+    state: lunacake
+  - type: Item
+
+- type: entity
+  parent: BaseItem
+  id: FoodSnackMochicakeWrapped
+  name: wrapped mochicake
+  description: Konnichiwa! Many go lucky rice cakes in future!
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Food/bay_food.rsi
+    state: mochicake_wrapped
+  - type: Item
+    heldPrefix: mochicake_wrapped
+    size: Tiny
+  - type: Tag
+    tags:
+      - FoodSnack
+  - type: SpawnItemsOnUse
+    items:
+      - id: FoodPacketMochicakeTrash
+      - id: FoodSnackMochicake
+    sound:
+      path: /Audio/Effects/unwrap.ogg
+
+- type: entity
+  parent: FoodSnackBase
+  id: FoodSnackMochicake
+  name: mochicake
+  description: Konnichiwa! Many go lucky rice cakes in future!
+  components:
+  - type: FlavorProfile
+    flavors:
+      - rice
+  - type: Sprite
+    sprite: Objects/Consumable/Food/bay_food.rsi
+    state: lunacake
+  - type: Item
+
+- type: entity
+  parent: BaseItem
+  id: FoodSnackMooncakeWrapped
+  name: wrapped mooncake
+  description: Explore the dark side! May contain trace amounts of reconstituted cocoa.
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Food/bay_food.rsi
+    state: mooncake_wrapped
+  - type: Item
+    heldPrefix: mooncake_wrapped
+    size: Tiny
+  - type: Tag
+    tags:
+      - FoodSnack
+  - type: SpawnItemsOnUse
+    items:
+      - id: FoodPacketMooncakeTrash
+      - id: FoodSnackMooncake
+    sound:
+      path: /Audio/Effects/unwrap.ogg
+
+- type: entity
+  parent: FoodSnackBase
+  id: FoodSnackMooncake
+  name: mooncake
+  description: Explore the dark side! May contain trace amounts of reconstituted cocoa.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - chocolate
+  - type: Sprite
+    sprite: Objects/Consumable/Food/bay_food.rsi
+    state: lunacake
+  - type: Item
+
+- type: entity
+  parent: FoodSnackBase
+  id: FoodSnackTidegobs
+  name: tide gobs
+  description: Contains over 9000% of your daily recommended intake of salt.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - salty
+  - type: Sprite
+    sprite: Objects/Consumable/Food/bay_food.rsi
+    state: tidegobs
+  - type: Item
+  - type: Food
+    trash: FoodPacketTidegobsTrash
+
+- type: entity
+  parent: FoodSnackBase
+  id: FoodSnackSaturnos
+  name: saturn-os
+  description: A day ration of salt, styrofoam and possibly sawdust.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - salty
+  - type: Sprite
+    sprite: Objects/Consumable/Food/bay_food.rsi
+    state: saturno
+  - type: Item
+  - type: Food
+    trash: FoodPacketSaturnosTrash
+
+- type: entity
+  parent: FoodSnackBase
+  id: FoodSnackJoveGello
+  name: jove gello
+  description: By Joove! It's some kind of gel.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - sweet
+  - type: Sprite
+    sprite: Objects/Consumable/Food/bay_food.rsi
+    state: jupiter
+  - type: Item
+  - type: Food
+    trash: FoodPacketJoveGelloTrash
+
+- type: entity
+  parent: FoodSnackBase
+  id: FoodSnackPlutoniumrods
+  name: plutonium rods
+  description: Baseless tasteless nutrithick rods to get you through the day. Now even less rash inducing!
+  components:
+  - type: FlavorProfile
+    flavors:
+      - chalky
+  - type: Sprite
+    sprite: Objects/Consumable/Food/bay_food.rsi
+    state: pluto
+  - type: Item
+  - type: Food
+    trash: FoodPacketPlutoniumrodsTrash
+
+- type: entity
+  parent: FoodSnackBase
+  id: FoodSnackMarsFrouka
+  name: frouka
+  description: Celebrate founding day with a steaming self-heated bowl of sweet eggs and taters!
+  components:
+  - type: FlavorProfile
+    flavors:
+      - egg
+      - potatoes
+      - mustard
+  - type: Sprite
+    sprite: Objects/Consumable/Food/bay_food.rsi
+    state: mars
+  - type: Item
+  - type: Food
+    trash: FoodPacketMarsFroukaTrash
+
+- type: entity
+  parent: FoodSnackBase
+  id: FoodSnackVenusianhotcakes
+  name: venusian hot cakes
+  description: Hot takes on hot cakes, a timeless classic now finally fit for human consumption!
+  components:
+  - type: FlavorProfile
+    flavors:
+      - spicy
+  - type: Sprite
+    sprite: Objects/Consumable/Food/bay_food.rsi
+    state: venus
+  - type: Item
+  - type: Food
+    trash: FoodPacketVenusTrash
+
+- type: entity
+  parent: FoodSnackBase
+  id: FoodSnackOortrocks
+  name: oort cloud rocks
+  description: Pop rocks themed on the most important industrial sector in Sol, new formula guarantees fewer shrapnel induced oral injury.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - fizzy
+      - sweet
+  - type: Sprite
+    sprite: Objects/Consumable/Food/bay_food.rsi
+    state: oort
+  - type: Item
+  - type: Food
+    trash: FoodPacketOortrocksTrash
+
+# Weeb Vend
+- type: entity
+  parent: FoodSnackBase
+  id: FoodSnackRedalertnuts
+  name: red alert nuts
+  description: A bag of Red Alert! brand spicy nuts. Goes well with your beer!
+  components:
+  - type: FlavorProfile
+    flavors:
+      - spicy
+  - type: Sprite
+    sprite: Objects/Consumable/Food/bay_food.rsi
+    state: weebonuts
+  - type: Item
+  - type: Food
+    trash: FoodPacketRedalertnutsTrash
+
+- type: entity
+  parent: FoodSnackBase
+  id: FoodSnackRicecake
+  name: rice cake
+  description: Ancient earth snack food made from balled up rice.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - rice
+  - type: Sprite
+    sprite: Objects/Consumable/Food/bay_food.rsi
+    state: ricecake
+  - type: Item
+
+- type: entity
+  parent: FoodSnackBase
+  id: FoodSnackPokeysticks
+  name: pokey sticks
+  description: A bundle of chocolate coated bisquit sticks.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - sweet
+      - chocolate
+  - type: Sprite
+    sprite: Objects/Consumable/Food/bay_food.rsi
+    state: pokeys
+  - type: Item
+
+- type: entity
+  parent: FoodSnackBase
+  id: FoodSnackChocobanana
+  name: chocobanana
+  description: A chocolate and sprinkles coated banana. On a stick
+  components:
+  - type: FlavorProfile
+    flavors:
+      - sweet
+      - chocolate
+  - type: Sprite
+    sprite: Objects/Consumable/Food/bay_food.rsi
+    state: chocobanana
+  - type: Item
+  - type: Food
+    trash: FoodPacketStickTrash
+
+- type: entity
+  parent: FoodSnackBase
+  id: FoodSnackDango
+  name: dango
+  description: Food dyed rice dumplings on a stick.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - rice
+      - sweet
+  - type: Sprite
+    sprite: Objects/Consumable/Food/bay_food.rsi
+    state: dango
+  - type: Item
+  - type: Food
+    trash: FoodPacketStickTrash
+
+# Old food
+- type: entity
+  parent: FoodSnackBase
+  id: FoodSnackAncientBurger
+  name: space burger
+  suffix: ancient
+  description: At some point in time this probably looked delicious.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - terrible
+  - type: Sprite
+    sprite: Objects/Consumable/Food/bay_food.rsi
+    state: ancient_burger
+  - type: Item
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 3
+  - type: RandomFillSolution
+    solution: food
+    weightedRandomId: RandomFillSpaceshroom
+
+- type: entity
+  parent: FoodSnackAncientBurger
+  id: FoodSnackAncientPizza
+  name: space pizza
+  description: At some point in time this probably looked delicious.
+  components:
+  - type: Sprite
+    state: ancient_pizza
+
+- type: entity
+  parent: FoodSnackAncientBurger
+  id: FoodSnackAncientFries
+  name: space fries
+  description: The salt appears to have preserved these, still stale and gross.
+  components:
+  - type: Sprite
+    state: ancient_fries
+
+- type: entity
+  parent: FoodSnackAncientBurger
+  id: FoodSnackAncientHotdog
+  name: space dog
+  description: This one is probably only marginally less safe to eat than when it was first created..
+  components:
+  - type: Sprite
+    state: ancient_hotdog
+
+- type: entity
+  parent: FoodSnackAncientBurger
+  id: FoodSnackAncientTaco
+  name: space taco
+  description: Interestingly, the shell has gone soft and the contents have gone stale.
+  components:
+  - type: Sprite
+    state: ancient_taco
+
+# trash
+- type: entity
+  noSpawn: true
+  parent: FoodPacketTrash
+  id: FoodPacketLunacakeTrash
+  name: lunacake wrapper
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Food/bay_trash.rsi
+    state: cakewrap
+  - type: Item
+
+- type: entity
+  noSpawn: true
+  parent: FoodPacketLunacakeTrash
+  id: FoodPacketMochicakeTrash
+  name: mochicake wrapper
+  components:
+  - type: Sprite
+    state: mochicakewrap
+  - type: Item
+
+- type: entity
+  noSpawn: true
+  parent: FoodPacketLunacakeTrash
+  id: FoodPacketMooncakeTrash
+  name: mooncake wrapper
+  components:
+  - type: Sprite
+    state: mooncakewrap
+  - type: Item
+
+- type: entity
+  noSpawn: true
+  parent: FoodPacketLunacakeTrash
+  id: FoodPacketTidegobsTrash
+  name: tidegobs trash
+  components:
+  - type: Sprite
+    state: tidegobs
+  - type: Item
+
+- type: entity
+  noSpawn: true
+  parent: FoodPacketLunacakeTrash
+  id: FoodPacketSaturnosTrash
+  name: saturn-os trash
+  components:
+  - type: Sprite
+    state: saturno
+  - type: Item
+
+- type: entity
+  noSpawn: true
+  parent: FoodPacketLunacakeTrash
+  id: FoodPacketJoveGelloTrash
+  name: jove gello trash
+  components:
+  - type: Sprite
+    state: jupiter
+  - type: Item
+
+- type: entity
+  noSpawn: true
+  parent: FoodPacketLunacakeTrash
+  id: FoodPacketPlutoniumrodsTrash
+  name: plutonium rods trash
+  components:
+  - type: Sprite
+    state: pluto
+  - type: Item
+
+- type: entity
+  noSpawn: true
+  parent: FoodPacketLunacakeTrash
+  id: FoodPacketMarsFroukaTrash
+  name: mars frouka trash
+  components:
+  - type: Sprite
+    state: mars
+  - type: Item
+
+- type: entity
+  noSpawn: true
+  parent: FoodPacketLunacakeTrash
+  id: FoodPacketVenusTrash
+  name: venus hot cakes trash
+  components:
+  - type: Sprite
+    state: venus
+  - type: Item
+
+- type: entity
+  noSpawn: true
+  parent: FoodPacketLunacakeTrash
+  id: FoodPacketOortrocksTrash
+  name: oort rocks trash
+  components:
+  - type: Sprite
+    state: oort
+  - type: Item
+
+# weebo vend
+- type: entity
+  noSpawn: true
+  parent: FoodPacketLunacakeTrash
+  id: FoodPacketRedalertnutsTrash
+  name: red alert nuts packet
+  components:
+  - type: Sprite
+    state: weebonuts
+  - type: Item
+
+- type: entity
+  noSpawn: true
+  parent: FoodPacketLunacakeTrash
+  id: FoodPacketStickTrash
+  name: stick
+  components:
+  - type: Sprite
+    state: stick
+  - type: Item
+
+#
+- type: entity
+  noSpawn: true
+  parent: FoodPacketLunacakeTrash
+  id: FoodPacketProteinbarTrash
+  name: protein bar wrapper
+  components:
+  - type: Sprite
+    state: proteinbar
+  - type: Item
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
index 07d918b5765..09b41d6e5d7 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   abstract: true
   parent: BaseItem
   id: BaseHandheldInstrument
@@ -71,6 +71,7 @@
         - BulletImpassable
   - type: StaticPrice
     price: 300
+  - type: RequireProjectileTarget
 
 - type: entity
   parent: BasePlaceableInstrument
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
index d87c5e700ab..fa814e8ed3a 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
@@ -1,7 +1,7 @@
 - type: entity
   abstract: true
   id: ReagentDispenserBase
-  parent: ConstructibleMachine
+  parent: SmallConstructibleMachine
   placement:
     mode: SnapgridCenter
   components:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
index a5e26463b99..204e06c8600 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
@@ -60,3 +60,4 @@
         ents: []
   - type: LightningTarget
     priority: 1
+  - type: RequireProjectileTarget
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml
index e2c210e7e6b..7b1e89bcc10 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: BaseTabletopChemicalMachine
-  parent: [ BaseMachinePowered, ConstructibleMachine ]
+  parent: [ BaseMachinePowered, SmallConstructibleMachine ]
   abstract: true
   components:
   - type: Transform
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Medical/disease_diagnoser.yml b/Resources/Prototypes/Entities/Structures/Machines/Medical/disease_diagnoser.yml
index e46c62053a9..ad98f47e36a 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Medical/disease_diagnoser.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/disease_diagnoser.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: DiseaseDiagnoser
-  parent: [ BaseMachinePowered, ConstructibleMachine ]
+  parent: [ BaseMachinePowered, SmallConstructibleMachine ]
   name: Disease Diagnoser Delta Extreme
   description: A machine that analyzes disease samples.
   placement:
@@ -43,5 +43,3 @@
     contentMargin: 12.0, 0.0, 12.0, 0.0
     # This is a narrow piece of paper
     maxWritableArea: 128.0, 0.0
-
-
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Medical/vaccinator.yml b/Resources/Prototypes/Entities/Structures/Machines/Medical/vaccinator.yml
index 041bca7c905..53542cdfa91 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Medical/vaccinator.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/vaccinator.yml
@@ -24,3 +24,4 @@
     containers:
       machine_board: !type:Container
       machine_parts: !type:Container
+  - type: RequireProjectileTarget
diff --git a/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml b/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml
index 1b183661f51..e6b4f77fa8b 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: MachineArtifactAnalyzer
-  parent: [ BaseMachinePowered, ConstructibleMachine ]
+  parent: [ BaseMachinePowered, SmallConstructibleMachine ]
   name: artifact analyzer
   description: A platform capable of performing analysis on various types of artifacts.
   components:
@@ -35,6 +35,7 @@
         - Impassable
         - MidImpassable
         - LowImpassable
+        - BulletImpassable
         hard: False
   - type: Transform
     anchored: true
diff --git a/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml b/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
index 621d9a1a7ec..fb5ed4440a9 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
@@ -70,3 +70,10 @@
     - machine_board
   - type: LightningTarget
     priority: 1
+
+- type: entity
+  abstract: true
+  parent: ConstructibleMachine
+  id: SmallConstructibleMachine
+  components:
+    - type: RequireProjectileTarget
diff --git a/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
index cd4a22b7909..e8439f82131 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
@@ -65,6 +65,7 @@
     deviceNetId: Wireless
     receiveFrequencyId: Fax
     transmitFrequencyId: Fax
+  - type: RequireProjectileTarget
 
 # Special
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 7300c0b9ec3..2a10abf3b34 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -518,6 +518,7 @@
         - Sheet
         - RawMaterial
         - Ingot
+  - type: RequireProjectileTarget
 
 - type: entity
   id: ExosuitFabricator
diff --git a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
index 37b5e50d31d..55dfe296a61 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
@@ -1,6 +1,6 @@
-- type: entity
+- type: entity
   id: KitchenMicrowave
-  parent: [ BaseMachinePowered, ConstructibleMachine ]
+  parent: [ BaseMachinePowered, SmallConstructibleMachine ]
   name: microwave
   description: It's magic.
   components:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
index d19e2379972..12fec44e4f4 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: KitchenReagentGrinder
-  parent: [ BaseMachinePowered, ConstructibleMachine ]
+  parent: [ BaseMachinePowered, SmallConstructibleMachine ]
   name: reagent grinder
   description: From BlenderTech. Will It Blend? Let's find out!
   suffix: grinder/juicer
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index 6efa5a63711..380f7e012d1 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -14,7 +14,7 @@
       path: /Audio/Ambience/Objects/vending_machine_hum.ogg
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/empty.rsi
-    snapCardinals: true
+    snapCardinals: false
   - type: Physics
     bodyType: Static
   - type: Transform
@@ -89,7 +89,10 @@
   - type: PointLight
     enabled: false
     castShadows: false
-    radius: 1.5
+    radius: 2
+    energy: 1.5
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
   - type: LitOnPowered
   - type: ApcPowerReceiver
     powerLoad: 200
@@ -212,7 +215,8 @@
     ejectState: eject-unshaded
     denyState: deny-unshaded
   - type: Sprite
-    sprite: Structures/Machines/VendingMachines/cart.rsi
+    noRot: true
+    sprite: Structures/Machines/VendingMachines/laptop.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Base"]
@@ -222,11 +226,18 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1
+    radius: 2
     energy: 1.3
     color: "#ffb0b0"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
   - type: AccessReader
     access: [["HeadOfPersonnel"]]
+  - type: Transform
+    noRot: false
+  - type: Rotatable
+    rotateWhileAnchored: false
+    rotateWhilePulling: true
 
 - type: entity
   parent: VendingMachine
@@ -255,9 +266,11 @@
   - type: AccessReader
     access: [["Service"]]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#4b93ad"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
 
 - type: entity
   parent: VendingMachine
@@ -278,6 +291,7 @@
     pack: CigaretteMachineAds
   - type: Speech
   - type: Sprite
+    noRot: true
     sprite: Structures/Machines/VendingMachines/cigs.rsi
     layers:
     - state: "off"
@@ -287,6 +301,11 @@
       shader: unshaded
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: Transform
+    noRot: false
+  - type: Rotatable
+    rotateWhileAnchored: false
+    rotateWhilePulling: true
 
 - type: entity
   parent: VendingMachine
@@ -314,9 +333,11 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.8
+    radius: 2
     energy: 1.6
     color: "#3db83b"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
 
 - type: entity
   parent: VendingMachine
@@ -344,9 +365,11 @@
     - state: panel
       map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
   - type: PointLight
-    radius: 1.8
+    radius: 2
     energy: 1.6
     color: "#3db83b"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
 
 - type: entity
   parent: VendingMachine
@@ -371,6 +394,7 @@
     pack: HotDrinksMachineAds
   - type: Speech
   - type: Sprite
+    noRot: true
     sprite: Structures/Machines/VendingMachines/coffee.rsi
     layers:
     - state: "off"
@@ -384,9 +408,16 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.3
     color: "#ad7c4b"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+  - type: Transform
+    noRot: false
+  - type: Rotatable
+    rotateWhileAnchored: false
+    rotateWhilePulling: true
 
 - type: entity
   parent: VendingMachine
@@ -409,6 +440,7 @@
     pack: RobustSoftdrinksAds
   - type: Speech
   - type: Sprite
+    noRot: true
     sprite: Structures/Machines/VendingMachines/cola.rsi
     layers:
     - state: "off"
@@ -419,9 +451,16 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#3c5eb5"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+  - type: Transform
+    noRot: false
+  - type: Rotatable
+    rotateWhileAnchored: false
+    rotateWhilePulling: true
 
 - type: entity
   parent: VendingMachineCola
@@ -429,7 +468,7 @@
   suffix: Black
   components:
   - type: Sprite
-    sprite: Structures/Machines/VendingMachines/cola-black.rsi
+    sprite: Structures/Machines/VendingMachines/soda2.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Base"]
@@ -439,9 +478,11 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#423438"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
 
 - type: entity
   parent: VendingMachineCola
@@ -450,7 +491,7 @@
   description: It vends cola, in space.
   components:
   - type: Sprite
-    sprite: Structures/Machines/VendingMachines/cola-red.rsi
+    sprite: Structures/Machines/VendingMachines/cola.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Base"]
@@ -460,18 +501,22 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#A50824"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
 
 - type: entity
-  parent: VendingMachineCola
+  parent: VendingMachine
   id: VendingMachineSpaceUp
   name: Space-Up! Vendor
   description: Indulge in an explosion of flavor.
   components:
   - type: VendingMachine
     pack: SpaceUpInventory
+    offState: off
+    normalState: normal-unshaded
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/spaceup.rsi
     layers:
@@ -483,9 +528,11 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#44964A"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
 
 - type: entity
   parent: VendingMachineCola
@@ -494,7 +541,12 @@
   components:
   - type: VendingMachine
     pack: SodaInventory
+    offState: off
+    normalState: normal-unshaded
+    denyState: deny-unshaded
+    ejectState: eject-unshaded
   - type: Sprite
+    noRot: true
     sprite: Structures/Machines/VendingMachines/soda.rsi
     layers:
     - state: "off"
@@ -505,18 +557,27 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#CBC6BE"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+  - type: Transform
+    noRot: false
+  - type: Rotatable
+    rotateWhileAnchored: false
+    rotateWhilePulling: true
 
 - type: entity
-  parent: VendingMachineCola
+  parent: VendingMachine
   id: VendingMachineStarkist
   name: Star-kist Vendor
   description: The taste of a star in liquid form.
   components:
   - type: VendingMachine
     pack: StarkistInventory
+    offState: off
+    normalState: normal-unshaded
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/starkist.rsi
     layers:
@@ -528,9 +589,13 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#D3A44D"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+  - type: Transform
+    noRot: true
 
 - type: entity
   parent: VendingMachine
@@ -563,9 +628,11 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#66538F"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
 
 - type: entity
   parent: VendingMachine
@@ -598,9 +665,11 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#6927C5"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
 
 - type: entity
   parent: VendingMachine
@@ -633,9 +702,11 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#D82929"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
 
 - type: entity
   parent: VendingMachine
@@ -649,9 +720,11 @@
     brokenState: broken
     normalState: normal-unshaded
     ejectState: eject-unshaded
+    denyState: deny-unshaded
   - type: Advertise
     pack: DinnerwareAds
   - type: Sprite
+    noRot: true
     sprite: Structures/Machines/VendingMachines/dinnerware.rsi
     layers:
     - state: "off"
@@ -664,9 +737,16 @@
   - type: AccessReader
     access: [["Service"]]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#4b93ad"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+  - type: Transform
+    noRot: false
+  - type: Rotatable
+    rotateWhileAnchored: false
+    rotateWhilePulling: true
 
 - type: entity
   parent: VendingMachine
@@ -679,9 +759,12 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
+    denyState: deny-unshaded
+    ejectState: eject-unshaded
   - type: Advertise
     pack: MagiVendAds
   - type: Sprite
+    noRot: true
     sprite: Structures/Machines/VendingMachines/magivend.rsi
     layers:
     - state: "off"
@@ -692,9 +775,16 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#9a18d6"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+  - type: Transform
+    noRot: false
+  - type: Rotatable
+    rotateWhileAnchored: false
+    rotateWhilePulling: true
 
 - type: entity
   parent: VendingMachine
@@ -724,9 +814,11 @@
     - texture: Structures/Machines/VendingMachines/maintenance_panel.png
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#6148c7"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
 
 - type: entity
   parent: VendingMachine
@@ -742,6 +834,7 @@
     ejectState: eject-unshaded
     denyState: deny-unshaded
   - type: Sprite
+    noRot: true
     sprite: Structures/Machines/VendingMachines/engivend.rsi
     layers:
     - state: "off"
@@ -754,9 +847,16 @@
   - type: AccessReader
     access: [["Engineering"]]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#b89e2a"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+  - type: Transform
+    noRot: false
+  - type: Rotatable
+    rotateWhileAnchored: false
+    rotateWhilePulling: true
 
 - type: entity
   parent: VendingMachine
@@ -775,7 +875,8 @@
   - type: Advertise
     pack: NanoMedAds
   - type: Sprite
-    sprite: Structures/Machines/VendingMachines/medical.rsi
+    sprite: Structures/Machines/VendingMachines/medivend.rsi
+    noRot: true
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Base"]
@@ -787,12 +888,19 @@
   - type: AccessReader
     access: [["Medical"]]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#9dc5c9"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
   - type: GuideHelp
     guides:
     - Medical Doctor
+  - type: Transform
+    noRot: false
+  - type: Rotatable
+    rotateWhileAnchored: false
+    rotateWhilePulling: true
 
 - type: entity
   parent: VendingMachine
@@ -810,7 +918,7 @@
   - type: Advertise
     pack: NutriMaxAds
   - type: Sprite
-    sprite: Structures/Machines/VendingMachines/nutri.rsi
+    sprite: Structures/Machines/VendingMachines/nutri_green.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Base"]
@@ -822,9 +930,11 @@
   - type: AccessReader
     access: [["Hydroponics"]]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#326e3f"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
 
 - type: entity
   parent: VendingMachine
@@ -842,7 +952,8 @@
   - type: Advertise
     pack: SecTechAds
   - type: Sprite
-    sprite: Structures/Machines/VendingMachines/sec.rsi
+    sprite: Structures/Machines/VendingMachines/security.rsi
+    noRot: true
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Base"]
@@ -854,12 +965,19 @@
   - type: AccessReader
     access: [["Security"]]
   - type: PointLight
-    radius: 1
-    energy: 1.2
+    radius: 2
+    energy: 1.8
     color: "#78645c"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
   - type: GuideHelp
     guides:
     - Security
+  - type: Transform
+    noRot: false
+  - type: Rotatable
+    rotateWhileAnchored: false
+    rotateWhilePulling: true
 
 - type: entity
   parent: VendingMachine
@@ -878,7 +996,7 @@
   - type: Advertise
     pack: MegaSeedAds
   - type: Sprite
-    sprite: Structures/Machines/VendingMachines/seeds.rsi
+    sprite: Structures/Machines/VendingMachines/seeds_green.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Base"]
@@ -888,9 +1006,11 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#326e3f"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
 
 - type: entity
   parent: VendingMachineSeedsUnlocked
@@ -920,6 +1040,7 @@
     pack: GetmoreChocolateCorpAds
   - type: Speech
   - type: Sprite
+    noRot: true
     sprite: Structures/Machines/VendingMachines/snack.rsi
     layers:
     - state: "off"
@@ -930,9 +1051,16 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#c73434"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+  - type: Transform
+    noRot: false
+  - type: Rotatable
+    rotateWhileAnchored: false
+    rotateWhilePulling: true
 
 - type: entity
   parent: VendingMachineSnack
@@ -960,9 +1088,11 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#737785"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
 
 - type: entity
   parent: VendingMachineSnack
@@ -980,9 +1110,11 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#3c5eb5"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
 
 - type: entity
   parent: VendingMachineSnack
@@ -1000,9 +1132,11 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#CE3401"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
 
 - type: entity
   parent: VendingMachineSnack
@@ -1020,9 +1154,11 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#5F6A1C"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
 
 - type: entity
   parent: VendingMachineSnack
@@ -1040,9 +1176,11 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#207E79"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
 
 - type: entity
   parent: VendingMachine
@@ -1064,7 +1202,8 @@
     pack: BodaAds
   - type: Speech
   - type: Sprite
-    sprite: Structures/Machines/VendingMachines/sovietsoda.rsi
+    sprite: Structures/Machines/VendingMachines/sodasoviet.rsi
+    noRot: true
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Base"]
@@ -1074,9 +1213,16 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
-    color: "#389690"
+    color: "#B80F0A"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+  - type: Transform
+    noRot: false
+  - type: Rotatable
+    rotateWhileAnchored: false
+    rotateWhilePulling: true
 
 - type: entity
   parent: VendingMachine
@@ -1097,6 +1243,7 @@
   - type: Speech
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/theater.rsi
+    noRot: true
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Base"]
@@ -1109,9 +1256,16 @@
       map: ["enum.VendingMachineVisualLayers.Screen"]
       shader: unshaded
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#c73434"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+  - type: Transform
+    noRot: false
+  - type: Rotatable
+    rotateWhileAnchored: false
+    rotateWhilePulling: true
 
 - type: entity
   parent: VendingMachine
@@ -1130,6 +1284,7 @@
     pack: VendomatAds
   - type: Speech
   - type: Sprite
+    noRot: true
     sprite: Structures/Machines/VendingMachines/vendomat.rsi
     layers:
     - state: "off"
@@ -1140,9 +1295,16 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#9dc5c9"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+  - type: Transform
+    noRot: false
+  - type: Rotatable
+    rotateWhileAnchored: false
+    rotateWhilePulling: true
 
 - type: entity
   parent: VendingMachine
@@ -1161,6 +1323,7 @@
     pack: VendomatAds
   - type: Speech
   - type: Sprite
+    noRot: true
     sprite: Structures/Machines/VendingMachines/robotics.rsi
     layers:
     - state: "off"
@@ -1173,9 +1336,16 @@
   - type: AccessReader
     access: [["Research"]]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#B0ADA9"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+  - type: Transform
+    noRot: false
+  - type: Rotatable
+    rotateWhileAnchored: false
+    rotateWhilePulling: true
   - type: GuideHelp
     guides:
     - Robotics
@@ -1194,6 +1364,7 @@
     ejectState: eject-unshaded
     denyState: deny-unshaded
   - type: Sprite
+    noRot: true
     sprite: Structures/Machines/VendingMachines/youtool.rsi
     layers:
     - state: "off"
@@ -1204,9 +1375,16 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#d4ab33"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+  - type: Transform
+    noRot: false
+  - type: Rotatable
+    rotateWhileAnchored: false
+    rotateWhilePulling: true
 
 - type: entity
   parent: VendingMachine
@@ -1224,6 +1402,7 @@
   - type: Advertise
     pack: GoodCleanFunAds
   - type: Sprite
+    noRot: true
     sprite: Structures/Machines/VendingMachines/games.rsi
     layers:
     - state: "off"
@@ -1234,9 +1413,16 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#326e3f"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+  - type: Transform
+    noRot: false
+  - type: Rotatable
+    rotateWhileAnchored: false
+    rotateWhilePulling: true
 
 - type: entity
   parent: VendingMachine
@@ -1251,12 +1437,15 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
+    denyState: deny-unshaded
+    ejectState: eject-unshaded
     initialStockQuality: 0.33
   - type: Advertise
     pack: ChangAds
   - type: Speech
   - type: Sprite
-    sprite: Structures/Machines/VendingMachines/changs.rsi
+    noRot: true
+    sprite: Structures/Machines/VendingMachines/snix.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Base"]
@@ -1266,9 +1455,16 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#ffe599"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+  - type: Transform
+    noRot: false
+  - type: Rotatable
+    rotateWhileAnchored: false
+    rotateWhilePulling: true
 
 - type: entity
   parent: VendingMachine
@@ -1293,9 +1489,11 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#9dc5c9"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
   - type: AccessReader
     access: [["Salvage"]]
   - type: GuideHelp
@@ -1330,9 +1528,11 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#d4ab33"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
 
 # wallmounted machines
 
@@ -1352,11 +1552,13 @@
   - type: Sprite
     drawdepth: WallMountedItems
     snapCardinals: false
-  - type: Rotatable
   - type: WallMount
     arc: 175
   - type: Transform
     noRot: false
+  - type: Rotatable
+    rotateWhileAnchored: false
+    rotateWhilePulling: true
 
 - type: entity
   parent: VendingMachineWallmount
@@ -1370,7 +1572,9 @@
     brokenState: broken
     normalState: normal-unshaded
     denyState: deny-unshaded
+    ejectState: eject-unshaded
   - type: Sprite
+    noRot: true
     sprite: Structures/Machines/VendingMachines/wallmed.rsi
     layers:
     - state: "off"
@@ -1385,6 +1589,17 @@
   - type: GuideHelp
     guides:
     - Medical
+  - type: Transform
+    noRot: false
+  - type: Rotatable
+    rotateWhileAnchored: false
+    rotateWhilePulling: true
+  - type: PointLight
+    radius: 2
+    energy: 1.6
+    color: "#9dc5c9"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
 
 # job clothing
 
@@ -1516,9 +1731,11 @@
   - type: AccessReader
     access: [["Chapel"]]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#CCCCCC" #The holy C
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
 
 - type: entity
   parent: VendingMachine
@@ -1739,10 +1956,12 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
+    denyState: deny-unshaded
+    ejectState: eject-unshaded
   - type: Advertise
     pack: JaniDrobeAds
   - type: Sprite
-    sprite: Structures/Machines/VendingMachines/janidrobe.rsi
+    sprite: Structures/Machines/VendingMachines/lavatory.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Base"]
@@ -1753,6 +1972,12 @@
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: AccessReader
     access: [["Janitor"]]
+  - type: PointLight
+    radius: 2
+    energy: 1.6
+    color: "#9dc5c9"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
 
 - type: entity
   parent: VendingMachine
@@ -1906,9 +2131,11 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#48CF48"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
   - type: AccessReader
     access: [["CentralCommand"]]
 
@@ -1940,9 +2167,11 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: PointLight
-    radius: 1.5
+    radius: 2
     energy: 1.6
     color: "#3c5eb5"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
   - type: Advertise
     pack: HappyHonkAds
   - type: AccessReader
@@ -2022,3 +2251,158 @@
   - type: AccessReader
     access: [["SyndicateAgent"]]
 
+- type: entity
+  id: VendingMachineFitness
+  parent: VendingMachine
+  name: SweatMAX
+  description: An exercise aid and nutrition supplement vendor that preys on your inadequacy.
+  components:
+  - type: Sprite
+    noRot: true
+    sprite: Structures/Machines/VendingMachines/fitness.rsi
+    layers:
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.Base"]
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
+      shader: unshaded
+    - state: "screen"
+      map: ["enum.VendingMachineVisualLayers.Screen"]
+      shader: unshaded
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: VendingMachine
+    pack: FitnessVendInventory
+    offState: off
+    brokenState: broken
+    normalState: normal-unshaded
+    denyState: deny-unshaded
+    ejectState: eject-unshaded
+    screenState: screen
+  - type: Advertise
+    pack: FitnessVendAds
+  - type: Transform
+    noRot: false
+  - type: Rotatable
+    rotateWhileAnchored: false
+    rotateWhilePulling: true
+  - type: PointLight
+    radius: 2
+    energy: 1.6
+    color: "#9dc5c9"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+
+- type: entity
+  id: VendingMachineHotfood
+  parent: VendingMachine
+  name: hot foods
+  description: An old vending machine promising 'hot foods'. You doubt any of its contents are still edible.
+  components:
+  - type: Sprite
+    noRot: true
+    sprite: Structures/Machines/VendingMachines/hotfood.rsi
+    layers:
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.Base"]
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
+      shader: unshaded
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+    - state: heater
+  - type: VendingMachine
+    pack: HotfoodInventory
+    offState: off
+    brokenState: broken
+    normalState: normal-unshaded
+    denyState: deny-unshaded
+    ejectState: eject-unshaded
+  - type: Rotatable
+    rotateWhileAnchored: false
+    rotateWhilePulling: true
+  - type: Advertise
+    pack: HotfoodAds
+  - type: PointLight
+    radius: 2
+    energy: 1.6
+    color: "#9dc5c9"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+
+- type: entity
+  id: VendingMachineSolsnack
+  parent: VendingMachine
+  name: Mars Mart
+  description: A SolCentric vending machine dispensing treats from home.
+  components:
+  - type: Sprite
+    noRot: true
+    sprite: Structures/Machines/VendingMachines/solsnack.rsi
+    layers:
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.Base"]
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
+      shader: unshaded
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: VendingMachine
+    pack: SolsnackInventory
+    offState: off
+    brokenState: broken
+    normalState: normal-unshaded
+    ejectState: eject-unshaded
+    denyState: deny-unshaded
+  - type: Advertise
+    pack: SolsnackAds
+  - type: Transform
+    noRot: false
+  - type: Rotatable
+    rotateWhileAnchored: false
+    rotateWhilePulling: true
+  - type: PointLight
+    radius: 2
+    energy: 1.6
+    color: "#9dc5c9"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+
+- type: entity
+  id: VendingMachineWeeb
+  parent: VendingMachine
+  name: Nippon-tan
+  description: A distressingly ethnic vending machine loaded with high sucrose low calorie for lack of better words snacks.
+  components:
+  - type: Sprite
+    noRot: true
+    sprite: Structures/Machines/VendingMachines/weeb.rsi
+    layers:
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.Base"]
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
+      shader: unshaded
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+    - state: fan
+  - type: VendingMachine
+    pack: WeebVendInventory
+    offState: off
+    brokenState: broken
+    normalState: normal-unshaded
+    denyState: deny-unshaded
+    ejectState: eject-unshaded
+  - type: Advertise
+    pack: WeebVendAds
+  - type: Transform
+    noRot: false
+  - type: Rotatable
+    rotateWhileAnchored: false
+    rotateWhilePulling: true
+  - type: PointLight
+    radius: 2
+    energy: 1.6
+    color: "#9dc5c9"
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
diff --git a/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml b/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml
index d69eb96f623..0a145177713 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: [ BaseStructureDynamic, ConstructibleMachine ]
+  parent: [ BaseStructureDynamic, SmallConstructibleMachine ]
   id: SurveillanceWirelessCameraBase
   name: wireless camera
   description: A camera. It's watching you. Kinda.
@@ -23,6 +23,8 @@
           density: 80
           mask:
             - MachineMask
+          layer:
+            - BulletImpassable
     - type: SurveillanceCameraMicrophone
       blacklist:
         components:
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
index 0e2a5f6fe5d..7f994b237ac 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: PortableScrubber
-  parent: [BaseMachinePowered, ConstructibleMachine]
+  parent: [BaseMachinePowered, SmallConstructibleMachine]
   name: portable scrubber
   description: It scrubs, portably!
   components:
@@ -120,7 +120,7 @@
         layer:
         - MachineLayer
   - type: ApcPowerReceiver
-    powerDisabled: true #starts off 
+    powerDisabled: true #starts off
   - type: Sprite
     sprite: Structures/Piping/Atmospherics/Portable/portable_sheater.rsi
     noRot: true
@@ -195,4 +195,4 @@
   suffix: Anchored, Enabled
   components:
   - type: ApcPowerReceiver
-    powerDisabled: false
\ No newline at end of file
+    powerDisabled: false
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
index 06f2fb2d181..6858f0433de 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
@@ -390,7 +390,7 @@
     board: HellfireHeaterMachineCircuitBoard
 
 - type: entity
-  parent: [ BaseMachinePowered, ConstructibleMachine ]
+  parent: [ BaseMachinePowered, SmallConstructibleMachine ]
   id: BaseGasCondenser
   name: condenser
   description: Condenses gases into liquids. Now we just need some plumbing.
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
index 1193182d09f..a9ea8261371 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
@@ -91,6 +91,7 @@
     - key: enum.DisposalUnitUiKey.Key
       type: DisposalUnitBoundUserInterface
   - type: RatKingRummageable
+  - type: RequireProjectileTarget
 
 - type: entity
   id: MailingUnit
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
index 52698f62cc0..6cfbc04ee1b 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: Emitter
   name: emitter
-  parent: ConstructibleMachine
+  parent: SmallConstructibleMachine
   description: A heavy duty industrial laser. Shoots non-stop when turned on.
   placement:
     mode: SnapgridCenter
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
index b606c01f1dd..26f0a1de6db 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
@@ -1,4 +1,4 @@
-#
+#
 # You can use this Desmos sheet to calculate fuel burn rate values:
 # https://www.desmos.com/calculator/qcektq5dqs
 #
@@ -6,7 +6,7 @@
 - type: entity
   abstract: true
   id: PortableGeneratorBase
-  parent: [ BaseMachine, ConstructibleMachine ]
+  parent: [ BaseMachine, SmallConstructibleMachine]
   components:
     # Basic properties
     - type: Transform
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
index 5a28c4962c1..c512266e974 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
@@ -49,6 +49,7 @@
     onBump: false
     requirePower: true
     highVoltageNode: output
+  - type: RequireProjectileTarget 
 
 - type: entity
   id: SolarPanel
@@ -157,6 +158,7 @@
     graph: SolarPanel
     node: solarassembly
     defaultTarget: solarpanel
+  - type: RequireProjectileTarget 
 
 - type: entity
   id: SolarTracker
@@ -201,3 +203,4 @@
   - type: Construction
     graph: SolarPanel
     node: solartracker
+  - type: RequireProjectileTarget 
diff --git a/Resources/Prototypes/Entities/Structures/Power/chargers.yml b/Resources/Prototypes/Entities/Structures/Power/chargers.yml
index 388cc3c9874..9f322dc5926 100644
--- a/Resources/Prototypes/Entities/Structures/Power/chargers.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/chargers.yml
@@ -58,12 +58,15 @@
         density: 500
         mask:
         - TabletopMachineMask
+        layer:
+        - BulletImpassable
   - type: PowerChargerVisuals
   - type: ContainerContainer
     containers:
       charger_slot: !type:ContainerSlot
       machine_board: !type:Container
       machine_parts: !type:Container
+  - type: RequireProjectileTarget
 
 - type: entity
   parent: BaseItemRecharger
diff --git a/Resources/Prototypes/Entities/Structures/Specific/bay12barbershop.yml b/Resources/Prototypes/Entities/Structures/Specific/bay12barbershop.yml
new file mode 100644
index 00000000000..e66ae347d97
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Specific/bay12barbershop.yml
@@ -0,0 +1,36 @@
+- type: entity
+  parent: SeatBase
+  id: ChairBarber
+  name: barbers chair
+  components:
+  - type: Transform
+    anchored: true
+  - type: Physics
+    bodyType: Static
+  - type: Anchorable
+  - type: Rotatable
+  - type: Sprite
+    sprite: Structures/Specific/barbershop.rsi
+    state: barberchair
+
+- type: entity
+  parent: BaseSign
+  id: BarberSignPole
+  name: barber pole
+  description: Hypnotic.
+  components:
+  - type: Sprite
+    sprite: Structures/Specific/barbershop.rsi
+    state: pole
+    snapCardinals: false
+
+- type: entity
+  parent: BarberSignPole
+  id: BarberSignThesnip
+  name: the snip
+  description: Let's hope it's not a medical practice...
+  components:
+  - type: Sprite
+    sprite: Structures/Specific/barbershop.rsi
+    state: thesnip
+    snapCardinals: false
diff --git a/Resources/Prototypes/Entities/Structures/Specific/bay12fitness.yml b/Resources/Prototypes/Entities/Structures/Specific/bay12fitness.yml
new file mode 100644
index 00000000000..1da1d85da02
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Specific/bay12fitness.yml
@@ -0,0 +1,80 @@
+- type: entity
+  parent: SeatBase
+  id: FitnessWeightsBench1
+  name: weights bench
+  components:
+  - type: Transform
+    anchored: true
+  - type: Physics
+    bodyType: Static
+  - type: Anchorable
+  - type: Rotatable
+  - type: Sprite
+    sprite: Structures/Specific/fitness.rsi
+    state: fitnessweight
+
+- type: entity
+  parent: FitnessWeightsBench1
+  id: FitnessWeightLifter
+  name: weight lifter
+  components:
+  - type: Sprite
+    sprite: Structures/Specific/fitness.rsi
+    state: fitnesslifter
+
+
+# Bags
+# TODO: Need a way to change to animation state on trigger in world (click) or use damage state visualiser and instant healing to change state on attack.
+#soundOnTrigger ?
+#TriggerOnActivate ?
+#TriggerOnCollide ?
+
+- type: entity
+  id: FitnessPunchingBagBopClown
+  parent: BaseStructure
+  name: clown bop bag
+  description: A fitness training bag with a clown printed on it.
+  components:
+  - type: Sprite
+    sprite: Structures/Specific/fitness.rsi
+    state: bopbag
+
+- type: entity
+  id: FitnessPunchingBag
+  parent: BaseStructure
+  name: punching bag
+  description: A fitness training bag.
+  components:
+  - type: Sprite
+    sprite: Structures/Specific/fitness.rsi
+    state: punchingbag
+
+- type: entity
+  id: FitnessPunchingBagCaptain
+  parent: FitnessPunchingBag
+  suffix: captain
+  description: A fitness training bag with a captain printed on it.
+  components:
+  - type: Sprite
+    sprite: Structures/Specific/fitness.rsi
+    state: punchingbagcaptain
+
+- type: entity
+  id: FitnessPunchingBagSyndicate
+  parent: FitnessPunchingBag
+  suffix: syndicate
+  description: A fitness training bag with a syndicate agent printed on it.
+  components:
+  - type: Sprite
+    sprite: Structures/Specific/fitness.rsi
+    state: punchingbagsyndie
+
+- type: entity
+  id: FitnessPunchingBagWizard
+  parent: FitnessPunchingBag
+  suffix: wizard
+  description: A fitness training bag with a wizard printed on it.
+  components:
+  - type: Sprite
+    sprite: Structures/Specific/fitness.rsi
+    state: punchingbagwizard
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
index 403e20b43c7..6299abef89a 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
@@ -74,6 +74,7 @@
     node: crategenericsteel
     containers:
       - entity_storage
+  - type: RequireProjectileTarget
 
 - type: entity
   parent: CrateGeneric
diff --git a/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml b/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml
index d341c017a70..d6becda9cc5 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml
@@ -156,6 +156,7 @@
     node: chestDrawer
   - type: StaticPrice
     price: 15
+  - type: RequireProjectileTarget
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml
index e7d938a3c9a..04289371228 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml
@@ -32,6 +32,7 @@
   - type: Sprite
     drawdepth: WallTops
     sprite: Structures/Wallmounts/signs.rsi
-    snapCardinals: true
+    snapCardinals: false
+    noRot: true
   - type: StaticPrice
     price: 20
diff --git a/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml b/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml
index f2b03aaeb8f..7277af64ca5 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml
@@ -69,7 +69,7 @@
         acts: [ "Destruction" ]
   - type: Climbable
     delay: 2.5
-
+  - type: RequireProjectileTarget
 
 #High
 - type: entity
@@ -93,8 +93,10 @@
         mask:
         - FullTileMask
         layer:
+        - Opaque
         - MidImpassable
         - LowImpassable
+        - BulletImpassable
   - type: Construction
     graph: FenceWood
     node: straight
@@ -120,8 +122,10 @@
         mask:
         - FullTileMask
         layer:
+        - Opaque
         - MidImpassable
         - LowImpassable
+        - BulletImpassable
   - type: Construction
     graph: FenceWood
     node: end
@@ -156,8 +160,10 @@
         mask:
         - TableMask
         layer:
+        - Opaque
         - MidImpassable
         - LowImpassable
+        - BulletImpassable
   - type: Construction
     graph: FenceWood
     node: corner
@@ -192,8 +198,10 @@
         mask:
         - TableMask
         layer:
+        - Opaque
         - MidImpassable
         - LowImpassable
+        - BulletImpassable
   - type: Construction
     graph: FenceWood
     node: tjunction
@@ -218,8 +226,10 @@
         mask:
         - FullTileMask
         layer:
+        - Opaque
         - MidImpassable
         - LowImpassable
+        - BulletImpassable
   - type: InteractionOutline
   - type: Door
     openSpriteState: door_opened
@@ -268,6 +278,7 @@
         layer:
         - MidImpassable
         - LowImpassable
+        - BulletImpassable
   - type: Construction
     graph: FenceWood
     node: straight_small
@@ -295,6 +306,7 @@
         layer:
         - MidImpassable
         - LowImpassable
+        - BulletImpassable
   - type: Construction
     graph: FenceWood
     node: end_small
@@ -331,6 +343,7 @@
         layer:
         - MidImpassable
         - LowImpassable
+        - BulletImpassable
   - type: Construction
     graph: FenceWood
     node: corner_small
@@ -367,6 +380,7 @@
         layer:
         - MidImpassable
         - LowImpassable
+        - BulletImpassable
   - type: Construction
     graph: FenceWood
     node: tjunction_small
@@ -393,6 +407,7 @@
         layer:
         - MidImpassable
         - LowImpassable
+        - BulletImpassable
   - type: InteractionOutline
   - type: Door
     openSpriteState: door_opened_small
@@ -415,4 +430,4 @@
       path: /Audio/Effects/door_close.ogg
   - type: Construction
     graph: FenceWood
-    node: gate_small
\ No newline at end of file
+    node: gate_small
diff --git a/Resources/Prototypes/Entities/Structures/hydro_tray.yml b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
index 43b8bd197a5..6dac2e656e4 100644
--- a/Resources/Prototypes/Entities/Structures/hydro_tray.yml
+++ b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: hydroponics tray
-  parent: [ hydroponicsSoil, ConstructibleMachine]
+  parent: [ hydroponicsSoil, SmallConstructibleMachine]
   id: hydroponicsTray
   description: An interstellar-grade space farmplot allowing for rapid growth and selective breeding of crops. Just... keep in mind the space weeds.
   components:
@@ -14,6 +14,8 @@
         hard: true
         mask:
         - MachineMask
+        layer:
+        - BulletImpassable
   - type: Anchorable
   - type: Pullable
   - type: Sprite
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
index 8a0e750abd6..ab3f6f3d1c1 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
@@ -26,7 +26,7 @@
       fix1:
         shape:
           !type:PhysShapeCircle
-          radius: 0.42
+          radius: 0.35
         density: 220
         restitution: 0.0
         mask:
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
index 2184926b95a..5bc02461eed 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
@@ -9,6 +9,7 @@
     scale: 0.8, 0.8
   - type: HumanoidAppearance
     species: Felinid
+    initial: Felinid
   - type: Fixtures
     fixtures: # TODO: This needs a second fixture just for mob collisions.
       fix1:
diff --git a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
index 9cb184b8ef0..ee8be0e5892 100644
--- a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
@@ -11,6 +11,12 @@
   femaleFirstNames: names_oni_female
   lastNames: names_oni_location
   naming: LastNoFirst
+  minHeight: 0.9
+  defaultHeight: 1.2
+  maxHeight: 1.3
+  minWidth: 0.85
+  defaultWidth: 1.2
+  maxWidth: 1.35
 
 - type: markingPoints
   id: MobOniMarkingLimits
diff --git a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml
index 754a4ae906b..4751d581746 100644
--- a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml
@@ -7,6 +7,12 @@
   markingLimits: MobFelinidMarkingLimits
   dollPrototype: MobFelinidDummy
   skinColoration: HumanToned
+  minHeight: 0.65
+  defaultHeight: 0.8
+  maxHeight: 1.1
+  minWidth: 0.6
+  defaultWidth: 0.8
+  maxWidth: 1.15
 
 - type: markingPoints
   id: MobFelinidMarkingLimits
diff --git a/Resources/Prototypes/SimpleStation14/humanoidProfiles/felinid.yml b/Resources/Prototypes/SimpleStation14/humanoidProfiles/felinid.yml
new file mode 100644
index 00000000000..33e6915a78c
--- /dev/null
+++ b/Resources/Prototypes/SimpleStation14/humanoidProfiles/felinid.yml
@@ -0,0 +1,6 @@
+- type: humanoidProfile
+  id: Felinid
+  profile:
+    species: Felinid
+    height: 0.8
+    width: 0.8
diff --git a/Resources/Prototypes/SimpleStation14/humanoidProfiles/oni.yml b/Resources/Prototypes/SimpleStation14/humanoidProfiles/oni.yml
new file mode 100644
index 00000000000..1e2d8af1e30
--- /dev/null
+++ b/Resources/Prototypes/SimpleStation14/humanoidProfiles/oni.yml
@@ -0,0 +1,6 @@
+- type: humanoidProfile
+  id: Oni
+  profile:
+    species: Oni
+    height: 1.2
+    width: 1.2
diff --git a/Resources/Prototypes/Species/dwarf.yml b/Resources/Prototypes/Species/dwarf.yml
index 86743ca2d66..d32f1e6476a 100644
--- a/Resources/Prototypes/Species/dwarf.yml
+++ b/Resources/Prototypes/Species/dwarf.yml
@@ -7,3 +7,9 @@
   markingLimits: MobHumanMarkingLimits
   dollPrototype: MobDwarfDummy
   skinColoration: HumanToned
+  minHeight: 0.6
+  defaultHeight: 0.8
+  maxHeight: 0.8
+  minWidth: 0.55
+  defaultWidth: 0.8
+  maxWidth: 0.85
diff --git a/Resources/Prototypes/Species/reptilian.yml b/Resources/Prototypes/Species/reptilian.yml
index f5cf1fa6ebf..752918e2f0c 100644
--- a/Resources/Prototypes/Species/reptilian.yml
+++ b/Resources/Prototypes/Species/reptilian.yml
@@ -11,6 +11,12 @@
   maleFirstNames: names_reptilian_male
   femaleFirstNames: names_reptilian_female
   naming: FirstDashFirst
+  minHeight: 0.7
+  defaultHeight: 0.95
+  maxHeight: 1.25
+  minWidth: 0.65
+  defaultWidth: 0.95
+  maxWidth: 1.3
 
 - type: speciesBaseSprites
   id: MobReptilianSprites
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/(mdr)grapejuice.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/(mdr)grapejuice.png
new file mode 100644
index 00000000000..33c8cf524d7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/(mdr)grapejuice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/absinthebottle.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/absinthebottle.png
new file mode 100644
index 00000000000..a696be55ecb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/absinthebottle.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/alco-blue.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/alco-blue.png
new file mode 100644
index 00000000000..a846c51dccb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/alco-blue.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/alco-green.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/alco-green.png
new file mode 100644
index 00000000000..832eff6c84c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/alco-green.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/alco-red.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/alco-red.png
new file mode 100644
index 00000000000..73bb8f09e55
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/alco-red.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/alcoholfreebeer.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/alcoholfreebeer.png
new file mode 100644
index 00000000000..04a3a9abc1a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/alcoholfreebeer.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/alebottle.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/alebottle.png
new file mode 100644
index 00000000000..b83adcb16ae
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/alebottle.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/alecan.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/alecan.png
new file mode 100644
index 00000000000..80312918b0e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/alecan.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/art_bru.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/art_bru.png
new file mode 100644
index 00000000000..fc610c54e70
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/art_bru.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/badminka.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/badminka.png
new file mode 100644
index 00000000000..bcc84e44a79
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/badminka.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/baijiu.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/baijiu.png
new file mode 100644
index 00000000000..bb126e29ee5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/baijiu.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/barflask.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/barflask.png
new file mode 100644
index 00000000000..ab221a062a8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/barflask.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/beastenergy.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/beastenergy.png
new file mode 100644
index 00000000000..8550ed2e326
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/beastenergy.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/beer.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/beer.png
new file mode 100644
index 00000000000..2a6edb52e51
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/beer.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/beercan.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/beercan.png
new file mode 100644
index 00000000000..ca7f51e7c9a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/beercan.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/bigteacup.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/bigteacup.png
new file mode 100644
index 00000000000..e69ef517774
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/bigteacup.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/bigteacup100.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/bigteacup100.png
new file mode 100644
index 00000000000..5d3c46b9c06
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/bigteacup100.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/blackstrap.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/blackstrap.png
new file mode 100644
index 00000000000..b6462b62194
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/blackstrap.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/bottleofnothing.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/bottleofnothing.png
new file mode 100644
index 00000000000..0758381372d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/bottleofnothing.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/broken.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/broken.png
new file mode 100644
index 00000000000..ed561fdb1ec
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/broken.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/broken_bottle.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/broken_bottle.png
new file mode 100644
index 00000000000..1037c72f797
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/broken_bottle.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/bronze_cup.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/bronze_cup.png
new file mode 100644
index 00000000000..b09bb8e7865
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/bronze_cup.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cachaca.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cachaca.png
new file mode 100644
index 00000000000..7f85a6361b6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cachaca.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/ccola.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/ccola.png
new file mode 100644
index 00000000000..9ee2b3e36d9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/ccola.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/champagne.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/champagne.png
new file mode 100644
index 00000000000..dedc64e96f2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/champagne.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/coffee.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/coffee.png
new file mode 100644
index 00000000000..d97aeb795d7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/coffee.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cognacbottle.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cognacbottle.png
new file mode 100644
index 00000000000..63ec409f302
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cognacbottle.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola-blue.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola-blue.png
new file mode 100644
index 00000000000..68de91a98a0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola-blue.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola-brown.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola-brown.png
new file mode 100644
index 00000000000..89ad1746392
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola-brown.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola-green.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola-green.png
new file mode 100644
index 00000000000..bbfc45864d6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola-green.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola-orange.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola-orange.png
new file mode 100644
index 00000000000..23851c7ca34
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola-orange.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola-pink.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola-pink.png
new file mode 100644
index 00000000000..4e030420086
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola-pink.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola-pork.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola-pork.png
new file mode 100644
index 00000000000..37946fbcd2c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola-pork.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola-purple.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola-purple.png
new file mode 100644
index 00000000000..435a9536e90
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola-purple.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola-red.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola-red.png
new file mode 100644
index 00000000000..8b8ef526f20
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola-red.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola-yellow.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola-yellow.png
new file mode 100644
index 00000000000..db373e7864c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola-yellow.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola.png
new file mode 100644
index 00000000000..2a7bec10ec8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cola.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/colabottle.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/colabottle.png
new file mode 100644
index 00000000000..d50cccf5aa5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/colabottle.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/coolant.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/coolant.png
new file mode 100644
index 00000000000..1d96dc5d870
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/coolant.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cream.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cream.png
new file mode 100644
index 00000000000..353bf21ec01
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/cream.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/detflask.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/detflask.png
new file mode 100644
index 00000000000..d5cff66ac72
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/detflask.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/dnb.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/dnb.png
new file mode 100644
index 00000000000..cf4f39b1658
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/dnb.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/dr_gibb.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/dr_gibb.png
new file mode 100644
index 00000000000..750f7df313c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/dr_gibb.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/energy_drink.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/energy_drink.png
new file mode 100644
index 00000000000..0a61d66e671
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/energy_drink.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/fitness-cup_black.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/fitness-cup_black.png
new file mode 100644
index 00000000000..f86defc451e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/fitness-cup_black.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/fitness-cup_blue.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/fitness-cup_blue.png
new file mode 100644
index 00000000000..e96763af972
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/fitness-cup_blue.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/fitness-cup_red.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/fitness-cup_red.png
new file mode 100644
index 00000000000..11551c2294a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/fitness-cup_red.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/flask.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/flask.png
new file mode 100644
index 00000000000..8da40323e9b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/flask.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/flavorpak.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/flavorpak.png
new file mode 100644
index 00000000000..cf19d84fae0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/flavorpak.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/ginbottle.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/ginbottle.png
new file mode 100644
index 00000000000..b3eb7616b9e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/ginbottle.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/gingerbeer.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/gingerbeer.png
new file mode 100644
index 00000000000..e63b6340cb6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/gingerbeer.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/golden_cup.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/golden_cup.png
new file mode 100644
index 00000000000..bb012a2017c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/golden_cup.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/goldschlagerbottle.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/goldschlagerbottle.png
new file mode 100644
index 00000000000..98d29311113
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/goldschlagerbottle.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/grenadinebottle.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/grenadinebottle.png
new file mode 100644
index 00000000000..3c0a06640fc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/grenadinebottle.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/hellshenbeer.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/hellshenbeer.png
new file mode 100644
index 00000000000..c7f3965dfe8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/hellshenbeer.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/herbal.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/herbal.png
new file mode 100644
index 00000000000..8d9be0c1fce
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/herbal.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/holyflask.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/holyflask.png
new file mode 100644
index 00000000000..0d8ed5a7849
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/holyflask.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/hrukhzaextract.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/hrukhzaextract.png
new file mode 100644
index 00000000000..a8df313f1b6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/hrukhzaextract.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/ice_tea_can.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/ice_tea_can.png
new file mode 100644
index 00000000000..811792e6370
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/ice_tea_can.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/ionbru.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/ionbru.png
new file mode 100644
index 00000000000..ba260f33140
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/ionbru.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/jar.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/jar.png
new file mode 100644
index 00000000000..efccd5f8307
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/jar.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/jar_metroid.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/jar_metroid.png
new file mode 100644
index 00000000000..11acb97b667
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/jar_metroid.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/jar_what.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/jar_what.png
new file mode 100644
index 00000000000..f2d321857a2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/jar_what.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/kahluabottle.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/kahluabottle.png
new file mode 100644
index 00000000000..4873366f7fb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/kahluabottle.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/lager.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/lager.png
new file mode 100644
index 00000000000..3d33258a36f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/lager.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/lemon-lime.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/lemon-lime.png
new file mode 100644
index 00000000000..348fa3836d5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/lemon-lime.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/lemonjuice.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/lemonjuice.png
new file mode 100644
index 00000000000..f37587df67f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/lemonjuice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/limejuice.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/limejuice.png
new file mode 100644
index 00000000000..65626e53b06
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/limejuice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/lithiumflask.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/lithiumflask.png
new file mode 100644
index 00000000000..f0c665c743b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/lithiumflask.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/lunabrandy.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/lunabrandy.png
new file mode 100644
index 00000000000..473a4766afe
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/lunabrandy.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/maplesyrup.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/maplesyrup.png
new file mode 100644
index 00000000000..033b13963bb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/maplesyrup.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/meta.json
new file mode 100644
index 00000000000..101ea21f895
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/meta.json
@@ -0,0 +1,413 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/464342c5dc8c417b7e79d56c69aa30445bdf3b75",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "pitcher"
+    },
+    {
+      "name": "pitcher15"
+    },
+    {
+      "name": "pitcher30"
+    },
+    {
+      "name": "pitcher50"
+    },
+    {
+      "name": "pitcher70"
+    },
+    {
+      "name": "pitcher85"
+    },
+    {
+      "name": "pitcher100"
+    },
+    {
+      "name": "alco-blue"
+    },
+    {
+      "name": "alco-red"
+    },
+    {
+      "name": "alco-green"
+    },
+    {
+      "name": "shaker"
+    },
+    {
+      "name": "jar"
+    },
+    {
+      "name": "jar_metroid"
+    },
+    {
+      "name": "jar_what"
+    },
+    {
+      "name": "waterbottle"
+    },
+    {
+      "name": "water_cup"
+    },
+    {
+      "name": "water_cup_e"
+    },
+    {
+      "name": "grenadinebottle"
+    },
+    {
+      "name": "holyflask"
+    },
+    {
+      "name": "barflask"
+    },
+    {
+      "name": "bigteacup"
+    },
+    {
+      "name": "bigteacup100"
+    },
+    {
+      "name": "vacuumflask"
+    },
+    {
+      "name": "teapot"
+    },
+    {
+      "name": "shinyflask"
+    },
+    {
+      "name": "lithiumflask"
+    },
+    {
+      "name": "rag"
+    },
+    {
+      "name": "rag_lit",
+      "delays": [
+        [
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "rag_small"
+    },
+    {
+      "name": "rag_small_lit",
+      "delays": [
+        [
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "colabottle"
+    },
+    {
+      "name": "space-up_bottle"
+    },
+    {
+      "name": "space_mountain_wind_bottle"
+    },
+    {
+      "name": "fitness-cup_black"
+    },
+    {
+      "name": "fitness-cup_red"
+    },
+    {
+      "name": "fitness-cup_blue"
+    },
+    {
+      "name": "beer"
+    },
+    {
+      "name": "alebottle"
+    },
+    {
+      "name": "rumbottle"
+    },
+    {
+      "name": "whiskeybottle"
+    },
+    {
+      "name": "whiskeybottle2"
+    },
+    {
+      "name": "vodkabottle"
+    },
+    {
+      "name": "premiumvodka"
+    },
+    {
+      "name": "ginbottle"
+    },
+    {
+      "name": "cognacbottle"
+    },
+    {
+      "name": "goldschlagerbottle"
+    },
+    {
+      "name": "patronbottle"
+    },
+    {
+      "name": "orangejuice"
+    },
+    {
+      "name": "limejuice"
+    },
+    {
+      "name": "cream"
+    },
+    {
+      "name": "tomatojuice"
+    },
+    {
+      "name": "sodawater"
+    },
+    {
+      "name": "milk"
+    },
+    {
+      "name": "soymilk"
+    },
+    {
+      "name": "coffee"
+    },
+    {
+      "name": "flask"
+    },
+    {
+      "name": "ramen"
+    },
+    {
+      "name": "golden_cup"
+    },
+    {
+      "name": "bottleofnothing"
+    },
+    {
+      "name": "nothing"
+    },
+    {
+      "name": "vermouthbottle"
+    },
+    {
+      "name": "kahluabottle"
+    },
+    {
+      "name": "tequillabottle"
+    },
+    {
+      "name": "winebottle"
+    },
+    {
+      "name": "pwinebottle"
+    },
+    {
+      "name": "premiumwine"
+    },
+    {
+      "name": "(mdr)grapejuice"
+    },
+    {
+      "name": "broken"
+    },
+    {
+      "name": "broken_bottle"
+    },
+    {
+      "name": "detflask"
+    },
+    {
+      "name": "badminka"
+    },
+    {
+      "name": "silver_cup"
+    },
+    {
+      "name": "bronze_cup"
+    },
+    {
+      "name": "herbal"
+    },
+    {
+      "name": "absinthebottle"
+    },
+    {
+      "name": "oil"
+    },
+    {
+      "name": "coolant"
+    },
+    {
+      "name": "placeholder"
+    },
+    {
+      "name": "syndi_cola"
+    },
+    {
+      "name": "syndi_cola_x"
+    },
+    {
+      "name": "art_bru"
+    },
+    {
+      "name": "beercan"
+    },
+    {
+      "name": "alecan"
+    },
+    {
+      "name": "space_mountain_wind"
+    },
+    {
+      "name": "dr_gibb"
+    },
+    {
+      "name": "starkist"
+    },
+    {
+      "name": "space-up"
+    },
+    {
+      "name": "lemon-lime"
+    },
+    {
+      "name": "tonic"
+    },
+    {
+      "name": "cola"
+    },
+    {
+      "name": "purple_can"
+    },
+    {
+      "name": "ice_tea_can"
+    },
+    {
+      "name": "energy_drink"
+    },
+    {
+      "name": "thirteen_loko"
+    },
+    {
+      "name": "flavorpak"
+    },
+    {
+      "name": "lunabrandy"
+    },
+    {
+      "name": "hellshenbeer"
+    },
+    {
+      "name": "blackstrap"
+    },
+    {
+      "name": "sake"
+    },
+    {
+      "name": "tadmorwine"
+    },
+    {
+      "name": "champagne"
+    },
+    {
+      "name": "prosecco"
+    },
+    {
+      "name": "whiskeybottle3"
+    },
+    {
+      "name": "beastenergy"
+    },
+    {
+      "name": "hrukhzaextract"
+    },
+    {
+      "name": "gingerbeer"
+    },
+    {
+      "name": "cola-orange"
+    },
+    {
+      "name": "cola-pink"
+    },
+    {
+      "name": "cola-purple"
+    },
+    {
+      "name": "cola-yellow"
+    },
+    {
+      "name": "cola-red"
+    },
+    {
+      "name": "cola-blue"
+    },
+    {
+      "name": "cola-brown"
+    },
+    {
+      "name": "cola-green"
+    },
+    {
+      "name": "cola-pork"
+    },
+    {
+      "name": "vcola"
+    },
+    {
+      "name": "ccola"
+    },
+    {
+      "name": "ocola"
+    },
+    {
+      "name": "ionbru"
+    },
+    {
+      "name": "baijiu"
+    },
+    {
+      "name": "cachaca"
+    },
+    {
+      "name": "rakia"
+    },
+    {
+      "name": "dnb"
+    },
+    {
+      "name": "alcoholfreebeer"
+    },
+    {
+      "name": "lager"
+    },
+    {
+      "name": "soju"
+    },
+    {
+      "name": "lemonjuice"
+    },
+    {
+      "name": "maplesyrup"
+    },
+    {
+        "name": "thoom"
+    },
+    {
+        "name": "water"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/milk.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/milk.png
new file mode 100644
index 00000000000..5387925e47b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/milk.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/nothing.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/nothing.png
new file mode 100644
index 00000000000..d9b49e8a6b5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/nothing.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/ocola.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/ocola.png
new file mode 100644
index 00000000000..93084027eb3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/ocola.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/oil.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/oil.png
new file mode 100644
index 00000000000..61a75bea35a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/oil.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/orangejuice.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/orangejuice.png
new file mode 100644
index 00000000000..0d35a2b2d0c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/orangejuice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/patronbottle.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/patronbottle.png
new file mode 100644
index 00000000000..7df7f754248
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/patronbottle.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/pitcher.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/pitcher.png
new file mode 100644
index 00000000000..5c118ff0507
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/pitcher.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/pitcher100.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/pitcher100.png
new file mode 100644
index 00000000000..dda0416eae4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/pitcher100.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/pitcher15.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/pitcher15.png
new file mode 100644
index 00000000000..a2260318a19
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/pitcher15.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/pitcher30.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/pitcher30.png
new file mode 100644
index 00000000000..027acaa18a2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/pitcher30.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/pitcher50.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/pitcher50.png
new file mode 100644
index 00000000000..dc6d16dae9c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/pitcher50.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/pitcher70.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/pitcher70.png
new file mode 100644
index 00000000000..0945994d0d1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/pitcher70.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/pitcher85.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/pitcher85.png
new file mode 100644
index 00000000000..437f48f3099
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/pitcher85.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/placeholder.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/placeholder.png
new file mode 100644
index 00000000000..363a370da15
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/placeholder.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/premiumvodka.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/premiumvodka.png
new file mode 100644
index 00000000000..5fb9ab4ac45
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/premiumvodka.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/premiumwine.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/premiumwine.png
new file mode 100644
index 00000000000..11757f12ea7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/premiumwine.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/prosecco.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/prosecco.png
new file mode 100644
index 00000000000..1afd6884085
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/prosecco.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/purple_can.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/purple_can.png
new file mode 100644
index 00000000000..813bf6fb6b8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/purple_can.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/pwinebottle.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/pwinebottle.png
new file mode 100644
index 00000000000..e599e674562
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/pwinebottle.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/rag.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/rag.png
new file mode 100644
index 00000000000..ecc4ef632be
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/rag.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/rag_lit.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/rag_lit.png
new file mode 100644
index 00000000000..c8cabd143d1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/rag_lit.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/rag_small.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/rag_small.png
new file mode 100644
index 00000000000..6cb555eff29
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/rag_small.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/rag_small_lit.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/rag_small_lit.png
new file mode 100644
index 00000000000..52fb5cd35f0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/rag_small_lit.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/rakia.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/rakia.png
new file mode 100644
index 00000000000..0b475a886e6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/rakia.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/ramen.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/ramen.png
new file mode 100644
index 00000000000..ec65d8e0c36
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/ramen.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/rumbottle.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/rumbottle.png
new file mode 100644
index 00000000000..c3ecfd5dea4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/rumbottle.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/sake.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/sake.png
new file mode 100644
index 00000000000..fbdf0a5f83d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/sake.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/shaker.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/shaker.png
new file mode 100644
index 00000000000..f80bfa55088
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/shaker.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/shinyflask.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/shinyflask.png
new file mode 100644
index 00000000000..e6c9ef3f040
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/shinyflask.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/silver_cup.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/silver_cup.png
new file mode 100644
index 00000000000..fd265bfa90d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/silver_cup.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/sodawater.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/sodawater.png
new file mode 100644
index 00000000000..a0bfb5db36f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/sodawater.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/soju.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/soju.png
new file mode 100644
index 00000000000..cdb90f22ddc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/soju.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/soymilk.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/soymilk.png
new file mode 100644
index 00000000000..cb682adb7a3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/soymilk.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/space-up.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/space-up.png
new file mode 100644
index 00000000000..4a203dfd2d8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/space-up.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/space-up_bottle.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/space-up_bottle.png
new file mode 100644
index 00000000000..f4194bd385c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/space-up_bottle.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/space_mountain_wind.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/space_mountain_wind.png
new file mode 100644
index 00000000000..37be9f854b5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/space_mountain_wind.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/space_mountain_wind_bottle.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/space_mountain_wind_bottle.png
new file mode 100644
index 00000000000..8e9c63d430b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/space_mountain_wind_bottle.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/starkist.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/starkist.png
new file mode 100644
index 00000000000..df57ecaac70
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/starkist.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/syndi_cola.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/syndi_cola.png
new file mode 100644
index 00000000000..0e435719282
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/syndi_cola.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/syndi_cola_x.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/syndi_cola_x.png
new file mode 100644
index 00000000000..1d40de5d280
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/syndi_cola_x.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/tadmorwine.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/tadmorwine.png
new file mode 100644
index 00000000000..ba89b690683
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/tadmorwine.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/teapot.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/teapot.png
new file mode 100644
index 00000000000..a59f755776e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/teapot.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/tequillabottle.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/tequillabottle.png
new file mode 100644
index 00000000000..9a50365259a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/tequillabottle.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/thirteen_loko.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/thirteen_loko.png
new file mode 100644
index 00000000000..bf867f76efd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/thirteen_loko.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/thoom.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/thoom.png
new file mode 100644
index 00000000000..f882275a497
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/thoom.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/tomatojuice.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/tomatojuice.png
new file mode 100644
index 00000000000..ba0e0ca2a12
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/tomatojuice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/tonic.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/tonic.png
new file mode 100644
index 00000000000..cf4ebdf3c6a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/tonic.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/vacuumflask.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/vacuumflask.png
new file mode 100644
index 00000000000..0e524de5e03
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/vacuumflask.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/vcola.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/vcola.png
new file mode 100644
index 00000000000..fbb5677b562
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/vcola.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/vermouthbottle.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/vermouthbottle.png
new file mode 100644
index 00000000000..204e361ee60
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/vermouthbottle.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/vodkabottle.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/vodkabottle.png
new file mode 100644
index 00000000000..0e379bf8fa0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/vodkabottle.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/water.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/water.png
new file mode 100644
index 00000000000..f432c9abbd4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/water.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/water_cup.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/water_cup.png
new file mode 100644
index 00000000000..0c9e03fd088
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/water_cup.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/water_cup_e.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/water_cup_e.png
new file mode 100644
index 00000000000..a72dab7a442
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/water_cup_e.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/waterbottle.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/waterbottle.png
new file mode 100644
index 00000000000..cfb23ef4015
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/waterbottle.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/whiskeybottle.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/whiskeybottle.png
new file mode 100644
index 00000000000..67a40d0c5fb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/whiskeybottle.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/whiskeybottle2.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/whiskeybottle2.png
new file mode 100644
index 00000000000..9d1f9144358
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/whiskeybottle2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/whiskeybottle3.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/whiskeybottle3.png
new file mode 100644
index 00000000000..1aff1529838
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/whiskeybottle3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/winebottle.png b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/winebottle.png
new file mode 100644
index 00000000000..b858642493c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi/winebottle.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/milkmini.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/milkmini.rsi/icon.png
new file mode 100644
index 00000000000..80d054ff0d2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/milkmini.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/milkmini.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/milkmini.rsi/icon_open.png
new file mode 100644
index 00000000000..80d054ff0d2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/milkmini.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/milkmini.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/milkmini.rsi/meta.json
new file mode 100644
index 00000000000..f2e5a45e978
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/milkmini.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/464342c5dc8c417b7e79d56c69aa30445bdf3b75",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Consumable/Drinks/milkminichoco.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/milkminichoco.rsi/icon.png
new file mode 100644
index 00000000000..75617ad3ab1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/milkminichoco.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/milkminichoco.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/milkminichoco.rsi/icon_open.png
new file mode 100644
index 00000000000..75617ad3ab1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/milkminichoco.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/milkminichoco.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/milkminichoco.rsi/meta.json
new file mode 100644
index 00000000000..f2e5a45e978
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/milkminichoco.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/464342c5dc8c417b7e79d56c69aa30445bdf3b75",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup10.png b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup10.png
new file mode 100644
index 00000000000..d8daeeb8b12
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup10.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup100.png b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup100.png
new file mode 100644
index 00000000000..bdd50023f68
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup100.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup20.png b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup20.png
new file mode 100644
index 00000000000..5b51586cae8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup20.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup30.png b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup30.png
new file mode 100644
index 00000000000..0d90159b4ba
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup30.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup40.png b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup40.png
new file mode 100644
index 00000000000..d22bc1a98db
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup40.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup50.png b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup50.png
new file mode 100644
index 00000000000..f30dac42708
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup50.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup60.png b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup60.png
new file mode 100644
index 00000000000..4af868b8f08
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup60.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup70.png b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup70.png
new file mode 100644
index 00000000000..a4cd283d299
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup70.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup80.png b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup80.png
new file mode 100644
index 00000000000..329e6aee39b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup80.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup90.png b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup90.png
new file mode 100644
index 00000000000..2d0cfe55241
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/fitness-cup90.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/icon.png
new file mode 100644
index 00000000000..f86defc451e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/icon_empty.png
new file mode 100644
index 00000000000..f86defc451e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/icon_open.png
new file mode 100644
index 00000000000..f86defc451e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/meta.json
new file mode 100644
index 00000000000..76bf0dac4e1
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi/meta.json
@@ -0,0 +1,50 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/464342c5dc8c417b7e79d56c69aa30445bdf3b75",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_open"
+    },
+    {
+      "name": "icon_empty"
+    },
+    {
+      "name": "fitness-cup10"
+    },
+    {
+      "name": "fitness-cup20"
+    },
+    {
+      "name": "fitness-cup30"
+    },
+    {
+      "name": "fitness-cup40"
+    },
+    {
+      "name": "fitness-cup50"
+    },
+    {
+      "name": "fitness-cup60"
+    },
+    {
+      "name": "fitness-cup70"
+    },
+    {
+      "name": "fitness-cup80"
+    },
+    {
+      "name": "fitness-cup90"
+    },
+    {
+      "name": "fitness-cup100"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup10.png b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup10.png
new file mode 100644
index 00000000000..d8daeeb8b12
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup10.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup100.png b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup100.png
new file mode 100644
index 00000000000..bdd50023f68
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup100.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup20.png b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup20.png
new file mode 100644
index 00000000000..5b51586cae8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup20.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup30.png b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup30.png
new file mode 100644
index 00000000000..0d90159b4ba
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup30.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup40.png b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup40.png
new file mode 100644
index 00000000000..d22bc1a98db
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup40.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup50.png b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup50.png
new file mode 100644
index 00000000000..f30dac42708
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup50.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup60.png b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup60.png
new file mode 100644
index 00000000000..4af868b8f08
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup60.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup70.png b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup70.png
new file mode 100644
index 00000000000..a4cd283d299
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup70.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup80.png b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup80.png
new file mode 100644
index 00000000000..329e6aee39b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup80.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup90.png b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup90.png
new file mode 100644
index 00000000000..2d0cfe55241
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/fitness-cup90.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/icon.png
new file mode 100644
index 00000000000..e96763af972
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/icon_empty.png
new file mode 100644
index 00000000000..e96763af972
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/icon_open.png
new file mode 100644
index 00000000000..e96763af972
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/meta.json
new file mode 100644
index 00000000000..76bf0dac4e1
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi/meta.json
@@ -0,0 +1,50 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/464342c5dc8c417b7e79d56c69aa30445bdf3b75",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_open"
+    },
+    {
+      "name": "icon_empty"
+    },
+    {
+      "name": "fitness-cup10"
+    },
+    {
+      "name": "fitness-cup20"
+    },
+    {
+      "name": "fitness-cup30"
+    },
+    {
+      "name": "fitness-cup40"
+    },
+    {
+      "name": "fitness-cup50"
+    },
+    {
+      "name": "fitness-cup60"
+    },
+    {
+      "name": "fitness-cup70"
+    },
+    {
+      "name": "fitness-cup80"
+    },
+    {
+      "name": "fitness-cup90"
+    },
+    {
+      "name": "fitness-cup100"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup10.png b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup10.png
new file mode 100644
index 00000000000..d8daeeb8b12
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup10.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup100.png b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup100.png
new file mode 100644
index 00000000000..bdd50023f68
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup100.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup20.png b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup20.png
new file mode 100644
index 00000000000..5b51586cae8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup20.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup30.png b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup30.png
new file mode 100644
index 00000000000..0d90159b4ba
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup30.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup40.png b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup40.png
new file mode 100644
index 00000000000..d22bc1a98db
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup40.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup50.png b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup50.png
new file mode 100644
index 00000000000..f30dac42708
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup50.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup60.png b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup60.png
new file mode 100644
index 00000000000..4af868b8f08
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup60.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup70.png b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup70.png
new file mode 100644
index 00000000000..a4cd283d299
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup70.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup80.png b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup80.png
new file mode 100644
index 00000000000..329e6aee39b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup80.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup90.png b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup90.png
new file mode 100644
index 00000000000..2d0cfe55241
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/fitness-cup90.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/icon.png
new file mode 100644
index 00000000000..11551c2294a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/icon_empty.png
new file mode 100644
index 00000000000..11551c2294a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/icon_open.png
new file mode 100644
index 00000000000..11551c2294a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/meta.json
new file mode 100644
index 00000000000..76bf0dac4e1
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi/meta.json
@@ -0,0 +1,50 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/464342c5dc8c417b7e79d56c69aa30445bdf3b75",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_open"
+    },
+    {
+      "name": "icon_empty"
+    },
+    {
+      "name": "fitness-cup10"
+    },
+    {
+      "name": "fitness-cup20"
+    },
+    {
+      "name": "fitness-cup30"
+    },
+    {
+      "name": "fitness-cup40"
+    },
+    {
+      "name": "fitness-cup50"
+    },
+    {
+      "name": "fitness-cup60"
+    },
+    {
+      "name": "fitness-cup70"
+    },
+    {
+      "name": "fitness-cup80"
+    },
+    {
+      "name": "fitness-cup90"
+    },
+    {
+      "name": "fitness-cup100"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/0box-donut1.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/0box-donut1.png
new file mode 100644
index 00000000000..d64ebb9feab
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/0box-donut1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/0box-donut_chaos.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/0box-donut_chaos.png
new file mode 100644
index 00000000000..0c2e7a5a3b8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/0box-donut_chaos.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/1box-donut1.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/1box-donut1.png
new file mode 100644
index 00000000000..d2a6d0e8d27
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/1box-donut1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/1box-donut_chaos.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/1box-donut_chaos.png
new file mode 100644
index 00000000000..a03c46d3280
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/1box-donut_chaos.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/2box-donut1.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/2box-donut1.png
new file mode 100644
index 00000000000..f7dcf01d914
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/2box-donut1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/2box-donut_chaos.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/2box-donut_chaos.png
new file mode 100644
index 00000000000..614623b978b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/2box-donut_chaos.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/3box-donut1.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/3box-donut1.png
new file mode 100644
index 00000000000..be75157d5c3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/3box-donut1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/3box-donut_chaos.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/3box-donut_chaos.png
new file mode 100644
index 00000000000..e7a0ab88f41
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/3box-donut_chaos.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/4box-donut1.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/4box-donut1.png
new file mode 100644
index 00000000000..9f5bfffb97b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/4box-donut1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/4box-donut_chaos.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/4box-donut_chaos.png
new file mode 100644
index 00000000000..a8a0ef5ed85
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/4box-donut_chaos.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/4no_raisins.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/4no_raisins.png
new file mode 100644
index 00000000000..eeec931923c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/4no_raisins.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/5box-donut1.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/5box-donut1.png
new file mode 100644
index 00000000000..d806d7cf064
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/5box-donut1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/5box-donut_chaos.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/5box-donut_chaos.png
new file mode 100644
index 00000000000..f05af23b4d3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/5box-donut_chaos.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/6box-donut1.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/6box-donut1.png
new file mode 100644
index 00000000000..4c59d3a28cc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/6box-donut1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/6box-donut_chaos.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/6box-donut_chaos.png
new file mode 100644
index 00000000000..4c59d3a28cc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/6box-donut_chaos.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/aesirsalad.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/aesirsalad.png
new file mode 100644
index 00000000000..468475995b6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/aesirsalad.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/aghrassh-cake.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/aghrassh-cake.png
new file mode 100644
index 00000000000..4abc0f2b3ff
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/aghrassh-cake.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/amanita_pie.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/amanita_pie.png
new file mode 100644
index 00000000000..3c507593080
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/amanita_pie.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/amanitajelly.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/amanitajelly.png
new file mode 100644
index 00000000000..4f3fc019473
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/amanitajelly.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/ancient_burger.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/ancient_burger.png
new file mode 100644
index 00000000000..affb0cc2d9c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/ancient_burger.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/ancient_fries.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/ancient_fries.png
new file mode 100644
index 00000000000..4999db34959
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/ancient_fries.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/ancient_hburger.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/ancient_hburger.png
new file mode 100644
index 00000000000..fe305bd8487
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/ancient_hburger.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/ancient_hotdog.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/ancient_hotdog.png
new file mode 100644
index 00000000000..e82cbbe8f8a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/ancient_hotdog.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/ancient_pizza.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/ancient_pizza.png
new file mode 100644
index 00000000000..a921f7d58e7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/ancient_pizza.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/ancient_taco.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/ancient_taco.png
new file mode 100644
index 00000000000..a75eec5d760
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/ancient_taco.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/applecake.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/applecake.png
new file mode 100644
index 00000000000..06a22353265
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/applecake.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/applecakeslice.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/applecakeslice.png
new file mode 100644
index 00000000000..a575f23eafc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/applecakeslice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/applepie.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/applepie.png
new file mode 100644
index 00000000000..e225797ec81
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/applepie.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/bacon.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/bacon.png
new file mode 100644
index 00000000000..4de5c439d19
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/bacon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/badrecipe.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/badrecipe.png
new file mode 100644
index 00000000000..acd740c0172
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/badrecipe.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/baguette.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/baguette.png
new file mode 100644
index 00000000000..91de73aedb0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/baguette.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/bananabread.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/bananabread.png
new file mode 100644
index 00000000000..5d2ebb4c0d1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/bananabread.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/bananabreadslice.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/bananabreadslice.png
new file mode 100644
index 00000000000..6f4926bbe2b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/bananabreadslice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/barbecue.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/barbecue.png
new file mode 100644
index 00000000000..1f1d04f9be3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/barbecue.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/bearmeat.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/bearmeat.png
new file mode 100644
index 00000000000..7c02703f2f7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/bearmeat.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/beetsoup.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/beetsoup.png
new file mode 100644
index 00000000000..211e4533505
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/beetsoup.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/berryclafoutis.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/berryclafoutis.png
new file mode 100644
index 00000000000..9192b395308
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/berryclafoutis.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/bigbiteburger.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/bigbiteburger.png
new file mode 100644
index 00000000000..c12c04fe7af
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/bigbiteburger.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/birdmeat.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/birdmeat.png
new file mode 100644
index 00000000000..e78fdc5cdfb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/birdmeat.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/birdsteak.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/birdsteak.png
new file mode 100644
index 00000000000..a23a344b25e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/birdsteak.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/birthdaycake.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/birthdaycake.png
new file mode 100644
index 00000000000..0f8d99283bc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/birthdaycake.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/birthdaycakeslice.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/birthdaycakeslice.png
new file mode 100644
index 00000000000..f35a08a88ef
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/birthdaycakeslice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/biscotti.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/biscotti.png
new file mode 100644
index 00000000000..7fb83946b16
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/biscotti.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/bisque.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/bisque.png
new file mode 100644
index 00000000000..afeaca4c158
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/bisque.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/boiledrice.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/boiledrice.png
new file mode 100644
index 00000000000..c1c843d3973
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/boiledrice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/boiledslimecore.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/boiledslimecore.png
new file mode 100644
index 00000000000..b2d7dec77a8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/boiledslimecore.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/brainburger.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/brainburger.png
new file mode 100644
index 00000000000..bfd085ef04d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/brainburger.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/braincake.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/braincake.png
new file mode 100644
index 00000000000..33a25e5224d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/braincake.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/braincakeslice.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/braincakeslice.png
new file mode 100644
index 00000000000..35018c29915
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/braincakeslice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/bread.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/bread.png
new file mode 100644
index 00000000000..fb15a90af9d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/bread.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/breadslice.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/breadslice.png
new file mode 100644
index 00000000000..d9b8c0d175c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/breadslice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/bunbun.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/bunbun.png
new file mode 100644
index 00000000000..c7a0956c48c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/bunbun.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/candiedapple.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/candiedapple.png
new file mode 100644
index 00000000000..103e99c5159
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/candiedapple.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/candy.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/candy.png
new file mode 100644
index 00000000000..13ba51c2106
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/candy.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/candy_corn.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/candy_corn.png
new file mode 100644
index 00000000000..434e26b8419
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/candy_corn.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/carrotcake.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/carrotcake.png
new file mode 100644
index 00000000000..3d7dce86600
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/carrotcake.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/carrotcake_slice.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/carrotcake_slice.png
new file mode 100644
index 00000000000..947ff02ace7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/carrotcake_slice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/carrotfries.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/carrotfries.png
new file mode 100644
index 00000000000..adbc7db7776
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/carrotfries.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cereal_box.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cereal_box.png
new file mode 100644
index 00000000000..bcb6251397e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cereal_box.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/chawanmushi.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/chawanmushi.png
new file mode 100644
index 00000000000..696b4829455
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/chawanmushi.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/chazuke.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/chazuke.png
new file mode 100644
index 00000000000..f904d1e39a8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/chazuke.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheeseburger.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheeseburger.png
new file mode 100644
index 00000000000..2ae2d7e9b88
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheeseburger.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesecake.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesecake.png
new file mode 100644
index 00000000000..5d829e712eb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesecake.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesecake_slice.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesecake_slice.png
new file mode 100644
index 00000000000..23ef5075659
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesecake_slice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesewedge-blue.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesewedge-blue.png
new file mode 100644
index 00000000000..f901ff881dd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesewedge-blue.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesewedge-fresh.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesewedge-fresh.png
new file mode 100644
index 00000000000..9f576c67661
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesewedge-fresh.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesewedge.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesewedge.png
new file mode 100644
index 00000000000..ea0d1caa424
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesewedge.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesewheel-blue.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesewheel-blue.png
new file mode 100644
index 00000000000..4200576f78b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesewheel-blue.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesewheel-fresh.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesewheel-fresh.png
new file mode 100644
index 00000000000..b02d6406144
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesewheel-fresh.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesewheel.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesewheel.png
new file mode 100644
index 00000000000..3b8562fd53d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesewheel.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesie_honkers.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesie_honkers.png
new file mode 100644
index 00000000000..203f3e425e0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesie_honkers.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesyfries.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesyfries.png
new file mode 100644
index 00000000000..03f3fab988b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cheesyfries.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cherrypie.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cherrypie.png
new file mode 100644
index 00000000000..374fcdd5fa5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cherrypie.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/chilied-eggs.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/chilied-eggs.png
new file mode 100644
index 00000000000..90edfe671cd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/chilied-eggs.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/chips.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/chips.png
new file mode 100644
index 00000000000..bdf1b8dfcfa
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/chips.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/chocobanana.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/chocobanana.png
new file mode 100644
index 00000000000..ddc8217d596
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/chocobanana.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/chocolatebar.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/chocolatebar.png
new file mode 100644
index 00000000000..a3f308a6bf8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/chocolatebar.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/chocolatecake.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/chocolatecake.png
new file mode 100644
index 00000000000..96f3e700afe
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/chocolatecake.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/chocolatecake_slice.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/chocolatecake_slice.png
new file mode 100644
index 00000000000..a0159511fcd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/chocolatecake_slice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/chocolateegg.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/chocolateegg.png
new file mode 100644
index 00000000000..585ab525bb2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/chocolateegg.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/clam-chowder.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/clam-chowder.png
new file mode 100644
index 00000000000..5640186a573
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/clam-chowder.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/clownburger.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/clownburger.png
new file mode 100644
index 00000000000..bc5f68c7841
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/clownburger.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/clownstears.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/clownstears.png
new file mode 100644
index 00000000000..18464ccfb7e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/clownstears.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/coldchili.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/coldchili.png
new file mode 100644
index 00000000000..4876b1c54d5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/coldchili.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/coldsauce.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/coldsauce.png
new file mode 100644
index 00000000000..b1519fd495b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/coldsauce.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cookie.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cookie.png
new file mode 100644
index 00000000000..8296dc90792
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cookie.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/corpsecube.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/corpsecube.png
new file mode 100644
index 00000000000..cb8caab9d0f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/corpsecube.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crab-cakes.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crab-cakes.png
new file mode 100644
index 00000000000..dbce817e995
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crab-cakes.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crab-dinner.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crab-dinner.png
new file mode 100644
index 00000000000..a5d50136e16
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crab-dinner.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crab-rangoon.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crab-rangoon.png
new file mode 100644
index 00000000000..777c97147e6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crab-rangoon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cracker.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cracker.png
new file mode 100644
index 00000000000..b3801098114
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cracker.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crackerbag.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crackerbag.png
new file mode 100644
index 00000000000..b65dcfee049
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crackerbag.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crackerbag0.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crackerbag0.png
new file mode 100644
index 00000000000..55ae18d7c2e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crackerbag0.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crackerbag1.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crackerbag1.png
new file mode 100644
index 00000000000..1fabbc5d5ff
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crackerbag1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crackerbag2.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crackerbag2.png
new file mode 100644
index 00000000000..4f97de5347a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crackerbag2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crackerbag3.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crackerbag3.png
new file mode 100644
index 00000000000..6650fe7d54a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crackerbag3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crackerbag4.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crackerbag4.png
new file mode 100644
index 00000000000..414345fed23
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crackerbag4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crackerbag5.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crackerbag5.png
new file mode 100644
index 00000000000..cc63a9afff0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crackerbag5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crackerbag6.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crackerbag6.png
new file mode 100644
index 00000000000..6d80912eed6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crackerbag6.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crayonmre.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crayonmre.png
new file mode 100644
index 00000000000..0c9c3eb82eb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crayonmre.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crayonmre1.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crayonmre1.png
new file mode 100644
index 00000000000..4dcf57c6d1d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/crayonmre1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/creamcheesebread.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/creamcheesebread.png
new file mode 100644
index 00000000000..ba3c8be02fe
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/creamcheesebread.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/creamcheesebreadslice.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/creamcheesebreadslice.png
new file mode 100644
index 00000000000..938b2db4457
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/creamcheesebreadslice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/croutons.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/croutons.png
new file mode 100644
index 00000000000..eb8d9152efd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/croutons.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cubancarp.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cubancarp.png
new file mode 100644
index 00000000000..6da7a461380
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/cubancarp.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/dango.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/dango.png
new file mode 100644
index 00000000000..11b151dce29
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/dango.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/dionaroast.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/dionaroast.png
new file mode 100644
index 00000000000..9403a6850b1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/dionaroast.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/donkpocket.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/donkpocket.png
new file mode 100644
index 00000000000..0c0e3d53492
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/donkpocket.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/donut1.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/donut1.png
new file mode 100644
index 00000000000..87b2e60b86b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/donut1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/donut2.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/donut2.png
new file mode 100644
index 00000000000..6be43be15db
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/donut2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/donut_chaos.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/donut_chaos.png
new file mode 100644
index 00000000000..2d4e51e32b8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/donut_chaos.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/donutbox.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/donutbox.png
new file mode 100644
index 00000000000..08ca03e1f67
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/donutbox.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/driedfish.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/driedfish.png
new file mode 100644
index 00000000000..fdc94a02b8e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/driedfish.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/egg-blue.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/egg-blue.png
new file mode 100644
index 00000000000..525dddaa7ab
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/egg-blue.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/egg-green.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/egg-green.png
new file mode 100644
index 00000000000..20c77479df5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/egg-green.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/egg-mime.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/egg-mime.png
new file mode 100644
index 00000000000..a779609dbcf
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/egg-mime.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/egg-orange.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/egg-orange.png
new file mode 100644
index 00000000000..8d80b7e2ffb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/egg-orange.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/egg-purple.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/egg-purple.png
new file mode 100644
index 00000000000..5553e98193f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/egg-purple.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/egg-rainbow.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/egg-rainbow.png
new file mode 100644
index 00000000000..b65ef5b9d55
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/egg-rainbow.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/egg-red.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/egg-red.png
new file mode 100644
index 00000000000..db17aded90c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/egg-red.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/egg-yellow.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/egg-yellow.png
new file mode 100644
index 00000000000..becbac7b4c4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/egg-yellow.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/egg.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/egg.png
new file mode 100644
index 00000000000..4e4684e1b2d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/egg.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox.png
new file mode 100644
index 00000000000..19f7a3fa4ce
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox0.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox0.png
new file mode 100644
index 00000000000..6b9ea775e55
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox0.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox1.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox1.png
new file mode 100644
index 00000000000..f21813468e3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox10.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox10.png
new file mode 100644
index 00000000000..587440479ae
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox10.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox11.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox11.png
new file mode 100644
index 00000000000..87ff736c894
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox11.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox12.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox12.png
new file mode 100644
index 00000000000..3522ca71e8c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox12.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox2.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox2.png
new file mode 100644
index 00000000000..9c13a11bdbc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox3.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox3.png
new file mode 100644
index 00000000000..53906bc57b1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox4.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox4.png
new file mode 100644
index 00000000000..0f2b42a1f37
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox5.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox5.png
new file mode 100644
index 00000000000..d5ef4c1ef49
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox6.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox6.png
new file mode 100644
index 00000000000..ab4770a953b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox6.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox7.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox7.png
new file mode 100644
index 00000000000..a44b1c08028
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox7.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox8.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox8.png
new file mode 100644
index 00000000000..9393d8afad3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox8.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox9.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox9.png
new file mode 100644
index 00000000000..ba039da54f2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggbox9.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggplantparm.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggplantparm.png
new file mode 100644
index 00000000000..5378d48a6ca
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/eggplantparm.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/emptycondiment.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/emptycondiment.png
new file mode 100644
index 00000000000..226a6be461b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/emptycondiment.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/enchiladas.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/enchiladas.png
new file mode 100644
index 00000000000..acab1bf72f7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/enchiladas.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/enzyme.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/enzyme.png
new file mode 100644
index 00000000000..c00aa17b699
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/enzyme.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/fishandchips.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/fishandchips.png
new file mode 100644
index 00000000000..364737b59b5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/fishandchips.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/fishburger.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/fishburger.png
new file mode 100644
index 00000000000..46139e21f31
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/fishburger.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/fishfillet.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/fishfillet.png
new file mode 100644
index 00000000000..8b6aafeba4f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/fishfillet.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/fishfingers.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/fishfingers.png
new file mode 100644
index 00000000000..a607ae660ac
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/fishfingers.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/flour.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/flour.png
new file mode 100644
index 00000000000..5f97bff67fd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/flour.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/fortune_cookie.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/fortune_cookie.png
new file mode 100644
index 00000000000..f092835b016
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/fortune_cookie.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/friedegg.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/friedegg.png
new file mode 100644
index 00000000000..8a9f9885bbb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/friedegg.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/fries.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/fries.png
new file mode 100644
index 00000000000..e20190c6ffa
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/fries.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/fruitpizza.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/fruitpizza.png
new file mode 100644
index 00000000000..32bd20271cf
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/fruitpizza.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/fruitpizzaslice.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/fruitpizzaslice.png
new file mode 100644
index 00000000000..147ee3cc1d4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/fruitpizzaslice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/gappletart.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/gappletart.png
new file mode 100644
index 00000000000..897883a4b82
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/gappletart.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/ghostburger.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/ghostburger.png
new file mode 100644
index 00000000000..edb9f701892
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/ghostburger.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/gukhe-fish.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/gukhe-fish.png
new file mode 100644
index 00000000000..d29fd2f9a29
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/gukhe-fish.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/hatchling-surprise.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/hatchling-surprise.png
new file mode 100644
index 00000000000..fb2af2a11d5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/hatchling-surprise.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/hburger.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/hburger.png
new file mode 100644
index 00000000000..e19475a9c6d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/hburger.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/herbsalad.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/herbsalad.png
new file mode 100644
index 00000000000..015b56c0129
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/herbsalad.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/hotchili.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/hotchili.png
new file mode 100644
index 00000000000..3aa8ab0d4cf
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/hotchili.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/hotcorgi.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/hotcorgi.png
new file mode 100644
index 00000000000..ec064f5f7c6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/hotcorgi.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/hotdog.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/hotdog.png
new file mode 100644
index 00000000000..06aa2c7881f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/hotdog.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/hotsauce.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/hotsauce.png
new file mode 100644
index 00000000000..5f62c9ed0e0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/hotsauce.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/hugemushroomslice.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/hugemushroomslice.png
new file mode 100644
index 00000000000..11c3fd2c38b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/hugemushroomslice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/icecream_banana.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/icecream_banana.png
new file mode 100644
index 00000000000..4ef529fe950
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/icecream_banana.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/icecream_blue.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/icecream_blue.png
new file mode 100644
index 00000000000..56456ffed33
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/icecream_blue.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/icecream_cherry.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/icecream_cherry.png
new file mode 100644
index 00000000000..c4bde3470fb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/icecream_cherry.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/icecream_chocolate.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/icecream_chocolate.png
new file mode 100644
index 00000000000..5b9532fcfba
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/icecream_chocolate.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/icecream_cone_chocolate.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/icecream_cone_chocolate.png
new file mode 100644
index 00000000000..91fef3dadd4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/icecream_cone_chocolate.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/icecream_cone_waffle.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/icecream_cone_waffle.png
new file mode 100644
index 00000000000..6abac4789ff
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/icecream_cone_waffle.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/icecream_strawberry.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/icecream_strawberry.png
new file mode 100644
index 00000000000..13f00165162
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/icecream_strawberry.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/icecream_vanilla.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/icecream_vanilla.png
new file mode 100644
index 00000000000..48b576eb50b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/icecream_vanilla.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/jdonut1.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/jdonut1.png
new file mode 100644
index 00000000000..e5f7755a6d4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/jdonut1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/jdonut2.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/jdonut2.png
new file mode 100644
index 00000000000..c558ad1a748
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/jdonut2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/jellyburger.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/jellyburger.png
new file mode 100644
index 00000000000..05b8471852e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/jellyburger.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/jellysandwich.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/jellysandwich.png
new file mode 100644
index 00000000000..d319cc8792d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/jellysandwich.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/jellytoast.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/jellytoast.png
new file mode 100644
index 00000000000..f04105f1cf8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/jellytoast.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/jupiter.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/jupiter.png
new file mode 100644
index 00000000000..814e469b112
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/jupiter.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/kabob.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/kabob.png
new file mode 100644
index 00000000000..0a531b167e3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/kabob.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/katsu.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/katsu.png
new file mode 100644
index 00000000000..9e274aa1d84
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/katsu.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/ketchup.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/ketchup.png
new file mode 100644
index 00000000000..5e9cee52225
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/ketchup.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/lemoncake.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/lemoncake.png
new file mode 100644
index 00000000000..a448abd866f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/lemoncake.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/lemoncake_slice.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/lemoncake_slice.png
new file mode 100644
index 00000000000..331a19a5d31
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/lemoncake_slice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/limecake.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/limecake.png
new file mode 100644
index 00000000000..e3031e0c5b4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/limecake.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/limecake_slice.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/limecake_slice.png
new file mode 100644
index 00000000000..4e79098c184
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/limecake_slice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/liquidfood.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/liquidfood.png
new file mode 100644
index 00000000000..7f99b4975ef
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/liquidfood.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/lizard_egg.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/lizard_egg.png
new file mode 100644
index 00000000000..908b9a6d5bf
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/lizard_egg.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/loadedbakedpotato.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/loadedbakedpotato.png
new file mode 100644
index 00000000000..1841e582c46
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/loadedbakedpotato.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/lunacake.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/lunacake.png
new file mode 100644
index 00000000000..bfcf3634874
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/lunacake.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/lunacake_wrapped.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/lunacake_wrapped.png
new file mode 100644
index 00000000000..e62d46edbf8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/lunacake_wrapped.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mars.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mars.png
new file mode 100644
index 00000000000..b2682cc25db
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mars.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mayo.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mayo.png
new file mode 100644
index 00000000000..833f9be077c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mayo.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meat.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meat.png
new file mode 100644
index 00000000000..e893a21ff71
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meat.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatball.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatball.png
new file mode 100644
index 00000000000..b2ab65fa8bb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatball.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatballsoup.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatballsoup.png
new file mode 100644
index 00000000000..644ad1e2986
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatballsoup.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatballspagetti.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatballspagetti.png
new file mode 100644
index 00000000000..d5807ca6db2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatballspagetti.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatbread.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatbread.png
new file mode 100644
index 00000000000..d2875dd29d7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatbread.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatbreadslice.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatbreadslice.png
new file mode 100644
index 00000000000..f8a85479170
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatbreadslice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatcube.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatcube.png
new file mode 100644
index 00000000000..6dbc37cc7a6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatcube.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatmre.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatmre.png
new file mode 100644
index 00000000000..6814a4412bf
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatmre.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatmre1.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatmre1.png
new file mode 100644
index 00000000000..e29fe2a51ce
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatmre1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatpie.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatpie.png
new file mode 100644
index 00000000000..872fbe61ec8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatpie.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatpizza.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatpizza.png
new file mode 100644
index 00000000000..ad60b7fc5c8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatpizza.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatpizzaslice.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatpizzaslice.png
new file mode 100644
index 00000000000..4f6f749d500
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatpizzaslice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatsteak.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatsteak.png
new file mode 100644
index 00000000000..11ec2c66038
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meatsteak.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meta.json
new file mode 100644
index 00000000000..8140ad5affe
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/meta.json
@@ -0,0 +1,1231 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation12 at https://github.com/Baystation12/Baystation12/blob/464342c5dc8c417b7e79d56c69aa30445bdf3b75/icons/obj/food/food.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "plaincake"
+    },
+    {
+      "name": "cheesecake"
+    },
+    {
+      "name": "chocolatecake"
+    },
+    {
+      "name": "birthdaycake"
+    },
+    {
+      "name": "applecake"
+    },
+    {
+      "name": "orangecake"
+    },
+    {
+      "name": "lemoncake"
+    },
+    {
+      "name": "carrotcake"
+    },
+    {
+      "name": "limecake"
+    },
+    {
+      "name": "pumpkinpie"
+    },
+    {
+      "name": "braincake"
+    },
+    {
+      "name": "plaincake_slice"
+    },
+    {
+      "name": "cheesecake_slice"
+    },
+    {
+      "name": "chocolatecake_slice"
+    },
+    {
+      "name": "birthdaycakeslice"
+    },
+    {
+      "name": "applecakeslice"
+    },
+    {
+      "name": "orangecake_slice"
+    },
+    {
+      "name": "lemoncake_slice"
+    },
+    {
+      "name": "carrotcake_slice"
+    },
+    {
+      "name": "limecake_slice"
+    },
+    {
+      "name": "pumpkinpieslice"
+    },
+    {
+      "name": "braincakeslice"
+    },
+    {
+      "name": "pie"
+    },
+    {
+      "name": "applepie"
+    },
+    {
+      "name": "meatpie"
+    },
+    {
+      "name": "cherrypie"
+    },
+    {
+      "name": "xenomeatpie"
+    },
+    {
+      "name": "waffles"
+    },
+    {
+      "name": "soylent_green"
+    },
+    {
+      "name": "soylent_yellow"
+    },
+    {
+      "name": "rofflewaffles"
+    },
+    {
+      "name": "bread"
+    },
+    {
+      "name": "bananabread"
+    },
+    {
+      "name": "creamcheesebread"
+    },
+    {
+      "name": "meatbread"
+    },
+    {
+      "name": "tofubread"
+    },
+    {
+      "name": "xenomeatbread"
+    },
+    {
+      "name": "breadslice"
+    },
+    {
+      "name": "sandwich_top"
+    },
+    {
+      "name": "bananabreadslice"
+    },
+    {
+      "name": "creamcheesebreadslice"
+    },
+    {
+      "name": "meatbreadslice"
+    },
+    {
+      "name": "tofubreadslice"
+    },
+    {
+      "name": "xenobreadslice"
+    },
+    {
+      "name": "hburger"
+    },
+    {
+      "name": "cheeseburger"
+    },
+    {
+      "name": "xburger"
+    },
+    {
+      "name": "brainburger"
+    },
+    {
+      "name": "jellyburger"
+    },
+    {
+      "name": "fishburger"
+    },
+    {
+      "name": "tofuburger"
+    },
+    {
+      "name": "ghostburger",
+      "delays": [
+        [
+          0.1,
+          0.08,
+          0.060000002,
+          0.05,
+          0.04,
+          0.04,
+          0.07,
+          0.1,
+          0.13,
+          0.11,
+          0.089999996,
+          0.07,
+          0.05,
+          0.060000002,
+          0.07,
+          0.08,
+          0.1,
+          0.120000005
+        ]
+      ]
+    },
+    {
+      "name": "spellburger"
+    },
+    {
+      "name": "clownburger"
+    },
+    {
+      "name": "mimeburger"
+    },
+    {
+      "name": "roburger",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.4
+        ]
+      ]
+    },
+    {
+      "name": "bigbiteburger"
+    },
+    {
+      "name": "superbiteburger"
+    },
+    {
+      "name": "pizzamargherita"
+    },
+    {
+      "name": "meatpizza"
+    },
+    {
+      "name": "mushroompizza"
+    },
+    {
+      "name": "vegetablepizza"
+    },
+    {
+      "name": "fruitpizza"
+    },
+    {
+      "name": "pizzamargheritaslice"
+    },
+    {
+      "name": "meatpizzaslice"
+    },
+    {
+      "name": "mushroompizzaslice"
+    },
+    {
+      "name": "vegetablepizzaslice"
+    },
+    {
+      "name": "fruitpizzaslice"
+    },
+    {
+      "name": "cookie"
+    },
+    {
+      "name": "phelmbiscuit"
+    },
+    {
+      "name": "spagetti"
+    },
+    {
+      "name": "spagettiboiled"
+    },
+    {
+      "name": "meatballspagetti"
+    },
+    {
+      "name": "pastatomato"
+    },
+    {
+      "name": "spesslaw"
+    },
+    {
+      "name": "stewedsoymeat"
+    },
+    {
+      "name": "coldchili"
+    },
+    {
+      "name": "hotchili"
+    },
+    {
+      "name": "meatballsoup"
+    },
+    {
+      "name": "onionsoup"
+    },
+    {
+      "name": "nettlesoup"
+    },
+    {
+      "name": "wishsoup"
+    },
+    {
+      "name": "tomatosoup"
+    },
+    {
+      "name": "vegetablesoup"
+    },
+    {
+      "name": "clownstears"
+    },
+    {
+      "name": "mushroomsoup"
+    },
+    {
+      "name": "mysterysoup",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "herbsalad"
+    },
+    {
+      "name": "aesirsalad"
+    },
+    {
+      "name": "validsalad"
+    },
+    {
+      "name": "donut1"
+    },
+    {
+      "name": "donut2"
+    },
+    {
+      "name": "jdonut1"
+    },
+    {
+      "name": "jdonut2"
+    },
+    {
+      "name": "donut_chaos",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "fries"
+    },
+    {
+      "name": "cheesyfries"
+    },
+    {
+      "name": "carrotfries"
+    },
+    {
+      "name": "meatball"
+    },
+    {
+      "name": "monkeycubebox"
+    },
+    {
+      "name": "monkeycubewrap"
+    },
+    {
+      "name": "monkeycube"
+    },
+    {
+      "name": "egg"
+    },
+    {
+      "name": "egg-purple"
+    },
+    {
+      "name": "egg-blue"
+    },
+    {
+      "name": "egg-red"
+    },
+    {
+      "name": "egg-orange"
+    },
+    {
+      "name": "egg-yellow"
+    },
+    {
+      "name": "egg-green"
+    },
+    {
+      "name": "egg-rainbow"
+    },
+    {
+      "name": "egg-mime"
+    },
+    {
+      "name": "chocolateegg"
+    },
+    {
+      "name": "donkpocket"
+    },
+    {
+      "name": "donutbox"
+    },
+    {
+      "name": "eggbox5"
+    },
+    {
+      "name": "eggbox1"
+    },
+    {
+      "name": "eggbox2"
+    },
+    {
+      "name": "eggbox3"
+    },
+    {
+      "name": "eggbox4"
+    },
+    {
+      "name": "eggbox11"
+    },
+    {
+      "name": "eggbox6"
+    },
+    {
+      "name": "eggbox7"
+    },
+    {
+      "name": "eggbox8"
+    },
+    {
+      "name": "eggbox9"
+    },
+    {
+      "name": "eggbox10"
+    },
+    {
+      "name": "eggbox12"
+    },
+    {
+      "name": "eggbox0"
+    },
+    {
+      "name": "eggbox"
+    },
+    {
+      "name": "crackerbag6"
+    },
+    {
+      "name": "crackerbag5"
+    },
+    {
+      "name": "crackerbag4"
+    },
+    {
+      "name": "crackerbag3"
+    },
+    {
+      "name": "crackerbag2"
+    },
+    {
+      "name": "crackerbag1"
+    },
+    {
+      "name": "crackerbag0"
+    },
+    {
+      "name": "crackerbag"
+    },
+    {
+      "name": "tray"
+    },
+    {
+      "name": "muffin"
+    },
+    {
+      "name": "sugarsmall"
+    },
+    {
+      "name": "liquidfood"
+    },
+    {
+      "name": "tastybread"
+    },
+    {
+      "name": "skrellsnacks"
+    },
+    {
+      "name": "candy_corn"
+    },
+    {
+      "name": "cubancarp"
+    },
+    {
+      "name": "loadedbakedpotato"
+    },
+    {
+      "name": "omelette"
+    },
+    {
+      "name": "kabob"
+    },
+    {
+      "name": "tofu"
+    },
+    {
+      "name": "meat"
+    },
+    {
+      "name": "rottenmeat",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "xenomeat"
+    },
+    {
+      "name": "birdmeat"
+    },
+    {
+      "name": "birdsteak"
+    },
+    {
+      "name": "popcorn"
+    },
+    {
+      "name": "eggplantparm"
+    },
+    {
+      "name": "fortune_cookie"
+    },
+    {
+      "name": "berryclafoutis"
+    },
+    {
+      "name": "badrecipe"
+    },
+    {
+      "name": "meatsteak"
+    },
+    {
+      "name": "spacylibertyduff",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "amanitajelly",
+      "delays": [
+        [
+          5,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          1
+        ]
+      ]
+    },
+    {
+      "name": "poppypretzel"
+    },
+    {
+      "name": "bacon"
+    },
+    {
+      "name": "rawbacon"
+    },
+    {
+      "name": "plump_pie"
+    },
+    {
+      "name": "amanita_pie"
+    },
+    {
+      "name": "bearmeat"
+    },
+    {
+      "name": "enchiladas"
+    },
+    {
+      "name": "monkeysdelight"
+    },
+    {
+      "name": "baguette"
+    },
+    {
+      "name": "fishandchips"
+    },
+    {
+      "name": "sandwich_filling"
+    },
+    {
+      "name": "sandwich"
+    },
+    {
+      "name": "toastedsandwich"
+    },
+    {
+      "name": "stew"
+    },
+    {
+      "name": "jellytoast"
+    },
+    {
+      "name": "milosoup"
+    },
+    {
+      "name": "soydope"
+    },
+    {
+      "name": "watermelonslice"
+    },
+    {
+      "name": "candiedapple"
+    },
+    {
+      "name": "chocolatebar"
+    },
+    {
+      "name": "hugemushroomslice"
+    },
+    {
+      "name": "tomatomeat"
+    },
+    {
+      "name": "jellysandwich"
+    },
+    {
+      "name": "boiledslimecore"
+    },
+    {
+      "name": "twobread"
+    },
+    {
+      "name": "sausage"
+    },
+    {
+      "name": "fishfingers"
+    },
+    {
+      "name": "friedegg"
+    },
+    {
+      "name": "mint"
+    },
+    {
+      "name": "chawanmushi"
+    },
+    {
+      "name": "beetsoup"
+    },
+    {
+      "name": "gappletart"
+    },
+    {
+      "name": "pizzabox1"
+    },
+    {
+      "name": "pizzabox_messy"
+    },
+    {
+      "name": "pizzabox_open"
+    },
+    {
+      "name": "pizzabox4"
+    },
+    {
+      "name": "pizzabox2"
+    },
+    {
+      "name": "pizzabox3"
+    },
+    {
+      "name": "pizzabox_tag"
+    },
+    {
+      "name": "pizzabox5"
+    },
+    {
+      "name": "cracker"
+    },
+    {
+      "name": "boiledrice"
+    },
+    {
+      "name": "rpudding"
+    },
+    {
+      "name": "tofurkey"
+    },
+    {
+      "name": "stuffing"
+    },
+    {
+      "name": "dionaroast"
+    },
+    {
+      "name": "taco"
+    },
+    {
+      "name": "hotdog"
+    },
+    {
+      "name": "0box-donut1"
+    },
+    {
+      "name": "0box-donut_chaos",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "1box-donut1"
+    },
+    {
+      "name": "1box-donut_chaos",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "2box-donut1"
+    },
+    {
+      "name": "2box-donut_chaos",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "3box-donut1"
+    },
+    {
+      "name": "3box-donut_chaos",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "4box-donut1"
+    },
+    {
+      "name": "4box-donut_chaos",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "5box-donut1"
+    },
+    {
+      "name": "5box-donut_chaos",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "6box-donut1"
+    },
+    {
+      "name": "6box-donut_chaos"
+    },
+    {
+      "name": "icecream_cone_waffle"
+    },
+    {
+      "name": "icecream_cone_chocolate"
+    },
+    {
+      "name": "icecream_vanilla"
+    },
+    {
+      "name": "icecream_strawberry"
+    },
+    {
+      "name": "icecream_blue"
+    },
+    {
+      "name": "icecream_chocolate"
+    },
+    {
+      "name": "bunbun"
+    },
+    {
+      "name": "barbecue"
+    },
+    {
+      "name": "threebread"
+    },
+    {
+      "name": "pancakes"
+    },
+    {
+      "name": "icecream_cherry"
+    },
+    {
+      "name": "icecream_banana"
+    },
+    {
+      "name": "hotcorgi"
+    },
+    {
+      "name": "onionrings"
+    },
+    {
+      "name": "flour"
+    },
+    {
+      "name": "emptycondiment"
+    },
+    {
+      "name": "mixedcondiments"
+    },
+    {
+      "name": "enzyme"
+    },
+    {
+      "name": "hotsauce"
+    },
+    {
+      "name": "ketchup"
+    },
+    {
+      "name": "soysauce"
+    },
+    {
+      "name": "mayo"
+    },
+    {
+      "name": "vinegar"
+    },
+    {
+      "name": "saltshakersmall"
+    },
+    {
+      "name": "peppermillsmall"
+    },
+    {
+      "name": "coldsauce"
+    },
+    {
+      "name": "cereal_box"
+    },
+    {
+      "name": "chips"
+    },
+    {
+      "name": "proteinbar"
+    },
+    {
+      "name": "sosjerky"
+    },
+    {
+      "name": "4no_raisins"
+    },
+    {
+      "name": "space_twinkie"
+    },
+    {
+      "name": "syndi_cakes"
+    },
+    {
+      "name": "cheesie_honkers"
+    },
+    {
+      "name": "salt"
+    },
+    {
+      "name": "nanopasta",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "ancient_hotdog"
+    },
+    {
+      "name": "ancient_fries"
+    },
+    {
+      "name": "ancient_pizza"
+    },
+    {
+      "name": "ancient_burger"
+    },
+    {
+      "name": "ancient_taco"
+    },
+    {
+      "name": "ancient_hburger"
+    },
+    {
+      "name": "pistachios"
+    },
+    {
+      "name": "semki"
+    },
+    {
+      "name": "salo"
+    },
+    {
+      "name": "driedfish"
+    },
+    {
+      "name": "squid"
+    },
+    {
+      "name": "croutons"
+    },
+    {
+      "name": "lizard_egg"
+    },
+    {
+      "name": "mre"
+    },
+    {
+      "name": "mre1"
+    },
+    {
+      "name": "vegmre"
+    },
+    {
+      "name": "vegmre1"
+    },
+    {
+      "name": "meatmre"
+    },
+    {
+      "name": "meatmre1"
+    },
+    {
+      "name": "meatcube"
+    },
+    {
+      "name": "spiderleg"
+    },
+    {
+      "name": "spiderleg_c"
+    },
+    {
+      "name": "pouch_small1"
+    },
+    {
+      "name": "packet_medium"
+    },
+    {
+      "name": "katsu"
+    },
+    {
+      "name": "crayonmre1"
+    },
+    {
+      "name": "crayonmre"
+    },
+    {
+      "name": "packet_small_white"
+    },
+    {
+      "name": "packet_small_red"
+    },
+    {
+      "name": "pouch_medium"
+    },
+    {
+      "name": "packet_small_black"
+    },
+    {
+      "name": "pouch_small"
+    },
+    {
+      "name": "packet_small"
+    },
+    {
+      "name": "pouch_medium1"
+    },
+    {
+      "name": "chazuke"
+    },
+    {
+      "name": "jupiter"
+    },
+    {
+      "name": "lunacake"
+    },
+    {
+      "name": "tidegobs"
+    },
+    {
+      "name": "saturno"
+    },
+    {
+      "name": "pluto"
+    },
+    {
+      "name": "mooncake_wrapped"
+    },
+    {
+      "name": "mochicake_wrapped"
+    },
+    {
+      "name": "lunacake_wrapped"
+    },
+    {
+      "name": "venus"
+    },
+    {
+      "name": "oort"
+    },
+    {
+      "name": "mars"
+    },
+    {
+      "name": "ricecake"
+    },
+    {
+      "name": "dango"
+    },
+    {
+      "name": "pokeys"
+    },
+    {
+      "name": "weebonuts"
+    },
+    {
+      "name": "chocobanana"
+    },
+    {
+      "name": "candy"
+    },
+    {
+      "name": "oliveoilsmall"
+    },
+    {
+      "name": "fishfillet"
+    },
+    {
+      "name": "cheesewheel"
+    },
+    {
+      "name": "cheesewedge"
+    },
+    {
+      "name": "cheesewheel-fresh"
+    },
+    {
+      "name": "cheesewedge-fresh"
+    },
+    {
+      "name": "cheesewheel-blue"
+    },
+    {
+      "name": "cheesewedge-blue"
+    },
+    {
+      "name": "chilied-eggs"
+    },
+    {
+      "name": "hatchling-surprise"
+    },
+    {
+      "name": "red-sun-special"
+    },
+    {
+      "name": "sea-delight"
+    },
+    {
+      "name": "stok-skewers"
+    },
+    {
+      "name": "gukhe-fish"
+    },
+    {
+      "name": "aghrassh-cake"
+    },
+    {
+      "name": "clam-chowder"
+    },
+    {
+      "name": "bisque"
+    },
+    {
+      "name": "stuffed-clam"
+    },
+    {
+      "name": "steamed-mussels"
+    },
+    {
+      "name": "oysters-rockefeller"
+    },
+    {
+      "name": "crab-cakes"
+    },
+    {
+      "name": "crab-rangoon"
+    },
+    {
+      "name": "crab-dinner"
+    },
+    {
+      "name": "shrimp-cocktail"
+    },
+    {
+      "name": "shrimp-tempura"
+    },
+    {
+      "name": "seafood-paella"
+    },
+    {
+      "name": "unscottiloaf"
+    },
+    {
+      "name": "unscotti"
+    },
+    {
+      "name": "biscotti"
+    },
+    {
+      "name": "corpsecube"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/milosoup.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/milosoup.png
new file mode 100644
index 00000000000..b69aa608abe
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/milosoup.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mimeburger.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mimeburger.png
new file mode 100644
index 00000000000..41d7e913d78
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mimeburger.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mint.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mint.png
new file mode 100644
index 00000000000..5f7cf405c14
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mint.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mixedcondiments.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mixedcondiments.png
new file mode 100644
index 00000000000..afb10fe85de
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mixedcondiments.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mochicake_wrapped.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mochicake_wrapped.png
new file mode 100644
index 00000000000..ef0cef23835
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mochicake_wrapped.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/monkeycube.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/monkeycube.png
new file mode 100644
index 00000000000..1f1c979f2ee
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/monkeycube.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/monkeycubebox.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/monkeycubebox.png
new file mode 100644
index 00000000000..9ca103d29ec
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/monkeycubebox.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/monkeycubewrap.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/monkeycubewrap.png
new file mode 100644
index 00000000000..27a4019c6d9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/monkeycubewrap.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/monkeysdelight.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/monkeysdelight.png
new file mode 100644
index 00000000000..71e3184924c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/monkeysdelight.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mooncake_wrapped.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mooncake_wrapped.png
new file mode 100644
index 00000000000..dc4a9ccce70
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mooncake_wrapped.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mre.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mre.png
new file mode 100644
index 00000000000..b0ce8dfec25
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mre.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mre1.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mre1.png
new file mode 100644
index 00000000000..aa1f249a7f1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mre1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/muffin.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/muffin.png
new file mode 100644
index 00000000000..5652b636dc4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/muffin.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mushroompizza.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mushroompizza.png
new file mode 100644
index 00000000000..a69b2cdfcf1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mushroompizza.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mushroompizzaslice.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mushroompizzaslice.png
new file mode 100644
index 00000000000..a8f8a3a456c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mushroompizzaslice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mushroomsoup.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mushroomsoup.png
new file mode 100644
index 00000000000..977f25e9c02
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mushroomsoup.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mysterysoup.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mysterysoup.png
new file mode 100644
index 00000000000..b44508d276c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/mysterysoup.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/nanopasta.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/nanopasta.png
new file mode 100644
index 00000000000..7c8c123a452
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/nanopasta.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/nettlesoup.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/nettlesoup.png
new file mode 100644
index 00000000000..0aa01789894
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/nettlesoup.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/oliveoilsmall.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/oliveoilsmall.png
new file mode 100644
index 00000000000..b29b4a8dd64
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/oliveoilsmall.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/omelette.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/omelette.png
new file mode 100644
index 00000000000..348e0e1c9a1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/omelette.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/onionrings.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/onionrings.png
new file mode 100644
index 00000000000..6ea49d88531
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/onionrings.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/onionsoup.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/onionsoup.png
new file mode 100644
index 00000000000..c19d4c0c999
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/onionsoup.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/oort.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/oort.png
new file mode 100644
index 00000000000..48bf96b34bf
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/oort.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/orangecake.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/orangecake.png
new file mode 100644
index 00000000000..adff03d692f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/orangecake.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/orangecake_slice.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/orangecake_slice.png
new file mode 100644
index 00000000000..263b997c81a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/orangecake_slice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/oysters-rockefeller.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/oysters-rockefeller.png
new file mode 100644
index 00000000000..2bb59721c37
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/oysters-rockefeller.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/packet_medium.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/packet_medium.png
new file mode 100644
index 00000000000..3631a7e19a7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/packet_medium.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/packet_small.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/packet_small.png
new file mode 100644
index 00000000000..bfbf77d5274
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/packet_small.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/packet_small_black.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/packet_small_black.png
new file mode 100644
index 00000000000..a807de43699
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/packet_small_black.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/packet_small_red.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/packet_small_red.png
new file mode 100644
index 00000000000..744f8c54b8e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/packet_small_red.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/packet_small_white.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/packet_small_white.png
new file mode 100644
index 00000000000..9840407ee0c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/packet_small_white.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pancakes.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pancakes.png
new file mode 100644
index 00000000000..ee14dbe315b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pancakes.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pastatomato.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pastatomato.png
new file mode 100644
index 00000000000..d049627f4c0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pastatomato.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/peppermillsmall.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/peppermillsmall.png
new file mode 100644
index 00000000000..3116ebff2d4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/peppermillsmall.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/phelmbiscuit.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/phelmbiscuit.png
new file mode 100644
index 00000000000..1921356bac6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/phelmbiscuit.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pie.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pie.png
new file mode 100644
index 00000000000..5f5a01c1353
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pie.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pistachios.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pistachios.png
new file mode 100644
index 00000000000..57ef100b0f1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pistachios.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzabox1.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzabox1.png
new file mode 100644
index 00000000000..eaec5a90985
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzabox1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzabox2.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzabox2.png
new file mode 100644
index 00000000000..67b598002d6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzabox2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzabox3.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzabox3.png
new file mode 100644
index 00000000000..0ffa6c8609f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzabox3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzabox4.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzabox4.png
new file mode 100644
index 00000000000..31cb9cda18d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzabox4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzabox5.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzabox5.png
new file mode 100644
index 00000000000..d19c8e98013
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzabox5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzabox_messy.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzabox_messy.png
new file mode 100644
index 00000000000..e234f4b28ba
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzabox_messy.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzabox_open.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzabox_open.png
new file mode 100644
index 00000000000..5ed171c85d8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzabox_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzabox_tag.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzabox_tag.png
new file mode 100644
index 00000000000..20e2333400b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzabox_tag.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzamargherita.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzamargherita.png
new file mode 100644
index 00000000000..8e6387bb23e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzamargherita.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzamargheritaslice.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzamargheritaslice.png
new file mode 100644
index 00000000000..c2d1c66266a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pizzamargheritaslice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/plaincake.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/plaincake.png
new file mode 100644
index 00000000000..706b6ce452d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/plaincake.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/plaincake_slice.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/plaincake_slice.png
new file mode 100644
index 00000000000..7b5b57ec1de
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/plaincake_slice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/plump_pie.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/plump_pie.png
new file mode 100644
index 00000000000..a2d689f11f6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/plump_pie.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pluto.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pluto.png
new file mode 100644
index 00000000000..51f572917f4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pluto.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pokeys.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pokeys.png
new file mode 100644
index 00000000000..6ed10e4ff74
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pokeys.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/popcorn.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/popcorn.png
new file mode 100644
index 00000000000..56911cdb855
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/popcorn.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/poppypretzel.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/poppypretzel.png
new file mode 100644
index 00000000000..14d5944783d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/poppypretzel.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pouch_medium.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pouch_medium.png
new file mode 100644
index 00000000000..24807feb81f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pouch_medium.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pouch_medium1.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pouch_medium1.png
new file mode 100644
index 00000000000..bcc0ab654fc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pouch_medium1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pouch_small.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pouch_small.png
new file mode 100644
index 00000000000..8b54c4266d2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pouch_small.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pouch_small1.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pouch_small1.png
new file mode 100644
index 00000000000..04322ecedd2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pouch_small1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/proteinbar.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/proteinbar.png
new file mode 100644
index 00000000000..6b00cbf9d26
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/proteinbar.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pumpkinpie.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pumpkinpie.png
new file mode 100644
index 00000000000..6f6faa6c656
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pumpkinpie.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pumpkinpieslice.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pumpkinpieslice.png
new file mode 100644
index 00000000000..2281c9d3001
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/pumpkinpieslice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/rawbacon.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/rawbacon.png
new file mode 100644
index 00000000000..17c1003702b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/rawbacon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/red-sun-special.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/red-sun-special.png
new file mode 100644
index 00000000000..bbf29b0e7a3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/red-sun-special.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/ricecake.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/ricecake.png
new file mode 100644
index 00000000000..f276a7c838b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/ricecake.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/roburger.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/roburger.png
new file mode 100644
index 00000000000..811f6865ba4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/roburger.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/rofflewaffles.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/rofflewaffles.png
new file mode 100644
index 00000000000..69ab3845548
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/rofflewaffles.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/rottenmeat.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/rottenmeat.png
new file mode 100644
index 00000000000..00502cdf846
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/rottenmeat.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/rpudding.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/rpudding.png
new file mode 100644
index 00000000000..6abcc52f813
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/rpudding.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/salo.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/salo.png
new file mode 100644
index 00000000000..149c3ee706a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/salo.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/salt.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/salt.png
new file mode 100644
index 00000000000..1f632b1d621
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/salt.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/saltshakersmall.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/saltshakersmall.png
new file mode 100644
index 00000000000..d92e3aad05d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/saltshakersmall.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/sandwich.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/sandwich.png
new file mode 100644
index 00000000000..433e39f3004
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/sandwich.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/sandwich_filling.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/sandwich_filling.png
new file mode 100644
index 00000000000..3cba7fcbe39
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/sandwich_filling.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/sandwich_top.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/sandwich_top.png
new file mode 100644
index 00000000000..b4fe2e4ac8a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/sandwich_top.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/saturno.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/saturno.png
new file mode 100644
index 00000000000..d99b721b4a0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/saturno.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/sausage.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/sausage.png
new file mode 100644
index 00000000000..bf6804318de
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/sausage.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/sea-delight.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/sea-delight.png
new file mode 100644
index 00000000000..4f23618f047
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/sea-delight.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/seafood-paella.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/seafood-paella.png
new file mode 100644
index 00000000000..e19922b132d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/seafood-paella.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/semki.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/semki.png
new file mode 100644
index 00000000000..f1790565a04
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/semki.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/shrimp-cocktail.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/shrimp-cocktail.png
new file mode 100644
index 00000000000..dd2a7678b84
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/shrimp-cocktail.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/shrimp-tempura.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/shrimp-tempura.png
new file mode 100644
index 00000000000..8b7df660b3a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/shrimp-tempura.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/skrellsnacks.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/skrellsnacks.png
new file mode 100644
index 00000000000..6b39f54e2d4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/skrellsnacks.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/sosjerky.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/sosjerky.png
new file mode 100644
index 00000000000..5cd71e2a57f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/sosjerky.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/soydope.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/soydope.png
new file mode 100644
index 00000000000..e439a7e058b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/soydope.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/soylent_green.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/soylent_green.png
new file mode 100644
index 00000000000..fecf1c978b4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/soylent_green.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/soylent_yellow.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/soylent_yellow.png
new file mode 100644
index 00000000000..5657b0b1a1c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/soylent_yellow.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/soysauce.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/soysauce.png
new file mode 100644
index 00000000000..cba2acb6f73
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/soysauce.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/space_twinkie.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/space_twinkie.png
new file mode 100644
index 00000000000..9850645121b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/space_twinkie.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/spacylibertyduff.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/spacylibertyduff.png
new file mode 100644
index 00000000000..79f455ed2f9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/spacylibertyduff.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/spagetti.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/spagetti.png
new file mode 100644
index 00000000000..c4add268251
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/spagetti.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/spagettiboiled.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/spagettiboiled.png
new file mode 100644
index 00000000000..0a7d64f616b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/spagettiboiled.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/spellburger.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/spellburger.png
new file mode 100644
index 00000000000..5a5c050f3a8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/spellburger.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/spesslaw.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/spesslaw.png
new file mode 100644
index 00000000000..69371c2b469
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/spesslaw.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/spiderleg.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/spiderleg.png
new file mode 100644
index 00000000000..5fc1d1550b8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/spiderleg.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/spiderleg_c.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/spiderleg_c.png
new file mode 100644
index 00000000000..91159e508f5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/spiderleg_c.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/squid.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/squid.png
new file mode 100644
index 00000000000..1b129363b08
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/squid.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/steamed-mussels.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/steamed-mussels.png
new file mode 100644
index 00000000000..764eeb7e04f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/steamed-mussels.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/stew.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/stew.png
new file mode 100644
index 00000000000..74c5ebd858a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/stew.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/stewedsoymeat.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/stewedsoymeat.png
new file mode 100644
index 00000000000..6d69305c52c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/stewedsoymeat.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/stok-skewers.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/stok-skewers.png
new file mode 100644
index 00000000000..52c0c8e1a35
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/stok-skewers.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/stuffed-clam.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/stuffed-clam.png
new file mode 100644
index 00000000000..f8d34475a8f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/stuffed-clam.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/stuffing.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/stuffing.png
new file mode 100644
index 00000000000..8c552d498b8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/stuffing.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/sugarsmall.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/sugarsmall.png
new file mode 100644
index 00000000000..b9eb5904abd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/sugarsmall.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/superbiteburger.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/superbiteburger.png
new file mode 100644
index 00000000000..4aa6f13be10
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/superbiteburger.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/syndi_cakes.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/syndi_cakes.png
new file mode 100644
index 00000000000..eac6bdfd9aa
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/syndi_cakes.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/taco.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/taco.png
new file mode 100644
index 00000000000..e6f0ce26a7a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/taco.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tastybread.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tastybread.png
new file mode 100644
index 00000000000..4c6e4d39f17
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tastybread.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/threebread.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/threebread.png
new file mode 100644
index 00000000000..7902d44546f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/threebread.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tidegobs.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tidegobs.png
new file mode 100644
index 00000000000..24b8a1ff37a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tidegobs.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/toastedsandwich.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/toastedsandwich.png
new file mode 100644
index 00000000000..94d7ede7de0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/toastedsandwich.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tofu.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tofu.png
new file mode 100644
index 00000000000..965e5c9166e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tofu.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tofubread.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tofubread.png
new file mode 100644
index 00000000000..bd96096fcf7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tofubread.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tofubreadslice.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tofubreadslice.png
new file mode 100644
index 00000000000..7d23b43bf59
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tofubreadslice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tofuburger.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tofuburger.png
new file mode 100644
index 00000000000..b8132530169
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tofuburger.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tofurkey.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tofurkey.png
new file mode 100644
index 00000000000..b0fb4acebe2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tofurkey.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tomatomeat.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tomatomeat.png
new file mode 100644
index 00000000000..efe887ed85d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tomatomeat.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tomatosoup.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tomatosoup.png
new file mode 100644
index 00000000000..040b44338cc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tomatosoup.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tray.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tray.png
new file mode 100644
index 00000000000..a35d30ba178
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/tray.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/twobread.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/twobread.png
new file mode 100644
index 00000000000..16efd87f91a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/twobread.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/unscotti.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/unscotti.png
new file mode 100644
index 00000000000..8251d814e28
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/unscotti.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/unscottiloaf.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/unscottiloaf.png
new file mode 100644
index 00000000000..955d679c7ca
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/unscottiloaf.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/validsalad.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/validsalad.png
new file mode 100644
index 00000000000..86233b749bf
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/validsalad.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/vegetablepizza.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/vegetablepizza.png
new file mode 100644
index 00000000000..68f8c5960ab
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/vegetablepizza.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/vegetablepizzaslice.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/vegetablepizzaslice.png
new file mode 100644
index 00000000000..1f78ff38b7b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/vegetablepizzaslice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/vegetablesoup.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/vegetablesoup.png
new file mode 100644
index 00000000000..92a96de29a4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/vegetablesoup.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/vegmre.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/vegmre.png
new file mode 100644
index 00000000000..2b691e41891
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/vegmre.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/vegmre1.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/vegmre1.png
new file mode 100644
index 00000000000..1f8b7e2c2de
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/vegmre1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/venus.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/venus.png
new file mode 100644
index 00000000000..c3475ff88f1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/venus.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/vinegar.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/vinegar.png
new file mode 100644
index 00000000000..22e6418b61a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/vinegar.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/waffles.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/waffles.png
new file mode 100644
index 00000000000..6d091468589
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/waffles.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/watermelonslice.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/watermelonslice.png
new file mode 100644
index 00000000000..40fb8710b78
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/watermelonslice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/weebonuts.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/weebonuts.png
new file mode 100644
index 00000000000..782319e4c91
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/weebonuts.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/wishsoup.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/wishsoup.png
new file mode 100644
index 00000000000..3239d6db3c0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/wishsoup.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/xburger.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/xburger.png
new file mode 100644
index 00000000000..e24047835f9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/xburger.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/xenobreadslice.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/xenobreadslice.png
new file mode 100644
index 00000000000..29926b182ec
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/xenobreadslice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/xenomeat.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/xenomeat.png
new file mode 100644
index 00000000000..98687e584f8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/xenomeat.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/xenomeatbread.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/xenomeatbread.png
new file mode 100644
index 00000000000..41bbe611647
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/xenomeatbread.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/xenomeatpie.png b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/xenomeatpie.png
new file mode 100644
index 00000000000..963a8f6c078
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food.rsi/xenomeatpie.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_bugmeat.rsi/bacon.png b/Resources/Textures/Objects/Consumable/Food/bay_food_bugmeat.rsi/bacon.png
new file mode 100644
index 00000000000..5eb1a301062
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_bugmeat.rsi/bacon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_bugmeat.rsi/box-open.png b/Resources/Textures/Objects/Consumable/Food/bay_food_bugmeat.rsi/box-open.png
new file mode 100644
index 00000000000..c2114de74f0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_bugmeat.rsi/box-open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_bugmeat.rsi/box.png b/Resources/Textures/Objects/Consumable/Food/bay_food_bugmeat.rsi/box.png
new file mode 100644
index 00000000000..3f1f0411ad8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_bugmeat.rsi/box.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_bugmeat.rsi/cutlet.png b/Resources/Textures/Objects/Consumable/Food/bay_food_bugmeat.rsi/cutlet.png
new file mode 100644
index 00000000000..08b40878fac
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_bugmeat.rsi/cutlet.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_bugmeat.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/bay_food_bugmeat.rsi/meta.json
new file mode 100644
index 00000000000..33e1ce3b05e
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Food/bay_food_bugmeat.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/464342c5dc8c417b7e79d56c69aa30445bdf3b75",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "box"
+    },
+    {
+      "name": "box-open"
+    },
+    {
+      "name": "rawcutlet"
+    },
+    {
+      "name": "cutlet"
+    },
+    {
+      "name": "rawbacon"
+    },
+    {
+      "name": "bacon"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_bugmeat.rsi/rawbacon.png b/Resources/Textures/Objects/Consumable/Food/bay_food_bugmeat.rsi/rawbacon.png
new file mode 100644
index 00000000000..610ea9518b3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_bugmeat.rsi/rawbacon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_bugmeat.rsi/rawcutlet.png b/Resources/Textures/Objects/Consumable/Food/bay_food_bugmeat.rsi/rawcutlet.png
new file mode 100644
index 00000000000..15a7a83e59e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_bugmeat.rsi/rawcutlet.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/beans-open.png b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/beans-open.png
new file mode 100644
index 00000000000..4a4c0f6cb5e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/beans-open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/beans.png b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/beans.png
new file mode 100644
index 00000000000..16e13a16d5f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/beans.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/beef-open.png b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/beef-open.png
new file mode 100644
index 00000000000..02ff311aab3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/beef-open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/beef.png b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/beef.png
new file mode 100644
index 00000000000..5751ae2322b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/beef.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/berries-open.png b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/berries-open.png
new file mode 100644
index 00000000000..554aa3d6808
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/berries-open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/berries.png b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/berries.png
new file mode 100644
index 00000000000..4f6d6049a66
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/berries.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/blank-open.png b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/blank-open.png
new file mode 100644
index 00000000000..127d3dff3a1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/blank-open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/blank.png b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/blank.png
new file mode 100644
index 00000000000..bafce30f9c2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/blank.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/carpeggs-open.png b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/carpeggs-open.png
new file mode 100644
index 00000000000..c4b2c42727b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/carpeggs-open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/carpeggs.png b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/carpeggs.png
new file mode 100644
index 00000000000..78fc904f2da
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/carpeggs.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/fisheggs-open.png b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/fisheggs-open.png
new file mode 100644
index 00000000000..7d2398a0b1f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/fisheggs-open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/fisheggs.png b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/fisheggs.png
new file mode 100644
index 00000000000..bb424c94b1d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/fisheggs.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/meta.json
new file mode 100644
index 00000000000..30e24696d02
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/meta.json
@@ -0,0 +1,59 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/464342c5dc8c417b7e79d56c69aa30445bdf3b75",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "blank"
+    },
+    {
+      "name": "blank-open"
+    },
+    {
+      "name": "beef"
+    },
+    {
+      "name": "beef-open"
+    },
+    {
+      "name": "beans"
+    },
+    {
+      "name": "beans-open"
+    },
+    {
+      "name": "tomato"
+    },
+    {
+      "name": "tomato-open"
+    },
+    {
+      "name": "spinach"
+    },
+    {
+      "name": "spinach-open"
+    },
+    {
+      "name": "berries"
+    },
+    {
+      "name": "berries-open"
+    },
+    {
+      "name": "fisheggs"
+    },
+    {
+      "name": "fisheggs-open"
+    },
+    {
+      "name": "carpeggs-open"
+    },
+    {
+      "name": "carpeggs"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/spinach-open.png b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/spinach-open.png
new file mode 100644
index 00000000000..b8f434a9f07
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/spinach-open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/spinach.png b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/spinach.png
new file mode 100644
index 00000000000..e3dd654dfb1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/spinach.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/tomato-open.png b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/tomato-open.png
new file mode 100644
index 00000000000..a5e3cd0f0e4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/tomato-open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/tomato.png b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/tomato.png
new file mode 100644
index 00000000000..0fa6292879e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_canned.rsi/tomato.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/bar.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/bar.png
new file mode 100644
index 00000000000..a3f308a6bf8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/bar.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/bar_filling.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/bar_filling.png
new file mode 100644
index 00000000000..1ad190aa6eb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/bar_filling.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/breadcustom.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/breadcustom.png
new file mode 100644
index 00000000000..2cbe405a6f3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/breadcustom.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/breadcustom_filling.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/breadcustom_filling.png
new file mode 100644
index 00000000000..754bed77150
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/breadcustom_filling.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/breadcustom_slice.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/breadcustom_slice.png
new file mode 100644
index 00000000000..2e0134fbb6b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/breadcustom_slice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/breadcustom_slice_filling.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/breadcustom_slice_filling.png
new file mode 100644
index 00000000000..b6f917b4956
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/breadcustom_slice_filling.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/cakecustom.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/cakecustom.png
new file mode 100644
index 00000000000..10a87626a6e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/cakecustom.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/cakecustom_filling.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/cakecustom_filling.png
new file mode 100644
index 00000000000..a14d4a02239
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/cakecustom_filling.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/cakecustom_slice.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/cakecustom_slice.png
new file mode 100644
index 00000000000..5ab53b3e55b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/cakecustom_slice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/cakecustom_slice_filling.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/cakecustom_slice_filling.png
new file mode 100644
index 00000000000..a2697b47ad5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/cakecustom_slice_filling.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/cookie.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/cookie.png
new file mode 100644
index 00000000000..8296dc90792
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/cookie.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/cookie_filling.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/cookie_filling.png
new file mode 100644
index 00000000000..e7228f5b672
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/cookie_filling.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/customburger.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/customburger.png
new file mode 100644
index 00000000000..197e3210c73
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/customburger.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/customburger_filling.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/customburger_filling.png
new file mode 100644
index 00000000000..afc2e4bad82
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/customburger_filling.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/donk.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/donk.png
new file mode 100644
index 00000000000..e6fe86ab5d7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/donk.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/donk_filling.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/donk_filling.png
new file mode 100644
index 00000000000..92c6846211b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/donk_filling.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/donut.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/donut.png
new file mode 100644
index 00000000000..9c84ead6a74
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/donut.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/donut_filling.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/donut_filling.png
new file mode 100644
index 00000000000..c888986d2db
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/donut_filling.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/jawbreaker.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/jawbreaker.png
new file mode 100644
index 00000000000..f20dcba79bb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/jawbreaker.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/jawbreaker_filling.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/jawbreaker_filling.png
new file mode 100644
index 00000000000..f20dcba79bb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/jawbreaker_filling.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/jellycustom.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/jellycustom.png
new file mode 100644
index 00000000000..c389eb4348d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/jellycustom.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/jellycustom_filling.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/jellycustom_filling.png
new file mode 100644
index 00000000000..5402d7e1ad2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/jellycustom_filling.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/kabob.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/kabob.png
new file mode 100644
index 00000000000..8ac16eb96ee
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/kabob.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/kabob_filling.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/kabob_filling.png
new file mode 100644
index 00000000000..c75c184a639
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/kabob_filling.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/meta.json
new file mode 100644
index 00000000000..fc56b7048e8
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/meta.json
@@ -0,0 +1,152 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation12 at https://github.com/Baystation12/Baystation12/blob/464342c5dc8c417b7e79d56c69aa30445bdf3b75/icons/obj/food/food_custom.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "pizza"
+    },
+    {
+      "name": "pizza_filling"
+    },
+    {
+      "name": "pizza_slice"
+    },
+    {
+      "name": "pizza_slice_filling"
+    },
+    {
+      "name": "cakecustom"
+    },
+    {
+      "name": "cakecustom_filling"
+    },
+    {
+      "name": "cakecustom_slice"
+    },
+    {
+      "name": "cakecustom_slice_filling"
+    },
+    {
+      "name": "piecustom"
+    },
+    {
+      "name": "piecustom_filling"
+    },
+    {
+      "name": "breadcustom"
+    },
+    {
+      "name": "breadcustom_filling"
+    },
+    {
+      "name": "breadcustom_slice"
+    },
+    {
+      "name": "breadcustom_slice_filling"
+    },
+    {
+      "name": "kabob"
+    },
+    {
+      "name": "kabob_filling"
+    },
+    {
+      "name": "waffles"
+    },
+    {
+      "name": "waffles_filling"
+    },
+    {
+      "name": "cookie"
+    },
+    {
+      "name": "cookie_filling"
+    },
+    {
+      "name": "donut"
+    },
+    {
+      "name": "donut_filling"
+    },
+    {
+      "name": "donk"
+    },
+    {
+      "name": "donk_filling"
+    },
+    {
+      "name": "bar"
+    },
+    {
+      "name": "bar_filling"
+    },
+    {
+      "name": "sucker"
+    },
+    {
+      "name": "sucker_filling"
+    },
+    {
+      "name": "jellycustom_filling"
+    },
+    {
+      "name": "jellycustom"
+    },
+    {
+      "name": "jawbreaker"
+    },
+    {
+      "name": "jawbreaker_filling"
+    },
+    {
+      "name": "pancakescustom"
+    },
+    {
+      "name": "pancakescustom_filling"
+    },
+    {
+      "name": "stuffing"
+    },
+    {
+      "name": "stuffing_filling"
+    },
+    {
+      "name": "shreds"
+    },
+    {
+      "name": "shreds_filling"
+    },
+    {
+      "name": "stew"
+    },
+    {
+      "name": "stew_filling"
+    },
+    {
+      "name": "serving_bowl"
+    },
+    {
+      "name": "serving_bowl_4"
+    },
+    {
+      "name": "serving_bowl_3"
+    },
+    {
+      "name": "serving_bowl_2"
+    },
+    {
+      "name": "serving_bowl_1"
+    },
+    {
+      "name": "customburger"
+    },
+    {
+      "name": "customburger_filling"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/pancakescustom.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/pancakescustom.png
new file mode 100644
index 00000000000..c2ec0f3dd55
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/pancakescustom.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/pancakescustom_filling.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/pancakescustom_filling.png
new file mode 100644
index 00000000000..ae776a1e340
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/pancakescustom_filling.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/piecustom.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/piecustom.png
new file mode 100644
index 00000000000..3b7eb5c1f8c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/piecustom.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/piecustom_filling.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/piecustom_filling.png
new file mode 100644
index 00000000000..d07c6ff6fb5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/piecustom_filling.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/pizza.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/pizza.png
new file mode 100644
index 00000000000..5848355aefd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/pizza.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/pizza_filling.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/pizza_filling.png
new file mode 100644
index 00000000000..3d7081c700c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/pizza_filling.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/pizza_slice.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/pizza_slice.png
new file mode 100644
index 00000000000..4b184d9e79e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/pizza_slice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/pizza_slice_filling.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/pizza_slice_filling.png
new file mode 100644
index 00000000000..2279b731343
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/pizza_slice_filling.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/serving_bowl.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/serving_bowl.png
new file mode 100644
index 00000000000..2abd8de27bc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/serving_bowl.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/serving_bowl_1.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/serving_bowl_1.png
new file mode 100644
index 00000000000..067d27e9175
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/serving_bowl_1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/serving_bowl_2.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/serving_bowl_2.png
new file mode 100644
index 00000000000..d3a7364bf5b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/serving_bowl_2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/serving_bowl_3.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/serving_bowl_3.png
new file mode 100644
index 00000000000..4575764a351
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/serving_bowl_3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/serving_bowl_4.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/serving_bowl_4.png
new file mode 100644
index 00000000000..4a4abf75758
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/serving_bowl_4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/shreds.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/shreds.png
new file mode 100644
index 00000000000..f740bff24f4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/shreds.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/shreds_filling.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/shreds_filling.png
new file mode 100644
index 00000000000..f740bff24f4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/shreds_filling.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/stew.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/stew.png
new file mode 100644
index 00000000000..738ca978420
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/stew.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/stew_filling.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/stew_filling.png
new file mode 100644
index 00000000000..57c0667e4ff
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/stew_filling.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/stuffing.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/stuffing.png
new file mode 100644
index 00000000000..4dd597bb002
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/stuffing.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/stuffing_filling.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/stuffing_filling.png
new file mode 100644
index 00000000000..6047563638e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/stuffing_filling.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/sucker.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/sucker.png
new file mode 100644
index 00000000000..13379afc87e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/sucker.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/sucker_filling.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/sucker_filling.png
new file mode 100644
index 00000000000..4b524e5e5ef
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/sucker_filling.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/waffles.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/waffles.png
new file mode 100644
index 00000000000..6d091468589
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/waffles.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/waffles_filling.png b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/waffles_filling.png
new file mode 100644
index 00000000000..6d1a340abf5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_custom.rsi/waffles_filling.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/bun.png b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/bun.png
new file mode 100644
index 00000000000..6927a0811a7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/bun.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/cutlet.png b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/cutlet.png
new file mode 100644
index 00000000000..82eca65c4cf
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/cutlet.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/dough.png b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/dough.png
new file mode 100644
index 00000000000..a9d4c3b39ad
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/dough.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/doughslice.png b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/doughslice.png
new file mode 100644
index 00000000000..9760276cfdf
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/doughslice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/egg.png b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/egg.png
new file mode 100644
index 00000000000..4e4684e1b2d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/egg.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/flat_dough.png b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/flat_dough.png
new file mode 100644
index 00000000000..1fcc0e299d5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/flat_dough.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/flatbread.png b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/flatbread.png
new file mode 100644
index 00000000000..5a42d0dba07
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/flatbread.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/lizard_egg.png b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/lizard_egg.png
new file mode 100644
index 00000000000..908b9a6d5bf
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/lizard_egg.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/meatball.png b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/meatball.png
new file mode 100644
index 00000000000..b2ab65fa8bb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/meatball.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/meta.json
new file mode 100644
index 00000000000..e0633e80ced
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/meta.json
@@ -0,0 +1,50 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/464342c5dc8c417b7e79d56c69aa30445bdf3b75",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dough"
+    },
+    {
+      "name": "flat_dough"
+    },
+    {
+      "name": "doughslice"
+    },
+    {
+      "name": "rawcutlet"
+    },
+    {
+      "name": "rawmeatball"
+    },
+    {
+      "name": "egg"
+    },
+    {
+      "name": "lizard_egg"
+    },
+    {
+      "name": "bun"
+    },
+    {
+      "name": "flatbread"
+    },
+    {
+      "name": "cutlet"
+    },
+    {
+      "name": "sausage"
+    },
+    {
+      "name": "meatball"
+    },
+    {
+      "name": "rawsticks"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/rawcutlet.png b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/rawcutlet.png
new file mode 100644
index 00000000000..9329c230b38
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/rawcutlet.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/rawmeatball.png b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/rawmeatball.png
new file mode 100644
index 00000000000..a7a4e7294a6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/rawmeatball.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/rawsticks.png b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/rawsticks.png
new file mode 100644
index 00000000000..9768f65063e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/rawsticks.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/sausage.png b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/sausage.png
new file mode 100644
index 00000000000..28d58683cd9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_ingredients.rsi/sausage.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/.png b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/.png
new file mode 100644
index 00000000000..7608f1e8f31
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/clam.png b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/clam.png
new file mode 100644
index 00000000000..5edfe83073a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/clam.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/clam_empty.png b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/clam_empty.png
new file mode 100644
index 00000000000..59a7a43eaa6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/clam_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/clam_open.png b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/clam_open.png
new file mode 100644
index 00000000000..e1fd0927c1a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/clam_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/crab.png b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/crab.png
new file mode 100644
index 00000000000..8c4f63fbc54
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/crab.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/crab_meat.png b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/crab_meat.png
new file mode 100644
index 00000000000..5f878dfce93
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/crab_meat.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/meta.json
new file mode 100644
index 00000000000..9ebd9ba1b76
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/meta.json
@@ -0,0 +1,53 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation12 at https://github.com/Baystation12/Baystation12/blob/464342c5dc8c417b7e79d56c69aa30445bdf3b75/icons/obj/food/food_shellfish.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": ""
+    },
+    {
+      "name": "clam"
+    },
+    {
+      "name": "clam_open"
+    },
+    {
+      "name": "clam_empty"
+    },
+    {
+      "name": "mussel"
+    },
+    {
+      "name": "mussel_open"
+    },
+    {
+      "name": "mussel_empty"
+    },
+    {
+      "name": "oyster"
+    },
+    {
+      "name": "oyster_open"
+    },
+    {
+      "name": "oyster_empty"
+    },
+    {
+      "name": "shrimp"
+    },
+    {
+      "name": "shrimp_meat"
+    },
+    {
+      "name": "crab"
+    },
+    {
+      "name": "crab_meat"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/mussel.png b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/mussel.png
new file mode 100644
index 00000000000..8035de8aad6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/mussel.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/mussel_empty.png b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/mussel_empty.png
new file mode 100644
index 00000000000..01c5e5c4e6e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/mussel_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/mussel_open.png b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/mussel_open.png
new file mode 100644
index 00000000000..82d2801a233
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/mussel_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/oyster.png b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/oyster.png
new file mode 100644
index 00000000000..43e63e52ffe
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/oyster.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/oyster_empty.png b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/oyster_empty.png
new file mode 100644
index 00000000000..5f1d408b296
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/oyster_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/oyster_open.png b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/oyster_open.png
new file mode 100644
index 00000000000..6e25a8eca25
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/oyster_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/shrimp.png b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/shrimp.png
new file mode 100644
index 00000000000..2e4f2e7dc40
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/shrimp.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/shrimp_meat.png b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/shrimp_meat.png
new file mode 100644
index 00000000000..09e6c36c1d6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_food_shellfish.rsi/shrimp_meat.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/4no_raisins.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/4no_raisins.png
new file mode 100644
index 00000000000..9763e242cad
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/4no_raisins.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/beans.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/beans.png
new file mode 100644
index 00000000000..5588b4d0a9b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/beans.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/beef.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/beef.png
new file mode 100644
index 00000000000..46727ef2215
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/beef.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/berries.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/berries.png
new file mode 100644
index 00000000000..5d2cbb00fce
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/berries.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/blank.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/blank.png
new file mode 100644
index 00000000000..127d3dff3a1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/blank.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/cakewrap.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/cakewrap.png
new file mode 100644
index 00000000000..1a4815dbf28
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/cakewrap.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/candy.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/candy.png
new file mode 100644
index 00000000000..3f34635a80f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/candy.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/carpeggs.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/carpeggs.png
new file mode 100644
index 00000000000..77460786fc0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/carpeggs.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/cheesie_honkers.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/cheesie_honkers.png
new file mode 100644
index 00000000000..761a4a62934
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/cheesie_honkers.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/chips.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/chips.png
new file mode 100644
index 00000000000..264a9761e3b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/chips.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/corncob.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/corncob.png
new file mode 100644
index 00000000000..0666e2c9218
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/corncob.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/croutons.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/croutons.png
new file mode 100644
index 00000000000..da7ca46d982
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/croutons.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/driedfish.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/driedfish.png
new file mode 100644
index 00000000000..6ee338a6d4a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/driedfish.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/fisheggs.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/fisheggs.png
new file mode 100644
index 00000000000..48bed2d577c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/fisheggs.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/hollowcoconut.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/hollowcoconut.png
new file mode 100644
index 00000000000..4bdc0358084
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/hollowcoconut.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/hollowpineapple.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/hollowpineapple.png
new file mode 100644
index 00000000000..c1f1fd567f3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/hollowpineapple.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/jupiter.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/jupiter.png
new file mode 100644
index 00000000000..cc613d0e1a6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/jupiter.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/liquidfood.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/liquidfood.png
new file mode 100644
index 00000000000..4bb69aef4be
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/liquidfood.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/liquidfood_old.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/liquidfood_old.png
new file mode 100644
index 00000000000..d183ad86b4a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/liquidfood_old.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/mars.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/mars.png
new file mode 100644
index 00000000000..685999820f9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/mars.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/meta.json
new file mode 100644
index 00000000000..5c505136e52
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/meta.json
@@ -0,0 +1,164 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/464342c5dc8c417b7e79d56c69aa30445bdf3b75",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "waffles"
+    },
+    {
+      "name": "plate"
+    },
+    {
+      "name": "snack_bowl"
+    },
+    {
+      "name": "tray"
+    },
+    {
+      "name": "trashbag0"
+    },
+    {
+      "name": "trashbag1"
+    },
+    {
+      "name": "trashbag2"
+    },
+    {
+      "name": "trashbag3"
+    },
+    {
+      "name": "liquidfood"
+    },
+    {
+      "name": "plasticbag"
+    },
+    {
+      "name": "corncob"
+    },
+    {
+      "name": "tastybread"
+    },
+    {
+      "name": "liquidfood_old"
+    },
+    {
+      "name": "4no_raisins"
+    },
+    {
+      "name": "proteinbar"
+    },
+    {
+      "name": "chips"
+    },
+    {
+      "name": "popcorn"
+    },
+    {
+      "name": "cheesie_honkers"
+    },
+    {
+      "name": "sosjerky"
+    },
+    {
+      "name": "syndi_cakes"
+    },
+    {
+      "name": "pistachios_pack"
+    },
+    {
+      "name": "semki_pack"
+    },
+    {
+      "name": "candy"
+    },
+    {
+      "name": "fisheggs"
+    },
+    {
+      "name": "salo"
+    },
+    {
+      "name": "driedfish"
+    },
+    {
+      "name": "squid"
+    },
+    {
+      "name": "monkeywrap"
+    },
+    {
+      "name": "croutons"
+    },
+    {
+      "name": "blank"
+    },
+    {
+      "name": "beef"
+    },
+    {
+      "name": "beans"
+    },
+    {
+      "name": "tomato"
+    },
+    {
+      "name": "spinach"
+    },
+    {
+      "name": "berries"
+    },
+    {
+      "name": "carpeggs"
+    },
+    {
+      "name": "cakewrap"
+    },
+    {
+      "name": "mochicakewrap"
+    },
+    {
+      "name": "mooncakewrap"
+    },
+    {
+      "name": "jupiter"
+    },
+    {
+      "name": "tidegobs"
+    },
+    {
+      "name": "saturno"
+    },
+    {
+      "name": "pluto"
+    },
+    {
+      "name": "venus"
+    },
+    {
+      "name": "oort"
+    },
+    {
+      "name": "mars"
+    },
+    {
+      "name": "stick"
+    },
+    {
+      "name": "weebonuts"
+    },
+    {
+      "name": "hollowpineapple"
+    },
+    {
+      "name": "hollowcoconut"
+    },
+    {
+      "name": "usedplatter"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/mochicakewrap.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/mochicakewrap.png
new file mode 100644
index 00000000000..276b8b05962
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/mochicakewrap.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/monkeywrap.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/monkeywrap.png
new file mode 100644
index 00000000000..7afc02e2950
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/monkeywrap.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/mooncakewrap.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/mooncakewrap.png
new file mode 100644
index 00000000000..c4ea9880039
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/mooncakewrap.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/oort.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/oort.png
new file mode 100644
index 00000000000..4063a0d1fff
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/oort.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/pistachios_pack.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/pistachios_pack.png
new file mode 100644
index 00000000000..f87f252bbce
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/pistachios_pack.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/plasticbag.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/plasticbag.png
new file mode 100644
index 00000000000..7584ed1a6df
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/plasticbag.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/plate.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/plate.png
new file mode 100644
index 00000000000..45379bbe6db
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/plate.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/pluto.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/pluto.png
new file mode 100644
index 00000000000..2f4a6d3bbaa
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/pluto.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/popcorn.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/popcorn.png
new file mode 100644
index 00000000000..fb5ac26fd4e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/popcorn.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/proteinbar.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/proteinbar.png
new file mode 100644
index 00000000000..f004d7e873b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/proteinbar.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/salo.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/salo.png
new file mode 100644
index 00000000000..59d1da93687
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/salo.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/saturno.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/saturno.png
new file mode 100644
index 00000000000..97feeb26aa1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/saturno.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/semki_pack.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/semki_pack.png
new file mode 100644
index 00000000000..1a58fce7602
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/semki_pack.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/snack_bowl.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/snack_bowl.png
new file mode 100644
index 00000000000..aeca559f3ea
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/snack_bowl.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/sosjerky.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/sosjerky.png
new file mode 100644
index 00000000000..7dd3c82ff5b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/sosjerky.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/spinach.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/spinach.png
new file mode 100644
index 00000000000..d9f8d73519f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/spinach.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/squid.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/squid.png
new file mode 100644
index 00000000000..c433f7b6c0e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/squid.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/stick.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/stick.png
new file mode 100644
index 00000000000..26f8d4d44c0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/stick.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/syndi_cakes.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/syndi_cakes.png
new file mode 100644
index 00000000000..8be9e8b6dda
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/syndi_cakes.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/tastybread.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/tastybread.png
new file mode 100644
index 00000000000..42bc2c8ca3b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/tastybread.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/tidegobs.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/tidegobs.png
new file mode 100644
index 00000000000..528c00b75ad
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/tidegobs.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/tomato.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/tomato.png
new file mode 100644
index 00000000000..644f80f8024
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/tomato.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/trashbag0.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/trashbag0.png
new file mode 100644
index 00000000000..c3f511a2d77
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/trashbag0.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/trashbag1.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/trashbag1.png
new file mode 100644
index 00000000000..5a1b5182288
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/trashbag1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/trashbag2.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/trashbag2.png
new file mode 100644
index 00000000000..20f785221a7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/trashbag2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/trashbag3.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/trashbag3.png
new file mode 100644
index 00000000000..037acd24248
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/trashbag3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/tray.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/tray.png
new file mode 100644
index 00000000000..0291f5d02b9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/tray.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/usedplatter.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/usedplatter.png
new file mode 100644
index 00000000000..f6343a89574
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/usedplatter.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/venus.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/venus.png
new file mode 100644
index 00000000000..c1285db19f3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/venus.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/waffles.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/waffles.png
new file mode 100644
index 00000000000..391c8b74da5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/waffles.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/weebonuts.png b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/weebonuts.png
new file mode 100644
index 00000000000..18ffab02ae7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bay_trash.rsi/weebonuts.png differ
diff --git a/Resources/Textures/Objects/Specific/barbershop.rsi/dye-e.png b/Resources/Textures/Objects/Specific/barbershop.rsi/dye-e.png
new file mode 100644
index 00000000000..9d35b161a42
Binary files /dev/null and b/Resources/Textures/Objects/Specific/barbershop.rsi/dye-e.png differ
diff --git a/Resources/Textures/Objects/Specific/barbershop.rsi/dye-f.png b/Resources/Textures/Objects/Specific/barbershop.rsi/dye-f.png
new file mode 100644
index 00000000000..9e113d439c4
Binary files /dev/null and b/Resources/Textures/Objects/Specific/barbershop.rsi/dye-f.png differ
diff --git a/Resources/Textures/Objects/Specific/barbershop.rsi/dye.png b/Resources/Textures/Objects/Specific/barbershop.rsi/dye.png
new file mode 100644
index 00000000000..65c9048ef35
Binary files /dev/null and b/Resources/Textures/Objects/Specific/barbershop.rsi/dye.png differ
diff --git a/Resources/Textures/Objects/Specific/barbershop.rsi/dye_color.png b/Resources/Textures/Objects/Specific/barbershop.rsi/dye_color.png
new file mode 100644
index 00000000000..1e35ab83d8d
Binary files /dev/null and b/Resources/Textures/Objects/Specific/barbershop.rsi/dye_color.png differ
diff --git a/Resources/Textures/Objects/Specific/barbershop.rsi/meta.json b/Resources/Textures/Objects/Specific/barbershop.rsi/meta.json
new file mode 100644
index 00000000000..4450663ba46
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/barbershop.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from goonstation at https://github.com/goonstation/goonstation/blob/16f8a5c31a6cfc019a1549b0b97f18865002a44c/icons/obj/barber_shop.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dye"
+    },
+    {
+      "name": "dye_color"
+    },
+    {
+      "name": "dye-e"
+    },
+    {
+      "name": "dye-f"
+    },
+    {
+      "name": "scissors"
+    },
+    {
+      "name": "razorblade"
+    },
+    {
+      "name": "tonic1"
+    },
+    {
+      "name": "tonic0"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Specific/barbershop.rsi/razorblade.png b/Resources/Textures/Objects/Specific/barbershop.rsi/razorblade.png
new file mode 100644
index 00000000000..47b3afac180
Binary files /dev/null and b/Resources/Textures/Objects/Specific/barbershop.rsi/razorblade.png differ
diff --git a/Resources/Textures/Objects/Specific/barbershop.rsi/scissors.png b/Resources/Textures/Objects/Specific/barbershop.rsi/scissors.png
new file mode 100644
index 00000000000..81022ca37b6
Binary files /dev/null and b/Resources/Textures/Objects/Specific/barbershop.rsi/scissors.png differ
diff --git a/Resources/Textures/Objects/Specific/barbershop.rsi/tonic0.png b/Resources/Textures/Objects/Specific/barbershop.rsi/tonic0.png
new file mode 100644
index 00000000000..76daf43be28
Binary files /dev/null and b/Resources/Textures/Objects/Specific/barbershop.rsi/tonic0.png differ
diff --git a/Resources/Textures/Objects/Specific/barbershop.rsi/tonic1.png b/Resources/Textures/Objects/Specific/barbershop.rsi/tonic1.png
new file mode 100644
index 00000000000..969fc2e7ec1
Binary files /dev/null and b/Resources/Textures/Objects/Specific/barbershop.rsi/tonic1.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/adh.rsi/adh-tool-broken.png b/Resources/Textures/Structures/Machines/VendingMachines/adh.rsi/adh-tool-broken.png
new file mode 100644
index 00000000000..97d8197527d
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/adh.rsi/adh-tool-broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/adh.rsi/adh-tool-deny.png b/Resources/Textures/Structures/Machines/VendingMachines/adh.rsi/adh-tool-deny.png
new file mode 100644
index 00000000000..e2f4b80384a
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/adh.rsi/adh-tool-deny.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/adh.rsi/adh-tool-off.png b/Resources/Textures/Structures/Machines/VendingMachines/adh.rsi/adh-tool-off.png
new file mode 100644
index 00000000000..04e2ecd0d4a
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/adh.rsi/adh-tool-off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/adh.rsi/adh-tool-panel.png b/Resources/Textures/Structures/Machines/VendingMachines/adh.rsi/adh-tool-panel.png
new file mode 100644
index 00000000000..e50605569e8
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/adh.rsi/adh-tool-panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/adh.rsi/adh-tool-vend.png b/Resources/Textures/Structures/Machines/VendingMachines/adh.rsi/adh-tool-vend.png
new file mode 100644
index 00000000000..660e82299f2
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/adh.rsi/adh-tool-vend.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/adh.rsi/adh-tool.png b/Resources/Textures/Structures/Machines/VendingMachines/adh.rsi/adh-tool.png
new file mode 100644
index 00000000000..23d4581828a
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/adh.rsi/adh-tool.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/adh.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/adh.rsi/meta.json
new file mode 100644
index 00000000000..257c756722c
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/VendingMachines/adh.rsi/meta.json
@@ -0,0 +1,91 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "adh-tool",
+      "directions": 4
+    },
+    {
+      "name": "adh-tool-vend",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.4,
+          0.1
+        ],
+        [
+          0.1,
+          0.4,
+          0.1
+        ],
+        [
+          0.1,
+          0.4,
+          0.1
+        ],
+        [
+          0.1,
+          0.4,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "adh-tool-deny",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "adh-tool-off",
+      "directions": 4
+    },
+    {
+      "name": "adh-tool-broken",
+      "directions": 4
+    },
+    {
+      "name": "adh-tool-panel",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/broken.png
index 671a4701fe5..69a18345dd6 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/deny-unshaded.png
index 4b8fc2a3e58..1200d326bdc 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/eject-unshaded.png
index 505d5f3861a..5479f208ea0 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/meta.json
index 1c53b7c6ccc..6467c185806 100644
--- a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/meta.json
@@ -1,45 +1,87 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177 and modified by potato1234x",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "normal-unshaded"
+      "name": "normal-unshaded",
+      "directions": 4
     },
     {
-      "name": "broken"
-    },
-    {
-      "name": "deny-unshaded",
+      "name": "eject-unshaded",
+      "directions": 4,
       "delays": [
         [
           0.1,
           0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
           0.1
         ]
       ]
     },
     {
-      "name": "off"
-    },
-    {
-      "name": "panel"
-    },
-    {
-      "name": "eject-unshaded",
+      "name": "deny-unshaded",
+      "directions": 4,
       "delays": [
         [
           0.1,
           0.1,
-          0.8,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
           0.1,
           0.1
         ]
       ]
+    },
+    {
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+      "name": "panel",
+      "directions": 4
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/normal-unshaded.png
index f92b13efd1d..25b8cbb6eaf 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/off.png
index c0e947c93fd..c2f1a7370aa 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/panel.png
index 15e5dbcafb1..9c868ef2cd0 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/broken.png
index a7608d24c10..0b413ac46da 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/coffee-hellfire.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/coffee-hellfire.png
new file mode 100644
index 00000000000..bbca7da7b69
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/coffee-hellfire.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/deny-unshaded.png
index 826a5517e3c..e16f8bea12e 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/eject-unshaded.png
index 8b66206bd75..283918001c0 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/meta.json
index 6a11e09a83e..578976fe854 100644
--- a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/meta.json
@@ -1,38 +1,49 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177 and modified by potato1234x (github) for ss14",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "normal-unshaded"
-    },
-    {
-      "name": "broken"
-    },
-    {
-      "name": "deny-unshaded",
+      "name": "coffee-hellfire",
       "delays": [
         [
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25
         ]
       ]
     },
     {
-      "name": "off"
-    },
-    {
-      "name": "panel"
-    },
-    {
-      "name": "screen",
+      "name": "normal-unshaded",
+      "directions": 4,
       "delays": [
         [
+          0.6,
+          0.6,
+          0.6,
+          0.6,
+          0.6
+        ],
+        [
+          0.6,
+          0.6,
+          0.6,
+          0.6,
+          0.6
+        ],
+        [
+          0.6,
+          0.6,
+          0.6,
+          0.6,
+          0.6
+        ],
+        [
+          0.6,
           0.6,
           0.6,
           0.6,
@@ -42,6 +53,7 @@
     },
     {
       "name": "eject-unshaded",
+      "directions": 4,
       "delays": [
         [
           0.2,
@@ -58,8 +70,124 @@
           0.2,
           0.2,
           0.8
+        ],
+        [
+          0.2,
+          0.2,
+          0.6,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.8
+        ],
+        [
+          0.2,
+          0.2,
+          0.6,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.8
+        ],
+        [
+          0.2,
+          0.2,
+          0.6,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.8
+        ]
+      ]
+    },
+    {
+      "name": "deny-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
         ]
       ]
+    },
+    {
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+      "name": "screen",
+      "directions": 4,
+      "delays": [
+        [
+          0.6,
+          0.6,
+          0.6,
+          0.6
+        ],
+        [
+          0.6,
+          0.6,
+          0.6,
+          0.6
+        ],
+        [
+          0.6,
+          0.6,
+          0.6,
+          0.6
+        ],
+        [
+          0.6,
+          0.6,
+          0.6,
+          0.6
+        ]
+      ]
+    },
+    {
+      "name": "panel",
+      "directions": 4
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/normal-unshaded.png
index 1a7fd066cda..b58f33c4333 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/off.png
index 8e7814af604..d314913811b 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/panel.png
index 1d9416bb74c..33fb7adec2c 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/screen.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/screen.png
index cc64a9de577..4e18d0b306e 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/screen.png and b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/screen.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/broken.png
index 6c296eb7b62..3cc0c94f530 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/deny-unshaded.png
index 0a5ff43f0ce..a2506b18b30 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/eject-unshaded.png
index 9efb08705fa..15d0bf6f27f 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/meta.json
index 3f7f1d8a0a7..83bee56da64 100644
--- a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
   "size": {
     "x": 32,
     "y": 32
@@ -9,48 +9,82 @@
   "states": [
     {
       "name": "normal-unshaded",
+      "directions": 4
+    },
+    {
+      "name": "eject-unshaded",
+      "directions": 4,
       "delays": [
         [
-          2.5,
           0.1,
-          3.4,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
           0.1
         ]
       ]
     },
-    {
-      "name": "broken"
-    },
-    {
-      "name": "normal"
-    },
     {
       "name": "deny-unshaded",
+      "directions": 4,
       "delays": [
         [
           0.1,
           0.1,
           0.1
-        ]
-      ]
-    },
-    {
-      "name": "eject-unshaded",
-      "delays": [
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
         [
-          0.5,
           0.1,
-          1.0,
           0.1,
           0.1
         ]
       ]
     },
     {
-      "name": "off"
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+        "name": "panel",
+        "directions": 4
     },
     {
-      "name": "panel"
+        "name": "normal"
     }
   ]
 }
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/normal-unshaded.png
index 96ee10550b6..2861c3d7beb 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/off.png
index acc26679bd3..e8c9485dcc4 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/panel.png
index 9e3049e07d7..4a1a54be105 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/broken.png
index 0f9501592a8..1f7d6214ca0 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/deny-unshaded.png
new file mode 100644
index 00000000000..bf94ebee5eb
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/eject-unshaded.png
index 73678935bc4..89fa2934a61 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/meta.json
index 5c200a94a96..05888a69835 100644
--- a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/meta.json
@@ -1,54 +1,99 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "broken"
+      "name": "normal-unshaded",
+      "directions": 4
     },
     {
       "name": "eject-unshaded",
+      "directions": 4,
       "delays": [
         [
           0.1,
-          0.7,
-          0.7,
-          0.7,
-          0.7,
-          0.7,
-          0.7,
-          0.7,
-          0.7,
-          0.7,
-          0.7,
-          0.7,
-          0.7,
-          0.7,
-          0.7,
+          0.1,
+          0.1,
+          0.6,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.6,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.6,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.6,
+          0.1,
+          0.1,
+          0.1,
           0.1
         ]
       ]
     },
     {
-      "name": "normal-unshaded",
+      "name": "deny-unshaded",
+      "directions": 4,
       "delays": [
         [
-          2.5,
-          0.05,
-          3.4,
-          0.05
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
         ]
       ]
     },
     {
-      "name": "off"
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
     },
     {
-      "name": "panel"
+      "name": "panel",
+      "directions": 4
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/normal-unshaded.png
index 5625997714f..b0084972030 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/off.png
index dc61f221c0e..9463f7ce992 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/panel.png
index 80912168e4e..c0a5b763bcd 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/dryingrack.rsi/drying_rack-close-off.png b/Resources/Textures/Structures/Machines/VendingMachines/dryingrack.rsi/drying_rack-close-off.png
new file mode 100644
index 00000000000..0eaaf7378ea
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/dryingrack.rsi/drying_rack-close-off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/dryingrack.rsi/drying_rack-close.png b/Resources/Textures/Structures/Machines/VendingMachines/dryingrack.rsi/drying_rack-close.png
new file mode 100644
index 00000000000..26925d12932
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/dryingrack.rsi/drying_rack-close.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/dryingrack.rsi/drying_rack-off.png b/Resources/Textures/Structures/Machines/VendingMachines/dryingrack.rsi/drying_rack-off.png
new file mode 100644
index 00000000000..5faefa4a5b6
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/dryingrack.rsi/drying_rack-off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/dryingrack.rsi/drying_rack-plant-off.png b/Resources/Textures/Structures/Machines/VendingMachines/dryingrack.rsi/drying_rack-plant-off.png
new file mode 100644
index 00000000000..41dd42d3654
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/dryingrack.rsi/drying_rack-plant-off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/dryingrack.rsi/drying_rack-plant.png b/Resources/Textures/Structures/Machines/VendingMachines/dryingrack.rsi/drying_rack-plant.png
new file mode 100644
index 00000000000..57c3f453828
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/dryingrack.rsi/drying_rack-plant.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/dryingrack.rsi/drying_rack.png b/Resources/Textures/Structures/Machines/VendingMachines/dryingrack.rsi/drying_rack.png
new file mode 100644
index 00000000000..8f571bcadf3
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/dryingrack.rsi/drying_rack.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/dryingrack.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/dryingrack.rsi/meta.json
new file mode 100644
index 00000000000..45c704ee8f8
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/VendingMachines/dryingrack.rsi/meta.json
@@ -0,0 +1,61 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "drying_rack",
+      "directions": 4
+    },
+    {
+      "name": "drying_rack-plant",
+      "directions": 4
+    },
+    {
+      "name": "drying_rack-close",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "drying_rack-off",
+      "directions": 4
+    },
+    {
+      "name": "drying_rack-plant-off",
+      "directions": 4
+    },
+    {
+      "name": "drying_rack-close-off",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/broken.png
index cfd081cf6b4..e90228b1bc2 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/deny-unshaded.png
index 4bac2c91b1d..1de356b1457 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/eject-unshaded.png
index 99c7cfeea1f..65ba08ddf02 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/meta.json
index 35b29c7356e..24c7cd05f45 100644
--- a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/meta.json
@@ -1,52 +1,91 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "broken"
+      "name": "normal-unshaded",
+      "directions": 4
     },
     {
-      "name": "deny-unshaded",
+      "name": "eject-unshaded",
+      "directions": 4,
       "delays": [
         [
           0.1,
+          0.4,
           0.1
-        ]
-      ]
-    },
-    {
-      "name": "eject-unshaded",
-      "delays": [
+        ],
+        [
+          0.1,
+          0.4,
+          0.1
+        ],
         [
           0.1,
           0.4,
-          0.2,
+          0.1
+        ],
+        [
+          0.1,
           0.4,
           0.1
         ]
       ]
     },
     {
-      "name": "normal-unshaded",
+      "name": "deny-unshaded",
+      "directions": 4,
       "delays": [
         [
-          2.5,
-          0.05,
-          3.4,
-          0.05
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
         ]
       ]
     },
     {
-      "name": "off"
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
     },
     {
-      "name": "panel"
+      "name": "panel",
+      "directions": 4
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/normal-unshaded.png
index d9f4a8ab47f..a15f723ec9f 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/off.png
index b38fbe41330..9eb4e5e6501 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/panel.png
index faddc533514..e50605569e8 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend_green.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend_green.rsi/broken.png
new file mode 100644
index 00000000000..c7b4d893d56
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/engivend_green.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend_green.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend_green.rsi/deny-unshaded.png
new file mode 100644
index 00000000000..c0a2ff42dc8
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/engivend_green.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend_green.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend_green.rsi/eject-unshaded.png
new file mode 100644
index 00000000000..9386d30925d
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/engivend_green.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend_green.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/engivend_green.rsi/meta.json
new file mode 100644
index 00000000000..24c7cd05f45
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/VendingMachines/engivend_green.rsi/meta.json
@@ -0,0 +1,91 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "normal-unshaded",
+      "directions": 4
+    },
+    {
+      "name": "eject-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.4,
+          0.1
+        ],
+        [
+          0.1,
+          0.4,
+          0.1
+        ],
+        [
+          0.1,
+          0.4,
+          0.1
+        ],
+        [
+          0.1,
+          0.4,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "deny-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+      "name": "panel",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend_green.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend_green.rsi/normal-unshaded.png
new file mode 100644
index 00000000000..ef5dbcba22a
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/engivend_green.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend_green.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend_green.rsi/off.png
new file mode 100644
index 00000000000..e58a27fcc38
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/engivend_green.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend_green.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend_green.rsi/panel.png
new file mode 100644
index 00000000000..3b9c62a5241
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/engivend_green.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fitness.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/fitness.rsi/broken.png
new file mode 100644
index 00000000000..f91f26a9189
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fitness.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fitness.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/fitness.rsi/deny-unshaded.png
new file mode 100644
index 00000000000..4beea443bb9
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fitness.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fitness.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/fitness.rsi/eject-unshaded.png
new file mode 100644
index 00000000000..ba4b8c488ac
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fitness.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fitness.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/fitness.rsi/meta.json
new file mode 100644
index 00000000000..5bf6de474a7
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/VendingMachines/fitness.rsi/meta.json
@@ -0,0 +1,165 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "normal-unshaded",
+      "directions": 4
+    },
+    {
+      "name": "eject-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "deny-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+      "name": "screen",
+      "directions": 4,
+      "delays": [
+        [
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "panel",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fitness.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/fitness.rsi/normal-unshaded.png
new file mode 100644
index 00000000000..3d28dddae28
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fitness.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fitness.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/fitness.rsi/off.png
new file mode 100644
index 00000000000..84269ea1c17
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fitness.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fitness.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/fitness.rsi/panel.png
new file mode 100644
index 00000000000..f61777362a1
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fitness.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fitness.rsi/screen.png b/Resources/Textures/Structures/Machines/VendingMachines/fitness.rsi/screen.png
new file mode 100644
index 00000000000..ca53e57d5c1
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fitness.rsi/screen.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/chem-1-off.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/chem-1-off.png
new file mode 100644
index 00000000000..baa3dbd9e75
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/chem-1-off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/chem-1.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/chem-1.png
new file mode 100644
index 00000000000..b9c3f06e0bf
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/chem-1.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/chem-2-off.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/chem-2-off.png
new file mode 100644
index 00000000000..895d100f0e0
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/chem-2-off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/chem-2.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/chem-2.png
new file mode 100644
index 00000000000..e5affd170d8
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/chem-2.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/chem-3-off.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/chem-3-off.png
new file mode 100644
index 00000000000..27296a3e5a1
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/chem-3-off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/chem-3.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/chem-3.png
new file mode 100644
index 00000000000..05c766a42a8
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/chem-3.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/chem-4-off.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/chem-4-off.png
new file mode 100644
index 00000000000..4cd21925199
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/chem-4-off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/chem-4.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/chem-4.png
new file mode 100644
index 00000000000..929907ef5ce
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/chem-4.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/drink-1-off.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/drink-1-off.png
new file mode 100644
index 00000000000..4409660a221
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/drink-1-off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/drink-1.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/drink-1.png
new file mode 100644
index 00000000000..84ba74ff81a
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/drink-1.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/drink-2-off.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/drink-2-off.png
new file mode 100644
index 00000000000..9f8857c0b12
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/drink-2-off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/drink-2.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/drink-2.png
new file mode 100644
index 00000000000..47399e6d5f7
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/drink-2.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/drink-3-off.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/drink-3-off.png
new file mode 100644
index 00000000000..22ac52faba5
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/drink-3-off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/drink-3.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/drink-3.png
new file mode 100644
index 00000000000..14deaf5226f
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/drink-3.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/drink-4-off.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/drink-4-off.png
new file mode 100644
index 00000000000..1695b513853
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/drink-4-off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/drink-4.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/drink-4.png
new file mode 100644
index 00000000000..844039637b9
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/drink-4.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/empty-off.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/empty-off.png
new file mode 100644
index 00000000000..e799fd79b02
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/empty-off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/empty.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/empty.png
new file mode 100644
index 00000000000..61660ac2297
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/empty.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/food-1-off.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/food-1-off.png
new file mode 100644
index 00000000000..db83adbad36
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/food-1-off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/food-1.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/food-1.png
new file mode 100644
index 00000000000..4914d8278c0
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/food-1.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/food-2-off.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/food-2-off.png
new file mode 100644
index 00000000000..0189382852c
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/food-2-off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/food-2.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/food-2.png
new file mode 100644
index 00000000000..fec9938613f
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/food-2.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/food-3-off.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/food-3-off.png
new file mode 100644
index 00000000000..b1280d3c1a7
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/food-3-off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/food-3.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/food-3.png
new file mode 100644
index 00000000000..782f9fdf7d3
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/food-3.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/food-4-off.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/food-4-off.png
new file mode 100644
index 00000000000..a4f547f3db8
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/food-4-off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/food-4.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/food-4.png
new file mode 100644
index 00000000000..4cf55699a58
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/food-4.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/meta.json
new file mode 100644
index 00000000000..a9902bf2343
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/meta.json
@@ -0,0 +1,147 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "empty",
+      "directions": 4
+    },
+    {
+      "name": "chem-1",
+      "directions": 4
+    },
+    {
+      "name": "chem-2",
+      "directions": 4
+    },
+    {
+      "name": "chem-3",
+      "directions": 4
+    },
+    {
+      "name": "chem-4",
+      "directions": 4
+    },
+    {
+      "name": "drink-1",
+      "directions": 4
+    },
+    {
+      "name": "drink-2",
+      "directions": 4
+    },
+    {
+      "name": "drink-3",
+      "directions": 4
+    },
+    {
+      "name": "drink-4",
+      "directions": 4
+    },
+    {
+      "name": "slime-1",
+      "directions": 4
+    },
+    {
+      "name": "slime-2",
+      "directions": 4
+    },
+    {
+      "name": "slime-3",
+      "directions": 4
+    },
+    {
+      "name": "slime-4",
+      "directions": 4
+    },
+    {
+      "name": "food-1",
+      "directions": 4
+    },
+    {
+      "name": "food-2",
+      "directions": 4
+    },
+    {
+      "name": "food-3",
+      "directions": 4
+    },
+    {
+      "name": "food-4",
+      "directions": 4
+    },
+    {
+      "name": "empty-off",
+      "directions": 4
+    },
+    {
+      "name": "chem-1-off",
+      "directions": 4
+    },
+    {
+      "name": "chem-2-off",
+      "directions": 4
+    },
+    {
+      "name": "chem-3-off",
+      "directions": 4
+    },
+    {
+      "name": "chem-4-off",
+      "directions": 4
+    },
+    {
+      "name": "drink-1-off",
+      "directions": 4
+    },
+    {
+      "name": "drink-2-off",
+      "directions": 4
+    },
+    {
+      "name": "drink-3-off",
+      "directions": 4
+    },
+    {
+      "name": "drink-4-off",
+      "directions": 4
+    },
+    {
+      "name": "slime-1-off",
+      "directions": 4
+    },
+    {
+      "name": "slime-2-off",
+      "directions": 4
+    },
+    {
+      "name": "slime-3-off",
+      "directions": 4
+    },
+    {
+      "name": "slime-4-off",
+      "directions": 4
+    },
+    {
+      "name": "food-1-off",
+      "directions": 4
+    },
+    {
+      "name": "food-2-off",
+      "directions": 4
+    },
+    {
+      "name": "food-3-off",
+      "directions": 4
+    },
+    {
+      "name": "food-4-off",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/slime-1-off.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/slime-1-off.png
new file mode 100644
index 00000000000..4566bfba4f2
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/slime-1-off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/slime-1.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/slime-1.png
new file mode 100644
index 00000000000..c39b376b758
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/slime-1.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/slime-2-off.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/slime-2-off.png
new file mode 100644
index 00000000000..5d9301b63c0
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/slime-2-off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/slime-2.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/slime-2.png
new file mode 100644
index 00000000000..05eb40cc810
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/slime-2.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/slime-3-off.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/slime-3-off.png
new file mode 100644
index 00000000000..c491bcbf10e
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/slime-3-off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/slime-3.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/slime-3.png
new file mode 100644
index 00000000000..20ecf0f0877
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/slime-3.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/slime-4-off.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/slime-4-off.png
new file mode 100644
index 00000000000..789b278a0b6
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/slime-4-off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/slime-4.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/slime-4.png
new file mode 100644
index 00000000000..dd526f98103
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgecontents.rsi/slime-4.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark-broken.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark-broken.png
new file mode 100644
index 00000000000..79c103b4729
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark-broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark-deny.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark-deny.png
new file mode 100644
index 00000000000..aa3ed702229
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark-deny.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark-off.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark-off.png
new file mode 100644
index 00000000000..3eda6154dca
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark-off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark-panel-broken.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark-panel-broken.png
new file mode 100644
index 00000000000..751b80af286
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark-panel-broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark-panel.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark-panel.png
new file mode 100644
index 00000000000..907ada864fb
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark-panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark-sidepanel.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark-sidepanel.png
new file mode 100644
index 00000000000..13002e5d4dc
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark-sidepanel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark-top-broken.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark-top-broken.png
new file mode 100644
index 00000000000..800fa6ae176
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark-top-broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark-top.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark-top.png
new file mode 100644
index 00000000000..dba2c6a9017
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark-top.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark-vend.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark-vend.png
new file mode 100644
index 00000000000..62eb44a95dc
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark-vend.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark.png
new file mode 100644
index 00000000000..edcf630e5be
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/fridge_dark.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/meta.json
new file mode 100644
index 00000000000..9754994b516
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/meta.json
@@ -0,0 +1,197 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "screen_small",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "fridge_dark-top",
+      "directions": 4
+    },
+    {
+      "name": "fridge_dark-top-broken",
+      "directions": 4
+    },
+    {
+      "name": "fridge_dark-sidepanel",
+      "directions": 4
+    },
+    {
+      "name": "fridge_dark-panel-broken",
+      "directions": 4
+    },
+    {
+      "name": "fridge_dark",
+      "directions": 4
+    },
+    {
+      "name": "fridge_dark-vend",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.8
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.8
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.8
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.8
+        ]
+      ]
+    },
+    {
+      "name": "fridge_dark-deny",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "fridge_dark-off",
+      "directions": 4
+    },
+    {
+      "name": "fridge_dark-broken",
+      "directions": 4
+    },
+    {
+      "name": "fridge_dark-panel",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/screen_small.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/screen_small.png
new file mode 100644
index 00000000000..8f7e3ae2882
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgedark.rsi/screen_small.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks-broken.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks-broken.png
new file mode 100644
index 00000000000..7295f0f4fd7
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks-broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks-deny.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks-deny.png
new file mode 100644
index 00000000000..cf531e92c7c
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks-deny.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks-off.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks-off.png
new file mode 100644
index 00000000000..e788c2b4b91
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks-off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks-panel-broken.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks-panel-broken.png
new file mode 100644
index 00000000000..d955bc3ce27
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks-panel-broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks-panel.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks-panel.png
new file mode 100644
index 00000000000..aa50a1978db
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks-panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks-sidepanel.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks-sidepanel.png
new file mode 100644
index 00000000000..802fedbec3e
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks-sidepanel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks-top-broken.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks-top-broken.png
new file mode 100644
index 00000000000..615af3fd214
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks-top-broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks-top.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks-top.png
new file mode 100644
index 00000000000..468f253660b
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks-top.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks-vend.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks-vend.png
new file mode 100644
index 00000000000..ca5fd3177e5
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks-vend.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks.png
new file mode 100644
index 00000000000..a48da3512ce
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/fridge_drinks.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/meta.json
new file mode 100644
index 00000000000..fe0f8a6680b
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/meta.json
@@ -0,0 +1,197 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "screen_small",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "fridge_drinks-top",
+      "directions": 4
+    },
+    {
+      "name": "fridge_drinks-top-broken",
+      "directions": 4
+    },
+    {
+      "name": "fridge_drinks-sidepanel",
+      "directions": 4
+    },
+    {
+      "name": "fridge_drinks-panel-broken",
+      "directions": 4
+    },
+    {
+      "name": "fridge_drinks",
+      "directions": 4
+    },
+    {
+      "name": "fridge_drinks-vend",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.8
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.8
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.8
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.8
+        ]
+      ]
+    },
+    {
+      "name": "fridge_drinks-deny",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "fridge_drinks-off",
+      "directions": 4
+    },
+    {
+      "name": "fridge_drinks-broken",
+      "directions": 4
+    },
+    {
+      "name": "fridge_drinks-panel",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/screen_small.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/screen_small.png
new file mode 100644
index 00000000000..8f7e3ae2882
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgedrink.rsi/screen_small.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food-broken.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food-broken.png
new file mode 100644
index 00000000000..cb8558ca3a7
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food-broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food-deny.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food-deny.png
new file mode 100644
index 00000000000..654387df9d1
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food-deny.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food-off.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food-off.png
new file mode 100644
index 00000000000..22f0fdf1966
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food-off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food-panel-broken.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food-panel-broken.png
new file mode 100644
index 00000000000..d955bc3ce27
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food-panel-broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food-panel.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food-panel.png
new file mode 100644
index 00000000000..aa50a1978db
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food-panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food-sidepanel.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food-sidepanel.png
new file mode 100644
index 00000000000..802fedbec3e
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food-sidepanel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food-top-broken.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food-top-broken.png
new file mode 100644
index 00000000000..615af3fd214
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food-top-broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food-top.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food-top.png
new file mode 100644
index 00000000000..468f253660b
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food-top.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food-vend.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food-vend.png
new file mode 100644
index 00000000000..fa21a3a11a4
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food-vend.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food.png
new file mode 100644
index 00000000000..7ac7d9801a7
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/fridge_food.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/meta.json
new file mode 100644
index 00000000000..5cb6003982c
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/meta.json
@@ -0,0 +1,189 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "screen_small",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "fridge_food-top",
+      "directions": 4
+    },
+    {
+      "name": "fridge_food-top-broken",
+      "directions": 4
+    },
+    {
+      "name": "fridge_food-sidepanel",
+      "directions": 4
+    },
+    {
+      "name": "fridge_food-panel-broken",
+      "directions": 4
+    },
+    {
+      "name": "fridge_food",
+      "directions": 4
+    },
+    {
+      "name": "fridge_food-vend",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.8
+        ],
+        [
+          0.1,
+          0.1,
+          0.8
+        ],
+        [
+          0.1,
+          0.1,
+          0.8
+        ],
+        [
+          0.1,
+          0.1,
+          0.8
+        ]
+      ]
+    },
+    {
+      "name": "fridge_food-deny",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "fridge_food-off",
+      "directions": 4
+    },
+    {
+      "name": "fridge_food-broken",
+      "directions": 4
+    },
+    {
+      "name": "fridge_food-panel",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/screen_small.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/screen_small.png
new file mode 100644
index 00000000000..8f7e3ae2882
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgefood.rsi/screen_small.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci-broken.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci-broken.png
new file mode 100644
index 00000000000..c3b5de48af7
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci-broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci-deny.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci-deny.png
new file mode 100644
index 00000000000..ee13f27c570
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci-deny.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci-off.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci-off.png
new file mode 100644
index 00000000000..2481ff6769e
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci-off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci-panel.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci-panel.png
new file mode 100644
index 00000000000..1b51bec320a
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci-panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci-sidepanel-broken.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci-sidepanel-broken.png
new file mode 100644
index 00000000000..5b773eef69a
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci-sidepanel-broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci-sidepanel.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci-sidepanel.png
new file mode 100644
index 00000000000..900359268b8
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci-sidepanel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci-top-broken.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci-top-broken.png
new file mode 100644
index 00000000000..995b9d07309
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci-top-broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci-top.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci-top.png
new file mode 100644
index 00000000000..8fbd5dfc1a1
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci-top.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci-vend.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci-vend.png
new file mode 100644
index 00000000000..33faefc1fa1
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci-vend.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci.png
new file mode 100644
index 00000000000..79d5e92ec07
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/fridge_sci.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/meta.json
new file mode 100644
index 00000000000..0cb0e891e88
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/meta.json
@@ -0,0 +1,193 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "screen_big",
+      "directions": 4,
+      "delays": [
+        [
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "fridge_sci-top",
+      "directions": 4
+    },
+    {
+      "name": "fridge_sci-top-broken",
+      "directions": 4
+    },
+    {
+      "name": "fridge_sci-sidepanel",
+      "directions": 4
+    },
+    {
+      "name": "fridge_sci-sidepanel-broken",
+      "directions": 4
+    },
+    {
+      "name": "fridge_sci",
+      "directions": 4
+    },
+    {
+      "name": "fridge_sci-vend",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "fridge_sci-deny",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "fridge_sci-off",
+      "directions": 4
+    },
+    {
+      "name": "fridge_sci-broken",
+      "directions": 4
+    },
+    {
+      "name": "fridge_sci-panel",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/screen_big.png b/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/screen_big.png
new file mode 100644
index 00000000000..9ff09281106
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/fridgesci.rsi/screen_big.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/broken.png
index be3c4f4d694..83843358315 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/deny-unshaded.png
new file mode 100644
index 00000000000..447914b8101
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/eject-unshaded.png
index d5814969aae..329c15295bf 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/meta.json
index d45bae2bf97..6467c185806 100644
--- a/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/meta.json
@@ -1,43 +1,87 @@
 {
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "normal-unshaded",
+      "directions": 4
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/dd67e1e4e10bcf632b82b8b14b6a8479d80d5f78#diff-34173d670aca65c110ef18312c32abc4e05c84f33a9402248a32000e45acd0d3",
-    "states": [
-        {
-          "name": "normal-unshaded",
-          "delays": [
-            [
-              2.5,
-              0.1,
-              3.4,
-              0.1
-            ]
-          ]
-        },
-        {
-          "name": "broken"
-        },
-        {
-          "name": "eject-unshaded",
-          "delays": [
-            [
-              0.5,
-              0.1,
-              1.0,
-              0.1,
-              0.1
-            ]
-          ]
-        },
-        {
-          "name": "off"
-        },
-        {
-          "name": "panel"
-        }
-    ]
-}
+    {
+      "name": "eject-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "deny-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+      "name": "panel",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/normal-unshaded.png
index d7ac9ba8c49..a1578bfc39f 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/off.png
index d688eea5252..39c2bfb50cf 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/panel.png
index 9e3049e07d7..6922e23f3d1 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/games.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/generic.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/generic.rsi/broken.png
new file mode 100644
index 00000000000..6a6c5c81bfd
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/generic.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/generic.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/generic.rsi/deny-unshaded.png
new file mode 100644
index 00000000000..540e1af3fcf
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/generic.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/generic.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/generic.rsi/eject-unshaded.png
new file mode 100644
index 00000000000..10fc965b2df
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/generic.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/generic.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/generic.rsi/meta.json
new file mode 100644
index 00000000000..6467c185806
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/VendingMachines/generic.rsi/meta.json
@@ -0,0 +1,87 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "normal-unshaded",
+      "directions": 4
+    },
+    {
+      "name": "eject-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "deny-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+      "name": "panel",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/generic.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/generic.rsi/normal-unshaded.png
new file mode 100644
index 00000000000..095c278ab9d
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/generic.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/generic.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/generic.rsi/off.png
new file mode 100644
index 00000000000..69ca73fbc3c
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/generic.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/generic.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/generic.rsi/panel.png
new file mode 100644
index 00000000000..7b9a8a6dbd7
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/generic.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/hotfood.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/hotfood.rsi/broken.png
new file mode 100644
index 00000000000..d594e68a03c
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/hotfood.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/hotfood.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/hotfood.rsi/deny-unshaded.png
new file mode 100644
index 00000000000..b5e57139103
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/hotfood.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/hotfood.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/hotfood.rsi/eject-unshaded.png
new file mode 100644
index 00000000000..a99c9f5894a
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/hotfood.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/hotfood.rsi/heater.png b/Resources/Textures/Structures/Machines/VendingMachines/hotfood.rsi/heater.png
new file mode 100644
index 00000000000..40ef8ac864c
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/hotfood.rsi/heater.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/hotfood.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/hotfood.rsi/meta.json
new file mode 100644
index 00000000000..11dd079a2cc
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/VendingMachines/hotfood.rsi/meta.json
@@ -0,0 +1,187 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "normal-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "eject-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "deny-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+      "name": "heater",
+      "directions": 4,
+      "delays": [
+        [
+          1,
+          0.1,
+          0.1
+        ],
+        [
+          1,
+          0.1,
+          0.1
+        ],
+        [
+          1,
+          0.1,
+          0.1
+        ],
+        [
+          1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "panel",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/hotfood.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/hotfood.rsi/normal-unshaded.png
new file mode 100644
index 00000000000..03668ae185e
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/hotfood.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/hotfood.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/hotfood.rsi/off.png
new file mode 100644
index 00000000000..770bd85da2a
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/hotfood.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/hotfood.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/hotfood.rsi/panel.png
new file mode 100644
index 00000000000..8ec12cf754a
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/hotfood.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/broken.png
new file mode 100644
index 00000000000..c33e51cae63
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/deny-unshaded.png
new file mode 100644
index 00000000000..44041c32478
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/eject-unshaded.png
new file mode 100644
index 00000000000..45e87f4f7bd
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/meta.json
new file mode 100644
index 00000000000..71ffade3dd0
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/meta.json
@@ -0,0 +1,95 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "normal-unshaded",
+      "directions": 4
+    },
+    {
+      "name": "eject-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.8,
+          0.1
+        ],
+        [
+          0.1,
+          0.8,
+          0.1
+        ],
+        [
+          0.1,
+          0.8,
+          0.1
+        ],
+        [
+          0.1,
+          0.8,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "deny-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+      "name": "panel",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/normal-unshaded.png
new file mode 100644
index 00000000000..09951acb4cd
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/off.png
new file mode 100644
index 00000000000..31df8b753f8
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/panel.png
new file mode 100644
index 00000000000..95ca9554d39
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/broken.png
new file mode 100644
index 00000000000..2afa82d3d9d
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/deny-unshaded.png
new file mode 100644
index 00000000000..5ab0afa3820
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/eject-unshaded.png
new file mode 100644
index 00000000000..a0e87b81c6d
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/meta.json
new file mode 100644
index 00000000000..f66df2c0799
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/meta.json
@@ -0,0 +1,109 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "normal-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          1,
+          1
+        ],
+        [
+          1,
+          1
+        ],
+        [
+          1,
+          1
+        ],
+        [
+          1,
+          1
+        ]
+      ]
+    },
+    {
+      "name": "eject-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.8,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.8,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.8,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.8,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "deny-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+      "name": "panel",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/normal-unshaded.png
new file mode 100644
index 00000000000..810cf5086e1
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/off.png
new file mode 100644
index 00000000000..22dbf40c472
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/panel.png
new file mode 100644
index 00000000000..d5841bd9d3b
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/lavatory.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/broken.png
index 17d7f7e5955..691470ec3a4 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/deny-unshaded.png
new file mode 100644
index 00000000000..e3a99050634
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/eject-unshaded.png
new file mode 100644
index 00000000000..92dacfcaf80
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/meta.json
index 777f43a5fd2..b340c351685 100644
--- a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/meta.json
@@ -1,31 +1,105 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/3e1db725c152145b1682a31e5e54da7a63595436#diff-b4b731212dc8db8859d52ef3b762bccfb667f8783ad4c36f648db7f758f7eaf2",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "broken"
-    },
-    {
-      "name": "off"
+      "name": "normal-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          4,
+          0.1
+        ],
+        [
+          4,
+          0.1
+        ],
+        [
+          4,
+          0.1
+        ],
+        [
+          4,
+          0.1
+        ]
+      ]
     },
     {
-      "name": "panel"
+      "name": "eject-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.7,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.7,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.7,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.7,
+          0.1,
+          0.1
+        ]
+      ]
     },
     {
-      "name": "normal-unshaded",
+      "name": "deny-unshaded",
+      "directions": 4,
       "delays": [
         [
-          2.7,
           0.1,
-          3.4,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
           0.1
         ]
       ]
+    },
+    {
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+      "name": "panel",
+      "directions": 4
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/normal-unshaded.png
index 21e74f3c7fb..0c700c9ad3a 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/off.png
index 3b3b865aa65..481e7c0fac1 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/panel.png
index 9e3049e07d7..a5d5634cafa 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/broken.png
new file mode 100644
index 00000000000..5a61cac92f9
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/deny-unshaded.png
new file mode 100644
index 00000000000..1e094aca6d5
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/eject-unshaded.png
new file mode 100644
index 00000000000..c4ff3380972
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/meta.json
new file mode 100644
index 00000000000..24c7cd05f45
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/meta.json
@@ -0,0 +1,91 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "normal-unshaded",
+      "directions": 4
+    },
+    {
+      "name": "eject-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.4,
+          0.1
+        ],
+        [
+          0.1,
+          0.4,
+          0.1
+        ],
+        [
+          0.1,
+          0.4,
+          0.1
+        ],
+        [
+          0.1,
+          0.4,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "deny-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+      "name": "panel",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/normal-unshaded.png
new file mode 100644
index 00000000000..0c8b9fbf92b
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/off.png
new file mode 100644
index 00000000000..923199a2c10
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/panel.png
new file mode 100644
index 00000000000..a40eb38dad6
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/medivend.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/misc.rsi/cooler.png b/Resources/Textures/Structures/Machines/VendingMachines/misc.rsi/cooler.png
new file mode 100644
index 00000000000..b6f02fb3129
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/misc.rsi/cooler.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/misc.rsi/green-outline.png b/Resources/Textures/Structures/Machines/VendingMachines/misc.rsi/green-outline.png
new file mode 100644
index 00000000000..1654849ed94
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/misc.rsi/green-outline.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/misc.rsi/heater.png b/Resources/Textures/Structures/Machines/VendingMachines/misc.rsi/heater.png
new file mode 100644
index 00000000000..3e0c8ff0a69
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/misc.rsi/heater.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/misc.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/misc.rsi/meta.json
new file mode 100644
index 00000000000..eb1370ebd9c
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/VendingMachines/misc.rsi/meta.json
@@ -0,0 +1,213 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "water_cooler",
+      "directions": 4
+    },
+    {
+      "name": "water_cooler-vend",
+      "directions": 4,
+      "delays": [
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ]
+      ]
+    },
+    {
+      "name": "water_cooler-broken",
+      "directions": 4
+    },
+    {
+      "name": "heater",
+      "directions": 4,
+      "delays": [
+        [
+          0.6,
+          0.6
+        ],
+        [
+          0.6,
+          0.6
+        ],
+        [
+          0.6,
+          0.6
+        ],
+        [
+          0.6,
+          0.6
+        ]
+      ]
+    },
+    {
+      "name": "cooler",
+      "directions": 4,
+      "delays": [
+        [
+          0.6,
+          0.6
+        ],
+        [
+          0.6,
+          0.6
+        ],
+        [
+          0.6,
+          0.6
+        ],
+        [
+          0.6,
+          0.6
+        ]
+      ]
+    },
+    {
+      "name": "green-outline",
+      "directions": 4,
+      "delays": [
+        [
+          3,
+          0.1,
+          2.5,
+          0.1,
+          0.1,
+          0.1,
+          2,
+          0.1
+        ],
+        [
+          3,
+          0.1,
+          2.5,
+          0.1,
+          0.1,
+          0.1,
+          2,
+          0.1
+        ],
+        [
+          3,
+          0.1,
+          2.5,
+          0.1,
+          0.1,
+          0.1,
+          2,
+          0.1
+        ],
+        [
+          3,
+          0.1,
+          2.5,
+          0.1,
+          0.1,
+          0.1,
+          2,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks",
+      "directions": 4,
+      "delays": [
+        [
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/misc.rsi/sparks.png b/Resources/Textures/Structures/Machines/VendingMachines/misc.rsi/sparks.png
new file mode 100644
index 00000000000..f4595aff2b1
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/misc.rsi/sparks.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/misc.rsi/water_cooler-broken.png b/Resources/Textures/Structures/Machines/VendingMachines/misc.rsi/water_cooler-broken.png
new file mode 100644
index 00000000000..c05c14d9316
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/misc.rsi/water_cooler-broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/misc.rsi/water_cooler-vend.png b/Resources/Textures/Structures/Machines/VendingMachines/misc.rsi/water_cooler-vend.png
new file mode 100644
index 00000000000..e580d4f61a6
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/misc.rsi/water_cooler-vend.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/misc.rsi/water_cooler.png b/Resources/Textures/Structures/Machines/VendingMachines/misc.rsi/water_cooler.png
new file mode 100644
index 00000000000..aac19f3bd94
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/misc.rsi/water_cooler.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/broken.png
index 265c20ed44a..0324187f46a 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/deny-unshaded.png
index 51bcf34dc37..9d14d111ab1 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/eject-unshaded.png
index c49dc97d282..b1c7346ae44 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/meta.json
index 35b29c7356e..22676b9a091 100644
--- a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/meta.json
@@ -1,18 +1,32 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "broken"
+      "name": "normal-unshaded",
+      "directions": 4
     },
     {
-      "name": "deny-unshaded",
+      "name": "eject-unshaded",
+      "directions": 4,
       "delays": [
+        [
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1
+        ],
         [
           0.1,
           0.1
@@ -20,33 +34,54 @@
       ]
     },
     {
-      "name": "eject-unshaded",
+      "name": "deny-unshaded",
+      "directions": 4,
       "delays": [
         [
           0.1,
-          0.4,
-          0.2,
-          0.4,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
           0.1
         ]
       ]
     },
     {
-      "name": "normal-unshaded",
-      "delays": [
-        [
-          2.5,
-          0.05,
-          3.4,
-          0.05
-        ]
-      ]
+      "name": "off",
+      "directions": 4
     },
     {
-      "name": "off"
+      "name": "broken",
+      "directions": 4
     },
     {
-      "name": "panel"
+      "name": "panel",
+      "directions": 4
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/normal-unshaded.png
index 275180babfe..b90a6b7f08d 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/off.png
index f7a48db2100..0e586d3ba46 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/panel.png
index 9e3049e07d7..d8247e3b066 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/broken.png
new file mode 100644
index 00000000000..788e77a1c96
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/deny-unshaded.png
new file mode 100644
index 00000000000..0ad3b337e5c
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/eject-unshaded.png
new file mode 100644
index 00000000000..8f10a97c649
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/meta.json
new file mode 100644
index 00000000000..22676b9a091
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/meta.json
@@ -0,0 +1,87 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "normal-unshaded",
+      "directions": 4
+    },
+    {
+      "name": "eject-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "deny-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+      "name": "panel",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/normal-unshaded.png
new file mode 100644
index 00000000000..10976cf5bba
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/off.png
new file mode 100644
index 00000000000..329f13911b6
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/panel.png
new file mode 100644
index 00000000000..d018408a2d2
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/nutri_green.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/broken.png
index 0e73b4e957a..c5a38c1b2d3 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/deny-unshaded.png
index 2a2832c15df..5dbb1b66dcb 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/eject-unshaded.png
index dffb3408711..3e0b2c656dc 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/meta.json
index d0d4a1f0e95..b9b202a57b2 100644
--- a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad. Modified by potato1234x (github) for SS14",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
   "size": {
     "x": 32,
     "y": 32
@@ -9,48 +9,86 @@
   "states": [
     {
       "name": "normal-unshaded",
+      "directions": 4
+    },
+    {
+      "name": "eject-unshaded",
+      "directions": 4,
       "delays": [
         [
-          2.5,
           0.1,
-          3.4,
+          0.4,
+          0.1
+        ],
+        [
+          0.1,
+          0.4,
+          0.1
+        ],
+        [
+          0.1,
+          0.4,
+          0.1
+        ],
+        [
+          0.1,
+          0.4,
           0.1
         ]
       ]
     },
-    {
-      "name": "broken"
-    },
-    {
-      "name": "normal"
-    },
     {
       "name": "deny-unshaded",
+      "directions": 4,
       "delays": [
         [
+          0.1,
+          0.1,
+          0.1,
           0.1,
           0.1,
           0.1
-        ]
-      ]
-    },
-    {
-      "name": "eject-unshaded",
-      "delays": [
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
         [
-          0.5,
           0.1,
-          1.0,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
           0.1,
           0.1
         ]
       ]
     },
     {
-      "name": "off"
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+        "name": "panel",
+        "directions": 4
     },
     {
-      "name": "panel"
+        "name": "normal"
     }
   ]
 }
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/normal-unshaded.png
index f98b47be440..3f5a40ca5ac 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/off.png
index b9aa0c326a1..aa1857d1b6b 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/panel.png
index 95f1e4d33e9..e8c4b1a79d8 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/broken.png
new file mode 100644
index 00000000000..b5f044ba681
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/deny-unshaded.png
new file mode 100644
index 00000000000..f9ee39fcf95
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/eject-unshaded.png
new file mode 100644
index 00000000000..5ca9a51ab38
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/meta.json
new file mode 100644
index 00000000000..24c7cd05f45
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/meta.json
@@ -0,0 +1,91 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "normal-unshaded",
+      "directions": 4
+    },
+    {
+      "name": "eject-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.4,
+          0.1
+        ],
+        [
+          0.1,
+          0.4,
+          0.1
+        ],
+        [
+          0.1,
+          0.4,
+          0.1
+        ],
+        [
+          0.1,
+          0.4,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "deny-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+      "name": "panel",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/normal-unshaded.png
new file mode 100644
index 00000000000..bc32376a67c
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/off.png
new file mode 100644
index 00000000000..cf829676d43
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/panel.png
new file mode 100644
index 00000000000..c2148a09c87
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/security.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/broken.png
index 883a4a70e61..7e7601218e9 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/deny-unshaded.png
index da34b0b1046..11d9aa191d3 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/eject-unshaded.png
index 630ea5a1d04..65a59b48227 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/meta.json
index 35b29c7356e..d24e37c145f 100644
--- a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/meta.json
@@ -1,52 +1,239 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "broken"
+      "name": "normal-unshaded",
+      "directions": 4
+    },
+    {
+      "name": "eject-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.4,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.4,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.4,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.4,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
     },
     {
       "name": "deny-unshaded",
+      "directions": 4,
       "delays": [
         [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
           0.1,
           0.1
         ]
       ]
     },
     {
-      "name": "eject-unshaded",
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+      "name": "panel",
+      "directions": 4
+    },
+    {
+      "name": "seeds-shelf0",
+      "directions": 4,
       "delays": [
         [
           0.1,
-          0.4,
-          0.2,
-          0.4,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
           0.1
         ]
       ]
     },
     {
-      "name": "normal-unshaded",
+      "name": "seeds-shelf1",
+      "directions": 4,
       "delays": [
         [
-          2.5,
-          0.05,
-          3.4,
-          0.05
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
         ]
       ]
     },
     {
-      "name": "off"
+      "name": "seeds-shelf2",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
     },
     {
-      "name": "panel"
+      "name": "seeds-shelf3",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/normal-unshaded.png
index 8182e6a2c78..5d7ca257aaf 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/off.png
index 3ab3fec281f..c7cf3fe4f3f 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/panel.png
index 9e3049e07d7..7265126ffb5 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/seeds-shelf0.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/seeds-shelf0.png
new file mode 100644
index 00000000000..f52017533a3
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/seeds-shelf0.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/seeds-shelf1.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/seeds-shelf1.png
new file mode 100644
index 00000000000..454ca429431
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/seeds-shelf1.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/seeds-shelf2.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/seeds-shelf2.png
new file mode 100644
index 00000000000..cd379eb9384
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/seeds-shelf2.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/seeds-shelf3.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/seeds-shelf3.png
new file mode 100644
index 00000000000..ad7eedec20e
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/seeds-shelf3.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/broken.png
new file mode 100644
index 00000000000..84fb48d3335
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/deny-unshaded.png
new file mode 100644
index 00000000000..47d437da3ff
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/eject-unshaded.png
new file mode 100644
index 00000000000..ce930c3b8f8
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/meta.json
new file mode 100644
index 00000000000..59ee307d291
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/meta.json
@@ -0,0 +1,295 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "normal-unshaded",
+      "directions": 4
+    },
+    {
+      "name": "eject-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "deny-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+      "name": "panel",
+      "directions": 4
+    },
+    {
+      "name": "seeds_generic-shelf0",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "seeds_generic-shelf1",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "seeds_generic-shelf2",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "seeds_generic-shelf3",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/normal-unshaded.png
new file mode 100644
index 00000000000..2eab092987d
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/off.png
new file mode 100644
index 00000000000..ded486fb6b5
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/panel.png
new file mode 100644
index 00000000000..5b3e87d9d3a
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/seeds_generic-shelf0.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/seeds_generic-shelf0.png
new file mode 100644
index 00000000000..5954a9c457a
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/seeds_generic-shelf0.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/seeds_generic-shelf1.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/seeds_generic-shelf1.png
new file mode 100644
index 00000000000..95c15fb2ebf
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/seeds_generic-shelf1.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/seeds_generic-shelf2.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/seeds_generic-shelf2.png
new file mode 100644
index 00000000000..2a59f75ff43
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/seeds_generic-shelf2.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/seeds_generic-shelf3.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/seeds_generic-shelf3.png
new file mode 100644
index 00000000000..038a01866d3
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/seeds_green.rsi/seeds_generic-shelf3.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/broken.png
index d08a87b7607..16ce86dc2d0 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/deny-unshaded.png
index b8221f982ee..5a6d5e1d4bd 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/eject-unshaded.png
index 49fcef45a1d..3200386e089 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/meta.json
index eaf66cff8f9..0227985bb84 100644
--- a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept and potato1234x",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
   "size": {
     "x": 32,
     "y": 32
@@ -9,44 +9,101 @@
   "states": [
     {
       "name": "normal-unshaded",
+      "directions": 4,
       "delays": [
         [
-          2.5,
-          0.05,
-          3.4
+          0.8,
+          0.8,
+          0.8
+        ],
+        [
+          0.8,
+          0.8,
+          0.8
+        ],
+        [
+          0.8,
+          0.8,
+          0.8
+        ],
+        [
+          0.8,
+          0.8,
+          0.8
         ]
       ]
     },
     {
-      "name": "broken"
-    },
-    {
-      "name": "deny-unshaded",
+      "name": "eject-unshaded",
+      "directions": 4,
       "delays": [
         [
           0.1,
           0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
           0.1
         ]
       ]
     },
     {
-      "name": "off"
-    },
-    {
-      "name": "panel"
-    },
-    {
-      "name": "eject-unshaded",
+      "name": "deny-unshaded",
+      "directions": 4,
       "delays": [
         [
           0.1,
           0.1,
-          0.8,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
           0.1,
           0.1
         ]
       ]
+    },
+    {
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+      "name": "panel",
+      "directions": 4
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/normal-unshaded.png
index f04f2db2afe..5748b25b90e 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/off.png
index 4f84067486c..20540e67f09 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/panel.png
index c60f5c3069d..12864f00cb3 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/broken.png
new file mode 100644
index 00000000000..92c80e39eb8
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/deny-unshaded.png
new file mode 100644
index 00000000000..753fee7feef
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/eject-unshaded.png
new file mode 100644
index 00000000000..b5b9987bde2
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/fan.png b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/fan.png
new file mode 100644
index 00000000000..0fc239d6cfd
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/fan.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/meta.json
new file mode 100644
index 00000000000..ef0b880049d
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/meta.json
@@ -0,0 +1,163 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "normal-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          4,
+          0.1,
+          3,
+          0.5,
+          0.5,
+          0.5,
+          0.5,
+          0.5,
+          0.5,
+          0.5,
+          0.5
+        ],
+        [
+          4,
+          0.1,
+          3,
+          0.5,
+          0.5,
+          0.5,
+          0.5,
+          0.5,
+          0.5,
+          0.5,
+          0.5
+        ],
+        [
+          4,
+          0.1,
+          3,
+          0.5,
+          0.5,
+          0.5,
+          0.5,
+          0.5,
+          0.5,
+          0.5,
+          0.5
+        ],
+        [
+          4,
+          0.1,
+          3,
+          0.5,
+          0.5,
+          0.5,
+          0.5,
+          0.5,
+          0.5,
+          0.5,
+          0.5
+        ]
+      ]
+    },
+    {
+      "name": "eject-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "deny-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+      "name": "fan",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "panel",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/normal-unshaded.png
new file mode 100644
index 00000000000..083570790a8
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/off.png
new file mode 100644
index 00000000000..fb11ce6be8f
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/panel.png
new file mode 100644
index 00000000000..d5fa87b5116
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snix.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/broken.png
index 72f84139195..835f27942a2 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/deny-unshaded.png
index 7f630c601cb..b2e5c5c7a9b 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/eject-unshaded.png
index bb21e6a5c5b..47b68325efc 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/meta.json
index d0d4a1f0e95..b1083273c3d 100644
--- a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad. Modified by potato1234x (github) for SS14",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
   "size": {
     "x": 32,
     "y": 32
@@ -9,48 +9,104 @@
   "states": [
     {
       "name": "normal-unshaded",
+      "directions": 4,
       "delays": [
         [
-          2.5,
           0.1,
-          3.4,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
           0.1
         ]
       ]
     },
     {
-      "name": "broken"
-    },
-    {
-      "name": "normal"
-    },
-    {
-      "name": "deny-unshaded",
+      "name": "eject-unshaded",
+      "directions": 4,
       "delays": [
         [
           0.1,
           0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
           0.1
         ]
       ]
     },
     {
-      "name": "eject-unshaded",
+      "name": "deny-unshaded",
+      "directions": 4,
       "delays": [
         [
-          0.5,
           0.1,
-          1.0,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
           0.1,
           0.1
         ]
       ]
     },
     {
-      "name": "off"
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+        "name": "panel",
+        "directions": 4
     },
     {
-      "name": "panel"
+        "name": "normal"
     }
   ]
 }
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/normal-unshaded.png
index 1328a3b0414..0abc407ddb1 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/off.png
index a5d20fa418c..7b55385247f 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/panel.png
index 9e3049e07d7..0dc97647769 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/broken.png
new file mode 100644
index 00000000000..d447296df6e
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/deny-unshaded.png
new file mode 100644
index 00000000000..dfc8b949c1f
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/eject-unshaded.png
new file mode 100644
index 00000000000..f005de716f5
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/meta.json
new file mode 100644
index 00000000000..6467c185806
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/meta.json
@@ -0,0 +1,87 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "normal-unshaded",
+      "directions": 4
+    },
+    {
+      "name": "eject-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "deny-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+      "name": "panel",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/normal-unshaded.png
new file mode 100644
index 00000000000..394a9f792c9
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/off.png
new file mode 100644
index 00000000000..8e0099b5ce9
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/panel.png
new file mode 100644
index 00000000000..4a1a54be105
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/soda2.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sodasoviet.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/sodasoviet.rsi/broken.png
new file mode 100644
index 00000000000..7c8745e4f43
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/sodasoviet.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sodasoviet.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/sodasoviet.rsi/deny-unshaded.png
new file mode 100644
index 00000000000..3744436645f
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/sodasoviet.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sodasoviet.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/sodasoviet.rsi/eject-unshaded.png
new file mode 100644
index 00000000000..e86cd1c5670
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/sodasoviet.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sodasoviet.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/sodasoviet.rsi/meta.json
new file mode 100644
index 00000000000..95be94ea05f
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/VendingMachines/sodasoviet.rsi/meta.json
@@ -0,0 +1,83 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken at commit https://github.com/Baystation12/Baystation12/commit/c39dcc148c04065ebac05f63bf3a556e8f21cac4",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "normal-unshaded",
+      "directions": 4
+    },
+    {
+      "name": "eject-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "deny-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.4,
+          0.4
+        ],
+        [
+          0.4,
+          0.4
+        ],
+        [
+          0.4,
+          0.4
+        ],
+        [
+          0.4,
+          0.4
+        ]
+      ]
+    },
+    {
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+      "name": "panel",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sodasoviet.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/sodasoviet.rsi/normal-unshaded.png
new file mode 100644
index 00000000000..62ce64eb0c9
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/sodasoviet.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sodasoviet.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/sodasoviet.rsi/off.png
new file mode 100644
index 00000000000..862d17f646b
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/sodasoviet.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sodasoviet.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/sodasoviet.rsi/panel.png
new file mode 100644
index 00000000000..c8122097f81
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/sodasoviet.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/solsnack.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/solsnack.rsi/broken.png
new file mode 100644
index 00000000000..c9fff1d29ae
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/solsnack.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/solsnack.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/solsnack.rsi/deny-unshaded.png
new file mode 100644
index 00000000000..40643888a0c
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/solsnack.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/solsnack.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/solsnack.rsi/eject-unshaded.png
new file mode 100644
index 00000000000..a7a40777ef3
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/solsnack.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/solsnack.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/solsnack.rsi/meta.json
new file mode 100644
index 00000000000..0227985bb84
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/VendingMachines/solsnack.rsi/meta.json
@@ -0,0 +1,109 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "normal-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.8,
+          0.8,
+          0.8
+        ],
+        [
+          0.8,
+          0.8,
+          0.8
+        ],
+        [
+          0.8,
+          0.8,
+          0.8
+        ],
+        [
+          0.8,
+          0.8,
+          0.8
+        ]
+      ]
+    },
+    {
+      "name": "eject-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "deny-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+      "name": "panel",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/solsnack.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/solsnack.rsi/normal-unshaded.png
new file mode 100644
index 00000000000..677ccd0cfe7
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/solsnack.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/solsnack.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/solsnack.rsi/off.png
new file mode 100644
index 00000000000..e214035f5b6
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/solsnack.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/solsnack.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/solsnack.rsi/panel.png
new file mode 100644
index 00000000000..c8122097f81
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/solsnack.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/broken.png
index 32fdbb98f30..753f96ecb45 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/deny-unshaded.png
index 66e29f2bf01..bc889ec638b 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/eject-unshaded.png
index 865de78e602..0a2d1ea2331 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/meta.json
index 8c67a03d350..057b1e8e940 100644
--- a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/meta.json
@@ -1,54 +1,109 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "normal-unshaded"
+      "name": "normal-unshaded",
+      "directions": 4
     },
     {
-      "name": "broken"
-    },
-    {
-      "name": "deny-unshaded",
+      "name": "eject-unshaded",
+      "directions": 4,
       "delays": [
         [
           0.1,
           0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
           0.1
         ]
       ]
     },
     {
-      "name": "off"
-    },
-    {
-      "name": "screen",
+      "name": "deny-unshaded",
+      "directions": 4,
       "delays": [
         [
-          3,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
           0.1
         ]
       ]
     },
     {
-      "name": "panel"
+      "name": "off",
+      "directions": 4
     },
     {
-      "name": "eject-unshaded",
+      "name": "broken",
+      "directions": 4
+    },
+    {
+      "name": "screen",
+      "directions": 4,
       "delays": [
         [
-          0.1,
-          0.1,
-          0.8,
-          0.1,
+          3,
+          0.1
+        ],
+        [
+          3,
+          0.1
+        ],
+        [
+          3,
+          0.1
+        ],
+        [
+          3,
           0.1
         ]
       ]
+    },
+    {
+      "name": "panel",
+      "directions": 4
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/normal-unshaded.png
index 027d2fe0098..b7e0751dddf 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/off.png
index 069d91a3737..3feefb11bf0 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/panel.png
index 6c43cd885bd..a2d8ea33205 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/screen.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/screen.png
index a0bf454c8d4..30c120bce78 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/screen.png and b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/screen.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/uniform.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/uniform.rsi/broken.png
new file mode 100644
index 00000000000..c20faa89db2
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/uniform.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/uniform.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/uniform.rsi/deny-unshaded.png
new file mode 100644
index 00000000000..34d6c07accd
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/uniform.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/uniform.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/uniform.rsi/eject-unshaded.png
new file mode 100644
index 00000000000..906425c3d18
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/uniform.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/uniform.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/uniform.rsi/meta.json
new file mode 100644
index 00000000000..24c7cd05f45
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/VendingMachines/uniform.rsi/meta.json
@@ -0,0 +1,91 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "normal-unshaded",
+      "directions": 4
+    },
+    {
+      "name": "eject-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.4,
+          0.1
+        ],
+        [
+          0.1,
+          0.4,
+          0.1
+        ],
+        [
+          0.1,
+          0.4,
+          0.1
+        ],
+        [
+          0.1,
+          0.4,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "deny-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+      "name": "panel",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/uniform.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/uniform.rsi/normal-unshaded.png
new file mode 100644
index 00000000000..46fe98a85d1
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/uniform.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/uniform.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/uniform.rsi/off.png
new file mode 100644
index 00000000000..b5de5eb5f43
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/uniform.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/uniform.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/uniform.rsi/panel.png
new file mode 100644
index 00000000000..f71c43d8ce8
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/uniform.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/broken.png
index 783cf8af957..3a2fbee2dd7 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/deny-unshaded.png
index 75081085a9a..066f7787bc1 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/eject-unshaded.png
new file mode 100644
index 00000000000..dd792204937
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/meta.json
index b34b3c2a117..0201682c862 100644
--- a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/meta.json
@@ -1,38 +1,87 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae, off.png taken from /tg/station commit ede31369cfa5ea1bed9262b5ef4bbef85f60fe26 and edited by @Flareguy",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "broken"
-    },
-    {
-      "name": "panel"
+      "name": "normal-unshaded",
+      "directions": 4
     },
     {
-      "name": "deny-unshaded",
+      "name": "eject-unshaded",
+      "directions": 4,
       "delays": [
         [
           0.1,
-          0.1
+          0.1,
+          0.1,
+          0.1,
+          0.6
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.6
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.6
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.6
         ]
       ]
     },
     {
-      "name": "normal-unshaded",
+      "name": "deny-unshaded",
+      "directions": 4,
       "delays": [
         [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
           0.1,
           0.1
         ]
       ]
     },
     {
-      "name": "off"
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+      "name": "panel",
+      "directions": 4
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/normal-unshaded.png
index c94e7ba2664..b5cd555038e 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/off.png
index fb933b86129..d3eed12c558 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/panel.png
index 851c8b78938..f67e50ee909 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/weeb.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/weeb.rsi/broken.png
new file mode 100644
index 00000000000..7ef463bc354
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/weeb.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/weeb.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/weeb.rsi/deny-unshaded.png
new file mode 100644
index 00000000000..8d9329bd55c
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/weeb.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/weeb.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/weeb.rsi/eject-unshaded.png
new file mode 100644
index 00000000000..c1612ce86e3
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/weeb.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/weeb.rsi/fan.png b/Resources/Textures/Structures/Machines/VendingMachines/weeb.rsi/fan.png
new file mode 100644
index 00000000000..5c521d83808
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/weeb.rsi/fan.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/weeb.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/weeb.rsi/meta.json
new file mode 100644
index 00000000000..76eb760cea0
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/VendingMachines/weeb.rsi/meta.json
@@ -0,0 +1,135 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "normal-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          4,
+          0.1
+        ],
+        [
+          4,
+          0.1
+        ],
+        [
+          4,
+          0.1
+        ],
+        [
+          4,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "eject-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.8,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "deny-unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+      "name": "fan",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "panel",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/weeb.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/weeb.rsi/normal-unshaded.png
new file mode 100644
index 00000000000..02f1ab353e8
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/weeb.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/weeb.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/weeb.rsi/off.png
new file mode 100644
index 00000000000..9d15cc4785f
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/weeb.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/weeb.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/weeb.rsi/panel.png
new file mode 100644
index 00000000000..d5fa87b5116
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/weeb.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/broken.png
index 18322391cce..f4bf0a39292 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/deny-unshaded.png
index 9819fb38674..9ee002be458 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/deny-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/eject-unshaded.png
index 9d19accfe1c..acc5b47a3de 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/eject-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/meta.json
index 4e9ac60b73d..24c7cd05f45 100644
--- a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/meta.json
@@ -1,52 +1,91 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept",
+  "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "broken"
+      "name": "normal-unshaded",
+      "directions": 4
     },
     {
-      "name": "deny-unshaded",
+      "name": "eject-unshaded",
+      "directions": 4,
       "delays": [
         [
-          0.5,
+          0.1,
+          0.4,
           0.1
-        ]
-      ]
-    },
-    {
-      "name": "eject-unshaded",
-      "delays": [
+        ],
         [
           0.1,
           0.4,
-          0.2,
+          0.1
+        ],
+        [
+          0.1,
+          0.4,
+          0.1
+        ],
+        [
+          0.1,
           0.4,
           0.1
         ]
       ]
     },
     {
-      "name": "normal-unshaded",
+      "name": "deny-unshaded",
+      "directions": 4,
       "delays": [
         [
-          2.5,
-          0.05,
-          3.4,
-          0.05
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
         ]
       ]
     },
     {
-      "name": "off"
+      "name": "off",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
     },
     {
-      "name": "panel"
+      "name": "panel",
+      "directions": 4
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/normal-unshaded.png
index 80ca6812f74..1aa08065ff8 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/off.png
index 2ac83c2eb83..1af7d16d170 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/panel.png
index faddc533514..e50605569e8 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Specific/barbershop.rsi/barberchair.png b/Resources/Textures/Structures/Specific/barbershop.rsi/barberchair.png
new file mode 100644
index 00000000000..7e8fd78ab75
Binary files /dev/null and b/Resources/Textures/Structures/Specific/barbershop.rsi/barberchair.png differ
diff --git a/Resources/Textures/Structures/Specific/barbershop.rsi/dyedispenser-broken.png b/Resources/Textures/Structures/Specific/barbershop.rsi/dyedispenser-broken.png
new file mode 100644
index 00000000000..a6b1937b7fa
Binary files /dev/null and b/Resources/Textures/Structures/Specific/barbershop.rsi/dyedispenser-broken.png differ
diff --git a/Resources/Textures/Structures/Specific/barbershop.rsi/dyedispenser-off.png b/Resources/Textures/Structures/Specific/barbershop.rsi/dyedispenser-off.png
new file mode 100644
index 00000000000..ff5f77f3d3b
Binary files /dev/null and b/Resources/Textures/Structures/Specific/barbershop.rsi/dyedispenser-off.png differ
diff --git a/Resources/Textures/Structures/Specific/barbershop.rsi/dyedispenser.png b/Resources/Textures/Structures/Specific/barbershop.rsi/dyedispenser.png
new file mode 100644
index 00000000000..b0ca6f422bc
Binary files /dev/null and b/Resources/Textures/Structures/Specific/barbershop.rsi/dyedispenser.png differ
diff --git a/Resources/Textures/Structures/Specific/barbershop.rsi/meta.json b/Resources/Textures/Structures/Specific/barbershop.rsi/meta.json
new file mode 100644
index 00000000000..1226428bcfb
--- /dev/null
+++ b/Resources/Textures/Structures/Specific/barbershop.rsi/meta.json
@@ -0,0 +1,37 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from goonstation at https://github.com/goonstation/goonstation/blob/16f8a5c31a6cfc019a1549b0b97f18865002a44c/icons/obj/barber_shop.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "pole",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "barberchair"
+    },
+    {
+      "name": "dyedispenser"
+    },
+    {
+      "name": "dyedispenser-off"
+    },
+    {
+      "name": "dyedispenser-broken"
+    },
+    {
+      "name": "thesnip"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Specific/barbershop.rsi/pole.png b/Resources/Textures/Structures/Specific/barbershop.rsi/pole.png
new file mode 100644
index 00000000000..963cb611fc4
Binary files /dev/null and b/Resources/Textures/Structures/Specific/barbershop.rsi/pole.png differ
diff --git a/Resources/Textures/Structures/Specific/barbershop.rsi/thesnip.png b/Resources/Textures/Structures/Specific/barbershop.rsi/thesnip.png
new file mode 100644
index 00000000000..9f3bb58b5eb
Binary files /dev/null and b/Resources/Textures/Structures/Specific/barbershop.rsi/thesnip.png differ
diff --git a/Resources/Textures/Structures/Specific/fitness.rsi/bopbag.png b/Resources/Textures/Structures/Specific/fitness.rsi/bopbag.png
new file mode 100644
index 00000000000..85f5da360c7
Binary files /dev/null and b/Resources/Textures/Structures/Specific/fitness.rsi/bopbag.png differ
diff --git a/Resources/Textures/Structures/Specific/fitness.rsi/bopbag2.png b/Resources/Textures/Structures/Specific/fitness.rsi/bopbag2.png
new file mode 100644
index 00000000000..1be1e633417
Binary files /dev/null and b/Resources/Textures/Structures/Specific/fitness.rsi/bopbag2.png differ
diff --git a/Resources/Textures/Structures/Specific/fitness.rsi/fitnesslifter.png b/Resources/Textures/Structures/Specific/fitness.rsi/fitnesslifter.png
new file mode 100644
index 00000000000..51317e29479
Binary files /dev/null and b/Resources/Textures/Structures/Specific/fitness.rsi/fitnesslifter.png differ
diff --git a/Resources/Textures/Structures/Specific/fitness.rsi/fitnesslifter2.png b/Resources/Textures/Structures/Specific/fitness.rsi/fitnesslifter2.png
new file mode 100644
index 00000000000..ccd6eb3fdb7
Binary files /dev/null and b/Resources/Textures/Structures/Specific/fitness.rsi/fitnesslifter2.png differ
diff --git a/Resources/Textures/Structures/Specific/fitness.rsi/fitnessweight-c.png b/Resources/Textures/Structures/Specific/fitness.rsi/fitnessweight-c.png
new file mode 100644
index 00000000000..1791c3c35bc
Binary files /dev/null and b/Resources/Textures/Structures/Specific/fitness.rsi/fitnessweight-c.png differ
diff --git a/Resources/Textures/Structures/Specific/fitness.rsi/fitnessweight-w.png b/Resources/Textures/Structures/Specific/fitness.rsi/fitnessweight-w.png
new file mode 100644
index 00000000000..3c515a49572
Binary files /dev/null and b/Resources/Textures/Structures/Specific/fitness.rsi/fitnessweight-w.png differ
diff --git a/Resources/Textures/Structures/Specific/fitness.rsi/fitnessweight.png b/Resources/Textures/Structures/Specific/fitness.rsi/fitnessweight.png
new file mode 100644
index 00000000000..d60d45cb896
Binary files /dev/null and b/Resources/Textures/Structures/Specific/fitness.rsi/fitnessweight.png differ
diff --git a/Resources/Textures/Structures/Specific/fitness.rsi/meta.json b/Resources/Textures/Structures/Specific/fitness.rsi/meta.json
new file mode 100644
index 00000000000..a4b18d2d642
--- /dev/null
+++ b/Resources/Textures/Structures/Specific/fitness.rsi/meta.json
@@ -0,0 +1,147 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/78a56e1a22ba1d8d6023ed9bdae55a6de7fe8a39/icons/obj/fitness.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "punchingbag"
+    },
+    {
+      "name": "punchingbag2",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "punchingbagwizard"
+    },
+    {
+      "name": "punchingbagwizard2",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "punchingbagsyndie"
+    },
+    {
+      "name": "punchingbagsyndie2",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "bopbag"
+    },
+    {
+      "name": "bopbag2",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "fitnesslifter"
+    },
+    {
+      "name": "fitnesslifter2",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "fitnessweight"
+    },
+    {
+      "name": "fitnessweight-c"
+    },
+    {
+      "name": "fitnessweight-w",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "punchingbagcaptain"
+    },
+    {
+      "name": "punchingbagcaptain2",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Specific/fitness.rsi/punchingbag.png b/Resources/Textures/Structures/Specific/fitness.rsi/punchingbag.png
new file mode 100644
index 00000000000..048ac4ce745
Binary files /dev/null and b/Resources/Textures/Structures/Specific/fitness.rsi/punchingbag.png differ
diff --git a/Resources/Textures/Structures/Specific/fitness.rsi/punchingbag2.png b/Resources/Textures/Structures/Specific/fitness.rsi/punchingbag2.png
new file mode 100644
index 00000000000..4b5efbfc8fc
Binary files /dev/null and b/Resources/Textures/Structures/Specific/fitness.rsi/punchingbag2.png differ
diff --git a/Resources/Textures/Structures/Specific/fitness.rsi/punchingbagcaptain.png b/Resources/Textures/Structures/Specific/fitness.rsi/punchingbagcaptain.png
new file mode 100644
index 00000000000..6ef688269da
Binary files /dev/null and b/Resources/Textures/Structures/Specific/fitness.rsi/punchingbagcaptain.png differ
diff --git a/Resources/Textures/Structures/Specific/fitness.rsi/punchingbagcaptain2.png b/Resources/Textures/Structures/Specific/fitness.rsi/punchingbagcaptain2.png
new file mode 100644
index 00000000000..efdf7c12b6d
Binary files /dev/null and b/Resources/Textures/Structures/Specific/fitness.rsi/punchingbagcaptain2.png differ
diff --git a/Resources/Textures/Structures/Specific/fitness.rsi/punchingbagsyndie.png b/Resources/Textures/Structures/Specific/fitness.rsi/punchingbagsyndie.png
new file mode 100644
index 00000000000..86339ad36be
Binary files /dev/null and b/Resources/Textures/Structures/Specific/fitness.rsi/punchingbagsyndie.png differ
diff --git a/Resources/Textures/Structures/Specific/fitness.rsi/punchingbagsyndie2.png b/Resources/Textures/Structures/Specific/fitness.rsi/punchingbagsyndie2.png
new file mode 100644
index 00000000000..e59e3844c5b
Binary files /dev/null and b/Resources/Textures/Structures/Specific/fitness.rsi/punchingbagsyndie2.png differ
diff --git a/Resources/Textures/Structures/Specific/fitness.rsi/punchingbagwizard.png b/Resources/Textures/Structures/Specific/fitness.rsi/punchingbagwizard.png
new file mode 100644
index 00000000000..0b6d9dca713
Binary files /dev/null and b/Resources/Textures/Structures/Specific/fitness.rsi/punchingbagwizard.png differ
diff --git a/Resources/Textures/Structures/Specific/fitness.rsi/punchingbagwizard2.png b/Resources/Textures/Structures/Specific/fitness.rsi/punchingbagwizard2.png
new file mode 100644
index 00000000000..11a00d2d55f
Binary files /dev/null and b/Resources/Textures/Structures/Specific/fitness.rsi/punchingbagwizard2.png differ